diff --git a/.gitignore b/.gitignore index 4d4dfbc..ea0491f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,9 @@ dist/ # Log files *.log +# PyCharm +.idea + # Applications *.app *.exe diff --git a/megamillions/MegaMillions.py b/megamillions/MegaMillions.py index 2ca3492..ec3b7c4 100644 --- a/megamillions/MegaMillions.py +++ b/megamillions/MegaMillions.py @@ -16,3 +16,9 @@ class MegaMillions(Ticket): def get_winnings_without_special_ball(self): return get_winnings_no_mb() + + def get_winning_numbers(self): + winners = self.feed.get_winning_numbers() + self.winning_numbers = winners['numbers'] + self.special_ball = winners['special_ball'] + self.multiplier = self.my_picks['mult'] \ No newline at end of file diff --git a/megamillions/game.py b/megamillions/game.py old mode 100755 new mode 100644 diff --git a/megamillions/picks.py b/megamillions/picks.py index 2750289..80c0858 100644 --- a/megamillions/picks.py +++ b/megamillions/picks.py @@ -1,14 +1,12 @@ my_picks = [ - {'picks': (9, 11, 42, 53, 69), 'mb': 22, 'ticket': 1}, - {'picks': (6, 11, 24, 42, 69), 'mb': 17, 'ticket': 1}, - {'picks': (2, 20, 24, 43, 48), 'mb': 13, 'ticket': 1}, - {'picks': (3, 7, 20, 47, 68), 'mb': 13, 'ticket': 1}, - {'picks': (5, 9, 13, 18, 25), 'mb': 9, 'ticket': 1}, + # {'picks': (9, 11, 42, 53, 69), 'mb': 22, 'ticket': 1}, + # {'picks': (6, 11, 24, 42, 69), 'mb': 17, 'ticket': 1}, + # {'picks': (2, 20, 24, 43, 48), 'mb': 13, 'ticket': 1}, + # {'picks': (3, 7, 20, 47, 68), 'mb': 13, 'ticket': 1}, + # {'picks': (5, 9, 13, 18, 25), 'mb': 9, 'ticket': 1}, # quick picks # - {'picks': (13, 37, 44, 50, 61), 'mb': 9, 'ticket': 2}, - {'picks': (1, 36, 43, 55, 68), 'mb': 25, 'ticket': 2}, - {'picks': (2, 13, 44, 52, 70), 'mb': 15, 'ticket': 2}, - {'picks': (8, 21, 27, 63, 64), 'mb': 2, 'ticket': 2}, - {'picks': (14, 42, 48, 57, 58), 'mb': 4, 'ticket': 2}, + {'picks': (9,18,22,52,53), 'mb': 4, 'mult': 3, 'ticket': 2}, + + {'picks': (1,5,21,36,60), 'mb': 24, 'mult': 3, 'ticket': 3}, ] diff --git a/megamillions/winning_structure.py b/megamillions/winning_structure.py index 87adac9..8f471d3 100644 --- a/megamillions/winning_structure.py +++ b/megamillions/winning_structure.py @@ -1,9 +1,10 @@ def get_winnings_mb(jackpot_cash): return { - 2: [4, 8, 20, 400, 20_000, jackpot_cash], - 3: [6, 12, 30, 600, 30_000, jackpot_cash], - 4: [8, 16, 40, 800, 40_000, jackpot_cash], - 5: [10, 20, 50, 1_000, 50_000, jackpot_cash] + 2: [10, 14, 20, 400, 20_000, jackpot_cash], + 3: [15, 21, 30, 600, 30_000, jackpot_cash], + 4: [20, 28, 40, 800, 40_000, jackpot_cash], + 5: [25, 35, 50, 1_000, 50_000, jackpot_cash], + 10: [50, 70, 100, 2_000, 100_000, jackpot_cash] } @@ -12,5 +13,6 @@ def get_winnings_no_mb(): 2: [0, 0, 0, 20, 1_000, 2_000_000], 3: [0, 0, 0, 30, 1_500, 3_000_000], 4: [0, 0, 0, 40, 2_000, 4_000_000], - 5: [0, 0, 0, 50, 2_500, 5_000_000] - } + 5: [0, 0, 0, 50, 2_500, 5_000_000], + 10: [0, 0, 0, 100, 5_000, 10_000_000] + } \ No newline at end of file diff --git a/play.py b/play.py old mode 100755 new mode 100644 diff --git a/powerball/game.py b/powerball/game.py old mode 100755 new mode 100644 diff --git a/powerball/picks.py b/powerball/picks.py index 769abda..fd0ec31 100644 --- a/powerball/picks.py +++ b/powerball/picks.py @@ -1,20 +1,14 @@ my_picks = [ - {'picks': (9, 11, 42, 53, 69), 'pb': 22, 'ticket': 1}, - {'picks': (6, 11, 24, 42, 69), 'pb': 17, 'ticket': 1}, - {'picks': (2, 20, 24, 43, 48), 'pb': 13, 'ticket': 1}, - {'picks': (3, 7, 20, 47, 68), 'pb': 13, 'ticket': 1}, - {'picks': (5, 9, 13, 18, 25), 'pb': 9, 'ticket': 1}, + {'picks': (9,11,42,53,69), 'pb': 22, 'ticket': 1}, + {'picks': (6,11,24,42,69), 'pb': 17, 'ticket': 1}, + {'picks': (2,20,24,43,48), 'pb': 13, 'ticket': 1}, + {'picks': (3,7,20,47,68), 'pb': 13, 'ticket': 1}, + {'picks': (5,9,13,18,25), 'pb': 9, 'ticket': 1}, - # Quick Picks # - {'picks': (4, 10, 17, 36, 67), 'pb': 16, 'ticket': 2}, - {'picks': (14, 20, 33, 41, 59), 'pb': 26, 'ticket': 2}, - {'picks': (32, 39, 56, 58, 67), 'pb': 23, 'ticket': 2}, - {'picks': (5, 12, 24, 61, 64), 'pb': 11, 'ticket': 2}, - {'picks': (11, 13, 16, 24, 35), 'pb': 25, 'ticket': 2}, - - {'picks': (32, 38, 47, 54, 62), 'pb': 26, 'ticket': 3}, - {'picks': (2, 10, 53, 62, 67), 'pb': 14, 'ticket': 3}, - {'picks': (1, 19, 37, 52, 66), 'pb': 22, 'ticket': 3}, - {'picks': (18, 35, 51, 65, 67), 'pb': 24, 'ticket': 3}, - {'picks': (17, 35, 42, 48, 65), 'pb': 7, 'ticket': 3}, + # quick picks # + {'picks': (32,33,54,60,63), 'pb': 1, 'ticket': 2}, + {'picks': (3,41,48,64,66), 'pb': 14, 'ticket': 2}, + {'picks': (2,4,24,41,54), 'pb': 19, 'ticket': 2}, + {'picks': (14,24,35,41,52), 'pb': 18, 'ticket': 2}, + {'picks': (11,31,61,65,68), 'pb': 14, 'ticket': 2}, ] diff --git a/requirements.txt b/requirements.txt index 0b1a6e0..3e384d0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -feedparser==6.0.8 +feedparser==6.0.11 sgmllib3k==1.0.0