diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py index 327b8de2..4e55cdfc 100644 --- a/pyfpdb/DerivedStats.py +++ b/pyfpdb/DerivedStats.py @@ -505,9 +505,14 @@ class DerivedStats(): """Returns true if player bet/raised the street as their first action""" betOrRaise = False for act in self.hand.actions[street]: - if act[0] == player and act[1] in ('bets', 'raises'): - betOrRaise = True - else: + if act[0] == player: + if act[1] in ('bets', 'raises'): + betOrRaise = True + else: + # player found but did not bet or raise as their first action + pass break + #else: + # haven't found player's first action yet return betOrRaise diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py index c6d20e0c..76a58b93 100644 --- a/pyfpdb/PokerStarsToFpdb.py +++ b/pyfpdb/PokerStarsToFpdb.py @@ -50,8 +50,8 @@ class PokerStars(HandHistoryConverter): (?P([%(LS)s\+\d\.]+\s?(?P%(LEGAL_ISO)s)?)|Freeroll)\s+)? # close paren of tournament info (?PHORSE|8\-Game|HOSE)?\s?\(? - (?PHold\'em|Razz|7\sCard\sStud|7\sCard\sStud\sHi/Lo|Omaha|Omaha\sHi/Lo|Badugi|Triple\sDraw\s2\-7\sLowball|5\sCard\sDraw)\s - (?PNo\sLimit|Limit|Pot\sLimit)\)?,?\s + (?PHold\'em|Razz|RAZZ|7\sCard\sStud|7\sCard\sStud\sHi/Lo|Omaha|Omaha\sHi/Lo|Badugi|Triple\sDraw\s2\-7\sLowball|5\sCard\sDraw)\s + (?PNo\sLimit|Limit|LIMIT|Pot\sLimit)\)?,?\s (-\sLevel\s(?P[IVXLC]+)\s)? \(? # open paren of the stakes (?P%(LS)s|)? @@ -150,12 +150,13 @@ class PokerStars(HandHistoryConverter): '1000.00': ('250.00', '500.00')} - limits = { 'No Limit':'nl', 'Pot Limit':'pl', 'Limit':'fl' } + limits = { 'No Limit':'nl', 'Pot Limit':'pl', 'Limit':'fl', 'LIMIT':'fl' } games = { # base, category "Hold'em" : ('hold','holdem'), 'Omaha' : ('hold','omahahi'), 'Omaha Hi/Lo' : ('hold','omahahilo'), 'Razz' : ('stud','razz'), + 'RAZZ' : ('stud','razz'), '7 Card Stud' : ('stud','studhi'), '7 Card Stud Hi/Lo' : ('stud','studhilo'), 'Badugi' : ('draw','badugi'),