From 9f6b1b1e85ed029673eef041e7f1be9e2356a780 Mon Sep 17 00:00:00 2001 From: Jérémy Zurcher Date: Mon, 20 Oct 2014 10:55:39 +0200 Subject: Paw,Unit: add boolean isA(PawnType type) --- core/src/ch/asynk/tankontank/game/Unit.java | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'core/src/ch/asynk/tankontank/game') diff --git a/core/src/ch/asynk/tankontank/game/Unit.java b/core/src/ch/asynk/tankontank/game/Unit.java index acb02016..56736d21 100644 --- a/core/src/ch/asynk/tankontank/game/Unit.java +++ b/core/src/ch/asynk/tankontank/game/Unit.java @@ -12,7 +12,7 @@ public class Unit extends HeadedPawn { public static final int DISABLED = 0; - public enum UnitType + public enum UnitType implements Pawn.PawnType { HARD_TARGET, HARD_TARGET_HQ, @@ -121,15 +121,21 @@ public class Unit extends HeadedPawn } @Override - public boolean isHq() + public boolean isUnit() { - return (type == UnitType.HARD_TARGET_HQ); + return true; } @Override - public boolean isHardTarget() + public boolean isA(PawnType t) { - return ((type == UnitType.HARD_TARGET) || (type == UnitType.HARD_TARGET_HQ)); + return (type == t); + } + + @Override + public boolean isHq() + { + return (type == UnitType.HARD_TARGET_HQ); } @Override @@ -142,9 +148,9 @@ public class Unit extends HeadedPawn } @Override - public boolean isUnit() + public boolean isHardTarget() { - return true; + return ((type == UnitType.HARD_TARGET) || (type == UnitType.HARD_TARGET_HQ)); } @Override -- cgit v1.2.3