From 4819fc28e5bfabf1f2e21142d3962f475050a63a Mon Sep 17 00:00:00 2001 From: Worros Date: Thu, 21 May 2009 22:14:49 +0800 Subject: [PATCH] Fix omaha hudCache update --- pyfpdb/Card.py | 8 ++++++++ pyfpdb/fpdb_simple.py | 11 +++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/pyfpdb/Card.py b/pyfpdb/Card.py index 4ecd69b0..0d7f9d34 100755 --- a/pyfpdb/Card.py +++ b/pyfpdb/Card.py @@ -44,6 +44,14 @@ def twoStartCardString(card): elif x > y: return(s[x] + s[y] + 's') else: return(s[y] + s[x] + 'o') +def fourStartCards(value1, suit1, value2, suit2, value3, suit3, value4, suit4): + """ Function to convert 4 value,suit pairs into a Omaha style starting hand e.g. AAds + Hand is stored as an int 13 * x + y where (x+2) represents rank of 1st card and + (y+2) represents rank of second card (2=2 .. 14=Ace) + If x > y then pair is suited, if x < y then unsuited""" + # This doesn't actually do anything yet - CG + return(0) + def cardFromValueSuit(value, suit): """ 0=none, 1-13=2-Ah 14-26=2-Ad 27-39=2-Ac 40-52=2-As """ if suit == 'h': return(value-1) diff --git a/pyfpdb/fpdb_simple.py b/pyfpdb/fpdb_simple.py index 52b09a39..f4615013 100644 --- a/pyfpdb/fpdb_simple.py +++ b/pyfpdb/fpdb_simple.py @@ -1551,10 +1551,14 @@ VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, result.append( getLastInsertId(backend, conn, cursor) ) elif (category=="omahahi" or category=="omahahilo"): for i in xrange(len(player_ids)): + startCards = Card.fourStartCards(card_values[i][0], card_suits[i][0], card_values[i][1], card_suits[i][1], card_values[i][2], card_suits[i][2], card_values[i][3], card_suits[i][3]) + card1 = Card.cardFromValueSuit(card_values[i][0], card_suits[i][0]) + card2 = Card.cardFromValueSuit(card_values[i][1], card_suits[i][1]) + card3 = Card.cardFromValueSuit(card_values[i][2], card_suits[i][2]) + card4 = Card.cardFromValueSuit(card_values[i][3], card_suits[i][3]) cursor.execute ("""INSERT INTO HandsPlayers (handId, playerId, startCash, position, tourneyTypeId, - card1Value, card1Suit, card2Value, card2Suit, - card3Value, card3Suit, card4Value, card4Suit, winnings, rake, seatNo, totalProfit, + card1, card2, card3, card4, winnings, rake, seatNo, totalProfit, street0VPI, street0Aggr, street0_3BChance, street0_3BDone, street1Seen, street2Seen, street3Seen, street4Seen, sawShowdown, street1Aggr, street2Aggr, street3Aggr, street4Aggr, @@ -1576,8 +1580,7 @@ VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)""", (hands_id, player_ids[i], start_cashes[i], positions[i], 1, # tourneytypeid - card_values[i][0], card_suits[i][0], card_values[i][1], card_suits[i][1], - card_values[i][2], card_suits[i][2], card_values[i][3], card_suits[i][3], + card1, card2, card3, card4, winnings[i], rakes[i], seatNos[i], hudCache['totalProfit'][i], hudCache['street0VPI'][i], hudCache['street0Aggr'][i], hudCache['street0_3BChance'][i], hudCache['street0_3BDone'][i],