change unit attack representation and implement sword

1 files changed, 3 insertions, 3 deletions

diff --git a/go/game/state.go b/go/game/state.go
index 1d4b644f..6ca100c8 100644
--- a/go/game/state.go
+++ b/go/game/state.go
@@ -139,14 +139,14 @@ func (s *State) IsValidAttack(a *AttackAction) error {
 	}
 
 	unit := a.Source().(Unit)
-	if unit.Attack == INVALID_ATTACK() {
+	if INVALID_ATTACK(unit.Attack) {
 		return fmt.Errorf("%s can not attack", unit.card.Name)
 	}
 
 	target := a.Targets().sel[0].(Permanent)
-	if !IsPositionInRange(unit.tile.Position, target.Tile().Position, unit.Attack.Range) {
+	if !IsPositionInRange(unit.tile.Position, target.Tile().Position, unit.Attack.MaxRange()) {
 		return fmt.Errorf("Attack target on %s is not in attack range %d of %s on %s",
-			target.Tile().Position.String(), unit.Attack.Range, unit.card.Name,
+			target.Tile().Position.String(), unit.Attack.MaxRange(), unit.card.Name,
 			unit.tile.Position.String())
 	}