diff --git a/ZoFo/Content/Content.mgcb b/ZoFo/Content/Content.mgcb
index c4dedca..3af7cd8 100644
--- a/ZoFo/Content/Content.mgcb
+++ b/ZoFo/Content/Content.mgcb
@@ -103,18 +103,6 @@
#begin Textures/Animations/testAnimationExample.animation
/copy:Textures/Animations/testAnimationExample.animation
-#begin Textures/AnimationTextures/Character/hr-level1_idle_gun.png
-/importer:TextureImporter
-/processor:TextureProcessor
-/processorParam:ColorKeyColor=255,0,255,255
-/processorParam:ColorKeyEnabled=True
-/processorParam:GenerateMipmaps=False
-/processorParam:PremultiplyAlpha=True
-/processorParam:ResizeToPowerOfTwo=False
-/processorParam:MakeSquare=False
-/processorParam:TextureFormat=Color
-/build:Textures/AnimationTextures/Character/hr-level1_idle_gun.png
-
#begin Textures/AnimationTextures/Character/hr-level1_idle.png
/importer:TextureImporter
/processor:TextureProcessor
@@ -127,6 +115,18 @@
/processorParam:TextureFormat=Color
/build:Textures/AnimationTextures/Character/hr-level1_idle.png
+#begin Textures/AnimationTextures/Character/hr-level1_idle_gun.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Textures/AnimationTextures/Character/hr-level1_idle_gun.png
+
#begin Textures/AnimationTextures/Character/hr-level1_mining_tool-1.png
/importer:TextureImporter
/processor:TextureProcessor
@@ -151,18 +151,6 @@
/processorParam:TextureFormat=Color
/build:Textures/AnimationTextures/Character/hr-level1_mining_tool-2.png
-#begin Textures/AnimationTextures/Character/hr-level1_running_gun.png
-/importer:TextureImporter
-/processor:TextureProcessor
-/processorParam:ColorKeyColor=255,0,255,255
-/processorParam:ColorKeyEnabled=True
-/processorParam:GenerateMipmaps=False
-/processorParam:PremultiplyAlpha=True
-/processorParam:ResizeToPowerOfTwo=False
-/processorParam:MakeSquare=False
-/processorParam:TextureFormat=Color
-/build:Textures/AnimationTextures/Character/hr-level1_running_gun.png
-
#begin Textures/AnimationTextures/Character/hr-level1_running.png
/importer:TextureImporter
/processor:TextureProcessor
@@ -175,6 +163,18 @@
/processorParam:TextureFormat=Color
/build:Textures/AnimationTextures/Character/hr-level1_running.png
+#begin Textures/AnimationTextures/Character/hr-level1_running_gun.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Textures/AnimationTextures/Character/hr-level1_running_gun.png
+
#begin Textures/AnimationTextures/unicorn.png
/importer:TextureImporter
/processor:TextureProcessor
@@ -271,18 +271,6 @@
/processorParam:TextureFormat=Color
/build:Textures/GUI/background/waiting.png
-#begin Textures/GUI/checkboxs_off-on.png
-/importer:TextureImporter
-/processor:TextureProcessor
-/processorParam:ColorKeyColor=255,0,255,255
-/processorParam:ColorKeyEnabled=True
-/processorParam:GenerateMipmaps=False
-/processorParam:PremultiplyAlpha=True
-/processorParam:ResizeToPowerOfTwo=False
-/processorParam:MakeSquare=False
-/processorParam:TextureFormat=Color
-/build:Textures/GUI/checkboxs_off-on.png
-
#begin Textures/GUI/checkboxs_off.png
/importer:TextureImporter
/processor:TextureProcessor
@@ -295,6 +283,18 @@
/processorParam:TextureFormat=Color
/build:Textures/GUI/checkboxs_off.png
+#begin Textures/GUI/checkboxs_off-on.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Textures/GUI/checkboxs_off-on.png
+
#begin Textures/GUI/checkboxs_on.png
/importer:TextureImporter
/processor:TextureProcessor
@@ -331,6 +331,18 @@
/processorParam:TextureFormat=Color
/build:Textures/GUI/mouse.png
+#begin Textures/GUI/switch.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Textures/GUI/switch.png
+
#begin Textures/GUI/Switch_backgrownd.png
/importer:TextureImporter
/processor:TextureProcessor
@@ -343,7 +355,7 @@
/processorParam:TextureFormat=Color
/build:Textures/GUI/Switch_backgrownd.png
-#begin Textures/GUI/switch.png
+#begin Textures/TileSetImages/Tilelist1.png
/importer:TextureImporter
/processor:TextureProcessor
/processorParam:ColorKeyColor=255,0,255,255
@@ -353,7 +365,55 @@
/processorParam:ResizeToPowerOfTwo=False
/processorParam:MakeSquare=False
/processorParam:TextureFormat=Color
-/build:Textures/GUI/switch.png
+/build:Textures/TileSetImages/Tilelist1.png
+
+#begin Textures/TileSetImages/Tilelist2.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Textures/TileSetImages/Tilelist2.png
+
+#begin Textures/TileSetImages/Tilelist3.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Textures/TileSetImages/Tilelist3.png
+
+#begin Textures/TileSetImages/Tilelist4.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Textures/TileSetImages/Tilelist4.png
+
+#begin Textures/TileSetImages/TilesetFloor.png
+/importer:TextureImporter
+/processor:TextureProcessor
+/processorParam:ColorKeyColor=255,0,255,255
+/processorParam:ColorKeyEnabled=True
+/processorParam:GenerateMipmaps=False
+/processorParam:PremultiplyAlpha=True
+/processorParam:ResizeToPowerOfTwo=False
+/processorParam:MakeSquare=False
+/processorParam:TextureFormat=Color
+/build:Textures/TileSetImages/TilesetFloor.png
#begin Textures/TileSetImages/TilesetFloor.png
/importer:TextureImporter
diff --git a/ZoFo/Content/MapData/MapSession.tiled-session b/ZoFo/Content/MapData/MapSession.tiled-session
index 2b7d661..257833b 100644
--- a/ZoFo/Content/MapData/MapSession.tiled-session
+++ b/ZoFo/Content/MapData/MapSession.tiled-session
@@ -3,24 +3,28 @@
"height": 4300,
"width": 2
},
- "activeFile": "TileSets/TileSet 1.tsj",
+ "activeFile": "TileMaps/main.tmj",
"expandedProjectPaths": [
".",
- "TileMaps",
- "TileSets"
+ "TileSets",
+ "TileMaps"
],
"fileStates": {
"TileMaps/TileSets/TileSet 1.tsj": {
"scaleInDock": 1
},
"TileMaps/main.tmj": {
- "scale": 0.25,
+ "scale": 0.75,
"selectedLayer": 0,
"viewCenter": {
- "x": 3078,
- "y": 2164
+ "x": 578,
+ "y": 482.66666666666674
}
},
+ "TileSets/CollisionTileSet.tsj": {
+ "scaleInDock": 0.75,
+ "scaleInEditor": 1
+ },
"TileSets/TileSet 1.tsj": {
"scaleInDock": 1,
"scaleInEditor": 1.5
@@ -33,14 +37,15 @@
"last.imagePath": "D:/C#/Я смотрел ваши ХАКАТОНЫ/ZoFo/ZoFo/Content/Textures/TileSetImages",
"openFiles": [
"TileSets/TileSet 1.tsj",
- "TileSets/WallSet.tsj",
- "TileMaps/main.tmj"
+ "TileMaps/main.tmj",
+ "TileSets/CollisionTileSet.tsj"
],
"project": "MapSession.tiled-project",
"recentFiles": [
- "TileSets/WallSet.tsj",
"TileMaps/main.tmj",
- "TileSets/TileSet 1.tsj"
+ "TileSets/TileSet 1.tsj",
+ "TileSets/CollisionTileSet.tsj",
+ "TileSets/WallSet.tsj"
],
"tileset.lastUsedFormat": "json",
"tileset.margin": 2,
diff --git a/ZoFo/Content/MapData/TileMaps/main.tmj b/ZoFo/Content/MapData/TileMaps/main.tmj
index 4b1d785..521ea7b 100644
--- a/ZoFo/Content/MapData/TileMaps/main.tmj
+++ b/ZoFo/Content/MapData/TileMaps/main.tmj
@@ -5,44 +5,44 @@
{
"chunks":[
{
- "data":[24, 50, 51, 24, 24, 24, 28, 29, 24, 24, 28, 46, 29, 24, 24, 50,
- 24, 28, 46, 46, 29, 24, 50, 51, 24, 90, 25, 111, 23, 28, 29, 89,
- 29, 50, 2, 2, 51, 24, 24, 28, 29, 28, 10, 3, 23, 25, 23, 89,
- 23, 90, 24, 24, 24, 24, 24, 25, 23, 50, 32, 10, 32, 47, 23, 89,
- 51, 24, 24, 24, 28, 29, 24, 50, 51, 24, 50, 51, 50, 2, 51, 24,
- 28, 46, 29, 24, 50, 51, 24, 24, 24, 24, 28, 46, 46, 46, 29, 89,
- 50, 2, 51, 24, 24, 24, 24, 28, 29, 24, 50, 2, 2, 2, 51, 89,
- 24, 24, 28, 29, 24, 89, 24, 50, 32, 29, 24, 90, 24, 24, 24, 24,
- 24, 89, 25, 23, 24, 90, 24, 24, 50, 51, 24, 24, 24, 24, 24, 24,
- 89, 24, 25, 23, 24, 24, 24, 24, 24, 24, 24, 24, 28, 46, 29, 24,
- 24, 24, 25, 23, 24, 28, 46, 29, 24, 89, 28, 29, 25, 111, 45, 29,
- 24, 24, 50, 51, 89, 50, 3, 45, 29, 24, 50, 51, 50, 2, 3, 45,
- 24, 90, 24, 24, 24, 24, 50, 2, 32, 29, 24, 24, 24, 24, 25, 1,
- 24, 89, 24, 24, 24, 24, 89, 24, 50, 51, 24, 24, 24, 24, 50, 32,
- 29, 90, 90, 24, 24, 89, 24, 24, 24, 24, 24, 24, 28, 29, 24, 50,
- 32, 29, 24, 24, 90, 24, 24, 24, 24, 24, 24, 24, 25, 45, 29, 24],
+ "data":[28, 46, 29, 24, 24, 28, 46, 29, 24, 90, 24, 24, 50, 51, 24, 24,
+ 50, 2, 32, 46, 29, 50, 2, 32, 29, 24, 90, 24, 89, 24, 24, 24,
+ 89, 28, 10, 3, 23, 24, 24, 25, 23, 24, 24, 24, 28, 29, 89, 24,
+ 24, 25, 23, 50, 32, 29, 24, 25, 23, 28, 29, 24, 50, 51, 28, 29,
+ 24, 25, 23, 24, 50, 51, 24, 50, 51, 50, 51, 24, 24, 24, 50, 32,
+ 24, 25, 23, 24, 24, 89, 24, 24, 24, 24, 24, 24, 24, 24, 28, 47,
+ 24, 50, 32, 46, 29, 90, 24, 579, 29, 24, 89, 89, 24, 24, 25, 579,
+ 29, 24, 25, 114, 45, 29, 24, 25, 23, 90, 24, 24, 24, 89, 50, 51,
+ 51, 89, 50, 3, 115, 23, 24, 25, 23, 89, 28, 29, 24, 24, 24, 89,
+ 24, 24, 24, 25, 111, 23, 90, 50, 51, 24, 50, 32, 46, 29, 24, 24,
+ 24, 90, 24, 50, 2, 51, 28, 46, 46, 29, 24, 50, 2, 51, 24, 24,
+ 24, 89, 24, 24, 28, 29, 50, 2, 2, 51, 24, 90, 24, 24, 89, 24,
+ 46, 29, 28, 46, 10, 32, 29, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+ 2, 51, 50, 2, 51, 50, 51, 24, 89, 24, 24, 90, 24, 24, 89, 90,
+ 24, 28, 46, 29, 24, 24, 24, 24, 89, 24, 24, 24, 24, 24, 89, 24,
+ 29, 50, 3, 23, 24, 90, 28, 29, 24, 24, 24, 24, 24, 90, 28, 46],
"height":16,
"width":16,
"x":0,
"y":0
},
{
- "data":[51, 28, 46, 29, 24, 24, 24, 24, 24, 50, 2, 51, 24, 24, 24, 24,
- 24, 50, 2, 51, 28, 29, 24, 24, 24, 28, 29, 89, 24, 28, 46, 29,
- 89, 24, 90, 24, 50, 32, 29, 24, 28, 10, 51, 24, 24, 25, 1, 51,
- 90, 24, 24, 24, 28, 10, 51, 90, 25, 45, 46, 29, 24, 25, 23, 89,
- 24, 28, 29, 28, 10, 32, 29, 28, 10, 2, 2, 51, 24, 50, 51, 24,
- 24, 50, 32, 10, 51, 50, 51, 25, 45, 46, 29, 24, 24, 90, 24, 24,
- 24, 24, 50, 32, 46, 29, 24, 50, 2, 2, 32, 29, 24, 24, 24, 24,
- 24, 24, 24, 50, 2, 32, 29, 24, 24, 24, 50, 51, 24, 24, 24, 24,
- 24, 24, 24, 24, 24, 25, 23, 90, 24, 89, 24, 28, 29, 24, 24, 28,
- 28, 46, 29, 24, 24, 50, 51, 24, 24, 24, 24, 50, 32, 29, 24, 25,
- 50, 2, 51, 28, 29, 28, 46, 29, 24, 24, 89, 24, 25, 45, 46, 10,
- 29, 24, 24, 50, 32, 10, 2, 51, 24, 24, 24, 24, 50, 2, 2, 51,
- 51, 24, 28, 29, 50, 51, 28, 46, 29, 24, 24, 24, 24, 24, 90, 28,
- 29, 24, 25, 23, 24, 24, 50, 2, 32, 29, 24, 24, 89, 24, 89, 50,
- 51, 24, 50, 51, 24, 24, 24, 24, 50, 32, 29, 89, 90, 24, 24, 24,
- 24, 24, 24, 24, 24, 28, 29, 24, 24, 25, 23, 24, 24, 28, 46, 29],
+ "data":[90, 24, 24, 24, 24, 24, 24, 24, 24, 90, 24, 89, 24, 24, 24, 24,
+ 28, 29, 24, 24, 24, 24, 24, 24, 90, 24, 89, 24, 24, 24, 24, 24,
+ 50, 51, 24, 24, 89, 24, 24, 24, 24, 24, 24, 24, 24, 28, 29, 24,
+ 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 25, 23, 28,
+ 46, 29, 24, 24, 24, 24, 24, 28, 29, 24, 24, 24, 90, 50, 32, 47,
+ 115, 23, 24, 24, 24, 24, 24, 25, 23, 28, 29, 24, 24, 89, 50, 3,
+ 3, 45, 46, 29, 24, 24, 24, 50, 51, 50, 51, 89, 24, 24, 28, 47,
+ 50, 2, 2, 32, 29, 24, 24, 24, 90, 24, 24, 24, 24, 24, 25, 1,
+ 24, 24, 24, 25, 23, 24, 24, 24, 89, 24, 24, 90, 24, 24, 50, 51,
+ 89, 24, 24, 25, 23, 24, 24, 24, 24, 24, 28, 29, 24, 24, 24, 90,
+ 24, 24, 24, 50, 32, 29, 24, 24, 28, 46, 47, 23, 24, 24, 24, 24,
+ 24, 24, 24, 90, 50, 51, 90, 24, 50, 3, 1, 51, 28, 29, 28, 46,
+ 24, 89, 28, 46, 46, 29, 24, 24, 24, 50, 51, 28, 10, 51, 50, 2,
+ 24, 90, 25, 1, 2, 51, 28, 46, 46, 46, 46, 10, 51, 24, 24, 24,
+ 24, 24, 50, 32, 29, 28, 10, 2, 2, 3, 1, 32, 29, 24, 24, 24,
+ 29, 24, 24, 25, 45, 47, 23, 24, 24, 50, 51, 25, 45, 29, 24, 24],
"height":16,
"width":16,
"x":16,
@@ -52,19 +52,19 @@
"data":[24, 24, 50, 51, 24, 50, 2, 51, 24, 28, 47, 1, 51, 25, 111, 45,
24, 24, 28, 29, 24, 24, 24, 28, 29, 25, 111, 23, 24, 50, 2, 2,
28, 46, 10, 51, 28, 29, 24, 25, 23, 50, 2, 51, 24, 24, 28, 29,
- 50, 2, 51, 90, 50, 32, 29, 50, 32, 46, 29, 24, 24, 24, 25, 23,
- 89, 24, 24, 24, 90, 50, 51, 24, 25, 114, 23, 24, 90, 24, 25, 23,
- 24, 28, 29, 24, 24, 28, 29, 89, 50, 2, 51, 24, 24, 24, 25, 23,
- 24, 50, 51, 28, 46, 10, 51, 24, 24, 24, 90, 24, 24, 24, 50, 32,
- 24, 24, 90, 50, 2, 32, 29, 28, 46, 29, 28, 46, 29, 24, 90, 50,
- 46, 29, 24, 90, 24, 25, 45, 47, 1, 51, 50, 2, 32, 46, 29, 89,
- 115, 45, 29, 24, 24, 50, 2, 2, 32, 29, 24, 24, 50, 3, 23, 24,
- 2, 2, 51, 24, 24, 24, 24, 24, 50, 32, 46, 29, 24, 50, 51, 24,
- 89, 24, 28, 29, 89, 24, 24, 24, 24, 25, 111, 23, 24, 28, 29, 24,
- 46, 29, 25, 23, 89, 28, 46, 29, 24, 25, 115, 23, 24, 25, 23, 24,
- 2, 32, 47, 45, 46, 10, 2, 32, 46, 10, 2, 51, 24, 25, 23, 89,
+ 10, 2, 51, 90, 50, 32, 29, 50, 32, 46, 29, 24, 24, 24, 25, 23,
+ 23, 24, 24, 24, 90, 50, 51, 24, 25, 114, 23, 24, 90, 24, 25, 23,
+ 23, 28, 29, 24, 24, 28, 29, 89, 50, 2, 51, 24, 24, 24, 25, 23,
+ 23, 50, 51, 28, 46, 10, 51, 24, 24, 24, 90, 24, 24, 24, 50, 32,
+ 51, 24, 90, 50, 2, 32, 29, 28, 46, 29, 28, 46, 29, 24, 90, 50,
+ 28, 29, 24, 90, 24, 25, 45, 47, 1, 51, 50, 2, 32, 46, 29, 89,
+ 25, 45, 29, 24, 24, 50, 2, 2, 32, 29, 24, 24, 50, 3, 23, 24,
+ 50, 2, 51, 24, 24, 24, 24, 24, 50, 32, 46, 29, 24, 50, 51, 24,
+ 29, 24, 28, 29, 89, 24, 24, 24, 24, 25, 111, 23, 24, 28, 29, 24,
+ 32, 29, 25, 23, 89, 28, 46, 29, 24, 25, 115, 23, 24, 25, 23, 24,
+ 50, 32, 47, 45, 46, 10, 2, 32, 46, 10, 2, 51, 24, 25, 23, 89,
24, 50, 2, 3, 1, 32, 46, 10, 2, 51, 89, 24, 89, 50, 51, 24,
- 90, 28, 46, 47, 23, 50, 3, 23, 24, 24, 90, 24, 28, 46, 46, 29],
+ 24, 28, 46, 47, 23, 50, 3, 23, 24, 24, 90, 24, 28, 46, 46, 29],
"height":16,
"width":16,
"x":32,
@@ -181,7 +181,7 @@
"y":0
},
{
- "data":[50, 51, 24, 24, 24, 24, 28, 46, 29, 24, 89, 28, 10, 2, 51, 28,
+ "data":[51, 24, 50, 51, 24, 24, 25, 45, 29, 24, 24, 28, 29, 24, 50, 3,
24, 24, 28, 29, 28, 29, 25, 111, 23, 90, 24, 25, 23, 24, 24, 25,
46, 46, 10, 51, 25, 23, 25, 115, 23, 90, 89, 50, 51, 24, 28, 47,
2, 2, 51, 24, 25, 23, 25, 111, 23, 24, 24, 24, 24, 24, 50, 2,
@@ -203,7 +203,7 @@
"y":16
},
{
- "data":[29, 24, 24, 24, 24, 50, 51, 24, 24, 25, 45, 29, 24, 50, 2, 32,
+ "data":[23, 24, 24, 50, 2, 2, 51, 89, 24, 28, 46, 10, 2, 51, 24, 28,
23, 24, 28, 46, 46, 46, 46, 29, 28, 47, 1, 51, 90, 24, 24, 50,
23, 89, 50, 2, 3, 115, 1, 51, 50, 2, 51, 89, 24, 24, 24, 28,
51, 28, 29, 24, 50, 2, 51, 24, 28, 29, 90, 24, 28, 29, 28, 47,
@@ -1087,137 +1087,49 @@
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 578, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 579, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 578, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+ "height":16,
+ "width":16,
+ "x":0,
+ "y":0
+ },
+ {
+ "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 583, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 578, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 583, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 578, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
"height":16,
"width":16,
- "x":16,
- "y":32
- },
- {
- "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 582, 582, 582, 582, 582, 582, 582, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
- "height":16,
- "width":16,
- "x":32,
- "y":32
- },
- {
- "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 582, 582, 582, 582, 582, 582, 582, 0, 0, 0, 583, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 584, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 584, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 585, 0, 0, 0, 0, 0, 584, 0, 0, 0, 0, 0],
- "height":16,
- "width":16,
- "x":48,
- "y":32
- },
- {
- "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 579, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 579, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 579, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 580, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
- "height":16,
- "width":16,
- "x":16,
- "y":48
- },
- {
- "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 581, 581, 581, 581, 581, 581, 581, 581, 581, 581, 581, 581, 581, 581,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
- "height":16,
- "width":16,
- "x":32,
- "y":48
- },
- {
- "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 584, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 584, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 584, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 584, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 584, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 584, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 584, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 584, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 584, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 585, 0, 0, 0, 0, 0, 584, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 581, 581, 581, 581, 581, 581, 581, 0, 0, 0, 585, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
- "height":16,
- "width":16,
- "x":48,
- "y":48
+ "x":0,
+ "y":16
}],
- "height":48,
+ "height":64,
"id":2,
"name":"Collidable ",
"opacity":1,
- "startx":16,
- "starty":16,
+ "startx":0,
+ "starty":0,
"type":"tilelayer",
"visible":true,
- "width":80,
+ "width":64,
"x":0,
"y":0
}],
diff --git a/ZoFo/Content/MapData/TileSets/CollisionTileSet.tsj b/ZoFo/Content/MapData/TileSets/CollisionTileSet.tsj
index f54327b..e748c72 100644
--- a/ZoFo/Content/MapData/TileSets/CollisionTileSet.tsj
+++ b/ZoFo/Content/MapData/TileSets/CollisionTileSet.tsj
@@ -9,16 +9,31 @@
"tiledversion":"1.10.2",
"tileheight":128,
"tiles":[
+ {
+ "id":0,
+ "type":"Tiles"
+ },
+ {
+ "id":1,
+ "type":"Tiles"
+ },
+ {
+ "id":2,
+ "type":"Tiles"
+ },
+ {
+ "id":3,
+ "type":"Tiles"
+ },
{
"id":4,
- "type":"Tile"
+ "type":"Tiles"
},
{
"id":5,
"objectgroup":
{
"draworder":"index",
- "id":2,
"name":"",
"objects":[
{
@@ -48,14 +63,14 @@
"visible":true,
"x":0,
"y":0
- }
+ },
+ "type":"StopObject"
},
{
"id":6,
"objectgroup":
{
"draworder":"index",
- "id":4,
"name":"",
"objects":[
{
@@ -74,14 +89,51 @@
"visible":true,
"x":0,
"y":0
- }
+ },
+ "type":"StopObject"
+ },
+ {
+ "id":7,
+ "objectgroup":
+ {
+ "draworder":"index",
+ "name":"",
+ "objects":[
+ {
+ "height":128,
+ "id":1,
+ "name":"",
+ "rotation":0,
+ "type":"",
+ "visible":true,
+ "width":36,
+ "x":0,
+ "y":0
+ },
+ {
+ "height":36.6666666666667,
+ "id":2,
+ "name":"",
+ "rotation":0,
+ "type":"",
+ "visible":true,
+ "width":128.666666666667,
+ "x":0,
+ "y":91.3333333333333
+ }],
+ "opacity":1,
+ "type":"objectgroup",
+ "visible":true,
+ "x":0,
+ "y":0
+ },
+ "type":"StopObject"
},
{
"id":8,
"objectgroup":
{
"draworder":"index",
- "id":2,
"name":"",
"objects":[
{
@@ -100,14 +152,14 @@
"visible":true,
"x":0,
"y":0
- }
+ },
+ "type":"StopObject"
},
{
"id":9,
"objectgroup":
{
"draworder":"index",
- "id":2,
"name":"",
"objects":[
{
@@ -126,14 +178,14 @@
"visible":true,
"x":0,
"y":0
- }
+ },
+ "type":"StopObject"
},
{
"id":10,
"objectgroup":
{
"draworder":"index",
- "id":2,
"name":"",
"objects":[
{
@@ -163,14 +215,14 @@
"visible":true,
"x":0,
"y":0
- }
+ },
+ "type":"StopObject"
},
{
"id":11,
"objectgroup":
{
"draworder":"index",
- "id":2,
"name":"",
"objects":[
{
@@ -189,14 +241,14 @@
"visible":true,
"x":0,
"y":0
- }
+ },
+ "type":"StopObject"
},
{
"id":12,
"objectgroup":
{
"draworder":"index",
- "id":2,
"name":"",
"objects":[
{
@@ -226,7 +278,156 @@
"visible":true,
"x":0,
"y":0
- }
+ },
+ "type":"StopObject"
+ },
+ {
+ "id":13,
+ "type":"StopObject"
+ },
+ {
+ "id":14,
+ "type":"StopObject"
+ },
+ {
+ "id":15,
+ "type":"StopObject"
+ },
+ {
+ "id":16,
+ "type":"StopObject"
+ },
+ {
+ "id":17,
+ "type":"StopObject"
+ },
+ {
+ "id":18,
+ "type":"StopObject"
+ },
+ {
+ "id":19,
+ "type":"StopObject"
+ },
+ {
+ "id":20,
+ "type":"StopObject"
+ },
+ {
+ "id":21,
+ "type":"StopObject"
+ },
+ {
+ "id":22,
+ "type":"StopObject"
+ },
+ {
+ "id":23,
+ "type":"StopObject"
+ },
+ {
+ "id":24,
+ "type":"StopObject"
+ },
+ {
+ "id":25,
+ "type":"StopObject"
+ },
+ {
+ "id":26,
+ "type":"StopObject"
+ },
+ {
+ "id":27,
+ "type":"StopObject"
+ },
+ {
+ "id":28,
+ "type":"StopObject"
+ },
+ {
+ "id":29,
+ "type":"StopObject"
+ },
+ {
+ "id":30,
+ "type":"StopObject"
+ },
+ {
+ "id":31,
+ "type":"StopObject"
+ },
+ {
+ "id":32,
+ "type":"StopObject"
+ },
+ {
+ "id":33,
+ "type":"StopObject"
+ },
+ {
+ "id":34,
+ "type":"StopObject"
+ },
+ {
+ "id":35,
+ "type":"StopObject"
+ },
+ {
+ "id":36,
+ "type":"StopObject"
+ },
+ {
+ "id":37,
+ "type":"StopObject"
+ },
+ {
+ "id":38,
+ "type":"StopObject"
+ },
+ {
+ "id":39,
+ "type":"StopObject"
+ },
+ {
+ "id":40,
+ "type":"StopObject"
+ },
+ {
+ "id":41,
+ "type":"StopObject"
+ },
+ {
+ "id":42,
+ "type":"StopObject"
+ },
+ {
+ "id":43,
+ "type":"StopObject"
+ },
+ {
+ "id":44,
+ "type":"StopObject"
+ },
+ {
+ "id":45,
+ "type":"StopObject"
+ },
+ {
+ "id":46,
+ "type":"StopObject"
+ },
+ {
+ "id":47,
+ "type":"StopObject"
+ },
+ {
+ "id":48,
+ "type":"StopObject"
+ },
+ {
+ "id":49,
+ "type":"StopObject"
}],
"tilewidth":128,
"type":"tileset",
diff --git a/ZoFo/Content/MapData/TileSets/TileSet 1.tsj b/ZoFo/Content/MapData/TileSets/TileSet 1.tsj
index bde6188..452c896 100644
--- a/ZoFo/Content/MapData/TileSets/TileSet 1.tsj
+++ b/ZoFo/Content/MapData/TileSets/TileSet 1.tsj
@@ -1082,6 +1082,1238 @@
{
"id":263,
"type":"Tile"
+ },
+ {
+ "id":264,
+ "type":"Tile"
+ },
+ {
+ "id":265,
+ "type":"Tile"
+ },
+ {
+ "id":266,
+ "type":"Tile"
+ },
+ {
+ "id":267,
+ "type":"Tile"
+ },
+ {
+ "id":268,
+ "type":"Tile"
+ },
+ {
+ "id":269,
+ "type":"Tile"
+ },
+ {
+ "id":270,
+ "type":"Tile"
+ },
+ {
+ "id":271,
+ "type":"Tile"
+ },
+ {
+ "id":272,
+ "type":"Tile"
+ },
+ {
+ "id":273,
+ "type":"Tile"
+ },
+ {
+ "id":274,
+ "type":"Tile"
+ },
+ {
+ "id":275,
+ "type":"Tile"
+ },
+ {
+ "id":276,
+ "type":"Tile"
+ },
+ {
+ "id":277,
+ "type":"Tile"
+ },
+ {
+ "id":278,
+ "type":"Tile"
+ },
+ {
+ "id":279,
+ "type":"Tile"
+ },
+ {
+ "id":280,
+ "type":"Tile"
+ },
+ {
+ "id":281,
+ "type":"Tile"
+ },
+ {
+ "id":282,
+ "type":"Tile"
+ },
+ {
+ "id":283,
+ "type":"Tile"
+ },
+ {
+ "id":284,
+ "type":"Tile"
+ },
+ {
+ "id":285,
+ "type":"Tile"
+ },
+ {
+ "id":286,
+ "type":"Tile"
+ },
+ {
+ "id":287,
+ "type":"Tile"
+ },
+ {
+ "id":288,
+ "type":"Tile"
+ },
+ {
+ "id":289,
+ "type":"Tile"
+ },
+ {
+ "id":290,
+ "type":"Tile"
+ },
+ {
+ "id":291,
+ "type":"Tile"
+ },
+ {
+ "id":292,
+ "type":"Tile"
+ },
+ {
+ "id":293,
+ "type":"Tile"
+ },
+ {
+ "id":294,
+ "type":"Tile"
+ },
+ {
+ "id":295,
+ "type":"Tile"
+ },
+ {
+ "id":296,
+ "type":"Tile"
+ },
+ {
+ "id":297,
+ "type":"Tile"
+ },
+ {
+ "id":298,
+ "type":"Tile"
+ },
+ {
+ "id":299,
+ "type":"Tile"
+ },
+ {
+ "id":300,
+ "type":"Tile"
+ },
+ {
+ "id":301,
+ "type":"Tile"
+ },
+ {
+ "id":302,
+ "type":"Tile"
+ },
+ {
+ "id":303,
+ "type":"Tile"
+ },
+ {
+ "id":304,
+ "type":"Tile"
+ },
+ {
+ "id":305,
+ "type":"Tile"
+ },
+ {
+ "id":306,
+ "type":"Tile"
+ },
+ {
+ "id":307,
+ "type":"Tile"
+ },
+ {
+ "id":308,
+ "type":"Tile"
+ },
+ {
+ "id":309,
+ "type":"Tile"
+ },
+ {
+ "id":310,
+ "type":"Tile"
+ },
+ {
+ "id":311,
+ "type":"Tile"
+ },
+ {
+ "id":312,
+ "type":"Tile"
+ },
+ {
+ "id":313,
+ "type":"Tile"
+ },
+ {
+ "id":314,
+ "type":"Tile"
+ },
+ {
+ "id":315,
+ "type":"Tile"
+ },
+ {
+ "id":316,
+ "type":"Tile"
+ },
+ {
+ "id":317,
+ "type":"Tile"
+ },
+ {
+ "id":318,
+ "type":"Tile"
+ },
+ {
+ "id":319,
+ "type":"Tile"
+ },
+ {
+ "id":320,
+ "type":"Tile"
+ },
+ {
+ "id":321,
+ "type":"Tile"
+ },
+ {
+ "id":322,
+ "type":"Tile"
+ },
+ {
+ "id":323,
+ "type":"Tile"
+ },
+ {
+ "id":324,
+ "type":"Tile"
+ },
+ {
+ "id":325,
+ "type":"Tile"
+ },
+ {
+ "id":326,
+ "type":"Tile"
+ },
+ {
+ "id":327,
+ "type":"Tile"
+ },
+ {
+ "id":328,
+ "type":"Tile"
+ },
+ {
+ "id":329,
+ "type":"Tile"
+ },
+ {
+ "id":330,
+ "type":"Tile"
+ },
+ {
+ "id":331,
+ "type":"Tile"
+ },
+ {
+ "id":332,
+ "type":"Tile"
+ },
+ {
+ "id":333,
+ "type":"Tile"
+ },
+ {
+ "id":334,
+ "type":"Tile"
+ },
+ {
+ "id":335,
+ "type":"Tile"
+ },
+ {
+ "id":336,
+ "type":"Tile"
+ },
+ {
+ "id":337,
+ "type":"Tile"
+ },
+ {
+ "id":338,
+ "type":"Tile"
+ },
+ {
+ "id":339,
+ "type":"Tile"
+ },
+ {
+ "id":340,
+ "type":"Tile"
+ },
+ {
+ "id":341,
+ "type":"Tile"
+ },
+ {
+ "id":342,
+ "type":"Tile"
+ },
+ {
+ "id":343,
+ "type":"Tile"
+ },
+ {
+ "id":344,
+ "type":"Tile"
+ },
+ {
+ "id":345,
+ "type":"Tile"
+ },
+ {
+ "id":346,
+ "type":"Tile"
+ },
+ {
+ "id":347,
+ "type":"Tile"
+ },
+ {
+ "id":348,
+ "type":"Tile"
+ },
+ {
+ "id":349,
+ "type":"Tile"
+ },
+ {
+ "id":350,
+ "type":"Tile"
+ },
+ {
+ "id":351,
+ "type":"Tile"
+ },
+ {
+ "id":352,
+ "type":"Tile"
+ },
+ {
+ "id":353,
+ "type":"Tile"
+ },
+ {
+ "id":354,
+ "type":"Tile"
+ },
+ {
+ "id":355,
+ "type":"Tile"
+ },
+ {
+ "id":356,
+ "type":"Tile"
+ },
+ {
+ "id":357,
+ "type":"Tile"
+ },
+ {
+ "id":358,
+ "type":"Tile"
+ },
+ {
+ "id":359,
+ "type":"Tile"
+ },
+ {
+ "id":360,
+ "type":"Tile"
+ },
+ {
+ "id":361,
+ "type":"Tile"
+ },
+ {
+ "id":362,
+ "type":"Tile"
+ },
+ {
+ "id":363,
+ "type":"Tile"
+ },
+ {
+ "id":364,
+ "type":"Tile"
+ },
+ {
+ "id":365,
+ "type":"Tile"
+ },
+ {
+ "id":366,
+ "type":"Tile"
+ },
+ {
+ "id":367,
+ "type":"Tile"
+ },
+ {
+ "id":368,
+ "type":"Tile"
+ },
+ {
+ "id":369,
+ "type":"Tile"
+ },
+ {
+ "id":370,
+ "type":"Tile"
+ },
+ {
+ "id":371,
+ "type":"Tile"
+ },
+ {
+ "id":372,
+ "type":"Tile"
+ },
+ {
+ "id":373,
+ "type":"Tile"
+ },
+ {
+ "id":374,
+ "type":"Tile"
+ },
+ {
+ "id":375,
+ "type":"Tile"
+ },
+ {
+ "id":376,
+ "type":"Tile"
+ },
+ {
+ "id":377,
+ "type":"Tile"
+ },
+ {
+ "id":378,
+ "type":"Tile"
+ },
+ {
+ "id":379,
+ "type":"Tile"
+ },
+ {
+ "id":380,
+ "type":"Tile"
+ },
+ {
+ "id":381,
+ "type":"Tile"
+ },
+ {
+ "id":382,
+ "type":"Tile"
+ },
+ {
+ "id":383,
+ "type":"Tile"
+ },
+ {
+ "id":384,
+ "type":"Tile"
+ },
+ {
+ "id":385,
+ "type":"Tile"
+ },
+ {
+ "id":386,
+ "type":"Tile"
+ },
+ {
+ "id":387,
+ "type":"Tile"
+ },
+ {
+ "id":388,
+ "type":"Tile"
+ },
+ {
+ "id":389,
+ "type":"Tile"
+ },
+ {
+ "id":390,
+ "type":"Tile"
+ },
+ {
+ "id":391,
+ "type":"Tile"
+ },
+ {
+ "id":392,
+ "type":"Tile"
+ },
+ {
+ "id":393,
+ "type":"Tile"
+ },
+ {
+ "id":394,
+ "type":"Tile"
+ },
+ {
+ "id":395,
+ "type":"Tile"
+ },
+ {
+ "id":396,
+ "type":"Tile"
+ },
+ {
+ "id":397,
+ "type":"Tile"
+ },
+ {
+ "id":398,
+ "type":"Tile"
+ },
+ {
+ "id":399,
+ "type":"Tile"
+ },
+ {
+ "id":400,
+ "type":"Tile"
+ },
+ {
+ "id":401,
+ "type":"Tile"
+ },
+ {
+ "id":402,
+ "type":"Tile"
+ },
+ {
+ "id":403,
+ "type":"Tile"
+ },
+ {
+ "id":404,
+ "type":"Tile"
+ },
+ {
+ "id":405,
+ "type":"Tile"
+ },
+ {
+ "id":406,
+ "type":"Tile"
+ },
+ {
+ "id":407,
+ "type":"Tile"
+ },
+ {
+ "id":408,
+ "type":"Tile"
+ },
+ {
+ "id":409,
+ "type":"Tile"
+ },
+ {
+ "id":410,
+ "type":"Tile"
+ },
+ {
+ "id":411,
+ "type":"Tile"
+ },
+ {
+ "id":412,
+ "type":"Tile"
+ },
+ {
+ "id":413,
+ "type":"Tile"
+ },
+ {
+ "id":414,
+ "type":"Tile"
+ },
+ {
+ "id":415,
+ "type":"Tile"
+ },
+ {
+ "id":416,
+ "type":"Tile"
+ },
+ {
+ "id":417,
+ "type":"Tile"
+ },
+ {
+ "id":418,
+ "type":"Tile"
+ },
+ {
+ "id":419,
+ "type":"Tile"
+ },
+ {
+ "id":420,
+ "type":"Tile"
+ },
+ {
+ "id":421,
+ "type":"Tile"
+ },
+ {
+ "id":422,
+ "type":"Tile"
+ },
+ {
+ "id":423,
+ "type":"Tile"
+ },
+ {
+ "id":424,
+ "type":"Tile"
+ },
+ {
+ "id":425,
+ "type":"Tile"
+ },
+ {
+ "id":426,
+ "type":"Tile"
+ },
+ {
+ "id":427,
+ "type":"Tile"
+ },
+ {
+ "id":428,
+ "type":"Tile"
+ },
+ {
+ "id":429,
+ "type":"Tile"
+ },
+ {
+ "id":430,
+ "type":"Tile"
+ },
+ {
+ "id":431,
+ "type":"Tile"
+ },
+ {
+ "id":432,
+ "type":"Tile"
+ },
+ {
+ "id":433,
+ "type":"Tile"
+ },
+ {
+ "id":434,
+ "type":"Tile"
+ },
+ {
+ "id":435,
+ "type":"Tile"
+ },
+ {
+ "id":436,
+ "type":"Tile"
+ },
+ {
+ "id":437,
+ "type":"Tile"
+ },
+ {
+ "id":438,
+ "type":"Tile"
+ },
+ {
+ "id":439,
+ "type":"Tile"
+ },
+ {
+ "id":440,
+ "type":"Tile"
+ },
+ {
+ "id":441,
+ "type":"Tile"
+ },
+ {
+ "id":442,
+ "type":"Tile"
+ },
+ {
+ "id":443,
+ "type":"Tile"
+ },
+ {
+ "id":444,
+ "type":"Tile"
+ },
+ {
+ "id":445,
+ "type":"Tile"
+ },
+ {
+ "id":446,
+ "type":"Tile"
+ },
+ {
+ "id":447,
+ "type":"Tile"
+ },
+ {
+ "id":448,
+ "type":"Tile"
+ },
+ {
+ "id":449,
+ "type":"Tile"
+ },
+ {
+ "id":450,
+ "type":"Tile"
+ },
+ {
+ "id":451,
+ "type":"Tile"
+ },
+ {
+ "id":452,
+ "type":"Tile"
+ },
+ {
+ "id":453,
+ "type":"Tile"
+ },
+ {
+ "id":454,
+ "type":"Tile"
+ },
+ {
+ "id":455,
+ "type":"Tile"
+ },
+ {
+ "id":456,
+ "type":"Tile"
+ },
+ {
+ "id":457,
+ "type":"Tile"
+ },
+ {
+ "id":458,
+ "type":"Tile"
+ },
+ {
+ "id":459,
+ "type":"Tile"
+ },
+ {
+ "id":460,
+ "type":"Tile"
+ },
+ {
+ "id":461,
+ "type":"Tile"
+ },
+ {
+ "id":462,
+ "type":"Tile"
+ },
+ {
+ "id":463,
+ "type":"Tile"
+ },
+ {
+ "id":464,
+ "type":"Tile"
+ },
+ {
+ "id":465,
+ "type":"Tile"
+ },
+ {
+ "id":466,
+ "type":"Tile"
+ },
+ {
+ "id":467,
+ "type":"Tile"
+ },
+ {
+ "id":468,
+ "type":"Tile"
+ },
+ {
+ "id":469,
+ "type":"Tile"
+ },
+ {
+ "id":470,
+ "type":"Tile"
+ },
+ {
+ "id":471,
+ "type":"Tile"
+ },
+ {
+ "id":472,
+ "type":"Tile"
+ },
+ {
+ "id":473,
+ "type":"Tile"
+ },
+ {
+ "id":474,
+ "type":"Tile"
+ },
+ {
+ "id":475,
+ "type":"Tile"
+ },
+ {
+ "id":476,
+ "type":"Tile"
+ },
+ {
+ "id":477,
+ "type":"Tile"
+ },
+ {
+ "id":478,
+ "type":"Tile"
+ },
+ {
+ "id":479,
+ "type":"Tile"
+ },
+ {
+ "id":480,
+ "type":"Tile"
+ },
+ {
+ "id":481,
+ "type":"Tile"
+ },
+ {
+ "id":482,
+ "type":"Tile"
+ },
+ {
+ "id":483,
+ "type":"Tile"
+ },
+ {
+ "id":484,
+ "type":"Tile"
+ },
+ {
+ "id":485,
+ "type":"Tile"
+ },
+ {
+ "id":486,
+ "type":"Tile"
+ },
+ {
+ "id":487,
+ "type":"Tile"
+ },
+ {
+ "id":488,
+ "type":"Tile"
+ },
+ {
+ "id":489,
+ "type":"Tile"
+ },
+ {
+ "id":490,
+ "type":"Tile"
+ },
+ {
+ "id":491,
+ "type":"Tile"
+ },
+ {
+ "id":492,
+ "type":"Tile"
+ },
+ {
+ "id":493,
+ "type":"Tile"
+ },
+ {
+ "id":494,
+ "type":"Tile"
+ },
+ {
+ "id":495,
+ "type":"Tile"
+ },
+ {
+ "id":496,
+ "type":"Tile"
+ },
+ {
+ "id":497,
+ "type":"Tile"
+ },
+ {
+ "id":498,
+ "type":"Tile"
+ },
+ {
+ "id":499,
+ "type":"Tile"
+ },
+ {
+ "id":500,
+ "type":"Tile"
+ },
+ {
+ "id":501,
+ "type":"Tile"
+ },
+ {
+ "id":502,
+ "type":"Tile"
+ },
+ {
+ "id":503,
+ "type":"Tile"
+ },
+ {
+ "id":504,
+ "type":"Tile"
+ },
+ {
+ "id":505,
+ "type":"Tile"
+ },
+ {
+ "id":506,
+ "type":"Tile"
+ },
+ {
+ "id":507,
+ "type":"Tile"
+ },
+ {
+ "id":508,
+ "type":"Tile"
+ },
+ {
+ "id":509,
+ "type":"Tile"
+ },
+ {
+ "id":510,
+ "type":"Tile"
+ },
+ {
+ "id":511,
+ "type":"Tile"
+ },
+ {
+ "id":512,
+ "type":"Tile"
+ },
+ {
+ "id":513,
+ "type":"Tile"
+ },
+ {
+ "id":514,
+ "type":"Tile"
+ },
+ {
+ "id":515,
+ "type":"Tile"
+ },
+ {
+ "id":516,
+ "type":"Tile"
+ },
+ {
+ "id":517,
+ "type":"Tile"
+ },
+ {
+ "id":518,
+ "type":"Tile"
+ },
+ {
+ "id":519,
+ "type":"Tile"
+ },
+ {
+ "id":520,
+ "type":"Tile"
+ },
+ {
+ "id":521,
+ "type":"Tile"
+ },
+ {
+ "id":522,
+ "type":"Tile"
+ },
+ {
+ "id":523,
+ "type":"Tile"
+ },
+ {
+ "id":524,
+ "type":"Tile"
+ },
+ {
+ "id":525,
+ "type":"Tile"
+ },
+ {
+ "id":526,
+ "type":"Tile"
+ },
+ {
+ "id":527,
+ "type":"Tile"
+ },
+ {
+ "id":528,
+ "type":"Tile"
+ },
+ {
+ "id":529,
+ "type":"Tile"
+ },
+ {
+ "id":530,
+ "type":"Tile"
+ },
+ {
+ "id":531,
+ "type":"Tile"
+ },
+ {
+ "id":532,
+ "type":"Tile"
+ },
+ {
+ "id":533,
+ "type":"Tile"
+ },
+ {
+ "id":534,
+ "type":"Tile"
+ },
+ {
+ "id":535,
+ "type":"Tile"
+ },
+ {
+ "id":536,
+ "type":"Tile"
+ },
+ {
+ "id":537,
+ "type":"Tile"
+ },
+ {
+ "id":538,
+ "type":"Tile"
+ },
+ {
+ "id":539,
+ "type":"Tile"
+ },
+ {
+ "id":540,
+ "type":"Tile"
+ },
+ {
+ "id":541,
+ "type":"Tile"
+ },
+ {
+ "id":542,
+ "type":"Tile"
+ },
+ {
+ "id":543,
+ "type":"Tile"
+ },
+ {
+ "id":544,
+ "type":"Tile"
+ },
+ {
+ "id":545,
+ "type":"Tile"
+ },
+ {
+ "id":546,
+ "type":"Tile"
+ },
+ {
+ "id":547,
+ "type":"Tile"
+ },
+ {
+ "id":548,
+ "type":"Tile"
+ },
+ {
+ "id":549,
+ "type":"Tile"
+ },
+ {
+ "id":550,
+ "type":"Tile"
+ },
+ {
+ "id":551,
+ "type":"Tile"
+ },
+ {
+ "id":552,
+ "type":"Tile"
+ },
+ {
+ "id":553,
+ "type":"Tile"
+ },
+ {
+ "id":554,
+ "type":"Tile"
+ },
+ {
+ "id":555,
+ "type":"Tile"
+ },
+ {
+ "id":556,
+ "type":"Tile"
+ },
+ {
+ "id":557,
+ "type":"Tile"
+ },
+ {
+ "id":558,
+ "type":"Tile"
+ },
+ {
+ "id":559,
+ "type":"Tile"
+ },
+ {
+ "id":560,
+ "type":"Tile"
+ },
+ {
+ "id":561,
+ "type":"Tile"
+ },
+ {
+ "id":562,
+ "type":"Tile"
+ },
+ {
+ "id":563,
+ "type":"Tile"
+ },
+ {
+ "id":564,
+ "type":"Tile"
+ },
+ {
+ "id":565,
+ "type":"Tile"
+ },
+ {
+ "id":566,
+ "type":"Tile"
+ },
+ {
+ "id":567,
+ "type":"Tile"
+ },
+ {
+ "id":568,
+ "type":"Tile"
+ },
+ {
+ "id":569,
+ "type":"Tile"
+ },
+ {
+ "id":570,
+ "type":"Tile"
+ },
+ {
+ "id":571,
+ "type":"Tile"
}],
"tilewidth":32,
"type":"tileset",
diff --git a/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs b/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs
index 34530f5..d38ccbf 100644
--- a/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs
+++ b/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs
@@ -43,6 +43,7 @@ namespace ZoFo.GameCore.GameManagers.MapManager
tileSet.FirstGid = tileSetInfo.FirstGid;
tileSets.Add(tileSet);
}
+ tileSets.Reverse();
foreach (var layer in tileMap.Layers)
{
@@ -52,7 +53,7 @@ namespace ZoFo.GameCore.GameManagers.MapManager
{
foreach (var tileSet in tileSets)
{
- if (tileSet.FirstGid - chunk.Data[i] <= 0)
+ if (tileSet.FirstGid <= chunk.Data[i])
{
int number = chunk.Data[i] - tileSet.FirstGid;
@@ -67,10 +68,7 @@ namespace ZoFo.GameCore.GameManagers.MapManager
(i % chunk.Width) * tileSet.TileWidth + chunk.X * tileSet.TileWidth,
(i / chunk.Height) * tileSet.TileHeight + chunk.Y * tileSet.TileHeight);
- Tile
- tile = tileSet
- .Tiles
- [i]; // По факту может быть StopObjectom, но на уровне Tiled это все в первую очередь Tile
+ Tile tile = tileSet.Tiles[number]; // По факту может быть StopObjectom, но на уровне Tiled это все в первую очередь Tile
switch (tile.Type)
{
@@ -89,11 +87,11 @@ namespace ZoFo.GameCore.GameManagers.MapManager
"Textures/TileSetImages/" +
Path.GetFileName(tileSet.Image).Replace(".png", ""),
collisionRectangles.ToArray()));
- // TODO: изменить конструктор, засунув коллизии.
break;
default:
break;
}
+ break;
}
}
}
@@ -126,6 +124,11 @@ namespace ZoFo.GameCore.GameManagers.MapManager
///
private List LoadRectangles(Tile tile)
{
+ if (tile.Objectgroup == null)
+ {
+ return new List();
+ }
+
List collisionRectangles = new List();
foreach (var obj in tile.Objectgroup.Objects)
{
diff --git a/ZoFo/GameCore/GameManagers/NetworkManager/ClientNetworkManager.cs b/ZoFo/GameCore/GameManagers/NetworkManager/ClientNetworkManager.cs
index 2a93f71..67c09bc 100644
--- a/ZoFo/GameCore/GameManagers/NetworkManager/ClientNetworkManager.cs
+++ b/ZoFo/GameCore/GameManagers/NetworkManager/ClientNetworkManager.cs
@@ -87,7 +87,7 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager
///
public void JoinYourself(int port) // single player
{
- endPoint = new IPEndPoint(GetIp(), port);
+ endPoint = new IPEndPoint(IPAddress.Parse("127.0.0.1"), port);
socket.Connect(endPoint);
SendData();
Thread listen = new Thread(StartListening);
diff --git a/ZoFo/GameCore/GameManagers/NetworkManager/ServerNetworkManager.cs b/ZoFo/GameCore/GameManagers/NetworkManager/ServerNetworkManager.cs
index 76e72c2..e51577e 100644
--- a/ZoFo/GameCore/GameManagers/NetworkManager/ServerNetworkManager.cs
+++ b/ZoFo/GameCore/GameManagers/NetworkManager/ServerNetworkManager.cs
@@ -37,8 +37,7 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager
///
private void Init()
{
- ip = GetIp();
- endPoint = new IPEndPoint(ip, port);
+ endPoint = new IPEndPoint(IPAddress.Parse("127.0.0.1"), port);
socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
managerThread = new Dictionary();
clients = new List();