diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py index 99e82b53..e1585240 100755 --- a/pyfpdb/FulltiltToFpdb.py +++ b/pyfpdb/FulltiltToFpdb.py @@ -338,7 +338,7 @@ class Fulltilt(HandHistoryConverter): def readPlayerStacks(self, hand): # Split hand text for FTP, as the regex matches the player names incorrectly # in the summary section - pre, post = hand.handText.split('SUMMARY') + pre, post = hand.handText.split('*** SUMMARY ***') m = self.re_PlayerInfo.finditer(pre) plist = {} diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/LHE-USD-1.00-200508.BB.and.Button.same.player.txt.hp b/pyfpdb/regression-test-files/cash/Stars/Flop/LHE-USD-1.00-200508.BB.and.Button.same.player.txt.hp index 9ff13bea..25cadbbd 100644 --- a/pyfpdb/regression-test-files/cash/Stars/Flop/LHE-USD-1.00-200508.BB.and.Button.same.player.txt.hp +++ b/pyfpdb/regression-test-files/cash/Stars/Flop/LHE-USD-1.00-200508.BB.and.Button.same.player.txt.hp @@ -47,6 +47,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -141,6 +145,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt.hp b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt.hp index 390b2e99..826d4bba 100644 --- a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt.hp +++ b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt.hp @@ -47,6 +47,10 @@ 'street0_3BDone': True, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -141,6 +145,10 @@ 'street0_3BDone': False, 'street0_4BChance': True, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -235,6 +243,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -329,6 +341,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -423,6 +439,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -517,6 +537,10 @@ 'street0_3BDone': False, 'street0_4BChance': True, 'street0_4BDone': True, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-CAP-9max-USD-0.25-0.50-201011.Capped.preflop.txt.hp b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-CAP-9max-USD-0.25-0.50-201011.Capped.preflop.txt.hp index 3e134e68..00d955be 100644 --- a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-CAP-9max-USD-0.25-0.50-201011.Capped.preflop.txt.hp +++ b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-CAP-9max-USD-0.25-0.50-201011.Capped.preflop.txt.hp @@ -47,6 +47,10 @@ 'street0_3BDone': True, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -141,6 +145,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -235,6 +243,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -329,6 +341,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -423,6 +439,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -517,6 +537,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -611,6 +635,10 @@ 'street0_3BDone': False, 'street0_4BChance': True, 'street0_4BDone': True, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-FR-USD-0.01-0.02-201004.4betPF.txt.hp b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-FR-USD-0.01-0.02-201004.4betPF.txt.hp index 811945de..a9cffd09 100644 --- a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-FR-USD-0.01-0.02-201004.4betPF.txt.hp +++ b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-FR-USD-0.01-0.02-201004.4betPF.txt.hp @@ -47,6 +47,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -141,6 +145,10 @@ 'street0_3BDone': False, 'street0_4BChance': True, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -235,6 +243,10 @@ 'street0_3BDone': True, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -329,6 +341,10 @@ 'street0_3BDone': False, 'street0_4BChance': True, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -423,6 +439,10 @@ 'street0_3BDone': False, 'street0_4BChance': True, 'street0_4BDone': True, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -517,6 +537,10 @@ 'street0_3BDone': False, 'street0_4BChance': True, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -611,6 +635,10 @@ 'street0_3BDone': False, 'street0_4BChance': True, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -705,6 +733,10 @@ 'street0_3BDone': False, 'street0_4BChance': True, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/PLO8-9max-USD-0.01-0.02-20100829.No.VPIP.from.posted.bb.txt.hp b/pyfpdb/regression-test-files/cash/Stars/Flop/PLO8-9max-USD-0.01-0.02-20100829.No.VPIP.from.posted.bb.txt.hp index 8a8353f6..352f0995 100644 --- a/pyfpdb/regression-test-files/cash/Stars/Flop/PLO8-9max-USD-0.01-0.02-20100829.No.VPIP.from.posted.bb.txt.hp +++ b/pyfpdb/regression-test-files/cash/Stars/Flop/PLO8-9max-USD-0.01-0.02-20100829.No.VPIP.from.posted.bb.txt.hp @@ -47,6 +47,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -141,6 +145,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -235,6 +243,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -329,6 +341,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -423,6 +439,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -517,6 +537,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -611,6 +635,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -705,6 +733,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -799,6 +831,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, diff --git a/pyfpdb/regression-test-files/cash/Stars/Stud/7-StudHL-USD-0.04-0.08-200911.Cardtest.txt.hp b/pyfpdb/regression-test-files/cash/Stars/Stud/7-StudHL-USD-0.04-0.08-200911.Cardtest.txt.hp index 6421fa0f..fd1bd3db 100644 --- a/pyfpdb/regression-test-files/cash/Stars/Stud/7-StudHL-USD-0.04-0.08-200911.Cardtest.txt.hp +++ b/pyfpdb/regression-test-files/cash/Stars/Stud/7-StudHL-USD-0.04-0.08-200911.Cardtest.txt.hp @@ -47,6 +47,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -141,6 +145,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -235,6 +243,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -329,6 +341,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -423,6 +439,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -517,6 +537,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -611,6 +635,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False, @@ -705,6 +733,10 @@ 'street0_3BDone': False, 'street0_4BChance': False, 'street0_4BDone': False, + 'street0_FoldTo3BChance': False, + 'street0_FoldTo3BDone': False, + 'street0_FoldTo4BChance': False, + 'street0_FoldTo4BDone': False, 'street1Aggr': False, 'street1Bets': 0, 'street1CBChance': False,