intermediate commit

* implement most of the kraken cards
* unify permanent marks
* add state based actions hook for card implementations

1 files changed, 1 insertions, 49 deletions

diff --git a/go/game/unit.go b/go/game/unit.go
index 82aa8528..a2934296 100644
--- a/go/game/unit.go
+++ b/go/game/unit.go
@@ -4,53 +4,6 @@ import (
 	"log"
 )
 
-type UnitMark int
-
-const (
-	paralysis UnitMark = iota + 1
-	poison
-	panic_
-	rage
-	ward
-	faith
-)
-
-func (mark UnitMark) String() string {
-	switch mark {
-	case paralysis:
-		return "paralysis"
-	case poison:
-		return "poison"
-	case panic_:
-		return "panic"
-	case rage:
-		return "rage"
-	case ward:
-		return "ward"
-	case faith:
-		return "faith"
-	default:
-		log.Fatalf("Unhandled unit mark %d", mark)
-		return ""
-	}
-}
-
-var UnitMarks = struct {
-	Paralysis UnitMark
-	Poison    UnitMark
-	Panic     UnitMark
-	Rage      UnitMark
-	Ward      UnitMark
-	Faith     UnitMark
-}{
-	Paralysis: paralysis,
-	Poison:    poison,
-	Panic:     panic_,
-	Rage:      rage,
-	Ward:      ward,
-	Faith:     faith,
-}
-
 const (
 	DEFAULT_AVAIL_MOVE_ACTIONS   = 1
 	DEFAULT_AVAIL_ATTACK_ACTIONS = 1
@@ -64,7 +17,6 @@ type Unit struct {
 	Upkeep      int
 	FullActions []*FullAction
 	FreeActions []*FreeAction
-	States      map[UnitMark]int
 	// Effects []Effects
 	AvailMoveActions        int
 	additionalMoveActions   int
@@ -97,7 +49,6 @@ func NewUnit(card *Card, tile *Tile, owner *Player) *Unit {
 		Movement:           movement,
 		Attack:             attack,
 		Upkeep:             upkeep,
-		States:             make(map[UnitMark]int),
 		AvailMoveActions:   DEFAULT_AVAIL_MOVE_ACTIONS,
 		AvailAttackActions: DEFAULT_AVAIL_ATTACK_ACTIONS,
 	}
@@ -120,6 +71,7 @@ func (u *Unit) resetBaseActions() {
 }
 
 func (u *Unit) onUpkeep() {
+	// TODO: handle state marks
 	u.resetBaseActions()
 }