diff options
| -rw-r--r-- | go/game/action.go | 16 | ||||
| -rw-r--r-- | go/game/targets.go | 18 | ||||
| -rw-r--r-- | go/game/tile.go | 2 |
3 files changed, 18 insertions, 18 deletions
diff --git a/go/game/action.go b/go/game/action.go index b41a08bf..08e42f64 100644 --- a/go/game/action.go +++ b/go/game/action.go @@ -162,7 +162,7 @@ func (a *MoveAction) String() string { } t := a.targets.sel[0].(*Tile) - return fmt.Sprintf("%s: %s -> %s", u.Controller().Name, u.Card().Name, t.Position.String()) + return fmt.Sprintf("%v: %v -> %v", u.Controller().Name, u.Card().Name, t.Position) } type AttackAction struct { @@ -197,12 +197,12 @@ func NewAttackAction(u *Unit) *AttackAction { func (a *AttackAction) String() string { u := a.source.(*Unit) if a.targets.RequireTargets() { - return fmt.Sprintf("attack %s", u.Attack.String()) + return fmt.Sprintf("attack %v", u.Attack) } target := a.targets.sel[0].(Permanent) - return fmt.Sprintf("%s: %s x %s", - u.Controller().Name, u.Card().Name, target.Tile().Position.String()) + return fmt.Sprintf("%v: %v x %v", + u.Controller().Name, u.Card().Name, target.Tile().Position) } type FullAction struct { @@ -242,7 +242,7 @@ func (a *FullAction) String() string { return fmt.Sprintf("↻ %s", a.desc) } - return fmt.Sprintf("%s: %s ↻@%s", u.Controller(), u.Card().Name, a.targets) + return fmt.Sprintf("%v: %s ↻@%v", u.Controller(), u.Card().Name, a.targets) } type FreeAction struct { @@ -276,7 +276,7 @@ func (a *FreeAction) String() string { return fmt.Sprintf("free_action %s", a.desc) } - return fmt.Sprintf("%s: %s free_action@%s", p.Controller(), p.Card().Name, a.targets) + return fmt.Sprintf("%v: %s free_action@%v", p.Controller(), p.Card().Name, a.targets) } type BuyAction struct { @@ -340,10 +340,10 @@ func (a *UpkeepAction) PayCosts(*State) bool { func (a *UpkeepAction) String() string { if a.pay { - return fmt.Sprintf("%s keep %s", a.player.Name, a.unit.Tile().Position.String()) + return fmt.Sprintf("%s keep %v", a.player.Name, a.unit.Tile().Position) } - return fmt.Sprintf("%s disband %s", a.player.Name, a.unit.Tile().Position.String()) + return fmt.Sprintf("%s disband %v", a.player.Name, a.unit.Tile().Position) } func NewUpkeepAction(p *Player, u *Unit, pay bool) *UpkeepAction { diff --git a/go/game/targets.go b/go/game/targets.go index e9f227e0..0ab61cbc 100644 --- a/go/game/targets.go +++ b/go/game/targets.go @@ -13,16 +13,16 @@ import ( type ( TargetConstraintFunc func(interface{}) error TargetConstraint struct { - desc string + desc string constraint TargetConstraintFunc } ) type Targets struct { - s *State - action Action + s *State + action Action constraints []*TargetConstraint - sel []interface{} + sel []interface{} } func fmtSel(sel interface{}) string { @@ -153,7 +153,7 @@ func enemyPermanentTargetConstraint(action Action) TargetConstraintFunc { return func(t interface{}) (err error) { p, _ := t.(Permanent) if !p.Controller().IsEnemy(sourceController) { - err = fmt.Errorf("Controller %s of target %t is not an enemy of %s", + err = fmt.Errorf("Controller %v of target %v is not an enemy of %v", p.Controller(), t, sourceController) } return @@ -164,13 +164,13 @@ func attackableTargetConstraint(action Action) TargetConstraintFunc { return func(t interface{}) (err error) { p, _ := t.(Permanent) if !p.Attackable() { - err = fmt.Errorf("Permanent %s isnot attackable", p) + err = fmt.Errorf("Permanent %v is not attackable", p) } if attackAction, ok := action.(*AttackAction); ok { attacker := attackAction.Source().(*Unit) if !IsPositionInRange(attacker.Tile().Position, p.Tile().Position, attacker.Attack.MaxRange()) { - err = fmt.Errorf("Position %s of target %s not in attack range %d of source's position %s", + err = fmt.Errorf("Position %v of target %v not in attack range %d of source's position %v", p.Tile().Position, p, attacker.Attack.MaxRange(), attacker.Tile().Position) } } @@ -192,7 +192,7 @@ func rangeTargetConstraint(source interface{}, r int) TargetConstraintFunc { return func(t interface{}) (err error) { p, _ := t.(Permanent) if !IsPositionInRange(sourcePos, p.Tile().Position, r) { - err = fmt.Errorf("Position %s of target %s not in range %d of source's position %s", + err = fmt.Errorf("Position %v of target %v not in range %d of source's position %v", p.Tile().Position, t, r, sourcePos) } return @@ -290,7 +290,7 @@ func parseTileTargetConstraint(desc string, s *State, action Action) []TargetCon if slices.Contains(u.MoveRangeTiles(s.Map), tile) { return nil } - return fmt.Errorf("tile %s is not in %d movement range", tile) + return fmt.Errorf("tile %v is not in %v's movement range", tile, u) }) } diff --git a/go/game/tile.go b/go/game/tile.go index 260747d1..ba600c66 100644 --- a/go/game/tile.go +++ b/go/game/tile.go @@ -80,7 +80,7 @@ type Tile struct { } func (t *Tile) String() string { - return fmt.Sprintf("%d@%d", t.Type, t.Position.String()) + return fmt.Sprintf("%v@%v", t.Type, t.Position) } func INVALID_TILE() Tile { |