diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-01 17:53:51 +0100 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-01 17:53:51 +0100 |
| commit | 8f87e60c9400a99f98d738a1aaaacf1dd6460043 (patch) | |
| tree | 72d930005dd1f1f2eed88bdd1f9d4bc9f782ded1 /core/src/ch/asynk/tankontank | |
| parent | 59b008e307fdde69842dc7e032a76ebd24e7ab48 (diff) | |
| download | RustAndDust-8f87e60c9400a99f98d738a1aaaacf1dd6460043.zip RustAndDust-8f87e60c9400a99f98d738a1aaaacf1dd6460043.tar.gz | |
clean up Pawn overlays
Diffstat (limited to 'core/src/ch/asynk/tankontank')
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/Map.java | 6 | ||||
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/Unit.java | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java index 199868f..8a72b91 100644 --- a/core/src/ch/asynk/tankontank/game/Map.java +++ b/core/src/ch/asynk/tankontank/game/Map.java @@ -314,9 +314,9 @@ public abstract class Map extends Board public void hideMoveablePawns() { moveablePawns.enable(Unit.MOVE, false); } public void showPossibleTargets() { possibleTargets.enable(Unit.TARGET, true); } public void hidePossibleTargets() { possibleTargets.enable(Unit.TARGET, false); } - public void showAttackAssists() { attackAssists.enable(Unit.ATTACK_ASSIST, true); } - public void hideAttackAssists() { attackAssists.enable(Unit.ATTACK, false); - attackAssists.enable(Unit.ATTACK_ASSIST, false); } + public void showAttackAssists() { attackAssists.enable(Unit.MAY_FIRE, true); } + public void hideAttackAssists() { attackAssists.enable(Unit.FIRE, false); + attackAssists.enable(Unit.MAY_FIRE, false); } public void showBreakPawns() { breakPawns.enable(Unit.MOVE, true); } public void hideBreakPawns() { breakPawns.enable(Unit.MOVE, false); } diff --git a/core/src/ch/asynk/tankontank/game/Unit.java b/core/src/ch/asynk/tankontank/game/Unit.java index b3db8d0..64af758 100644 --- a/core/src/ch/asynk/tankontank/game/Unit.java +++ b/core/src/ch/asynk/tankontank/game/Unit.java @@ -11,9 +11,9 @@ import ch.asynk.tankontank.engine.Orientation; public class Unit extends HeadedPawn { public static final int MOVE = 0; - public static final int ATTACK = 1; - public static final int TARGET = 2; - public static final int ATTACK_ASSIST = 3; + public static final int TARGET = 1; + public static final int FIRE = 2; + public static final int MAY_FIRE = 3; public enum UnitType implements Pawn.PawnType { @@ -232,8 +232,8 @@ public class Unit extends HeadedPawn public void hideMoveable() { enableOverlay(MOVE, false); } public void showTarget() { enableOverlay(TARGET, true); } public void hideTarget() { enableOverlay(TARGET, false); } - public void showAttack() { enableOverlay(ATTACK, true); } - public void hideAttack() { enableOverlay(ATTACK, false); } - public void showAttackAssist() { enableOverlay(ATTACK_ASSIST, true); } - public void hideAttackAssist() { enableOverlay(ATTACK_ASSIST, false); } + public void showAttack() { enableOverlay(FIRE, true); } + public void hideAttack() { enableOverlay(FIRE, false); } + public void showAttackAssist() { enableOverlay(MAY_FIRE, true); } + public void hideAttackAssist() { enableOverlay(MAY_FIRE, false); } } |