move Factory, MapA, MapB into game/battles

4 files changed, 13 insertions, 46 deletions

diff --git a/core/src/ch/asynk/tankontank/TankOnTank.java b/core/src/ch/asynk/tankontank/TankOnTank.java
index b409095..268def1 100644
--- a/core/src/ch/asynk/tankontank/TankOnTank.java
+++ b/core/src/ch/asynk/tankontank/TankOnTank.java
@@ -8,9 +8,9 @@ import com.badlogic.gdx.graphics.g2d.TextureAtlas;
 import com.badlogic.gdx.scenes.scene2d.ui.Skin;
 
 import ch.asynk.tankontank.screens.LoadScreen;
-import ch.asynk.tankontank.game.Factory;
 import ch.asynk.tankontank.game.Ctrl;
 import ch.asynk.tankontank.game.Config;
+import ch.asynk.tankontank.game.battles.Factory;
 
 public class TankOnTank extends Game
 {
diff --git a/core/src/ch/asynk/tankontank/game/Factory.java b/core/src/ch/asynk/tankontank/game/battles/Factory.java
index 86db346..f753d47 100644
--- a/core/src/ch/asynk/tankontank/game/Factory.java
+++ b/core/src/ch/asynk/tankontank/game/battles/Factory.java
@@ -1,16 +1,15 @@
-package ch.asynk.tankontank.game;
+package ch.asynk.tankontank.game.battles;
 
 import com.badlogic.gdx.utils.Disposable;
-import com.badlogic.gdx.assets.AssetManager;
-import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
-
-import com.badlogic.gdx.math.GridPoint2;
 
 import ch.asynk.tankontank.TankOnTank;
 import ch.asynk.tankontank.engine.Board;
-import ch.asynk.tankontank.engine.Orientation;
+import ch.asynk.tankontank.game.Player;
+import ch.asynk.tankontank.game.Map;
+import ch.asynk.tankontank.game.Hex;
+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;
 
@@ -154,32 +153,4 @@ public class Factory implements Board.TileBuilder, Disposable
     {
         return new Hex(cx, cy, atlas);
     }
-
-    public Player fakeSetup(Map map, Player gePlayer, Player usPlayer)
-    {
-        Orientation o = Orientation.NORTH;
-        GridPoint2 p = new GridPoint2();
-
-        gePlayer.addUnit(map.setPawnAt(getUnit(UnitId.GE_TIGER), p.set(4, 7), o));
-        gePlayer.addUnit(map.setPawnAt(getUnit(UnitId.GE_TIGER), p.set(3, 6), o));
-        gePlayer.addUnit(map.setPawnAt(getUnit(UnitId.GE_PANZER_IV), p.set(3, 5), o));
-        gePlayer.addUnit(map.setPawnAt(getUnit(UnitId.GE_PANZER_IV_HQ), p.set(2, 4), o));
-        gePlayer.addUnit(map.setPawnAt(getUnit(UnitId.GE_PANZER_IV), p.set(2, 3), o));
-        gePlayer.addUnit(map.setPawnAt(getUnit(UnitId.GE_PANZER_IV), p.set(1, 2), o));
-        gePlayer.addUnit(map.setPawnAt(getUnit(UnitId.GE_PANZER_IV_HQ), p.set(1, 1), o));
-        gePlayer.addUnit(map.setPawnAt(getUnit(UnitId.GE_PANZER_IV), p.set(0, 0), o));
-
-        o = Orientation.SOUTH;
-        usPlayer.addUnit(map.setPawnAt(getUnit(UnitId.US_WOLVERINE), p.set(13, 8), o));
-        usPlayer.addUnit(map.setPawnAt(getUnit(UnitId.US_WOLVERINE), p.set(12, 7), o));
-        usPlayer.addUnit(map.setPawnAt(getUnit(UnitId.US_PRIEST), p.set(12, 6), o));
-        usPlayer.addUnit(map.setPawnAt(getUnit(UnitId.US_SHERMAN), p.set(11, 5), o));
-        usPlayer.addUnit(map.setPawnAt(getUnit(UnitId.US_SHERMAN_HQ), p.set(11, 4), o));
-        usPlayer.addUnit(map.setPawnAt(getUnit(UnitId.US_SHERMAN), p.set(10, 3), o));
-        usPlayer.addUnit(map.setPawnAt(getUnit(UnitId.US_SHERMAN), p.set(10, 2), o));
-        usPlayer.addUnit(map.setPawnAt(getUnit(UnitId.US_SHERMAN_HQ), p.set(9, 1), o));
-        usPlayer.addUnit(map.setPawnAt(getUnit(UnitId.US_SHERMAN), p.set(9, 0), o));
-
-        return usPlayer;
-    }
 }
diff --git a/core/src/ch/asynk/tankontank/game/MapA.java b/core/src/ch/asynk/tankontank/game/battles/MapA.java
index 0f33bcb..3f18e39 100644
--- a/core/src/ch/asynk/tankontank/game/MapA.java
+++ b/core/src/ch/asynk/tankontank/game/battles/MapA.java
@@ -1,12 +1,10 @@
-package ch.asynk.tankontank.game;
-
-import com.badlogic.gdx.assets.AssetManager;
-import com.badlogic.gdx.graphics.Texture;
-import com.badlogic.gdx.graphics.g2d.TextureAtlas;
+package ch.asynk.tankontank.game.battles;
 
 import ch.asynk.tankontank.TankOnTank;
 import ch.asynk.tankontank.engine.Board;
 import ch.asynk.tankontank.engine.Orientation;
+import ch.asynk.tankontank.game.Map;
+import ch.asynk.tankontank.game.Hex;
 
 public class MapA extends Map
 {
diff --git a/core/src/ch/asynk/tankontank/game/MapB.java b/core/src/ch/asynk/tankontank/game/battles/MapB.java
index 7314aea..c0f23a2 100644
--- a/core/src/ch/asynk/tankontank/game/MapB.java
+++ b/core/src/ch/asynk/tankontank/game/battles/MapB.java
@@ -1,12 +1,10 @@
-package ch.asynk.tankontank.game;
-
-import com.badlogic.gdx.assets.AssetManager;
-import com.badlogic.gdx.graphics.Texture;
-import com.badlogic.gdx.graphics.g2d.TextureAtlas;
+package ch.asynk.tankontank.game.battles;
 
 import ch.asynk.tankontank.TankOnTank;
 import ch.asynk.tankontank.engine.Board;
 import ch.asynk.tankontank.engine.Orientation;
+import ch.asynk.tankontank.game.Map;
+import ch.asynk.tankontank.game.Hex;
 
 public class MapB extends Map
 {