From 773ba71499321b52aeb831934d676145d273d8c0 Mon Sep 17 00:00:00 2001 From: Worros Date: Wed, 17 Feb 2010 19:57:26 +0800 Subject: [PATCH] Change blind semantics slightly to improve accounting. This should improve the case where a second small blind is added. The player committing the second sb still has a 1xsb accouting error --- pyfpdb/Hand.py | 6 ++++++ pyfpdb/PokerStarsToFpdb.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py index 73dd7600..bc9278a6 100644 --- a/pyfpdb/Hand.py +++ b/pyfpdb/Hand.py @@ -344,6 +344,11 @@ For sites (currently only Carbon Poker) which record "all in" as a special actio self.bets['BLINDSANTES'][player].append(Decimal(self.sb)) self.pot.addCommonMoney(Decimal(self.sb)) + if blindtype == 'secondsb': + amount = Decimal(0) + self.bets['BLINDSANTES'][player].append(Decimal(self.sb)) + self.pot.addCommonMoney(Decimal(self.sb)) + self.bets['PREFLOP'][player].append(Decimal(amount)) self.pot.addMoney(player, Decimal(amount)) self.lastBet['PREFLOP'] = Decimal(amount) @@ -1441,6 +1446,7 @@ class Pot(object): # Return any uncalled bet. committed = sorted([ (v,k) for (k,v) in self.committed.items()]) + print "DEBUG: committed: %s" % committed #ERROR below. lastbet is correct in most cases, but wrong when # additional money is committed to the pot in cash games # due to an additional sb being posted. (Speculate that diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py index 39066b8e..87574e9d 100755 --- a/pyfpdb/PokerStarsToFpdb.py +++ b/pyfpdb/PokerStarsToFpdb.py @@ -294,7 +294,7 @@ class PokerStars(HandHistoryConverter): hand.addBlind(a.group('PNAME'), 'small blind', a.group('SB')) count = 1 else: - hand.addAnte(a.group('PNAME'), a.group('SB')) + hand.addBlind(a.group('PNAME'), 'secondsb', a.group('SB')) except: # no small blind hand.addBlind(None, None, None) for a in self.re_PostBB.finditer(hand.handText):