1 files changed, 55 insertions, 8 deletions
diff --git a/go/game/action.go b/go/game/action.go
index f00c21cd..b8bc8d6e 100644
--- a/go/game/action.go
+++ b/go/game/action.go
@@ -15,6 +15,7 @@ type Action interface {
 	Targets() *Targets
 	Target() *Target // Shortcut for to select the first target
 
+	NeedsActionCostChoice() bool
 	CheckTargets(*State) error
 	PayCosts(s *State) bool
 	resolve(s *State)
@@ -23,14 +24,15 @@ type Action interface {
 
 type PassPriority struct{ player *Player }
 
-func (a *PassPriority) Source() interface{}     { return a.player }
-func (*PassPriority) Targets() *Targets         { return nil }
-func (*PassPriority) Target() *Target           { return nil }
-func (*PassPriority) CheckTargets(*State) error { return nil }
-func (*PassPriority) PayCosts(*State) bool      { return true }
-func (*PassPriority) resolve(*State)            {}
-func (*PassPriority) String() string            { return "pass" }
-func NewPassPriority(p *Player) Action          { return &PassPriority{p} }
+func (a *PassPriority) Source() interface{}       { return a.player }
+func (*PassPriority) Targets() *Targets           { return nil }
+func (*PassPriority) Target() *Target             { return nil }
+func (*PassPriority) NeedsActionCostChoice() bool { return false }
+func (*PassPriority) CheckTargets(*State) error   { return nil }
+func (*PassPriority) PayCosts(*State) bool        { return true }
+func (*PassPriority) resolve(*State)              {}
+func (*PassPriority) String() string              { return "pass" }
+func NewPassPriority(p *Player) Action            { return &PassPriority{p} }
 
 type TargetSelection struct {
 	player  *Player
@@ -40,6 +42,7 @@ type TargetSelection struct {
 func (sel *TargetSelection) Source() interface{}         { return sel.player }
 func (sel *TargetSelection) Targets() *Targets           { return sel.targets }
 func (sel *TargetSelection) Target() *Target             { return sel.targets.ts[0] }
+func (*TargetSelection) NeedsActionCostChoice() bool     { return false }
 func (sel *TargetSelection) CheckTargets(s *State) error { return sel.targets.CheckTargets(s) }
 func (*TargetSelection) PayCosts(*State) bool            { return true }
 func (*TargetSelection) resolve(*State)                  {}
@@ -206,6 +209,32 @@ func genFullActionCost(u *Unit) ActionCostFunc {
 	}
 }
 
+type EquipAction struct {
+	ActionBase
+	equipment *Equipment
+}
+
+func NewEquipAction(u *Unit, e *Equipment) *EquipAction {
+	a := &EquipAction{
+		ActionBase{
+			source: u,
+			Card:   u.Card(),
+		},
+		e,
+	}
+
+	a.resolveFunc = func(s *State) {
+		u.equip(e)
+	}
+
+	return a
+}
+
+func (a *EquipAction) String() string {
+	u := a.source.(*Unit)
+	return fmt.Sprintf("%s equip %v", u.FmtWController(), a.equipment)
+}
+
 type AttackAction struct {
 	ActionBase
 }
@@ -428,3 +457,21 @@ func newUpkeepAction(p *Player) *UpkeepAction {
 
 	return a
 }
+
+func (a *ActionBase) NeedsActionCostChoice() bool {
+	return a.costFunc == nil
+}
+
+func UseMoveAction(a Action) {
+	switch a := a.(type) {
+	case *EquipAction:
+		a.costFunc = genMoveActionCost(a.Source().(*Unit))
+	}
+}
+
+func UseAttackAction(a Action) {
+	switch a := a.(type) {
+	case *EquipAction:
+		a.costFunc = genAttackActionCost(a.Source().(*Unit))
+	}
+}