game.Factory -> Factory

6 files changed, 7 insertions, 10 deletions

diff --git a/core/src/ch/asynk/rustanddust/RustAndDust.java b/core/src/ch/asynk/rustanddust/RustAndDust.java
index 5a63c70..bcbdc43 100644
--- a/core/src/ch/asynk/rustanddust/RustAndDust.java
+++ b/core/src/ch/asynk/rustanddust/RustAndDust.java
@@ -16,7 +16,7 @@ import ch.asynk.rustanddust.screens.MenuScreen;
 import ch.asynk.rustanddust.screens.GameScreen;
 import ch.asynk.rustanddust.game.Ctrl;
 import ch.asynk.rustanddust.game.Config;
-import ch.asynk.rustanddust.game.battles.Factory;
+import ch.asynk.rustanddust.game.Factory;
 import ch.asynk.rustanddust.ui.Bg;
 
 public class RustAndDust extends Game
diff --git a/core/src/ch/asynk/rustanddust/game/Army.java b/core/src/ch/asynk/rustanddust/game/Army.java
index aaa4073..9a1663b 100644
--- a/core/src/ch/asynk/rustanddust/game/Army.java
+++ b/core/src/ch/asynk/rustanddust/game/Army.java
@@ -1,7 +1,7 @@
 package ch.asynk.rustanddust.game;
 
 import ch.asynk.rustanddust.engine.Faction;
-import ch.asynk.rustanddust.game.battles.Factory;
+import ch.asynk.rustanddust.game.Factory;
 
 public enum Army implements Faction
 {
diff --git a/core/src/ch/asynk/rustanddust/game/Battle.java b/core/src/ch/asynk/rustanddust/game/Battle.java
index c54f9f4..add6820 100644
--- a/core/src/ch/asynk/rustanddust/game/Battle.java
+++ b/core/src/ch/asynk/rustanddust/game/Battle.java
@@ -1,7 +1,7 @@
 package ch.asynk.rustanddust.game;
 
 import ch.asynk.rustanddust.ui.Position;
-import ch.asynk.rustanddust.game.battles.Factory.MapType;
+import ch.asynk.rustanddust.game.Factory.MapType;
 
 public interface Battle
 {
diff --git a/core/src/ch/asynk/rustanddust/game/battles/Factory.java b/core/src/ch/asynk/rustanddust/game/Factory.java
index a2833d0..eb3cb39 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/Factory.java
+++ b/core/src/ch/asynk/rustanddust/game/Factory.java
@@ -1,4 +1,4 @@
-package ch.asynk.rustanddust.game.battles;
+package ch.asynk.rustanddust.game;
 
 import com.badlogic.gdx.utils.Disposable;
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
@@ -6,14 +6,9 @@ import com.badlogic.gdx.graphics.g2d.TextureAtlas.AtlasRegion;
 
 import ch.asynk.rustanddust.RustAndDust;
 import ch.asynk.rustanddust.engine.Board;
-import ch.asynk.rustanddust.game.Player;
-import ch.asynk.rustanddust.game.Map;
-import ch.asynk.rustanddust.game.Hex;
-import ch.asynk.rustanddust.game.Army;
-import ch.asynk.rustanddust.game.Unit;
 import ch.asynk.rustanddust.game.Unit.UnitId;
 import ch.asynk.rustanddust.game.Unit.UnitType;
-import ch.asynk.rustanddust.game.Battle;
+import ch.asynk.rustanddust.game.battles.Map00;
 import ch.asynk.rustanddust.game.battles.BattleTest;
 
 public class Factory implements Board.TileBuilder, Disposable
diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
index 03dbc3c..a5c9b3d 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
+++ b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
@@ -12,6 +12,7 @@ import ch.asynk.rustanddust.game.Zone;
 import ch.asynk.rustanddust.game.Hex;
 import ch.asynk.rustanddust.game.Unit;
 import ch.asynk.rustanddust.game.Unit.UnitId;
+import ch.asynk.rustanddust.game.Factory;
 import ch.asynk.rustanddust.game.State.StateType;
 import ch.asynk.rustanddust.engine.Orientation;
 
diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java b/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java
index bb78a55..bf37ac0 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java
+++ b/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java
@@ -5,6 +5,7 @@ import ch.asynk.rustanddust.game.Player;
 import ch.asynk.rustanddust.game.Map;
 import ch.asynk.rustanddust.game.Zone;
 import ch.asynk.rustanddust.game.Unit.UnitId;
+import ch.asynk.rustanddust.game.Factory;
 import ch.asynk.rustanddust.ui.Position;
 import ch.asynk.rustanddust.engine.Orientation;