From 3befa0b69aac783475b8edfd9ba469fae8a0db02 Mon Sep 17 00:00:00 2001 From: Jérémy Zurcher Date: Wed, 19 Nov 2014 15:08:06 +0100 Subject: Battle: implement default getReinforcement(Ctrl, Map) return false --- core/src/ch/asynk/tankontank/game/battles/BattleCommon.java | 8 ++++++++ .../ch/asynk/tankontank/game/battles/BattleFrontalAssault.java | 6 ------ core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java | 6 ------ core/src/ch/asynk/tankontank/game/battles/BattleLastStand.java | 6 ------ 4 files changed, 8 insertions(+), 18 deletions(-) (limited to 'core/src/ch/asynk/tankontank') diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java b/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java index 3d380d2c..4b536f1f 100644 --- a/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java +++ b/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java @@ -9,6 +9,8 @@ import ch.asynk.tankontank.engine.Zone; import ch.asynk.tankontank.game.Army; import ch.asynk.tankontank.game.Battle; import ch.asynk.tankontank.game.Player; +import ch.asynk.tankontank.game.Ctrl; +import ch.asynk.tankontank.game.Map; import ch.asynk.tankontank.game.Unit; import ch.asynk.tankontank.game.Unit.UnitId; import ch.asynk.tankontank.game.State.StateType; @@ -75,6 +77,12 @@ public abstract class BattleCommon implements Battle return StateType.SELECT; } + @Override + public boolean getReinforcement(Ctrl ctrl, Map map) + { + return false; + } + @Override public Zone getEntryZone(Unit unit) { diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleFrontalAssault.java b/core/src/ch/asynk/tankontank/game/battles/BattleFrontalAssault.java index 13483d22..ecd9841e 100644 --- a/core/src/ch/asynk/tankontank/game/battles/BattleFrontalAssault.java +++ b/core/src/ch/asynk/tankontank/game/battles/BattleFrontalAssault.java @@ -83,12 +83,6 @@ public class BattleFrontalAssault extends BattleCommon return gePlayer; } - @Override - public boolean getReinforcement(Ctrl ctrl, Map map) - { - return false; - } - @Override public void setup(Ctrl ctrl, Map map) { diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java b/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java index 0e3fde79..82e4b7c8 100644 --- a/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java +++ b/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java @@ -75,12 +75,6 @@ public class BattleHeadToHead extends BattleCommon return null; } - @Override - public boolean getReinforcement(Ctrl ctrl, Map map) - { - return false; - } - @Override public void setup(Ctrl ctrl, Map map) { diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleLastStand.java b/core/src/ch/asynk/tankontank/game/battles/BattleLastStand.java index 7adf3e4a..19ccf612 100644 --- a/core/src/ch/asynk/tankontank/game/battles/BattleLastStand.java +++ b/core/src/ch/asynk/tankontank/game/battles/BattleLastStand.java @@ -72,12 +72,6 @@ public class BattleLastStand extends BattleCommon return gePlayer; } - @Override - public boolean getReinforcement(Ctrl ctrl, Map map) - { - return false; - } - @Override public void setup(Ctrl ctrl, Map map) { -- cgit v1.2.3