remove LNL battles, and map definitions

11 files changed, 1 insertions, 27 deletions

diff --git a/core/src/ch/asynk/rustanddust/RustAndDust.java b/core/src/ch/asynk/rustanddust/RustAndDust.java
index f6f0c22..3e4d70d 100644
--- a/core/src/ch/asynk/rustanddust/RustAndDust.java
+++ b/core/src/ch/asynk/rustanddust/RustAndDust.java
@@ -88,10 +88,6 @@ public class RustAndDust extends Game
 
     public void loadGameAssets()
     {
-        if (config.battle.getMapType() == Factory.MapType.MAP_A)
-            manager.load("data/map_a.png", Texture.class);
-        if (config.battle.getMapType() == Factory.MapType.MAP_B)
-            manager.load("data/map_b.png", Texture.class);
         if (config.battle.getMapType() == Factory.MapType.MAP_00)
             manager.load("data/map_00.png", Texture.class);
         int i = config.graphics.i;
@@ -119,10 +115,6 @@ public class RustAndDust extends Game
 
     private void unloadGameAssets()
     {
-        if (config.battle.getMapType() == Factory.MapType.MAP_A)
-            manager.unload("data/map_a.png");
-        if (config.battle.getMapType() == Factory.MapType.MAP_B)
-            manager.unload("data/map_b.png");
         if (config.battle.getMapType() == Factory.MapType.MAP_00)
             manager.unload("data/map_00.png");
         int i = config.graphics.i;
diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java b/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java
index a237bca..e4bf08f 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java
+++ b/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java
@@ -20,7 +20,7 @@ public class BattleTest extends BattleCommon
     {
         super(factory);
         name = "*** Test ***";
-        mapType = Factory.MapType.MAP_B;
+        mapType = Factory.MapType.MAP_00;
     }
 
     @Override
diff --git a/core/src/ch/asynk/rustanddust/game/battles/Factory.java b/core/src/ch/asynk/rustanddust/game/battles/Factory.java
index 0f232c4..fbe6d20 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/Factory.java
+++ b/core/src/ch/asynk/rustanddust/game/battles/Factory.java
@@ -13,12 +13,6 @@ 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.BattleHeadToHead;
-import ch.asynk.rustanddust.game.battles.BattleFrontalAssault;
-import ch.asynk.rustanddust.game.battles.BattleLastStand;
-import ch.asynk.rustanddust.game.battles.BattleCounterAttack;
-import ch.asynk.rustanddust.game.battles.BattleStabToTheFlank;
-import ch.asynk.rustanddust.game.battles.BattleNightAction;
 import ch.asynk.rustanddust.game.battles.BattleTest;
 
 public class Factory implements Board.TileBuilder, Disposable
@@ -48,12 +42,6 @@ public class Factory implements Board.TileBuilder, Disposable
         this.game = game;
         this.assetsLoaded = false;
         battles = new Battle[] {
-            new BattleHeadToHead(this),
-            new BattleFrontalAssault(this),
-            new BattleLastStand(this),
-            new BattleCounterAttack(this),
-            new BattleStabToTheFlank(this),
-            new BattleNightAction(this),
             new BattleTest(this),
         };
     }
@@ -87,12 +75,6 @@ public class Factory implements Board.TileBuilder, Disposable
             case MAP_00:
                 m = new Map00(game, "data/map_00.png", "data/hex.png");
                 break;
-            case MAP_A:
-                m = new MapA(game, "data/map_a.png", "data/hex.png");
-                break;
-            case MAP_B:
-                m = new MapB(game, "data/map_b.png", "data/hex.png");
-                break;
         }
 
         return m;
diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleCounterAttack.java b/old/BattleCounterAttack.java
index cea1d13..cea1d13 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleCounterAttack.java
+++ b/old/BattleCounterAttack.java
diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleFrontalAssault.java b/old/BattleFrontalAssault.java
index 372e045..372e045 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleFrontalAssault.java
+++ b/old/BattleFrontalAssault.java
diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleHeadToHead.java b/old/BattleHeadToHead.java
index 0d88846..0d88846 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleHeadToHead.java
+++ b/old/BattleHeadToHead.java
diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleLastStand.java b/old/BattleLastStand.java
index f898ce9..f898ce9 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleLastStand.java
+++ b/old/BattleLastStand.java
diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleNightAction.java b/old/BattleNightAction.java
index f9817db..f9817db 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleNightAction.java
+++ b/old/BattleNightAction.java
diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleStabToTheFlank.java b/old/BattleStabToTheFlank.java
index c45bac4..c45bac4 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleStabToTheFlank.java
+++ b/old/BattleStabToTheFlank.java
diff --git a/core/src/ch/asynk/rustanddust/game/battles/MapA.java b/old/MapA.java
index 8e772b8..8e772b8 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/MapA.java
+++ b/old/MapA.java
diff --git a/core/src/ch/asynk/rustanddust/game/battles/MapB.java b/old/MapB.java
index f882f69..f882f69 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/MapB.java
+++ b/old/MapB.java