Changeset 14

Timestamp:

02/03/08 20:33:23 (4 years ago)

Author:

mike

Message:

Will make it through one hand now

Files:

• holdemtable.py (modified) (14 diffs)
• tabled.py (modified) (1 diff)

holdemtable.py

@@ -19 +19 @@
         self.__money_in_pot = None  #money in pot before previous round
         self.__action_history = []
+        self.__has_acted = False
+        self.__has_folded =False
         self.status = "need implementing"
 
@@ -24 +26 @@
         self.__in_hand = True
         self.__money_in_pot = 0.0
+        self.__has_folded = False
         self.cards = []
         self.__action_history = []
@@ -36 +39 @@
         self.__action_history = []
         self.__money_in_pot += self.moneyInPhase()
+        self.__has_acted = False
 
 
@@ -44 +48 @@
                 "seat"  : self.seat}
     def privateData(self):
-        dat = {"user_id"        : self.user_id,
-               "id"             : self.id,
-               "cards"          : self.cards}
+        dat = {"user_id" : self.user_id,
+               "id"      : self.id,
+               "cards"   : self.cards}
         return dat
 
@@ -61 +65 @@
             raise InsufficientFundsException("Insufficient Funds")
         else:
-            self.money -= value
+            if value != None: self.money -= value
+            if not self.__has_acted and action != "small_blinds" and action != "large_blinds":
+                self.__has_acted = True
+            if action == "fold": self.__has_folded = True
             self.__action_history.append((action,value))
 
+    def hasFolded(self):
+        return self.__has_folded
     def inHand(self):
         #TODO need to change this
         return self.__in_hand
+
+    def hasActed(self):
+        return self.__has_acted
 
 
@@ -83 +95 @@
         self.community_cards = None
         self.possible_actions = None #to cache possible actions
-        pass
+        self.__hand_count = 0
 
     def actionOn(self):
@@ -104 +116 @@
         self.pot = 0.0
         self.community_cards = []
+        self.__hand_count += 1
         print self.player_array
         for p in self.player_array: p.nextHand()
@@ -119 +132 @@
         if self.phase != None: self.phase += 1
         else: self.phase = 0
-
+        print "PHASE: %d" % self.phase
+        for p in self.player_array: p.nextPhase()
         pn = PHASES[self.phase]
         if pn == "blinds":
@@ -127 +141 @@
         elif pn == "flop":
             for _ in range(3):
-                self.community_cards.append(self.deck.deal)
+                self.community_cards.append(self.deck.deal())
         elif pn == "turn":
-            self.community_cards.append(self.deck.deal)
+            self.community_cards.append(self.deck.deal())
         elif pn == "river":
-            self.community_cards.append(self.deck.deal)
+            self.community_cards.append(self.deck.deal())
 
 
@@ -137 +151 @@
         else: return self.nextAction()
     
+    #Are there any outstanding bets?
+    def outstandingBets(self):
+        max_money = max([p.moneyInPhase() for p in self.player_array])
+        for p in self.player_array:
+            if not p.hasFolded() and p.moneyInPhase() < max_money:
+                return True
+        return False
 
     #returns false if phase is over
@@ -151 +172 @@
             while not self.player_array[self.__action_on].inHand():
                 self.__action_on = ( self.__action_on + 1 ) % len(self.player_array)
-        else: self.action = 0
-        return True
+        else: self.__action_on = 0
+        if self.player_array[self.__action_on].hasActed()\
+                and not self.outstandingBets():
+                    return False
+        else: return True
 
     def requiredAction(self, player_id):
@@ -166 +190 @@
 
         max_money = max([p.moneyInPhase() for p in self.player_array])
-
+        
         money_in_phase = me.moneyInPhase()
+        
+        min_bet = self.blinds[1]
+        if PHASES[self.phase] == "river": min_bet *= 2
+
         if max_money == money_in_phase: self.possible_actions["check"] = (None,None)
-        if max_money > money_in_phase: self.possible_actions["call"] =\
-                (max_money - money_in_phase, max_money - money_in_phase)
-        #TODO this needs to change if it's the river
-        if max_money == 0: self.possible_actions["bet"] = (self.blinds[1], me.money)
+
+        if max_money > money_in_phase: 
+            call = min(me.money, max_money-money_in_phase)
+            self.possible_actions["call"] = (call,call)
+        bet_raise = min( me.money, min_bet + max_money - money_in_phase )
+        if max_money == 0 and me.money != 0.0:
+            self.possible_actions["bet"] = (bet_raise, me.money)
         #TODO this needs to change to reflect the last bet
-        else: self.possible_actions["raise"] = (self.blinds[1] + max_money - money_in_phase, me.money)
+        else: self.possible_actions["raise"] = (bet_raise, me.money)
 
         return self.possible_actions
@@ -206 +237 @@
         range = pa[action]
         if not (range[0] <= value <= range[1]):
-            print range[0]
-            print value
-            print range[1]
             raise InvalidActionException("Value out of range")
         self.player_array[self.__action_on].doAction(action,value)
-        self.nextAction()
-
-
-        
-
-
+        if not self.nextAction():
+            if not self.nextPhase():
+                if not self.nextHand():
+                    #TODO add game end code handing hurr
+                    pass
 
 
 
 class holdemtable:
-    def __init__(self, name, max_players = 4):
+    def __init__(self, name, max_players = 3, blinds = (5.0,10.0)):
         self.max_players = max_players
         self.players={}
@@ -228 +255 @@
         self.holdemround = None
         self.deferred = []
-        self.blinds = (1.0,2.0)
+        self.blinds = blinds
 
 

tabled.py

@@ -21 +21 @@
 
     def sendMessage(self, data):
-        self.sendString( cjson.encode(
-            data) )
+        try:
+            self.sendString( cjson.encode(
+                data) )
+        except cjson.EncodeError,e:
+            print data
+            print e
         d = defer.Deferred()
         d.addCallback(self.sendMessage)