Merge branch 'Development' into MinorFixesAndConnections

2024-08-17 19:01:25 +03:00 · 2024-08-17 19:01:25 +03:00 · 48e4864030
commit 48e4864030
parent 5a6d56128c 2a5dde0169
206 changed files with 1599 additions and 96 deletions
--- a/GameSettings.txt
+++ b/GameSettings.txt
@ -0,0 +1 @@
+{"IsFullScreen":false,"MainVolume":1.0,"MusicVolume":1.0,"SoundEffectsVolume":1.0,"Resolution":{"X":1440,"Y":900}}
--- a/ZoFo/Content/MapData/MapSession.tiled-session
+++ b/ZoFo/Content/MapData/MapSession.tiled-session
@ -5,8 +5,8 @@
    },
    "activeFile": "TileSets/TileSet 1.tsj",
    "expandedProjectPaths": [
-        "TileMaps",
        ".",
+        "TileMaps",
        "TileSets"
    ],
    "fileStates": {
@ -17,8 +17,8 @@
            "scale": 0.25,
            "selectedLayer": 0,
            "viewCenter": {
-                "x": 1734,
-                "y": 1652
+                "x": 3078,
+                "y": 2164
            }
        },
        "TileSets/TileSet 1.tsj": {
@ -30,14 +30,23 @@
            "scaleInEditor": 1
        }
    },
+    "last.imagePath": "D:/C#/Я смотрел ваши ХАКАТОНЫ/ZoFo/ZoFo/Content/Textures/TileSetImages",
    "openFiles": [
        "TileSets/TileSet 1.tsj",
        "TileSets/WallSet.tsj",
        "TileMaps/main.tmj"
    ],
+    "project": "MapSession.tiled-project",
    "recentFiles": [
-        "TileMaps/main.tmj",
        "TileSets/WallSet.tsj",
+        "TileMaps/main.tmj",
        "TileSets/TileSet 1.tsj"
-    ]
+    ],
+    "tileset.lastUsedFormat": "json",
+    "tileset.margin": 2,
+    "tileset.spacing": 2,
+    "tileset.tileSize": {
+        "height": 128,
+        "width": 128
+    }
 }
--- a/ZoFo/Content/MapData/TileMaps/main.tmj
+++ b/ZoFo/Content/MapData/TileMaps/main.tmj
@ -1065,7 +1065,7 @@
         "class":"Tile",
         "height":96,
         "id":1,
-         "name":"\u0421\u043b\u043e\u0439 \u0442\u0430\u0439\u043b\u043e\u0432 1",
+         "name":"Tiles",
         "opacity":1,
         "startx":0,
         "starty":0,
@ -1074,8 +1074,154 @@
         "width":128,
         "x":0,
         "y":0
+        }, 
+        {
+         "chunks":[
+                {
+                 "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, 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],
+                 "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
+                }],
+         "height":48,
+         "id":2,
+         "name":"Collidable ",
+         "opacity":1,
+         "startx":16,
+         "starty":16,
+         "type":"tilelayer",
+         "visible":true,
+         "width":80,
+         "x":0,
+         "y":0
        }],
- "nextlayerid":2,
+ "nextlayerid":3,
 "nextobjectid":1,
 "orientation":"orthogonal",
 "renderorder":"right-down",
@ -1085,6 +1231,10 @@
        {
         "firstgid":1,
         "source":"..\/TileSets\/TileSet 1.tsj"
+        }, 
+        {
+         "firstgid":573,
+         "source":"..\/TileSets\/CollisionTileSet.tsj"
        }],
 "tilewidth":32,
 "type":"map",
--- a/ZoFo/Content/MapData/TileSets/CollisionTileSet.tsj
+++ b/ZoFo/Content/MapData/TileSets/CollisionTileSet.tsj
@ -0,0 +1,234 @@
+{ "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":4,
+         "type":"Tile"
+        }, 
+        {
+         "id":5,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "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
+            }
+        }, 
+        {
+         "id":6,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":4,
+             "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
+            }
+        }, 
+        {
+         "id":8,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "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
+            }
+        }, 
+        {
+         "id":9,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "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
+            }
+        }, 
+        {
+         "id":10,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "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
+            }
+        }, 
+        {
+         "id":11,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "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
+            }
+        }, 
+        {
+         "id":12,
+         "objectgroup":
+            {
+             "draworder":"index",
+             "id":2,
+             "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
+            }
+        }],
+ "tilewidth":128,
+ "type":"tileset",
+ "version":"1.10"
+}
--- a/ZoFo/Content/MapData/TileSets/TileSet
+++ b/ZoFo/Content/MapData/TileSets/TileSet
--- a/ZoFo/Content/MapData/TileSets/WallSet.tsj
+++ b/ZoFo/Content/MapData/TileSets/WallSet.tsj
@ -1,21 +0,0 @@
-{ "class":"StopObject",
- "columns":5,
- "grid":
-    {
-     "height":16,
-     "orientation":"orthogonal",
-     "width":16
-    },
- "image":"..\/..\/Textures\/StopObjects\/Tilelist2.png",
- "imageheight":1302,
- "imagewidth":652,
- "margin":2,
- "name":"WallSet",
- "spacing":2,
- "tilecount":3240,
- "tiledversion":"1.10.2",
- "tileheight":128,
- "tilewidth":128,
- "type":"tileset",
- "version":"1.10"
-}
--- a/ZoFo/Content/MapData/TileSets/WallSet.tsx
+++ b/ZoFo/Content/MapData/TileSets/WallSet.tsx
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.10" tiledversion="1.10.2" name="WallSet" tilewidth="128" tileheight="128" spacing="2" margin="2" tilecount="3240" columns="5">
- <grid orientation="orthogonal" width="16" height="16"/>
- <image source="../../Textures/StopObjects/Tilelist2.png" width="652" height="1302"/>
-</tileset>
--- a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0000_Layer-1.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0000_Layer-1.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0001_Layer-2.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0001_Layer-2.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0002_Layer-3.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0002_Layer-3.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0003_Layer-4.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0003_Layer-4.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0004_Layer-5.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0004_Layer-5.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0005_Layer-6.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0005_Layer-6.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0006_Layer-7.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0006_Layer-7.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0007_Layer-8.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0007_Layer-8.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0008_Layer-9.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0008_Layer-9.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0009_Layer-10.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0009_Layer-10.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0010_Layer-11.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0010_Layer-11.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0011_Layer-12.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0011_Layer-12.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0012_Layer-13.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0012_Layer-13.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0013_Layer-14.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0013_Layer-14.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0014_Layer-15.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0014_Layer-15.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0015_Layer-16.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0015_Layer-16.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0016_Layer-0.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0016_Layer-0.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0000_Layer-1.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0000_Layer-1.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0001_Layer-2.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0001_Layer-2.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0002_Layer-3.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0002_Layer-3.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0003_Layer-4.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0003_Layer-4.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0004_Layer-5.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0004_Layer-5.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0005_Layer-6.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0005_Layer-6.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0006_Layer-7.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0006_Layer-7.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0007_Layer-8.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0007_Layer-8.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0008_Layer-9.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0008_Layer-9.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0009_Layer-10.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0009_Layer-10.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0010_Layer-11.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0010_Layer-11.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0011_Layer-12.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0011_Layer-12.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0012_Layer-13.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0012_Layer-13.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0013_Layer-14.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0013_Layer-14.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0014_Layer-15.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0014_Layer-15.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0015_Layer-16.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0015_Layer-16.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0016_Layer-17.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0016_Layer-17.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0017_Layer-18.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0017_Layer-18.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0018_Layer-19.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0018_Layer-19.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0019_Layer-20.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0019_Layer-20.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0020_Layer-21.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0020_Layer-21.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0021_Layer-22.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0021_Layer-22.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0022_Layer-23.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0022_Layer-23.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0023_Layer-24.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0023_Layer-24.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0024_Layer-25.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0024_Layer-25.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0025_Layer-26.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0025_Layer-26.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0026_Layer-27.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0026_Layer-27.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0027_Layer-28.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0027_Layer-28.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0028_Layer-29.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0028_Layer-29.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0029_Layer-30.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0029_Layer-30.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0030_Layer-31.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0030_Layer-31.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0031_Layer-32.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0031_Layer-32.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0032_Layer-33.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0032_Layer-33.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0033_Layer-34.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0033_Layer-34.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0034_Layer-35.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0034_Layer-35.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0035_Layer-36.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0035_Layer-36.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0036_Layer-37.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0036_Layer-37.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0037_Layer-38.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0037_Layer-38.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0038_Layer-39.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0038_Layer-39.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0039_Layer-40.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0039_Layer-40.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0040_Layer-41.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0040_Layer-41.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0041_Layer-42.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0041_Layer-42.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0042_Layer-43.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0042_Layer-43.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0043_Layer-44.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0043_Layer-44.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0044_Layer-45.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0044_Layer-45.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0045_Layer-46.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0045_Layer-46.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0046_Layer-47.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0046_Layer-47.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0047_Layer-48.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0047_Layer-48.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0048_Layer-49.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0048_Layer-49.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0049_Layer-50.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0049_Layer-50.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0050_Layer-51.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0050_Layer-51.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0051_Layer-52.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0051_Layer-52.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0052_Layer-53.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0052_Layer-53.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0053_Layer-54.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0053_Layer-54.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0054_Layer-55.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0054_Layer-55.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0055_Layer-56.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0055_Layer-56.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0056_Layer-57.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0056_Layer-57.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0057_Layer-58.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0057_Layer-58.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0058_Layer-59.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0058_Layer-59.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0059_Layer-60.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0059_Layer-60.png
--- a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0060_Layer-0.png
+++ b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0060_Layer-0.png
--- a/ZoFo/Content/Textures/StopObjects/Roof/roof_0000_Layer-1.png
+++ b/ZoFo/Content/Textures/StopObjects/Roof/roof_0000_Layer-1.png
--- a/ZoFo/Content/Textures/StopObjects/Roof/roof_0001_Layer-2.png
+++ b/ZoFo/Content/Textures/StopObjects/Roof/roof_0001_Layer-2.png
--- a/ZoFo/Content/Textures/StopObjects/Roof/roof_0002_Layer-3.png
+++ b/ZoFo/Content/Textures/StopObjects/Roof/roof_0002_Layer-3.png
--- a/ZoFo/Content/Textures/StopObjects/Roof/roof_0003_Layer-4.png
+++ b/ZoFo/Content/Textures/StopObjects/Roof/roof_0003_Layer-4.png
--- a/ZoFo/Content/Textures/StopObjects/Roof/roof_0004_Layer-5.png
+++ b/ZoFo/Content/Textures/StopObjects/Roof/roof_0004_Layer-5.png
--- a/ZoFo/Content/Textures/StopObjects/Roof/roof_0005_Layer-6.png
+++ b/ZoFo/Content/Textures/StopObjects/Roof/roof_0005_Layer-6.png
--- a/ZoFo/Content/Textures/StopObjects/Roof/roof_0006_Layer-7.png
+++ b/ZoFo/Content/Textures/StopObjects/Roof/roof_0006_Layer-7.png
--- a/ZoFo/Content/Textures/StopObjects/Roof/roof_0007_Layer-8.png
+++ b/ZoFo/Content/Textures/StopObjects/Roof/roof_0007_Layer-8.png
--- a/ZoFo/Content/Textures/StopObjects/Roof/roof_0008_Layer-9.png
+++ b/ZoFo/Content/Textures/StopObjects/Roof/roof_0008_Layer-9.png
--- a/ZoFo/Content/Textures/StopObjects/Roof/roof_0009_Layer-10.png
+++ b/ZoFo/Content/Textures/StopObjects/Roof/roof_0009_Layer-10.png
--- a/ZoFo/Content/Textures/StopObjects/Roof/roof_0010_Layer-11.png
+++ b/ZoFo/Content/Textures/StopObjects/Roof/roof_0010_Layer-11.png
--- a/ZoFo/Content/Textures/StopObjects/Roof/roof_0011_Layer-12.png
+++ b/ZoFo/Content/Textures/StopObjects/Roof/roof_0011_Layer-12.png
--- a/ZoFo/Content/Textures/StopObjects/Roof/roof_0012_Layer-13.png
+++ b/ZoFo/Content/Textures/StopObjects/Roof/roof_0012_Layer-13.png
--- a/ZoFo/Content/Textures/StopObjects/Roof/roof_0013_Layer-14.png
+++ b/ZoFo/Content/Textures/StopObjects/Roof/roof_0013_Layer-14.png
--- a/ZoFo/Content/Textures/StopObjects/Roof/roof_0014_Layer-15.png
+++ b/ZoFo/Content/Textures/StopObjects/Roof/roof_0014_Layer-15.png
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				`{"IsFullScreen":false,"MainVolume":1.0,"MusicVolume":1.0,"SoundEffectsVolume":1.0,"Resolution":{"X":1440,"Y":900}}`