evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.assembla.com/fpdboz.git

Browse Source
This commit is contained in:
eblade 2009-02-21 07:46:20 -05:00
commit 9fa6d05528
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pyfpdb/Hand.py
View File

@ -425,11 +425,14 @@ Map the tuple self.gametype onto the pokerstars string describing it
print >>fh, "DEBUG: what do they show" print >>fh, "DEBUG: what do they show"
# Current PS format has the lines: # Current PS format has the lines:
# Uncalled bet ($111.25) returned to s0rrow
# s0rrow collected $5.15 from side pot # s0rrow collected $5.15 from side pot
# stervels: shows [Ks Qs] (two pair, Kings and Queens) # stervels: shows [Ks Qs] (two pair, Kings and Queens)
# stervels collected $45.35 from main pot # stervels collected $45.35 from main pot
# Immediately before the summary. # Immediately before the summary.
# The current importer uses those lines for importing winning rather than the summary # The current importer uses those lines for importing winning rather than the summary
for name in self.pot.returned:
print >>fh, _("Uncalled bet ($%s) returned to %s" %(self.pot.returned[name],name))
for name in self.collected: for name in self.collected:
print >>fh, _("%s collected $%s from x pot" %(name, self.collected[name])) print >>fh, _("%s collected $%s from x pot" %(name, self.collected[name]))
@ -537,6 +540,7 @@ class Pot(object):
self.contenders = set() self.contenders = set()
self.committed = {} self.committed = {}
self.total = None self.total = None
self.returned = {}
def addPlayer(self,player): def addPlayer(self,player):
self.committed[player] = Decimal(0) self.committed[player] = Decimal(0)
@ -558,9 +562,10 @@ class Pot(object):
lastbet = committed[-1][0] - committed[-2][0] lastbet = committed[-1][0] - committed[-2][0]
if lastbet > 0: # uncalled if lastbet > 0: # uncalled
returnto = committed[-1][1] returnto = committed[-1][1]
#print "returning %f to %s" % (lastbet, returnto) #print "DEBUG: returning %f to %s" % (lastbet, returnto)
self.total -= lastbet self.total -= lastbet
self.committed[returnto] -= lastbet self.committed[returnto] -= lastbet
self.returned[returnto] = lastbet
# Work out side pots # Work out side pots