From 8f87e60c9400a99f98d738a1aaaacf1dd6460043 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Sat, 1 Nov 2014 17:53:51 +0100 Subject: clean up Pawn overlays --- core/src/ch/asynk/tankontank/game/Map.java | 6 +++--- core/src/ch/asynk/tankontank/game/Unit.java | 14 +++++++------- data/assets/pawn-overlays/00_move.png | Bin 0 -> 14933 bytes data/assets/pawn-overlays/01_move.png | Bin 15042 -> 0 bytes data/assets/pawn-overlays/01_target.png | Bin 0 -> 2869 bytes data/assets/pawn-overlays/02_attack.png | Bin 8137 -> 0 bytes data/assets/pawn-overlays/02_fire.png | Bin 0 -> 8137 bytes data/assets/pawn-overlays/03_may_fire.png | Bin 0 -> 4550 bytes data/assets/pawn-overlays/03_target.png | Bin 2869 -> 0 bytes data/assets/pawn-overlays/04_attack_assist.png | Bin 4550 -> 0 bytes data/assets/pawn-overlays/12_attack.png | Bin 6820 -> 0 bytes data/assets/pawn-overlays/14_attack_assist.png | Bin 3834 -> 0 bytes 12 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 data/assets/pawn-overlays/00_move.png delete mode 100644 data/assets/pawn-overlays/01_move.png create mode 100644 data/assets/pawn-overlays/01_target.png delete mode 100644 data/assets/pawn-overlays/02_attack.png create mode 100644 data/assets/pawn-overlays/02_fire.png create mode 100644 data/assets/pawn-overlays/03_may_fire.png delete mode 100644 data/assets/pawn-overlays/03_target.png delete mode 100644 data/assets/pawn-overlays/04_attack_assist.png delete mode 100644 data/assets/pawn-overlays/12_attack.png delete mode 100644 data/assets/pawn-overlays/14_attack_assist.png 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); } } diff --git a/data/assets/pawn-overlays/00_move.png b/data/assets/pawn-overlays/00_move.png new file mode 100644 index 0000000..73c92cb Binary files /dev/null and b/data/assets/pawn-overlays/00_move.png differ diff --git a/data/assets/pawn-overlays/01_move.png b/data/assets/pawn-overlays/01_move.png deleted file mode 100644 index 1505885..0000000 Binary files a/data/assets/pawn-overlays/01_move.png and /dev/null differ diff --git a/data/assets/pawn-overlays/01_target.png b/data/assets/pawn-overlays/01_target.png new file mode 100644 index 0000000..953151d Binary files /dev/null and b/data/assets/pawn-overlays/01_target.png differ diff --git a/data/assets/pawn-overlays/02_attack.png b/data/assets/pawn-overlays/02_attack.png deleted file mode 100644 index 2344671..0000000 Binary files a/data/assets/pawn-overlays/02_attack.png and /dev/null differ diff --git a/data/assets/pawn-overlays/02_fire.png b/data/assets/pawn-overlays/02_fire.png new file mode 100644 index 0000000..2344671 Binary files /dev/null and b/data/assets/pawn-overlays/02_fire.png differ diff --git a/data/assets/pawn-overlays/03_may_fire.png b/data/assets/pawn-overlays/03_may_fire.png new file mode 100644 index 0000000..52b29dd Binary files /dev/null and b/data/assets/pawn-overlays/03_may_fire.png differ diff --git a/data/assets/pawn-overlays/03_target.png b/data/assets/pawn-overlays/03_target.png deleted file mode 100644 index 953151d..0000000 Binary files a/data/assets/pawn-overlays/03_target.png and /dev/null differ diff --git a/data/assets/pawn-overlays/04_attack_assist.png b/data/assets/pawn-overlays/04_attack_assist.png deleted file mode 100644 index 52b29dd..0000000 Binary files a/data/assets/pawn-overlays/04_attack_assist.png and /dev/null differ diff --git a/data/assets/pawn-overlays/12_attack.png b/data/assets/pawn-overlays/12_attack.png deleted file mode 100644 index a616530..0000000 Binary files a/data/assets/pawn-overlays/12_attack.png and /dev/null differ diff --git a/data/assets/pawn-overlays/14_attack_assist.png b/data/assets/pawn-overlays/14_attack_assist.png deleted file mode 100644 index 7584dee..0000000 Binary files a/data/assets/pawn-overlays/14_attack_assist.png and /dev/null differ -- cgit v1.1-2-g2b99