Merge pull request #37 from progtime-net/hot_fix2

fix 2, removed blue lines, but still glitching tiles

ZoFo/Content/Content.mgcb

@@ -175,18 +175,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
@@ -199,6 +187,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
@@ -235,18 +235,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
@@ -259,7 +247,7 @@
 /processorParam:TextureFormat=Color
 /build:Textures/GUI/switch.png
 
-#begin Textures/TileSets/TilesetFloor.png
+#begin Textures/GUI/Switch_backgrownd.png
 /importer:TextureImporter
 /processor:TextureProcessor
 /processorParam:ColorKeyColor=255,0,255,255
@@ -269,5 +257,17 @@
 /processorParam:ResizeToPowerOfTwo=False
 /processorParam:MakeSquare=False
 /processorParam:TextureFormat=Color
-/build:Textures/TileSets/TilesetFloor.png;Textures/TileSets/TileSet 1.png
+/build:Textures/GUI/Switch_backgrownd.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
 

ZoFo/Content/MapData/MapSession.tiled-session

@@ -3,11 +3,11 @@
         "height": 4300,
         "width": 2
     },
-    "activeFile": "TileMaps/main.tmj",
+    "activeFile": "TileSets/TileSet 1.tsj",
     "expandedProjectPaths": [
+        "TileMaps",
         ".",
-        "TileSets",
+        "TileSets"
-        "TileMaps"
     ],
     "fileStates": {
         "TileMaps/TileSets/TileSet 1.tsj": {
@@ -17,27 +17,33 @@
             "scale": 1,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 256,
+                "x": 534.5,
-                "y": 255.5
+                "y": 441
             }
         },
         "TileSets/TileSet 1.tsj": {
             "scaleInDock": 1,
-            "scaleInEditor": 1
+            "scaleInEditor": 3
         }
     },
     "last.externalTilesetPath": "D:/C#/Я смотрел ваши ХАКАТОНЫ/ZoFo/ZoFo/Content/MapData/TileSets",
-    "last.imagePath": "D:/C#/Я смотрел ваши ХАКАТОНЫ/ZoFo/ZoFo/Content/Textures/Background",
+    "last.imagePath": "D:/C#/Я смотрел ваши ХАКАТОНЫ/ZoFo/ZoFo/Content/Textures/TileSet",
     "map.fixedSize": false,
     "map.lastUsedFormat": "json",
     "map.tileHeight": 16,
     "map.tileWidth": 16,
     "openFiles": [
-        "TileMaps/main.tmj"
+        "TileMaps/main.tmj",
+        "TileSets/TileSet 1.tsj"
     ],
     "project": "MapSession.tiled-project",
     "recentFiles": [
         "TileMaps/main.tmj",
         "TileSets/TileSet 1.tsj"
-    ]
+    ],
+    "tileset.lastUsedFormat": "json",
+    "tileset.tileSize": {
+        "height": 16,
+        "width": 16
+    }
 }

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

@@ -7,16 +7,16 @@
      "orientation":"orthogonal",
      "width":24
     },
- "image":"..\/..\/Textures\/Background\/TilesetFloor.png",
+ "image":"..\/..\/Textures\/TileSet\/TilesetFloor.png",
- "imageheight":416,
+ "imageheight":832,
- "imagewidth":352,
+ "imagewidth":704,
  "margin":0,
  "name":"TileSet 1",
  "objectalignment":"topleft",
  "spacing":0,
  "tilecount":572,
  "tiledversion":"1.10.2",
- "tileheight":16,
+ "tileheight":32,
  "tiles":[
         {
          "id":27,
@@ -54,7 +54,7 @@
          "id":112,
          "probability":0.100000001490116
         }],
- "tilewidth":16,
+ "tilewidth":32,
  "type":"tileset",
  "version":"1.10",
  "wangsets":[

ZoFo/GameCore/GameManagers/MapManager/MapManager.cs

@@ -62,12 +62,14 @@ namespace ZoFo.GameCore.GameManagers.MapManager
                                 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) ;
+                                Vector2 position = new Vector2((i % chunk.Width) * tileSet.TileWidth + chunk.X * tileSet.TileWidth, 
+                                    (i / chunk.Height) * tileSet.TileHeight + chunk.Y * tileSet.TileHeight) ;
 
                                 switch (layer.Class)
                                 {
                                     case "Tile":
-                                        AppManager.Instance.server.RegisterGameObject(new MapObject(position, new Vector2(tileSet.TileWidth, tileSet.TileHeight), sourceRectangle, "Textures\\TileSets\\"+tileSet.Name)); //fix naming
+                                        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":
                                         // new StopObject(position, new Vector2(tileSet.TileWidth * _scale, tileSet.TileHeight * _scale), sourceRectangle, tileSet.Name);

ZoFo/GameCore/ZoFo_grafics/GraphicsComponent.cs

@@ -24,7 +24,7 @@ namespace ZoFo.GameCore.ZoFo_graphics
         private List<Texture2D> textures;
         public List<string> texturesNames; //rethink public and following that errors
         private AnimationContainer currentAnimation;
-        static public int scaling = 2;
+        static public int scaling = 1;
         public int parentId;
         public AnimationContainer CurrentAnimation
         {