diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py index 7965f81d..938e7b3b 100644 --- a/pyfpdb/DerivedStats.py +++ b/pyfpdb/DerivedStats.py @@ -290,9 +290,11 @@ class DerivedStats(): # print "p_actions:", self.pfba(actions), "p_folds:", self.pfba(actions, l=('folds',)), "alliners:", alliners # pas = set.union(self.pfba(actions) - self.pfba(actions, l=('folds',)), alliners) - # hand.players includes people that are sitting out on some sites. - # Those that posted an ante should have been deal cards. - p_in = set([x[0] for x in hand.actions[hand.allStreets[0]]] + [x[0] for x in hand.actions[hand.actionStreets[0]]]) + # hand.players includes people that are sitting out on some sites for cash games + # actionStreets[1] is 'DEAL', 'THIRD', 'PREFLOP', so any player dealt cards + # must act on this street if dealt cards. Almost certainly broken for the 'all-in blind' case + # and right now i don't care - CG + p_in = set([x[0] for x in hand.actions[hand.actionStreets[1]]]) for (i, street) in enumerate(hand.actionStreets): actions = hand.actions[street] diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py index 9271b073..52d6682d 100644 --- a/pyfpdb/PokerStarsToFpdb.py +++ b/pyfpdb/PokerStarsToFpdb.py @@ -52,7 +52,8 @@ class PokerStars(HandHistoryConverter): '60.00': ('15.00', '30.00'), '60': ('15.00', '30.00'), '100.00': ('25.00', '50.00'), '100': ('25.00', '50.00'),'200.00': ('50.00', '100.00'), '200': ('50.00', '100.00'), '400.00': ('100.00', '200.00'), '400': ('100.00', '200.00'),'1000.00': ('250.00', '500.00'), - '1000': ('250.00', '500.00')} + '1000': ('250.00', '500.00') + } limits = { 'No Limit':'nl', 'Pot Limit':'pl', 'Limit':'fl', 'LIMIT':'fl' } games = { # base, category