Changeset 21

Timestamp:

02/04/08 08:40:59 (4 years ago)

Author:

mike

Message:

Fixed hand ranking algorithm

Files:

• deck.py (modified) (1 diff)
• hand.py (modified) (2 diffs)
• holdemtable.py (modified) (8 diffs)

deck.py

@@ -5 +5 @@
 
 def card_vals(cards):
-    return [deck.cards.index(card) for card in cards]
+    print cards
+    return [(CARDS.index(card),b) for card,b in cards]
 
 class deck:

hand.py

@@ -10 +10 @@
                 "four_of_a_kind",
                 "straight_flush" ]
+
+#def format_hand(hand):
+#input all 7 cards
+def best_hand(cards):
+    all_poosible_hands = list(combNoReplace(cards,5))
+    for h in all_poosible_hands: h.sort( cmp = lambda a,b: cmp(b,a) )
+    pos_hands = [judge_hand(h) for h in all_poosible_hands]
+    return max(pos_hands)
+    
 
 #returns the best combination for the 5 cards
@@ -64 +73 @@
                 highest_n = current_n
                 highest_card = a
+        else:
+            last = a
+            current_n = 1
     if highest_n == 1: return ("high_card",card_vals)
     #check for full house

holdemtable.py

@@ -1 +1 @@
 import deck
 import random
+import hand
 from twisted.internet import defer
 
@@ -7 +8 @@
 
 class InsufficientFundsException(Exception):
+    pass
+
+class ImproperPhaseException(Exception):
     pass
 
@@ -42 +46 @@
 
     def __publicData(self):
-        return {"owner" : self.user_id,
+        dat =  {"owner" : self.user_id,
                 "status": self.status,
                 "money" : self.money,
                 "seat"  : self.seat}
+        if self.__cards_shown:
+            dat["cards"] = self.cards
+        return dat
 
     def __privateData(self):
@@ -115 +122 @@
         return False
 
+    #wrap up the hand. Who wins?  Etc.
+    def finishHand(self):
+        if not self.hand_over:
+            raise ImproperPhaseException("Hand is not over")
+        #now, let's get a list of people who are still in.
+        still_in = [ p for p in self.__player_array if not p.has_folded ]
+        winner = None
+        if len(still_in) == 1:
+            winner = still_in[0]
+        else:
+            #create list of tuples of (id,hand)
+            hands = [ (p.id,hand.best_hand(deck.card_vals(p.cards + self.__community_cards)))
+                    for p in still_in ]
+            #TODO add ties
+            hands.sort(cmp = lambda a,b: cmp(a[1],b[1]))
+            winner = hands.pop()
+            print "%s winds the hand with %s" % (winner[0], hand.HAND_ORDERS[winner[1][0]])
+
+            
+
+
     #return false if game is over
     def nextHand(self):
@@ -122 +150 @@
         self.__phase = None
         self.__community_cards = []
+        self.__last_bet_raise = None
         if self.__hand_count == None:
             self.__hand_count = 0
@@ -169 +198 @@
         elif pn == "river":
             self.__community_cards.append(self.__deck.deal())
+        elif pn == "showdown":
+            #If somebody bet or raised, they have to show
+            if self.__last_bet_raise != None:
+                self.__player_array[self.__last_bet_raise].doAction("show",None)
+                self.__action_on = self.__last_bet_raise
+            else:
+                #Else we start fromt he button
+                self.__action_on = None
 
 
@@ -265 +302 @@
             raise InvalidActionException("Value out of range")
         self.current_player.doAction(action,value)
+        if action == "bet" or action == "raise":
+            self.__last_bet_raise = self.__action_on
         if not self.nextAction():
             if not self.nextPhase():
+                self.finishHand()
                 if not self.nextHand():
                     #TODO add game end code handing hurr
@@ -328 +368 @@
     def checkStart(self):
         if self.isFull():
-            self.__game_state = holdemround(self.__players,self.__blinds,self.__format)
+            self.__game_state = holdemround(self.__players,self.__format)
             self.__game_started = True
             self.__game_state.nextHand()