From e1fd108c06f3628b717009cc0b66b604feacb8ac Mon Sep 17 00:00:00 2001
From: Steve <stryan@saintnet.tech>
Date: Wed, 10 Nov 2021 17:46:19 -0500
Subject: [PATCH] add ally effect

---
 game.go   | 8 ++++----
 oracle.go | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/game.go b/game.go
index 4682d77..580ac60 100644
--- a/game.go
+++ b/game.go
@@ -342,7 +342,7 @@ func (g *Game) PlayerAct(id int, cmd string) *Deck {
 			fmt.Println("not enough arguments")
 			return nil
 		}
-		if !g.HasDrawn || !g.QueuedEffect != nil {
+		if !g.HasDrawn || g.QueuedEffect != nil {
 			return nil
 		}
 		x_i, err := strconv.Atoi(cmd_s[1])
@@ -395,7 +395,7 @@ func (g *Game) PlayerAct(id int, cmd string) *Deck {
 			fmt.Println("board position out of bounds")
 			return nil
 		}
-		switch g.TargetStatus {
+		switch g.TargetReq {
 		case TargetSelf:
 			if board != g.CurrentTurn && g.GetBoard(board)[pos].Id != g.QueuedEffect.Owner {
 				fmt.Println("self target not on self")
@@ -417,8 +417,8 @@ func (g *Game) PlayerAct(id int, cmd string) *Deck {
 		}
 		AddEffect(g.GetBoard(board)[pos], g.QueuedEffect)
 		g.QueuedEffect = nil
-		g.TargetStatus = TargetNone
-		return g.GetBoard(board)
+		g.TargetReq = TargetNone
+		return DeckFromCards(g.GetBoard(board))
 
 	default:
 		fmt.Println("Invalid act command")
diff --git a/oracle.go b/oracle.go
index 9dc3a34..b5aa7c9 100644
--- a/oracle.go
+++ b/oracle.go
@@ -69,7 +69,9 @@ func OracleEnters(c *Card, g *Game) {
 				}
 			}
 		}
-
+	case Ally:
+		g.QueuedEffect = &Effect{c.Id, uuid.Nil, 2, 1}
+		g.TargetReq = TargetOwn
 	}
 }
 
@@ -142,7 +144,7 @@ func OraclePower(c CardType, g *Game) int {
 	switch c {
 	case Speedster, HealthPotion, Tree, Goblin:
 		return 1
-	case Commander:
+	case Commander, Ally:
 		return 2
 	case Paladin:
 		return 3