diff --git a/src/data/map/default.obj b/src/data/map/default.obj index 5ecfeae..083a097 100644 --- a/src/data/map/default.obj +++ b/src/data/map/default.obj @@ -33,7 +33,7 @@ 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 +0000004000000000000000000000000000000000 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 diff --git a/src/data/map/water.png b/src/data/map/water.png new file mode 100644 index 0000000..da67e62 Binary files /dev/null and b/src/data/map/water.png differ diff --git a/src/ei/game/scene/Map.java b/src/ei/game/scene/Map.java index 32834cd..9e12648 100644 --- a/src/ei/game/scene/Map.java +++ b/src/ei/game/scene/Map.java @@ -18,6 +18,7 @@ import ei.game.player.PlayerHandler; import ei.game.scene.map.Factory; import ei.game.scene.map.Prison; import ei.game.scene.map.Stone; +import ei.game.scene.map.Water; public class Map { public static final int MAP_GRASS = 0; @@ -31,6 +32,7 @@ public class Map { public static final int OBJ_STONE = 1; public static final int OBJ_FACTORY = 2; public static final int OBJ_PRISON = 3; + public static final int OBJ_WATER = 4; public static final int POS_SIZE = 50; private int width; @@ -150,6 +152,9 @@ public class Map { case OBJ_PRISON: gaia.addUnit(new Prison(new Vector2i(i,j),gaia)); break; + case OBJ_WATER: + gaia.addUnit(new Water(new Vector2i(i,j),gaia, 300)); + break; } } }