diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py index 7778c956..26e95394 100644 --- a/pyfpdb/DerivedStats.py +++ b/pyfpdb/DerivedStats.py @@ -292,7 +292,7 @@ class DerivedStats(): # 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['BLINDSANTES']]) + p_in = set([x[0] for x in hand.actions['BLINDSANTES']] + [x[0] for x in hand.actions['PREFLOP']]) for (i, street) in enumerate(hand.actionStreets): actions = hand.actions[street] diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py index 454f7e79..8bff1cdd 100755 --- a/pyfpdb/EverleafToFpdb.py +++ b/pyfpdb/EverleafToFpdb.py @@ -58,7 +58,7 @@ class Everleaf(HandHistoryConverter): self.re_HeroCards = re.compile(ur"^Dealt to %s \[ (?P.*) \]$" % player_re, re.MULTILINE) # ^%s(?P: bets| checks| raises| calls| folds)(\s\[(?:\$| €|) (?P[.,\d]+) (USD|EURO|Chips)\])? self.re_Action = re.compile(ur"^%s(?P: bets| checks| raises| calls| folds)(\s\[(?:[$€]?) (?P[.,\d]+)\s?(USD|EURO|Chips|)\])?" % player_re, re.MULTILINE) - self.re_ShowdownAction = re.compile(ur"^%s shows \[ (?P.*) \]$" % player_re, re.MULTILINE) + self.re_ShowdownAction = re.compile(ur"^%s shows \[ (?P.*) \]" % player_re, re.MULTILINE) self.re_CollectPot = re.compile(ur"^%s wins (?:[$€]?)\s?(?P[.\d]+) (USD|EURO|chips)(.*?\[ (?P.*?) \])?" % player_re, re.MULTILINE) self.re_SitsOut = re.compile(ur"^%s sits out" % player_re, re.MULTILINE) diff --git a/pyfpdb/HUD_config.xml.example b/pyfpdb/HUD_config.xml.example index 9ee17c1c..da257d1c 100644 --- a/pyfpdb/HUD_config.xml.example +++ b/pyfpdb/HUD_config.xml.example @@ -556,22 +556,26 @@ Left-Drag to Move" + + + + + - diff --git a/pyfpdb/Stats.py b/pyfpdb/Stats.py index 9bb6307c..74558da8 100755 --- a/pyfpdb/Stats.py +++ b/pyfpdb/Stats.py @@ -589,8 +589,8 @@ def agg_fact(stat_dict, player): def cbet(stat_dict, player): - """ Flop continuation bet.""" - """ Continuation bet % = (times made a continuation bet on the flop) * 100 / (number of opportunities to make a continuation bet on the flop) """ + """ Total continuation bet.""" + """ Continuation bet % = (times made a continuation bet on any street) * 100 / (number of opportunities to make a continuation bet on any street) """ stat = 0.0 try: