diff --git a/src/data/map/asfalt_horizontal.png b/src/data/map/asfalt_horizontal.png new file mode 100644 index 0000000..6924f12 Binary files /dev/null and b/src/data/map/asfalt_horizontal.png differ diff --git a/src/data/map/asfalt_vertical.png b/src/data/map/asfalt_vertical.png new file mode 100644 index 0000000..c6fd758 Binary files /dev/null and b/src/data/map/asfalt_vertical.png differ diff --git a/src/data/map/default.map b/src/data/map/default.map index bd9441f..a01625f 100644 --- a/src/data/map/default.map +++ b/src/data/map/default.map @@ -4,37 +4,37 @@ 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000344400000000000000000000000000 -0000000000344400000000000000000000000000 -0000000000344400000000000000000000000000 -0000000000303300000000000000000000000000 -0000000000303300000000000000000000000000 -0000000000333300000000000000000000000000 -0000000000003000000000000000000000000000 -0000000000003000000000000000000000000000 -0000000000003333333333333333333333333330 -0000000000003000000000000030000000000000 -0000000000003000000000000030000000000000 -0000000000003111000000000030000000000000 -0000000000003111000000000030000000000000 -0000000000003111000000000030000000000000 -0000333333333333333333333330000000000000 -0000300000000000000000000030000000000000 -0000300000000000000000000030000000000000 -0000300000000000000000000030000000000000 -0000300000000000000000000030000000000000 -0000300000000000000000000030000000000000 -0000300000000000000000000030000000000000 -0000300044400000000000000030000000000000 -0000300044400000000000000030000000000000 -0000300044400000000000000030000000000000 -0000333333333333333333333333333330000000 -0000000000000000003000000000000030000000 -0000000000000000003000000000000030000000 -0000000000000000003000000000000030000000 -0000000000000000003000000000000030000000 -0000000000000000003000000000000030000000 -0000000000000000003333333333333330000000 +5555555555555555555555555555555555555555 +0000600000300000000000000000000000600000 +0000600000344400000000000000000000600000 +0000600000344400000000000000000000600000 +0000600000344400000000000000000000600000 +0000600000303300000000000000000000600000 +0000600000303300000000000000000000600000 +0000600000333300000000000000000000600000 +0000600000006000000000000000000000600000 +0000600000006000000000000000000000600000 +5555655555556555555555555555555555555550 +0000600000006000000000000060000000000000 +0000600000006000000000000060000000000000 +0000600000006000011113111160000000000000 +0000600000006000011113111160000000000000 +0000600000006000011113111160000000000000 +5555555555555555555555555560000000000000 +0000600000000000000000000060000000000000 +0000600000000000000000000060000000000000 +0000600000000000000000000060000000000000 +0000600000000000000000000065555555555555 +0000600000000000000000000060003000000000 +0000600000000000000000000060004440000000 +0000600044400000000000000060004440000000 +0000600044400000000000000060004440000000 +0000600044400000000000000060003333000000 +5555555555555555555555555555553303000000 +0000000000000000006000000000003333000000 +0000000000000000006000000000000060000000 +0000000000000000006000000000000060000000 +0000000000000000006000000000000060000000 +0000000000000000006000000000000060000000 +0000000000000000005555555555555555555555 0000000000000000000000000000000000000000 \ No newline at end of file diff --git a/src/data/map/default.obj b/src/data/map/default.obj index da5c3ee..05e3475 100644 --- a/src/data/map/default.obj +++ b/src/data/map/default.obj @@ -15,8 +15,8 @@ 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 -0000000000000000000000000000000000000000 -0000000000000000020000200000000000000000 +0000000000000001000000100000000000000000 +0000000000000000020100200000000000000000 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 diff --git a/src/data/map/redmud.png b/src/data/map/redmud.png new file mode 100644 index 0000000..c242752 Binary files /dev/null and b/src/data/map/redmud.png differ diff --git a/src/data/map/sand.jpg b/src/data/map/sand.jpg deleted file mode 100644 index ed8a6d8..0000000 Binary files a/src/data/map/sand.jpg and /dev/null differ diff --git a/src/ei/game/scene/Map.java b/src/ei/game/scene/Map.java index 1ef3ae9..281ceae 100644 --- a/src/ei/game/scene/Map.java +++ b/src/ei/game/scene/Map.java @@ -24,6 +24,8 @@ public class Map { public static final int MAP_REDMUD = 2; public static final int MAP_ASFALT = 3; public static final int MAP_PARKING = 4; + public static final int MAP_ASFALT_HORIZONTAL = 5; + public static final int MAP_ASFALT_VERTICAL = 6; public static final int OBJ_STONE = 1; public static final int OBJ_FACTORY = 2; @@ -106,14 +108,20 @@ public class Map { mapNode.add(getPosSprite(i,j,"data/map/grass.png", 7)); break; case MAP_SAND: - mapNode.add(getPosSprite(i,j,"data/map/sand.png", 7)); + mapNode.add(getPosSprite(i,j,"data/map/sand.png", 6)); break; case MAP_REDMUD: - mapNode.add(getPosSprite(i,j,"data/map/redmud.jpg", 0)); + mapNode.add(getPosSprite(i,j,"data/map/redmud.png", 6)); break; case MAP_ASFALT: mapNode.add(getPosSprite(i,j,"data/map/asfalt.png", 6)); break; + case MAP_ASFALT_HORIZONTAL: + mapNode.add(getPosSprite(i,j,"data/map/asfalt_horizontal.png", 6)); + break; + case MAP_ASFALT_VERTICAL: + mapNode.add(getPosSprite(i,j,"data/map/asfalt_vertical.png", 6)); + break; case MAP_PARKING: mapNode.add(getPosSprite(i,j,parking[parkingIndex], 0)); parkingIndex++;