diff options
author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-13 17:24:21 +0100 |
---|---|---|
committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-13 17:24:21 +0100 |
commit | 52eb838731e3e38a72652d15ebc60e66860cabf0 (patch) | |
tree | c745d14756b1711bb015e0e818d562f00fe036a4 /core/src/ch/asynk/tankontank/game | |
parent | f74e9de84574721f7cf0689dc18a05cc50f50ba8 (diff) | |
download | RustAndDust-52eb838731e3e38a72652d15ebc60e66860cabf0.zip RustAndDust-52eb838731e3e38a72652d15ebc60e66860cabf0.tar.gz |
Config: add and use Battle battle
Diffstat (limited to 'core/src/ch/asynk/tankontank/game')
-rw-r--r-- | core/src/ch/asynk/tankontank/game/Config.java | 2 | ||||
-rw-r--r-- | core/src/ch/asynk/tankontank/game/battles/Factory.java | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Config.java b/core/src/ch/asynk/tankontank/game/Config.java index dbbf7bf..c562b50 100644 --- a/core/src/ch/asynk/tankontank/game/Config.java +++ b/core/src/ch/asynk/tankontank/game/Config.java @@ -9,6 +9,7 @@ public class Config public boolean mustValidate; public boolean showEnemyPossibilities; public boolean debug; + public Battle battle; public Config() { @@ -19,5 +20,6 @@ public class Config this.canCancel = true; this.mustValidate = false; this.showEnemyPossibilities = false; + this.battle = null; } } diff --git a/core/src/ch/asynk/tankontank/game/battles/Factory.java b/core/src/ch/asynk/tankontank/game/battles/Factory.java index 8d111d0..09d062d 100644 --- a/core/src/ch/asynk/tankontank/game/battles/Factory.java +++ b/core/src/ch/asynk/tankontank/game/battles/Factory.java @@ -12,6 +12,8 @@ import ch.asynk.tankontank.game.Army; import ch.asynk.tankontank.game.Unit; import ch.asynk.tankontank.game.Unit.UnitId; import ch.asynk.tankontank.game.Unit.UnitType; +import ch.asynk.tankontank.game.Battle; +import ch.asynk.tankontank.game.battles.BattleHeadToHead; public class Factory implements Board.TileBuilder, Disposable { @@ -30,11 +32,15 @@ public class Factory implements Board.TileBuilder, Disposable public TextureAtlas pawnsAtlas; public TextureAtlas pawnOverlaysAtlas; public TextureAtlas tileOverlaysAtlas; + public Battle battles[]; private final TankOnTank game; public Factory(final TankOnTank game) { this.game = game; + battles = new Battle[] { + new BattleHeadToHead(this), + }; } public void assetsLoaded() |