Changeset 17

Timestamp:

02/04/08 06:45:26 (11 months ago)

Author:

mike

Message:

Added antes and stuff

Files:

• holdemtable.py (modified) (13 diffs)

holdemtable.py

@@ -10 +10 @@
 
 class player(object):
-    starting_money = 1000.0
-
-
-    def __init__(self, id, user_id, seat):
+    def __init__(self, id, user_id, seat, starting_money):
         self.__seat = seat
         self.__id = id
         self.__user_id = user_id
-        self.__money = self.starting_money
+        self.__money = starting_money
         self.__in_hand = True
         self.__cards = []
@@ -62 +59 @@
         else:
             if value != None: self.__money -= value
-            if not self.__has_acted and action != "small_blinds" and action != "large_blinds":
+            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
@@ -85 +82 @@
 
 
-PHASES = ["blinds", "flop", "turn", "river"]
+PHASES = ["blinds", "flop", "turn", "river", "showdown"]
 class holdemround(object):
     
 
-    def __init__(self,players,blinds):
+    def __init__(self,players,format):
         self.__deck = deck.deck()
-        self.__blinds = blinds
+        self.__blinds = None
+        self.__round_length = format["round_length"]
+        self.__blind_structure = format["blinds"]
         #keep both of these on hand so we can quickly find a player
         self.__players = players
@@ -100 +99 @@
         self.__community_cards = None
         self.__possible_actions = None #to cache possible actions
-        self.__hand_count = 0
+        self.__hand_count = None
+
 
     #hand over?
@@ -117 +117 @@
         self.__phase = None
         self.__community_cards = []
-        self.__hand_count += 1
+        if self.__hand_count == None:
+            self.__hand_count = 0
+        else: self.__hand_count += 1
+        #Next phase of blinds
+        if self.__hand_count % self.__round_length == 0:
+            #Next blind phase
+            self.__blinds = self.__blind_structure[self.__hand_count/self.__round_length]
         print self.__player_array
         for p in self.__player_array: p.nextHand()
@@ -137 +143 @@
         pn = PHASES[self.__phase]
         if pn == "blinds":
-            self.__player_array[0].doAction("small_blinds",self.__blinds[0])
-            self.__player_array[1].doAction("large_blinds",self.__blinds[1])
+            self.__player_array[0].doAction("small_blinds",
+                    min(self.__player_array[0],self.__blinds[1]))
+
+            self.__player_array[1].doAction("large_blinds",
+                    min(self.__player_array[1],self.__blinds[2]))
+            #do antes for the rest
+            for p in self.__player_array[2:]:
+                p.doAction("ante",min(p.money,self.__blinds[0]))
+
             self.__action_on = 1
         elif pn == "flop":
@@ -194 +207 @@
         money_in_phase = me.money_in_phase
         
-        min_bet = self.__blinds[1]
+        min_bet = self.__blinds[2]
         if PHASES[self.__phase] == "river": min_bet *= 2
 
@@ -216 +229 @@
                  "action_on": self.current_player.seat,
                  "pot_before_phase": self.pot,
-                 "community_cards": self.__community_cards }
+                 "community_cards": self.__community_cards,
+                 "hand_number": self.__hand_count,
+                 "current_blinds": self.__blinds}
         p_actions = {}
 
@@ -253 +268 @@
     pot = property( lambda self: sum([ p.money_in_pot for p in self.__player_array] ))
 
+DEFAULT_FORMAT = {"max_players":3,
+                  "round_length":8,
+                  "starting_money":2000.0.
+                  "blinds":[(None,25,50),
+                            (None,50,100),
+                            (None,100,200),
+                            (25,100,200),
+                            (25,150,300),
+                            (50,200,400),
+                            (75,300,600),
+                            (100,500,1000),
+                            (200,500,1500),
+                            (300,1000,2000),
+                            (400,1500,3000),
+                            (500,2000,4000),
+                            (500,3000,6000),
+                            (1000,4000,8000),
+                            (1000,5000,10000),
+                            (2000,5000,15000),
+                            (3000,10000,20000),
+                            (4000,15000,30000),
+                            (5000,20000,40000)]}
 
 class holdemtable:
-    def __init__(self, name, max_players = 3, blinds = (5.0,10.0)):
-        self.__max_players = max_players
+    def __init__(self, name, format = DEFAULT_FORMAT):
+        self.__max_players = format["max_players"]
         self.__players={}
         self.__game_started = False
@@ -262 +299 @@
         self.__holdemgame = None
         self.__deferreds = []
-        self.__blinds = blinds
+        self.__format = format
         self.__cached_response = None
 
@@ -268 +305 @@
     def addPlayer(self, data, deferred ):
         p_id = data['client_id']
-        self.__players[p_id]=player(p_id, data['user_id'], len(self.__players))
+        self.__players[p_id]=player(p_id,
+                                    data['user_id'],
+                                    len(self.__players),
+                                    self.__format["starting_money"])
         self.addDeferred( p_id, deferred )
         self.stateChanged("Player Added")
@@ -275 +315 @@
     def checkStart(self):
         if self.isFull():
-            self.__game_state = holdemround(self.__players,self.__blinds)
+            self.__game_state = holdemround(self.__players,self.__blinds,self.__format)
             self.__game_started = True
             self.__game_state.nextHand()
@@ -295 +335 @@
             table_info["game_in_progress"] = self.__game_started
             table_info["name"] = self.__name
-            table_info["blinds"] = self.__blinds
+            table_info["format"] = self.__format
 
             players = {}