intermediate commit

* detect tokens and do not add them to pile of cards
* only add spells not already in exile to their owners discard pile
* add the played card to onPlay callback

1 files changed, 5 insertions, 4 deletions

diff --git a/go/game/state.go b/go/game/state.go
index 5a4714f7..7a54ddc0 100644
--- a/go/game/state.go
+++ b/go/game/state.go
@@ -392,14 +392,15 @@ func (s *State) resolvePlay(p *Player, c *Card, targets *Targets) {
 			s.addNewEquipment(c, tile.Position, p)
 		}
 	case CardTypes.Spell:
-		c.Impl.onPlay(s, p, targets)
+		c.Impl.onPlay(s, c, p, targets)
 	default:
 		log.Printf("Resolving unhandled card type: %s\n", c.Type.String())
 	}
 
-	if c.IsPermanent() {
-	} else {
-		p.DiscardPile.AddCard(c)
+	if c.Type == CardTypes.Spell {
+		if !s.Exile.Contains(c) {
+			p.DiscardPile.AddCard(c)
+		}
 	}
 }