intermediate commit

1 files changed, 27 insertions, 10 deletions

diff --git a/go/game/player.go b/go/game/player.go
index 608fc7e9..7a72e111 100644
--- a/go/game/player.go
+++ b/go/game/player.go
@@ -2,6 +2,7 @@ package game
 
 import (
 	"image/color"
+	"log"
 )
 
 const (
@@ -60,7 +61,7 @@ func (p *Player) Upkeep() {
 	// TODO: handle upkeep triggers
 
 	for _, unit := range p.gameState.Units {
-		if unit.Controller != p {
+		if unit.controller != p {
 			continue
 		}
 
@@ -76,7 +77,7 @@ func (p *Player) Upkeep() {
 func (p *Player) ActionPhase() {
 	for {
 		a := promptAction(p.Ctrl)
-		if _, ok := a.(*PassPriorityAction); ok {
+		if _, ok := a.(*PassPriority); ok {
 			return
 		}
 		p.gameState.DeclareAction(a)
@@ -84,19 +85,13 @@ func (p *Player) ActionPhase() {
 	}
 }
 
-func (p *Player) buy(c *Card) {
-	p.Resource -= c.BuyCost
-	p.DiscardPile.AddCard(c)
-}
-
 func (p *Player) BuyPhase() {
 	a := promptBuy(p.Ctrl)
-	if _, ok := a.(*PassPriorityAction); ok {
+	if _, ok := a.(*PassPriority); ok {
 		return
 	}
 	p.gameState.DeclareAction(a)
 	p.gameState.Stack.Resolve()
-	// TODO: select card to buy
 }
 
 func (p *Player) DiscardCard(c *Card) {
@@ -104,7 +99,24 @@ func (p *Player) DiscardCard(c *Card) {
 }
 
 func (p *Player) DiscardPhase() {
-	// TODO: select cards to discard
+	cards := p.PromptHandCardSelection(0, p.Deck.Size())
+	for _, c := range cards {
+		p.DiscardCard(c)
+	}
+}
+
+func (p *Player) PromptHandCardSelection(min, max int) []*Card {
+	p.Ctrl.SendNotification(NewHandCardSelectionPrompt(min, max))
+	switch a := p.Ctrl.RecvAction().(type) {
+	case *HandCardSelection:
+		// TODO: validate cards
+		return a.cards
+	case *PassPriority:
+		return nil
+	default:
+		log.Fatalf("Unexpected response type %T for hand card selection", a)
+	}
+	return nil
 }
 
 func (p *Player) Draw() {
@@ -120,3 +132,8 @@ func (p *Player) DrawN(n int) {
 	drawnCards := p.Deck.Draw(n)
 	p.Hand.AddCards(drawnCards)
 }
+
+func (p *Player) IsEnemy(other *Player) bool {
+	// TODO: support coop / teams
+	return p != other
+}