diff --git a/src/data/map/default.map b/src/data/map/default.map index a01625f..d30372b 100644 --- a/src/data/map/default.map +++ b/src/data/map/default.map @@ -1,9 +1,4 @@ 0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 5555555555555555555555555555555555555555 0000600000300000000000000000000000600000 0000600000344400000000000000000000600000 diff --git a/src/data/map/default.obj b/src/data/map/default.obj index 083a097..d232743 100644 --- a/src/data/map/default.obj +++ b/src/data/map/default.obj @@ -10,11 +10,6 @@ 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 0000000000000001000000100000000000000000 0000000000000000020100200000000000000000 0000000000000000000000000000000000000000 @@ -33,8 +28,8 @@ 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 +0000000000000000000000000000000000000000 0000004000000000000000000000000000000000 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 \ No newline at end of file diff --git a/src/data/map/water.png b/src/data/map/water.png index da67e62..4c60c14 100644 Binary files a/src/data/map/water.png and b/src/data/map/water.png differ diff --git a/src/ei/game/gamestate/InGameState.java b/src/ei/game/gamestate/InGameState.java index 9ebf536..22a2bbe 100644 --- a/src/ei/game/gamestate/InGameState.java +++ b/src/ei/game/gamestate/InGameState.java @@ -53,10 +53,10 @@ public class InGameState extends GameState{ PlayerHandler.getInstance().addPlayer(player); AiPlayer ai = new AiPlayer(); - ai.addUnit(new Tank(1,39, ai)); - ai.addUnit(new Tank(2,39, ai)); - ai.addUnit(new APU(4, 39, ai)); - ai.addUnit(new APU(5, 39, ai)); + ai.addUnit(new Tank(29,33, ai)); + ai.addUnit(new Tank(30,33, ai)); + ai.addUnit(new APU(31, 33, ai)); + ai.addUnit(new APU(32, 33, ai)); PlayerHandler.getInstance().addPlayer(ai); rootNode.add(map.getMapNode()); diff --git a/src/ei/game/player/AiPlayer.java b/src/ei/game/player/AiPlayer.java index 6a33a8a..7f35dbe 100644 --- a/src/ei/game/player/AiPlayer.java +++ b/src/ei/game/player/AiPlayer.java @@ -25,7 +25,7 @@ public class AiPlayer extends Player{ */ public AiPlayer(){ super(); - cc = new CommandCenter(30,30,this); + cc = new CommandCenter(30,25,this); addUnit(cc); attackingUnits = new ArrayList(); } diff --git a/src/ei/game/player/HumanPlayer.java b/src/ei/game/player/HumanPlayer.java index b2587b1..0ba3fb3 100644 --- a/src/ei/game/player/HumanPlayer.java +++ b/src/ei/game/player/HumanPlayer.java @@ -10,7 +10,7 @@ public class HumanPlayer extends Player{ public HumanPlayer(){ super(); - cc = new CommandCenter(10,10,this); + cc = new CommandCenter(10,5,this); addUnit(cc); }