Update

srvasude · Apr 30, 2012 · 4170911 · 4170911
1 parent 09acabf
commit 4170911
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/engine/Runner.py b/engine/Runner.py
@@ -34,7 +34,7 @@ def play(cards, initialDeck, players):
         #print("----------Player{0}'s action phase------------".format(gs.turn))
         gs = curPlayer.playActionPhase(gs)
         #print("----------Player{0}'s buy phase ({1} coins, {2} buys)----".format(gs.turn, gs.abcs[gs.turn]['coins'] + curPlayer.totalTreasure(gs), gs.abcs[gs.turn]['buys']))
-        print str(gs.abcs[gs.turn]['coins'] + curPlayer.totalTreasure(gs)) + '\t' + str(gs.abcs[gs.turn]['buys']) + '\t' + str(gs.players[0].goalDeck - gs.pcards[0].allCards())
+        print str(gs.abcs[gs.turn]['coins'] + curPlayer.totalTreasure(gs)) + '\t' + str(gs.abcs[gs.turn]['buys']) + '\t[' + str(gs.players[0].goalDeck - gs.pcards[0].allCards()) + ']'
         bought = gs.stacks.copy()
         gs = curPlayer.playBuyPhase(gs)
         #print("----------Player{0}'s has bought: ({1})----".format(gs.turn, str(bought - gs.stacks)))

diff --git a/player/GUMDRP.py b/player/GUMDRP.py
@@ -92,7 +92,6 @@ def playBuyPhase(self, gameState):
         abcs = gameState.abcs[gameState.turn]
         coins = gameState.abcs[gameState.turn]['coins'] + self.totalTreasure(gameState)
         cards = gameState.pcards[gameState.turn] 
-        #cards_to_buy = self.goalDeck - cards.allCards()
         while abcs['buys'] > 0:
             possibleBuys = self.availableBuys(gameState, coins)
             if not possibleBuys:
@@ -106,8 +105,6 @@ def playBuyPhase(self, gameState):
             abcs['buys'] -= 1
             coins -= buy.cost
             gameState.pcards[gameState.turn].gain(buy)
-           # if buy in self.goalDeck:
-           #     cards_to_buy[buy] -= 1
         gameState.abcs[gameState.turn]['coins'] = coins
         return gameState
 
@@ -120,12 +117,16 @@ def valueCard(self, gameState, card):
         if card in [Copper.Copper(), Estate.Estate()]:
             return (0,0,-1)
         cards = gameState.pcards[gameState.turn]
-        if card in (self.goalDeck - cards.allCards()).keys():
+
+        if len(self.goalDeck - cards.allCards())==0:
+            if card in [Province.Province()]:
+                return (10000,0,0)
+        if card in (self.goalDeck).keys():
             num_left = gameState.stacks[card]
             card_amount = (self.goalDeck - cards.allCards())[card]
             if card_amount == 0: card_amount = -100
             return (num_left*self.cvparams[0] + card_amount*self.cvparams[1]+ card.cost*self.cvparams[2], 0, 0)
-        if card in (self.miniDeck - cards.allCards()).keys():
+        if card in (self.miniDeck).keys():
             num_left = gameState.stacks[card]
             card_amount = (self.miniDeck - cards.allCards())[card]
             if card_amount == 0: card_amount = -100