Changeset 20

Timestamp:

02/04/08 07:15:10 (4 years ago)

Author:

mike

Message:

Added antes and stuff

Files:

• holdemtable.py (modified) (9 diffs)

holdemtable.py

@@ -20 +20 @@
         self.__action_history = []
         self.__has_acted = False
-        self.__has_folded =False
+        self.__has_folded = False
+        self.__action_log = []
         self.__status = "need implementing"
+        self.__cards_shown = False
 
     def nextHand(self):
@@ -27 +29 @@
         self.__has_folded = False
         self.__cards = []
+        self.__cards_shown = False
         self.__action_history = []
 
@@ -61 +64 @@
             if not self.__has_acted and not action in ["small_blinds","large_blinds","ante"]:
                 self.__has_acted = True
-            if action == "fold": self.__has_folded = True
+            if action == "fold" or action == "muck": self.__has_folded = True
+            if action == "show": self.__cards_shown = True
             self.__action_history.append((action,value))
 
@@ -100 +104 @@
         self.__possible_actions = None #to cache possible actions
         self.__hand_count = None
+        self.__last_bet_raise = None
 
 
@@ -140 +145 @@
         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 self.hand_over: return False
+
+        pn = self.phase
         if pn == "blinds":
             self.__player_array[0].doAction("small_blinds",
@@ -163 +171 @@
 
 
-        if self.hand_over: return False
-        else: return self.nextAction()
+        return self.nextAction()
     
     #Are there any outstanding bets?
@@ -202 +209 @@
 
         me = self.current_player
-        self.__possible_actions = {"fold":(None,None)}
-
-        max_money = max([p.money_in_phase for p in self.__player_array])
-        
-        money_in_phase = me.money_in_phase
-        
-        min_bet = self.__blinds[2]
-        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: 
-            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"] = (bet_raise, me.money)
+        if self.phase == "showdown":
+            self.__possible_actions = {"muck":(None,None),
+                                       "show":(None,None)}
+        else:
+            self.__possible_actions = {"fold":(None,None)}
+
+            max_money = max([p.money_in_phase for p in self.__player_array])
+            
+            money_in_phase = me.money_in_phase
+            
+            min_bet = self.__blinds[2]
+            if self.phase == "river": min_bet *= 2
+
+            if max_money == money_in_phase: self.__possible_actions["check"] = (None,None)
+
+            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"] = (bet_raise, me.money)
 
         return self.__possible_actions
@@ -227 +238 @@
 
     def __getState(self):
-        state = {"phase": PHASES[self.__phase],
+        state = {"phase": self.phase,
                  "action_on": self.current_player.seat,
                  "pot_before_phase": self.pot,
@@ -265 +276 @@
     hand_over = property( __isHandOver )
     possible_actions = property( __getPossibleActions )
+    phase = property( lambda self: PHASES[self.__phase] )
 
     #returns the amount of money in pot before current phase