saaving

ZoFo/Content/Content.mgcb

@@ -37,11 +37,11 @@
 #begin MapData/TileMaps/main.tmj
 /copy:MapData/TileMaps/main.tmj
 
-#begin MapData/TileMaps/main.tmx
+#begin MapData/TileSets/tileset 1 collision.tsj
-/copy:MapData/TileMaps/main.tmx
+/copy:MapData/TileSets/tileset 1 collision.tsj
 
-#begin MapData/TileSets/CollisionTileSet.tsj
+#begin MapData/TileSets/TileSet 1.tsj
-/copy:MapData/TileSets/CollisionTileSet.tsj
+/copy:MapData/TileSets/TileSet 1.tsj
 
 #begin sounds/Loot.wav
 /importer:WavImporter
@@ -100,18 +100,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
@@ -124,6 +112,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
@@ -148,18 +148,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
@@ -172,6 +160,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
@@ -268,18 +268,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
@@ -292,6 +280,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
@@ -328,18 +328,6 @@
 /processorParam:TextureFormat=Color
 /build:Textures/GUI/mouse.png
 
-#begin Textures/GUI/Switch_backgrownd.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_backgrownd.png
-
 #begin Textures/GUI/switch.png
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -352,6 +340,18 @@
 /processorParam:TextureFormat=Color
 /build:Textures/GUI/switch.png
 
+#begin Textures/GUI/Switch_backgrownd.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_backgrownd.png
+
 #begin Textures/Test/pickaxe.webp
 /importer:TextureImporter
 /processor:TextureProcessor
@@ -362,7 +362,6 @@
 /processorParam:ResizeToPowerOfTwo=False
 /processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
-
 /build:Textures/Test/pickaxe.webp
 
 #begin Textures/Test/rock.jpg
@@ -375,11 +374,9 @@
 /processorParam:ResizeToPowerOfTwo=False
 /processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
-
 /build:Textures/Test/rock.jpg
 
 #begin Textures/Test/steel.png
-
 /importer:TextureImporter
 /processor:TextureProcessor
 /processorParam:ColorKeyColor=255,0,255,255
@@ -389,11 +386,9 @@
 /processorParam:ResizeToPowerOfTwo=False
 /processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
-
 /build:Textures/Test/steel.png
 
 #begin Textures/Test/wood.jpg
-
 /importer:TextureImporter
 /processor:TextureProcessor
 /processorParam:ColorKeyColor=255,0,255,255
@@ -403,11 +398,9 @@
 /processorParam:ResizeToPowerOfTwo=False
 /processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
-
 /build:Textures/Test/wood.jpg
 
-#begin Textures/TileSets/TilesetFloor.png
+#begin Textures/TileSetImages/Pipes.png
-
 /importer:TextureImporter
 /processor:TextureProcessor
 /processorParam:ColorKeyColor=255,0,255,255
@@ -417,7 +410,245 @@
 /processorParam:ResizeToPowerOfTwo=False
 /processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
+/build:Textures/TileSetImages/Pipes.png
 
-/build:Textures/TileSets/TilesetFloor.png
+#begin Textures/TileSetImages/Tilelist1.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/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/TilesetDesert.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/TilesetDesert.png
+
+#begin Textures/TileSetImages/TilesetDungeon.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/TilesetDungeon.png
+
+#begin Textures/TileSetImages/TilesetElement.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/TilesetElement.png
+
+#begin Textures/TileSetImages/TilesetField.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/TilesetField.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/TilesetFloorB.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/TilesetFloorB.png
+
+#begin Textures/TileSetImages/TilesetFloorDetail.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/TilesetFloorDetail.png
+
+#begin Textures/TileSetImages/TilesetHole.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/TilesetHole.png
+
+#begin Textures/TileSetImages/TilesetHouse.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/TilesetHouse.png
+
+#begin Textures/TileSetImages/TilesetLogic.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/TilesetLogic.png
+
+#begin Textures/TileSetImages/TilesetNature.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/TilesetNature.png
+
+#begin Textures/TileSetImages/TilesetRelief.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/TilesetRelief.png
+
+#begin Textures/TileSetImages/TilesetReliefDetail.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/TilesetReliefDetail.png
+
+#begin Textures/TileSetImages/TilesetTowers.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/TilesetTowers.png
+
+#begin Textures/TileSetImages/TilesetVillageAbandoned.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/TilesetVillageAbandoned.png
+
+#begin Textures/TileSetImages/TilesetWater.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/TilesetWater.png
 

ZoFo/Content/MapData/MapSession.tiled-session

@@ -5,20 +5,20 @@
     },
     "activeFile": "TileMaps/main.tmj",
     "expandedProjectPaths": [
-        ".",
         "TileSets",
-        "TileMaps"
+        "TileMaps",
+        "."
     ],
     "fileStates": {
         "TileMaps/TileSets/TileSet 1.tsj": {
             "scaleInDock": 1
         },
         "TileMaps/main.tmj": {
-            "scale": 0.75,
+            "scale": 0.5,
-            "selectedLayer": 0,
+            "selectedLayer": 1,
             "viewCenter": {
-                "x": 578,
+                "x": 895,
-                "y": 482.66666666666674
+                "y": 270
             }
         },
         "TileSets/CollisionTileSet.tsj": {
@@ -43,15 +43,15 @@
     "project": "MapSession.tiled-project",
     "recentFiles": [
         "TileMaps/main.tmj",
-        "TileSets/TileSet 1.tsj",
         "TileSets/CollisionTileSet.tsj",
+        "TileSets/TileSet 1.tsj",
         "TileSets/WallSet.tsj"
     ],
     "tileset.lastUsedFormat": "json",
-    "tileset.margin": 2,
+    "tileset.margin": 0,
-    "tileset.spacing": 2,
+    "tileset.spacing": 0,
     "tileset.tileSize": {
-        "height": 128,
+        "height": 16,
-        "width": 128
+        "width": 16
     }
 }

ZoFo/Content/MapData/TileMaps/main.tmx

@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="30" height="20" tilewidth="16" tileheight="16" infinite="1" nextlayerid="2" nextobjectid="1">
- <tileset firstgid="1" source="../TileSets/TileSet 1.tsj"/>
- <layer id="1" name="Слой тайлов 1" width="30" height="20">
-  <data encoding="csv">
-   <chunk x="-16" y="-16" width="16" height="16">
-24,24,24,28,29,24,24,24,28,46,29,24,25,115,45,46,
-24,24,24,25,23,24,24,24,50,2,51,24,50,2,2,2,
-24,24,24,50,32,29,24,24,24,24,24,24,24,24,24,28,
-28,29,24,28,10,32,29,24,24,28,46,29,24,24,24,50,
-47,23,24,50,32,10,32,46,29,50,2,51,24,24,24,24,
-1,32,29,90,25,23,50,2,32,29,24,90,28,29,24,24,
-51,50,32,29,50,51,90,24,25,45,46,29,25,23,24,90,
-24,24,50,32,46,29,24,28,10,2,2,51,50,51,24,90,
-24,24,24,50,2,32,46,10,32,29,24,90,24,24,24,90,
-29,24,89,24,24,50,3,23,50,32,46,46,46,46,29,24,
-51,24,24,28,29,24,25,23,24,25,1,2,3,111,45,29,
-24,90,24,50,51,24,25,23,28,47,23,89,50,3,115,23,
-24,24,24,24,24,89,50,32,47,1,51,24,24,50,2,51,
-28,29,24,24,24,24,28,10,2,51,24,24,24,24,24,28,
-10,32,29,24,24,24,25,23,28,29,90,24,24,90,24,50,
-32,10,51,24,24,24,50,32,10,32,29,24,90,28,29,24
-</chunk>
-   <chunk x="0" y="-16" width="16" height="16">
-10,51,24,90,24,25,23,28,29,24,24,24,24,24,24,24,
-51,24,28,29,24,50,32,10,51,24,24,24,24,24,24,24,
-29,28,10,32,46,29,50,32,29,24,24,24,24,24,24,24,
-51,25,23,50,2,32,29,25,23,24,24,28,29,24,90,24,
-24,25,23,24,24,25,23,50,51,24,24,50,32,29,24,90,
-24,50,32,29,90,25,45,29,24,24,24,24,50,51,24,89,
-24,89,50,51,24,25,114,23,24,24,24,24,24,24,24,24,
-24,24,28,29,24,50,2,51,24,24,90,28,29,24,24,28,
-24,24,25,23,89,24,24,24,28,46,29,25,23,24,24,50,
-28,46,10,51,24,28,46,29,25,111,45,10,51,28,29,24,
-50,2,51,24,24,25,115,45,10,3,1,51,24,25,23,24,
-24,24,24,24,24,50,2,2,32,10,51,24,90,25,23,24,
-24,24,24,24,24,24,24,24,50,51,24,24,24,25,23,24,
-46,29,24,24,24,24,24,89,24,24,24,28,46,47,23,90,
-2,32,29,24,24,28,46,46,29,24,24,25,1,3,23,89,
-24,50,32,29,24,25,1,3,23,24,89,50,32,10,51,24
-</chunk>
-   <chunk x="16" y="-16" width="16" height="16">
-24,24,24,24,90,24,89,24,89,24,50,51,89,24,24,24,
-24,28,29,28,29,24,24,24,24,28,29,24,24,24,28,29,
-24,25,23,50,51,24,24,28,29,50,51,24,24,24,25,45,
-90,50,51,28,29,24,24,25,23,24,24,28,29,24,50,3,
-24,24,28,10,51,90,90,50,51,24,24,50,51,24,24,50,
-24,24,25,45,29,24,28,29,24,24,24,24,24,28,29,24,
-90,24,50,2,51,28,10,51,90,24,28,29,24,25,45,46,
-29,90,24,24,24,50,51,24,24,28,10,32,46,10,3,1,
-32,29,24,90,24,24,24,24,28,47,23,50,2,51,50,51,
-25,23,24,24,28,46,46,46,47,114,45,29,24,24,24,24,
-50,32,29,24,50,3,111,111,115,111,1,32,29,24,24,24,
-24,50,51,24,28,10,2,2,2,2,32,10,51,24,24,89,
-24,24,89,90,25,23,24,24,24,24,50,32,46,46,29,89,
-24,24,24,90,25,23,89,24,28,29,90,50,2,2,51,24,
-24,24,24,28,10,51,24,28,47,45,29,24,24,24,24,24,
-24,24,24,25,23,24,90,50,2,2,32,46,46,46,46,46
-</chunk>
-   <chunk x="-16" y="0" width="16" height="16">
-10,32,46,29,24,24,24,25,23,50,32,29,24,50,32,46,
-51,50,2,32,29,24,24,25,45,29,25,23,24,24,25,1,
-24,24,24,25,23,28,46,10,2,51,50,51,24,24,50,51,
-90,89,90,50,51,50,2,51,24,24,28,29,90,24,24,24,
-90,28,46,29,90,24,24,24,90,24,50,51,90,24,90,28,
-29,50,2,51,24,24,24,89,24,24,24,24,24,89,24,50,
-23,24,24,28,46,29,90,90,24,89,24,28,29,24,24,24,
-32,46,29,25,115,45,29,24,90,24,24,25,23,24,24,28,
-10,2,32,47,115,1,51,24,24,24,24,25,23,24,28,10,
-32,29,50,2,2,51,24,24,24,24,24,25,23,28,10,51,
-50,51,89,24,24,89,24,28,29,24,24,50,32,10,32,46,
-24,24,90,90,28,46,29,50,51,24,24,24,25,23,25,115,
-24,90,24,24,50,2,32,29,24,24,90,24,25,45,10,2,
-24,24,24,24,24,24,50,32,29,24,24,28,10,3,23,24,
-90,24,24,24,24,89,90,50,32,29,90,50,51,50,32,46,
-46,29,24,90,24,24,24,24,50,51,28,29,24,24,50,2
-</chunk>
-   <chunk x="0" y="0" width="16" height="16">
-46,46,10,32,46,47,23,25,23,89,24,24,25,23,90,24,
-2,2,32,47,1,2,51,25,23,24,28,29,50,32,29,24,
-24,90,50,3,23,24,28,10,51,28,47,45,29,25,23,28,
-24,24,24,50,51,28,47,23,24,50,3,114,45,10,51,50,
-29,24,24,89,24,25,114,45,46,46,10,2,2,32,29,89,
-51,24,24,24,24,50,3,111,115,115,23,24,24,50,32,29,
-24,28,29,24,24,24,25,1,2,2,51,90,24,90,50,51,
-29,50,32,29,28,29,25,23,24,24,89,28,29,24,24,24,
-51,24,50,51,50,32,10,32,46,29,24,50,51,24,90,24,
-24,24,24,24,89,50,32,10,2,32,46,29,89,28,29,24,
-29,90,24,24,24,24,50,51,28,10,3,23,28,10,51,24,
-23,89,24,24,90,24,24,24,50,32,10,51,50,51,24,24,
-51,24,24,24,24,24,24,24,24,50,32,46,46,29,28,46,
-24,24,24,90,24,24,24,24,24,24,50,3,1,32,47,115,
-46,29,24,89,24,24,24,89,24,24,24,25,45,10,3,111,
-2,51,28,29,28,29,24,28,46,46,46,10,2,51,50,2
-</chunk>
-   <chunk x="16" y="0" width="16" height="16">
-28,29,28,10,32,46,29,24,24,28,10,2,2,2,2,2,
-50,51,50,51,25,115,45,46,29,50,51,24,24,24,24,24,
-29,24,89,24,50,3,115,114,23,24,24,24,24,24,24,24,
-51,90,24,89,24,50,2,2,51,24,89,24,24,28,46,29,
-24,90,24,24,89,24,90,28,29,24,24,24,28,10,2,51,
-24,24,24,24,28,29,90,50,51,28,29,24,25,23,24,24,
-28,29,24,24,50,32,29,28,29,50,51,89,50,32,29,24,
-50,51,24,24,24,50,32,10,51,24,89,24,24,25,23,24,
-24,24,24,24,24,24,50,32,29,24,24,24,24,50,51,24,
-90,24,24,24,24,24,24,25,45,29,24,24,24,89,28,29,
-24,24,24,24,28,29,24,25,1,51,24,24,24,24,50,32,
-28,29,28,29,50,32,46,10,51,28,29,24,24,24,24,50,
-47,45,10,51,24,50,2,32,46,47,23,24,89,90,24,24,
-111,115,23,24,24,90,24,50,2,2,32,29,24,89,28,46,
-1,2,51,28,46,46,29,24,28,29,50,32,29,28,47,111,
-51,24,24,50,3,114,23,24,50,32,46,47,23,25,111,111
-</chunk>
-  </data>
- </layer>
-</map>

ZoFo/Content/MapData/TileSets/CollisionTileSet.tsj

@@ -1,435 +0,0 @@
-{ "columns":5,
- "image":"..\/..\/Textures\/TileSetImages\/Tilelist2.png",
- "imageheight":1302,
- "imagewidth":652,
- "margin":2,
- "name":"CollisionTileSet",
- "spacing":2,
- "tilecount":50,
- "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":"Tiles"
-        }, 
-        {
-         "id":5,
-         "objectgroup":
-            {
-             "draworder":"index",
-             "name":"",
-             "objects":[
-                    {
-                     "height":128,
-                     "id":1,
-                     "name":"",
-                     "rotation":0,
-                     "type":"",
-                     "visible":true,
-                     "width":37,
-                     "x":0,
-                     "y":0
-                    }, 
-                    {
-                     "height":36.3333333333333,
-                     "id":2,
-                     "name":"",
-                     "rotation":0,
-                     "type":"",
-                     "visible":true,
-                     "width":127.333333333333,
-                     "x":0.666666666666671,
-                     "y":0
-                    }],
-             "opacity":1,
-             "type":"objectgroup",
-             "visible":true,
-             "x":0,
-             "y":0
-            },
-         "type":"StopObject"
-        }, 
-        {
-         "id":6,
-         "objectgroup":
-            {
-             "draworder":"index",
-             "name":"",
-             "objects":[
-                    {
-                     "height":128.333333333333,
-                     "id":4,
-                     "name":"",
-                     "rotation":0,
-                     "type":"",
-                     "visible":true,
-                     "width":35.6666666666667,
-                     "x":0.666666666666667,
-                     "y":0
-                    }],
-             "opacity":1,
-             "type":"objectgroup",
-             "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",
-             "name":"",
-             "objects":[
-                    {
-                     "height":36,
-                     "id":1,
-                     "name":"",
-                     "rotation":0,
-                     "type":"",
-                     "visible":true,
-                     "width":127.666666666667,
-                     "x":0,
-                     "y":91.6666666666667
-                    }],
-             "opacity":1,
-             "type":"objectgroup",
-             "visible":true,
-             "x":0,
-             "y":0
-            },
-         "type":"StopObject"
-        }, 
-        {
-         "id":9,
-         "objectgroup":
-            {
-             "draworder":"index",
-             "name":"",
-             "objects":[
-                    {
-                     "height":36,
-                     "id":1,
-                     "name":"",
-                     "rotation":0,
-                     "type":"",
-                     "visible":true,
-                     "width":127.666666666667,
-                     "x":0,
-                     "y":0.333333333333333
-                    }],
-             "opacity":1,
-             "type":"objectgroup",
-             "visible":true,
-             "x":0,
-             "y":0
-            },
-         "type":"StopObject"
-        }, 
-        {
-         "id":10,
-         "objectgroup":
-            {
-             "draworder":"index",
-             "name":"",
-             "objects":[
-                    {
-                     "height":36.6666666666667,
-                     "id":2,
-                     "name":"",
-                     "rotation":0,
-                     "type":"",
-                     "visible":true,
-                     "width":128.333333333333,
-                     "x":0,
-                     "y":0
-                    }, 
-                    {
-                     "height":127.666666666667,
-                     "id":3,
-                     "name":"",
-                     "rotation":0,
-                     "type":"",
-                     "visible":true,
-                     "width":36.6666666666667,
-                     "x":91.6666666666667,
-                     "y":0.333333333333329
-                    }],
-             "opacity":1,
-             "type":"objectgroup",
-             "visible":true,
-             "x":0,
-             "y":0
-            },
-         "type":"StopObject"
-        }, 
-        {
-         "id":11,
-         "objectgroup":
-            {
-             "draworder":"index",
-             "name":"",
-             "objects":[
-                    {
-                     "height":127.666666666667,
-                     "id":1,
-                     "name":"",
-                     "rotation":0,
-                     "type":"",
-                     "visible":true,
-                     "width":37,
-                     "x":91,
-                     "y":0.333333333333333
-                    }],
-             "opacity":1,
-             "type":"objectgroup",
-             "visible":true,
-             "x":0,
-             "y":0
-            },
-         "type":"StopObject"
-        }, 
-        {
-         "id":12,
-         "objectgroup":
-            {
-             "draworder":"index",
-             "name":"",
-             "objects":[
-                    {
-                     "height":128,
-                     "id":4,
-                     "name":"",
-                     "rotation":0,
-                     "type":"",
-                     "visible":true,
-                     "width":37,
-                     "x":91,
-                     "y":0
-                    }, 
-                    {
-                     "height":36.6666666666667,
-                     "id":5,
-                     "name":"",
-                     "rotation":0,
-                     "type":"",
-                     "visible":true,
-                     "width":128,
-                     "x":0,
-                     "y":91.3333333333333
-                    }],
-             "opacity":1,
-             "type":"objectgroup",
-             "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",
- "version":"1.10"
-}

ZoFo/Content/MapData/TileSets/TileSet 1.tsj

@@ -8,15 +8,15 @@
      "width":24
     },
  "image":"..\/..\/Textures\/TileSetImages\/TilesetFloor.png",
- "imageheight":832,
+ "imageheight":417,
- "imagewidth":704,
+ "imagewidth":352,
  "margin":0,
  "name":"TileSet 1",
  "objectalignment":"topleft",
  "spacing":0,
  "tilecount":572,
  "tiledversion":"1.10.2",
- "tileheight":32,
+ "tileheight":16,
  "tiles":[
         {
          "id":0,
@@ -2315,7 +2315,7 @@
          "id":571,
          "type":"Tile"
         }],
- "tilewidth":32,
+ "tilewidth":16,
  "type":"tileset",
  "version":"1.10",
  "wangsets":[

ZoFo/GameCore/GameManagers/MapManager/MapElements/Layer.cs

@@ -15,5 +15,6 @@ namespace ZoFo.GameCore.GameManagers.MapManager.MapElements
         public int Id { get; set; }
         public bool Visibility { get; set; }
         public string Class { get; set; }
+        public string Type { get; set; }
     }
 }

ZoFo/GameCore/GameManagers/MapManager/MapManager.cs

@@ -47,51 +47,59 @@ namespace ZoFo.GameCore.GameManagers.MapManager
 
             foreach (var layer in tileMap.Layers)
             {
-                foreach (var chunk in layer.Chunks)
+                if (layer.Type == "objectgroup")
                 {
-                    for (int i = 0; i < chunk.Data.Length; i++)
+
+                }
+                else
+                {
+                    foreach (var chunk in layer.Chunks)
                     {
-                        foreach (var tileSet in tileSets)
+                        for (int i = 0; i < chunk.Data.Length; i++)
                         {
-                            if (tileSet.FirstGid <= chunk.Data[i])
+                            foreach (var tileSet in tileSets)
                             {
-                                int number = chunk.Data[i] - tileSet.FirstGid;
+                                if (tileSet.FirstGid <= chunk.Data[i])
-
-                                int relativeColumn = number % tileSet.Columns;
-                                int relativeRow = number / tileSet.Columns; // относительно левого угла чанка
-
-                                Rectangle sourceRectangle = new Rectangle(relativeColumn * tileSet.TileWidth,
-                                    relativeRow * tileSet.TileHeight,
-                                    tileSet.TileWidth, tileSet.TileHeight);
-
-                                Vector2 position = new Vector2(
-                                    (i % chunk.Width) * tileSet.TileWidth + chunk.X * tileSet.TileWidth,
-                                    (i / chunk.Height) * tileSet.TileHeight + chunk.Y * tileSet.TileHeight);
-
-                                Tile tile = tileSet.Tiles[number]; // По факту может быть StopObjectom, но на уровне Tiled это все в первую очередь Tile
-
-                                switch (tile.Type)
                                 {
-                                    case "Tile":
+                                    int number = chunk.Data[i] - tileSet.FirstGid;
-                                        AppManager.Instance.server.RegisterGameObject(new MapObject(position,
+
-                                            new Vector2(tileSet.TileWidth, tileSet.TileHeight),
+                                    int relativeColumn = number % tileSet.Columns;
-                                            sourceRectangle,
+                                    int relativeRow = number / tileSet.Columns; // относительно левого угла чанка
-                                            "Textures/TileSetImages/" +
+
-                                            Path.GetFileName(tileSet.Image).Replace(".png", "")));
+                                    Rectangle sourceRectangle = new Rectangle(relativeColumn * (tileSet.TileWidth + tileSet.Spacing) + tileSet.Margin,
-                                        break;
+                                        relativeRow * (tileSet.TileHeight + tileSet.Spacing) + tileSet.Margin,
-                                    case "StopObject":
+                                        tileSet.TileWidth, tileSet.TileHeight);
-                                        var collisionRectangles = LoadRectangles(tile); // Грузит коллизии обьектов
+
-                                        AppManager.Instance.server.RegisterGameObject(new StopObject(position/4,//TODO
+                                    Vector2 position = new Vector2(
-                                            new Vector2(tileSet.TileWidth, tileSet.TileHeight),
+                                        (i % chunk.Width) * tileMap.TileWidth + chunk.X * tileMap.TileWidth,
-                                            sourceRectangle,
+                                        (i / chunk.Height) * tileMap.TileHeight + chunk.Y * tileMap.TileHeight);
-                                            "Textures/TileSetImages/" +
+
-                                            Path.GetFileName(tileSet.Image).Replace(".png", ""),
+                                    Tile tile = tileSet.Tiles[number]; // По факту может быть StopObjectom, но на уровне Tiled это все в первую очередь Tile
-                                            collisionRectangles.ToArray()));
+
-                                        break;
+                                    switch (tile.Type)
-                                    default:
+                                    {
-                                        break;
+                                        case "Tile":
+                                            AppManager.Instance.server.RegisterGameObject(new MapObject(position,
+                                                new Vector2(tileSet.TileWidth, tileSet.TileHeight),
+                                                sourceRectangle,
+                                                "Textures/TileSetImages/" + Path.GetFileName(tileSet.Image).Replace(".png", "")));
+                                            break;
+
+                                        case "StopObject":
+                                            var collisionRectangles = LoadRectangles(tile); // Грузит коллизии обьектов
+
+                                            AppManager.Instance.server.RegisterGameObject(new StopObject(position,
+                                                new Vector2(tileSet.TileWidth, tileSet.TileHeight),
+                                                sourceRectangle,
+                                                "Textures/TileSetImages/" + Path.GetFileName(tileSet.Image).Replace(".png", ""),
+                                                collisionRectangles.ToArray()));
+                                            break;
+
+                                        default:
+                                            break;
+                                    }
+                                    break;
                                 }
-                                break;
                             }
                         }
                     }

ZoFo/GameCore/GameManagers/NetworkManager/ClientNetworkManager.cs

@@ -101,7 +101,7 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager
             string hostName = Dns.GetHostName(); // Retrive the Name of HOST
             var ipList = Dns.GetHostByName(hostName).AddressList;
             string myIP = ipList[ipList.Count() - 1].ToString();// Get the IP
-            return IPAddress.Parse(myIP);
+            return IPAddress.Parse("127.0.0.1");
         }
 
         //поток 2

ZoFo/GameCore/GameManagers/NetworkManager/ServerNetworkManager.cs

@@ -55,7 +55,7 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager
             string hostName = Dns.GetHostName(); // Retrive the Name of HOST
             var ipList = Dns.GetHostByName(hostName).AddressList;
             string myIP = ipList[ipList.Count()-1].ToString();// Get the IP
-            return IPAddress.Parse(myIP);
+            return IPAddress.Parse("127.0.0.1");
         }
 
         /// <summary>