Army: engine/Army -> interface engine/Faction + enum game/Army implements Faction

5 files changed, 29 insertions, 4 deletions

diff --git a/core/src/ch/asynk/tankontank/game/Army.java b/core/src/ch/asynk/tankontank/game/Army.java
new file mode 100644
index 0000000..9e729c6
--- /dev/null
+++ b/core/src/ch/asynk/tankontank/game/Army.java
@@ -0,0 +1,29 @@
+package ch.asynk.tankontank.game;
+
+import ch.asynk.tankontank.engine.Faction;
+
+public enum Army implements Faction
+{
+    GE("German"),
+    US("US"),
+    USSR("Soviet"),
+    EN("English");
+
+    private String s;
+
+    Army(String s) {
+        this.s = s;
+    }
+
+    @Override
+    public boolean isEnemy(Faction other)
+    {
+        return (this != other);
+    }
+
+    @Override
+    public String toString()
+    {
+        return s;
+    }
+}
diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java
index 2a8c99a..ca2ca64 100644
--- a/core/src/ch/asynk/tankontank/game/Ctrl.java
+++ b/core/src/ch/asynk/tankontank/game/Ctrl.java
@@ -3,7 +3,6 @@ package ch.asynk.tankontank.game;
 import com.badlogic.gdx.utils.Disposable;
 
 import ch.asynk.tankontank.TankOnTank;
-import ch.asynk.tankontank.engine.Army;
 import ch.asynk.tankontank.game.states.StateCommon;
 import ch.asynk.tankontank.game.states.StateSelect;
 import ch.asynk.tankontank.game.states.StateMove;
diff --git a/core/src/ch/asynk/tankontank/game/Factory.java b/core/src/ch/asynk/tankontank/game/Factory.java
index fe0ffaa..86db346 100644
--- a/core/src/ch/asynk/tankontank/game/Factory.java
+++ b/core/src/ch/asynk/tankontank/game/Factory.java
@@ -9,7 +9,6 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.math.GridPoint2;
 
 import ch.asynk.tankontank.TankOnTank;
-import ch.asynk.tankontank.engine.Army;
 import ch.asynk.tankontank.engine.Board;
 import ch.asynk.tankontank.engine.Orientation;
 import ch.asynk.tankontank.game.Unit.UnitId;
diff --git a/core/src/ch/asynk/tankontank/game/Player.java b/core/src/ch/asynk/tankontank/game/Player.java
index d63a3f9..15efea0 100644
--- a/core/src/ch/asynk/tankontank/game/Player.java
+++ b/core/src/ch/asynk/tankontank/game/Player.java
@@ -12,7 +12,6 @@ import com.badlogic.gdx.graphics.g2d.TextureAtlas;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 
 import ch.asynk.tankontank.TankOnTank;
-import ch.asynk.tankontank.engine.Army;
 import ch.asynk.tankontank.engine.Pawn;
 import ch.asynk.tankontank.engine.gfx.Image;
 import ch.asynk.tankontank.engine.gfx.Drawable;
diff --git a/core/src/ch/asynk/tankontank/game/Unit.java b/core/src/ch/asynk/tankontank/game/Unit.java
index ce652b2..f047de4 100644
--- a/core/src/ch/asynk/tankontank/game/Unit.java
+++ b/core/src/ch/asynk/tankontank/game/Unit.java
@@ -3,7 +3,6 @@ package ch.asynk.tankontank.game;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
 
-import ch.asynk.tankontank.engine.Army;
 import ch.asynk.tankontank.engine.Pawn;
 import ch.asynk.tankontank.engine.Tile;
 import ch.asynk.tankontank.engine.HeadedPawn;