Changeset 22

Timestamp:

02/04/08 08:53:57 (11 months ago)

Author:

mike

Message:

Added hand formatting for text output

Files:

• hand.py (modified) (1 diff)
• holdemtable.py (modified) (1 diff)

hand.py

@@ -11 +11 @@
                 "straight_flush" ]
 
-#def format_hand(hand):
+def format_hand(hand):
+    #TODO add Ace support
+    kickers  = [deck.CARDS[c] for c in hand[1] if c >= 0]
+    name = HAND_ORDERS(hand[0])
+    if name == "high_card":
+        return "high card (%s) with kickers (%s)" % (kickers.pop(0),kickers)
+    elif name == "pair":
+        return "pair of (%s)'s with kickers (%s)" % (kickers.pop(0),kickers)
+    elif name == "two_pair":
+        return "two pair of (%s)'s and (%s)'s with kickers (%s)" % (kickers.pop(0),kickers.pop(0),kickers)
+    elif name == "four_of_a_kind":
+        return "four of a kind (%s) with kickers (%s)" % (kickers.pop(0),kickers)
+    elif name == "three_of_a_kind":
+        return "three of a kind (%s) with kickers (%s)" % (kickers.pop(0),kickers)
+    elif name == "flush":
+        return "flush with high card (%s)" % (kickers.pop(0))
+    elif name == "straight_flush":
+        return "straight flush with high card (%s)" % (kickers.pop(0))
+    elif name == "straight":
+        return "straight with high card (%s)" % (kickers.pop(0))
+    elif name == "full_house":
+        return "full house with (%s) over (%s)" % (kickers.pop(0),kickers.pop(0))
+    else: return "???"
+
+
 #input all 7 cards
 def best_hand(cards):

holdemtable.py

@@ -138 +138 @@
             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]])
+            print "%s withs with %s" % (winner[0],hand.format_hand(winner[1]))