From 4170911df963685b10a4b1277bcd6e9ad7845df7 Mon Sep 17 00:00:00 2001
From: David Karesh <davidnk@gmail.com>
Date: Mon, 30 Apr 2012 15:46:15 -0400
Subject: [PATCH] Update

---
 engine/Runner.py |  2 +-
 player/GUMDRP.py | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/engine/Runner.py b/engine/Runner.py
index 4e6b445..dd7006d 100644
--- 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
index 00d8140..8447515 100644
--- 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