summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-11-19 15:08:06 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2014-11-19 15:08:06 +0100
commit3befa0b69aac783475b8edfd9ba469fae8a0db02 (patch)
tree10016da70f557d4b006e0628f23ed100435ad861 /core
parent05c5358566773114ab171334aaeae720aa94e584 (diff)
downloadRustAndDust-3befa0b69aac783475b8edfd9ba469fae8a0db02.zip
RustAndDust-3befa0b69aac783475b8edfd9ba469fae8a0db02.tar.gz
Battle: implement default getReinforcement(Ctrl, Map) return false
Diffstat (limited to 'core')
-rw-r--r--core/src/ch/asynk/tankontank/game/battles/BattleCommon.java8
-rw-r--r--core/src/ch/asynk/tankontank/game/battles/BattleFrontalAssault.java6
-rw-r--r--core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java6
-rw-r--r--core/src/ch/asynk/tankontank/game/battles/BattleLastStand.java6
4 files changed, 8 insertions, 18 deletions
diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java b/core/src/ch/asynk/tankontank/game/battles/BattleCommon.java
index 3d380d2..4b536f1 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;
@@ -76,6 +78,12 @@ public abstract class BattleCommon implements Battle
}
@Override
+ public boolean getReinforcement(Ctrl ctrl, Map map)
+ {
+ return false;
+ }
+
+ @Override
public Zone getEntryZone(Unit unit)
{
return unitEntry.get(unit);
diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleFrontalAssault.java b/core/src/ch/asynk/tankontank/game/battles/BattleFrontalAssault.java
index 13483d2..ecd9841 100644
--- a/core/src/ch/asynk/tankontank/game/battles/BattleFrontalAssault.java
+++ b/core/src/ch/asynk/tankontank/game/battles/BattleFrontalAssault.java
@@ -84,12 +84,6 @@ public class BattleFrontalAssault extends BattleCommon
}
@Override
- public boolean getReinforcement(Ctrl ctrl, Map map)
- {
- return false;
- }
-
- @Override
public void setup(Ctrl ctrl, Map map)
{
objectives = new TileSet(map, 3);
diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java b/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java
index 0e3fde7..82e4b7c 100644
--- a/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java
+++ b/core/src/ch/asynk/tankontank/game/battles/BattleHeadToHead.java
@@ -76,12 +76,6 @@ public class BattleHeadToHead extends BattleCommon
}
@Override
- public boolean getReinforcement(Ctrl ctrl, Map map)
- {
- return false;
- }
-
- @Override
public void setup(Ctrl ctrl, Map map)
{
// end deployment
diff --git a/core/src/ch/asynk/tankontank/game/battles/BattleLastStand.java b/core/src/ch/asynk/tankontank/game/battles/BattleLastStand.java
index 7adf3e4..19ccf61 100644
--- a/core/src/ch/asynk/tankontank/game/battles/BattleLastStand.java
+++ b/core/src/ch/asynk/tankontank/game/battles/BattleLastStand.java
@@ -73,12 +73,6 @@ public class BattleLastStand extends BattleCommon
}
@Override
- public boolean getReinforcement(Ctrl ctrl, Map map)
- {
- return false;
- }
-
- @Override
public void setup(Ctrl ctrl, Map map)
{
objectives = new TileSet(map, 4);