diff --git a/GameSettings.txt b/GameSettings.txt new file mode 100644 index 0000000..f5dcd93 --- /dev/null +++ b/GameSettings.txt @@ -0,0 +1 @@ +{"IsFullScreen":false,"MainVolume":1.0,"MusicVolume":1.0,"SoundEffectsVolume":1.0,"Resolution":{"X":1440,"Y":900}} \ No newline at end of file diff --git a/ZoFo/Content/MapData/MapSession.tiled-session b/ZoFo/Content/MapData/MapSession.tiled-session index b075b59..2b7d661 100644 --- 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 + } } diff --git a/ZoFo/Content/MapData/TileMaps/main.tmj b/ZoFo/Content/MapData/TileMaps/main.tmj index fa928f7..4b1d785 100644 --- 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", diff --git a/ZoFo/Content/MapData/TileSets/CollisionTileSet.tsj b/ZoFo/Content/MapData/TileSets/CollisionTileSet.tsj new file mode 100644 index 0000000..f54327b --- /dev/null +++ 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" +} \ No newline at end of file diff --git a/ZoFo/Content/MapData/TileSets/TileSet 1.tsj b/ZoFo/Content/MapData/TileSets/TileSet 1.tsj index d681881..bde6188 100644 --- a/ZoFo/Content/MapData/TileSets/TileSet 1.tsj +++ b/ZoFo/Content/MapData/TileSets/TileSet 1.tsj @@ -7,7 +7,7 @@ "orientation":"orthogonal", "width":24 }, - "image":"..\/..\/Textures\/TileSet\/TilesetFloor.png", + "image":"..\/..\/Textures\/TileSetImages\/TilesetFloor.png", "imageheight":832, "imagewidth":704, "margin":0, @@ -18,41 +18,1070 @@ "tiledversion":"1.10.2", "tileheight":32, "tiles":[ + { + "id":0, + "type":"Tile" + }, + { + "id":1, + "type":"Tile" + }, + { + "id":2, + "type":"Tile" + }, + { + "id":3, + "type":"Tile" + }, + { + "id":4, + "type":"Tile" + }, + { + "id":5, + "type":"Tile" + }, + { + "id":6, + "type":"Tile" + }, + { + "id":7, + "type":"Tile" + }, + { + "id":8, + "type":"Tile" + }, + { + "id":9, + "type":"Tile" + }, + { + "id":10, + "type":"Tile" + }, + { + "id":11, + "type":"Tile" + }, + { + "id":12, + "type":"Tile" + }, + { + "id":13, + "type":"Tile" + }, + { + "id":14, + "type":"Tile" + }, + { + "id":15, + "type":"Tile" + }, + { + "id":16, + "type":"Tile" + }, + { + "id":17, + "type":"Tile" + }, + { + "id":18, + "type":"Tile" + }, + { + "id":19, + "type":"Tile" + }, + { + "id":20, + "type":"Tile" + }, + { + "id":21, + "type":"Tile" + }, + { + "id":22, + "type":"Tile" + }, + { + "id":23, + "type":"Tile" + }, + { + "id":24, + "type":"Tile" + }, + { + "id":25, + "type":"Tile" + }, + { + "id":26, + "type":"Tile" + }, { "id":27, - "probability":0.5 + "probability":0.5, + "type":"Tile" }, { "id":28, - "probability":0.5 + "probability":0.5, + "type":"Tile" + }, + { + "id":29, + "type":"Tile" + }, + { + "id":30, + "type":"Tile" + }, + { + "id":31, + "type":"Tile" + }, + { + "id":32, + "type":"Tile" + }, + { + "id":33, + "type":"Tile" + }, + { + "id":34, + "type":"Tile" + }, + { + "id":35, + "type":"Tile" + }, + { + "id":36, + "type":"Tile" + }, + { + "id":37, + "type":"Tile" + }, + { + "id":38, + "type":"Tile" + }, + { + "id":39, + "type":"Tile" + }, + { + "id":40, + "type":"Tile" + }, + { + "id":41, + "type":"Tile" + }, + { + "id":42, + "type":"Tile" + }, + { + "id":43, + "type":"Tile" + }, + { + "id":44, + "type":"Tile" + }, + { + "id":45, + "type":"Tile" + }, + { + "id":46, + "type":"Tile" + }, + { + "id":47, + "type":"Tile" + }, + { + "id":48, + "type":"Tile" }, { "id":49, - "probability":0.5 + "probability":0.5, + "type":"Tile" }, { "id":50, - "probability":0.5 + "probability":0.5, + "type":"Tile" + }, + { + "id":51, + "type":"Tile" + }, + { + "id":52, + "type":"Tile" + }, + { + "id":53, + "type":"Tile" + }, + { + "id":54, + "type":"Tile" + }, + { + "id":55, + "type":"Tile" + }, + { + "id":56, + "type":"Tile" + }, + { + "id":57, + "type":"Tile" + }, + { + "id":58, + "type":"Tile" + }, + { + "id":59, + "type":"Tile" + }, + { + "id":60, + "type":"Tile" + }, + { + "id":61, + "type":"Tile" + }, + { + "id":62, + "type":"Tile" + }, + { + "id":63, + "type":"Tile" + }, + { + "id":64, + "type":"Tile" + }, + { + "id":65, + "type":"Tile" + }, + { + "id":66, + "type":"Tile" + }, + { + "id":67, + "type":"Tile" + }, + { + "id":68, + "type":"Tile" + }, + { + "id":69, + "type":"Tile" + }, + { + "id":70, + "type":"Tile" + }, + { + "id":71, + "type":"Tile" + }, + { + "id":72, + "type":"Tile" + }, + { + "id":73, + "type":"Tile" + }, + { + "id":74, + "type":"Tile" + }, + { + "id":75, + "type":"Tile" + }, + { + "id":76, + "type":"Tile" + }, + { + "id":77, + "type":"Tile" + }, + { + "id":78, + "type":"Tile" + }, + { + "id":79, + "type":"Tile" + }, + { + "id":80, + "type":"Tile" + }, + { + "id":81, + "type":"Tile" + }, + { + "id":82, + "type":"Tile" + }, + { + "id":83, + "type":"Tile" + }, + { + "id":84, + "type":"Tile" + }, + { + "id":85, + "type":"Tile" + }, + { + "id":86, + "type":"Tile" + }, + { + "id":87, + "type":"Tile" }, { "id":88, - "probability":0.100000001490116 + "probability":0.100000001490116, + "type":"Tile" }, { "id":89, - "probability":0.100000001490116 + "probability":0.100000001490116, + "type":"Tile" + }, + { + "id":90, + "type":"Tile" + }, + { + "id":91, + "type":"Tile" + }, + { + "id":92, + "type":"Tile" + }, + { + "id":93, + "type":"Tile" + }, + { + "id":94, + "type":"Tile" + }, + { + "id":95, + "type":"Tile" + }, + { + "id":96, + "type":"Tile" + }, + { + "id":97, + "type":"Tile" + }, + { + "id":98, + "type":"Tile" + }, + { + "id":99, + "type":"Tile" + }, + { + "id":100, + "type":"Tile" + }, + { + "id":101, + "type":"Tile" + }, + { + "id":102, + "type":"Tile" + }, + { + "id":103, + "type":"Tile" + }, + { + "id":104, + "type":"Tile" + }, + { + "id":105, + "type":"Tile" + }, + { + "id":106, + "type":"Tile" + }, + { + "id":107, + "type":"Tile" + }, + { + "id":108, + "type":"Tile" + }, + { + "id":109, + "type":"Tile" }, { "id":110, - "probability":2 + "probability":2, + "type":"Tile" }, { "id":111, - "probability":0.100000001490116 + "probability":0.100000001490116, + "type":"Tile" }, { "id":112, - "probability":0.100000001490116 + "probability":0.100000001490116, + "type":"Tile" + }, + { + "id":113, + "type":"Tile" + }, + { + "id":114, + "type":"Tile" + }, + { + "id":115, + "type":"Tile" + }, + { + "id":116, + "type":"Tile" + }, + { + "id":117, + "type":"Tile" + }, + { + "id":118, + "type":"Tile" + }, + { + "id":119, + "type":"Tile" + }, + { + "id":120, + "type":"Tile" + }, + { + "id":121, + "type":"Tile" + }, + { + "id":122, + "type":"Tile" + }, + { + "id":123, + "type":"Tile" + }, + { + "id":124, + "type":"Tile" + }, + { + "id":125, + "type":"Tile" + }, + { + "id":126, + "type":"Tile" + }, + { + "id":127, + "type":"Tile" + }, + { + "id":128, + "type":"Tile" + }, + { + "id":129, + "type":"Tile" + }, + { + "id":130, + "type":"Tile" + }, + { + "id":131, + "type":"Tile" + }, + { + "id":132, + "type":"Tile" + }, + { + "id":133, + "type":"Tile" + }, + { + "id":134, + "type":"Tile" + }, + { + "id":135, + "type":"Tile" + }, + { + "id":136, + "type":"Tile" + }, + { + "id":137, + "type":"Tile" + }, + { + "id":138, + "type":"Tile" + }, + { + "id":139, + "type":"Tile" + }, + { + "id":140, + "type":"Tile" + }, + { + "id":141, + "type":"Tile" + }, + { + "id":142, + "type":"Tile" + }, + { + "id":143, + "type":"Tile" + }, + { + "id":144, + "type":"Tile" + }, + { + "id":145, + "type":"Tile" + }, + { + "id":146, + "type":"Tile" + }, + { + "id":147, + "type":"Tile" + }, + { + "id":148, + "type":"Tile" + }, + { + "id":149, + "type":"Tile" + }, + { + "id":150, + "type":"Tile" + }, + { + "id":151, + "type":"Tile" + }, + { + "id":152, + "type":"Tile" + }, + { + "id":153, + "type":"Tile" + }, + { + "id":154, + "type":"Tile" + }, + { + "id":155, + "type":"Tile" + }, + { + "id":156, + "type":"Tile" + }, + { + "id":157, + "type":"Tile" + }, + { + "id":158, + "type":"Tile" + }, + { + "id":159, + "type":"Tile" + }, + { + "id":160, + "type":"Tile" + }, + { + "id":161, + "type":"Tile" + }, + { + "id":162, + "type":"Tile" + }, + { + "id":163, + "type":"Tile" + }, + { + "id":164, + "type":"Tile" + }, + { + "id":165, + "type":"Tile" + }, + { + "id":166, + "type":"Tile" + }, + { + "id":167, + "type":"Tile" + }, + { + "id":168, + "type":"Tile" + }, + { + "id":169, + "type":"Tile" + }, + { + "id":170, + "type":"Tile" + }, + { + "id":171, + "type":"Tile" + }, + { + "id":172, + "type":"Tile" + }, + { + "id":173, + "type":"Tile" + }, + { + "id":174, + "type":"Tile" + }, + { + "id":175, + "type":"Tile" + }, + { + "id":176, + "type":"Tile" + }, + { + "id":177, + "type":"Tile" + }, + { + "id":178, + "type":"Tile" + }, + { + "id":179, + "type":"Tile" + }, + { + "id":180, + "type":"Tile" + }, + { + "id":181, + "type":"Tile" + }, + { + "id":182, + "type":"Tile" + }, + { + "id":183, + "type":"Tile" + }, + { + "id":184, + "type":"Tile" + }, + { + "id":185, + "type":"Tile" + }, + { + "id":186, + "type":"Tile" + }, + { + "id":187, + "type":"Tile" + }, + { + "id":188, + "type":"Tile" + }, + { + "id":189, + "type":"Tile" + }, + { + "id":190, + "type":"Tile" + }, + { + "id":191, + "type":"Tile" + }, + { + "id":192, + "type":"Tile" + }, + { + "id":193, + "type":"Tile" + }, + { + "id":194, + "type":"Tile" + }, + { + "id":195, + "type":"Tile" + }, + { + "id":196, + "type":"Tile" + }, + { + "id":197, + "type":"Tile" + }, + { + "id":198, + "type":"Tile" + }, + { + "id":199, + "type":"Tile" + }, + { + "id":200, + "type":"Tile" + }, + { + "id":201, + "type":"Tile" + }, + { + "id":202, + "type":"Tile" + }, + { + "id":203, + "type":"Tile" + }, + { + "id":204, + "type":"Tile" + }, + { + "id":205, + "type":"Tile" + }, + { + "id":206, + "type":"Tile" + }, + { + "id":207, + "type":"Tile" + }, + { + "id":208, + "type":"Tile" + }, + { + "id":209, + "type":"Tile" + }, + { + "id":210, + "type":"Tile" + }, + { + "id":211, + "type":"Tile" + }, + { + "id":212, + "type":"Tile" + }, + { + "id":213, + "type":"Tile" + }, + { + "id":214, + "type":"Tile" + }, + { + "id":215, + "type":"Tile" + }, + { + "id":216, + "type":"Tile" + }, + { + "id":217, + "type":"Tile" + }, + { + "id":218, + "type":"Tile" + }, + { + "id":219, + "type":"Tile" + }, + { + "id":220, + "type":"Tile" + }, + { + "id":221, + "type":"Tile" + }, + { + "id":222, + "type":"Tile" + }, + { + "id":223, + "type":"Tile" + }, + { + "id":224, + "type":"Tile" + }, + { + "id":225, + "type":"Tile" + }, + { + "id":226, + "type":"Tile" + }, + { + "id":227, + "type":"Tile" + }, + { + "id":228, + "type":"Tile" + }, + { + "id":229, + "type":"Tile" + }, + { + "id":230, + "type":"Tile" + }, + { + "id":231, + "type":"Tile" + }, + { + "id":232, + "type":"Tile" + }, + { + "id":233, + "type":"Tile" + }, + { + "id":234, + "type":"Tile" + }, + { + "id":235, + "type":"Tile" + }, + { + "id":236, + "type":"Tile" + }, + { + "id":237, + "type":"Tile" + }, + { + "id":238, + "type":"Tile" + }, + { + "id":239, + "type":"Tile" + }, + { + "id":240, + "type":"Tile" + }, + { + "id":241, + "type":"Tile" + }, + { + "id":242, + "type":"Tile" + }, + { + "id":243, + "type":"Tile" + }, + { + "id":244, + "type":"Tile" + }, + { + "id":245, + "type":"Tile" + }, + { + "id":246, + "type":"Tile" + }, + { + "id":247, + "type":"Tile" + }, + { + "id":248, + "type":"Tile" + }, + { + "id":249, + "type":"Tile" + }, + { + "id":250, + "type":"Tile" + }, + { + "id":251, + "type":"Tile" + }, + { + "id":252, + "type":"Tile" + }, + { + "id":253, + "type":"Tile" + }, + { + "id":254, + "type":"Tile" + }, + { + "id":255, + "type":"Tile" + }, + { + "id":256, + "type":"Tile" + }, + { + "id":257, + "type":"Tile" + }, + { + "id":258, + "type":"Tile" + }, + { + "id":259, + "type":"Tile" + }, + { + "id":260, + "type":"Tile" + }, + { + "id":261, + "type":"Tile" + }, + { + "id":262, + "type":"Tile" + }, + { + "id":263, + "type":"Tile" }], "tilewidth":32, "type":"tileset", diff --git a/ZoFo/Content/MapData/TileSets/WallSet.tsj b/ZoFo/Content/MapData/TileSets/WallSet.tsj deleted file mode 100644 index 4cf3f82..0000000 --- a/ZoFo/Content/MapData/TileSets/WallSet.tsj +++ /dev/null @@ -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" -} \ No newline at end of file diff --git a/ZoFo/Content/MapData/TileSets/WallSet.tsx b/ZoFo/Content/MapData/TileSets/WallSet.tsx deleted file mode 100644 index 35564d4..0000000 --- a/ZoFo/Content/MapData/TileSets/WallSet.tsx +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git 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 deleted file mode 100644 index 880cd49..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0000_Layer-1.png and /dev/null differ diff --git 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 deleted file mode 100644 index ad2fc2b..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0001_Layer-2.png and /dev/null differ diff --git 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 deleted file mode 100644 index 3d95308..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0002_Layer-3.png and /dev/null differ diff --git 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 deleted file mode 100644 index 3c9368c..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0003_Layer-4.png and /dev/null differ diff --git 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 deleted file mode 100644 index d31fb47..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0004_Layer-5.png and /dev/null differ diff --git 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 deleted file mode 100644 index fc721e5..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0005_Layer-6.png and /dev/null differ diff --git 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 deleted file mode 100644 index fc1f3d1..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0006_Layer-7.png and /dev/null differ diff --git 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 deleted file mode 100644 index af254f2..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0007_Layer-8.png and /dev/null differ diff --git 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 deleted file mode 100644 index 0879664..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0008_Layer-9.png and /dev/null differ diff --git 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 deleted file mode 100644 index 8fda383..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0009_Layer-10.png and /dev/null differ diff --git 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 deleted file mode 100644 index 6f2a493..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0010_Layer-11.png and /dev/null differ diff --git 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 deleted file mode 100644 index 4e7ab49..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0011_Layer-12.png and /dev/null differ diff --git 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 deleted file mode 100644 index d654f41..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0012_Layer-13.png and /dev/null differ diff --git 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 deleted file mode 100644 index 2eeb752..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0013_Layer-14.png and /dev/null differ diff --git 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 deleted file mode 100644 index cf2f09d..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0014_Layer-15.png and /dev/null differ diff --git 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 deleted file mode 100644 index c13af22..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0015_Layer-16.png and /dev/null differ diff --git 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 deleted file mode 100644 index 44a6ab4..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/Shadows/shadows_house_0016_Layer-0.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0000_Layer-1.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0000_Layer-1.png deleted file mode 100644 index 4655585..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0000_Layer-1.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0001_Layer-2.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0001_Layer-2.png deleted file mode 100644 index 3823f71..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0001_Layer-2.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0002_Layer-3.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0002_Layer-3.png deleted file mode 100644 index 05ef220..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0002_Layer-3.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0003_Layer-4.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0003_Layer-4.png deleted file mode 100644 index 87f4ecf..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0003_Layer-4.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0004_Layer-5.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0004_Layer-5.png deleted file mode 100644 index 62b95fc..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0004_Layer-5.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0005_Layer-6.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0005_Layer-6.png deleted file mode 100644 index 0bf58ea..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0005_Layer-6.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0006_Layer-7.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0006_Layer-7.png deleted file mode 100644 index a5efeaf..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0006_Layer-7.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0007_Layer-8.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0007_Layer-8.png deleted file mode 100644 index da72a26..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0007_Layer-8.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0008_Layer-9.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0008_Layer-9.png deleted file mode 100644 index 19e371c..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0008_Layer-9.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0009_Layer-10.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0009_Layer-10.png deleted file mode 100644 index 121ebe2..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0009_Layer-10.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0010_Layer-11.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0010_Layer-11.png deleted file mode 100644 index 634a7cd..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0010_Layer-11.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0011_Layer-12.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0011_Layer-12.png deleted file mode 100644 index e3715af..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0011_Layer-12.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0012_Layer-13.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0012_Layer-13.png deleted file mode 100644 index d53022c..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0012_Layer-13.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0013_Layer-14.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0013_Layer-14.png deleted file mode 100644 index bacb44a..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0013_Layer-14.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0014_Layer-15.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0014_Layer-15.png deleted file mode 100644 index 8b7d74f..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0014_Layer-15.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0015_Layer-16.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0015_Layer-16.png deleted file mode 100644 index baa78b8..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0015_Layer-16.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0016_Layer-17.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0016_Layer-17.png deleted file mode 100644 index ba73b4b..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0016_Layer-17.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0017_Layer-18.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0017_Layer-18.png deleted file mode 100644 index 705506a..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0017_Layer-18.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0018_Layer-19.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0018_Layer-19.png deleted file mode 100644 index f9acadc..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0018_Layer-19.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0019_Layer-20.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0019_Layer-20.png deleted file mode 100644 index 5630bf3..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0019_Layer-20.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0020_Layer-21.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0020_Layer-21.png deleted file mode 100644 index c56674c..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0020_Layer-21.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0021_Layer-22.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0021_Layer-22.png deleted file mode 100644 index 394c48b..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0021_Layer-22.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0022_Layer-23.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0022_Layer-23.png deleted file mode 100644 index 8edeed6..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0022_Layer-23.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0023_Layer-24.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0023_Layer-24.png deleted file mode 100644 index 043499e..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0023_Layer-24.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0024_Layer-25.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0024_Layer-25.png deleted file mode 100644 index 0cf74a0..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0024_Layer-25.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0025_Layer-26.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0025_Layer-26.png deleted file mode 100644 index ed9dc8d..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0025_Layer-26.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0026_Layer-27.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0026_Layer-27.png deleted file mode 100644 index f531421..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0026_Layer-27.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0027_Layer-28.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0027_Layer-28.png deleted file mode 100644 index 6f4ecca..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0027_Layer-28.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0028_Layer-29.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0028_Layer-29.png deleted file mode 100644 index f3a2131..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0028_Layer-29.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0029_Layer-30.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0029_Layer-30.png deleted file mode 100644 index 75eea87..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0029_Layer-30.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0030_Layer-31.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0030_Layer-31.png deleted file mode 100644 index 8c4eaa1..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0030_Layer-31.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0031_Layer-32.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0031_Layer-32.png deleted file mode 100644 index dc64505..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0031_Layer-32.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0032_Layer-33.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0032_Layer-33.png deleted file mode 100644 index f5a7b8f..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0032_Layer-33.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0033_Layer-34.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0033_Layer-34.png deleted file mode 100644 index 50b8e5b..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0033_Layer-34.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0034_Layer-35.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0034_Layer-35.png deleted file mode 100644 index 963376a..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0034_Layer-35.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0035_Layer-36.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0035_Layer-36.png deleted file mode 100644 index 986dd9a..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0035_Layer-36.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0036_Layer-37.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0036_Layer-37.png deleted file mode 100644 index c28721b..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0036_Layer-37.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0037_Layer-38.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0037_Layer-38.png deleted file mode 100644 index 0a479fd..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0037_Layer-38.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0038_Layer-39.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0038_Layer-39.png deleted file mode 100644 index b2c273a..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0038_Layer-39.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0039_Layer-40.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0039_Layer-40.png deleted file mode 100644 index 5d3d948..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0039_Layer-40.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0040_Layer-41.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0040_Layer-41.png deleted file mode 100644 index 71068e6..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0040_Layer-41.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0041_Layer-42.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0041_Layer-42.png deleted file mode 100644 index 85624be..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0041_Layer-42.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0042_Layer-43.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0042_Layer-43.png deleted file mode 100644 index c411dfb..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0042_Layer-43.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0043_Layer-44.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0043_Layer-44.png deleted file mode 100644 index 58d2288..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0043_Layer-44.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0044_Layer-45.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0044_Layer-45.png deleted file mode 100644 index 079b5cc..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0044_Layer-45.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0045_Layer-46.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0045_Layer-46.png deleted file mode 100644 index 65234d0..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0045_Layer-46.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0046_Layer-47.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0046_Layer-47.png deleted file mode 100644 index b5898ca..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0046_Layer-47.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0047_Layer-48.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0047_Layer-48.png deleted file mode 100644 index 417ecb3..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0047_Layer-48.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0048_Layer-49.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0048_Layer-49.png deleted file mode 100644 index 3e04981..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0048_Layer-49.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0049_Layer-50.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0049_Layer-50.png deleted file mode 100644 index 1972504..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0049_Layer-50.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0050_Layer-51.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0050_Layer-51.png deleted file mode 100644 index cd8dc23..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0050_Layer-51.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0051_Layer-52.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0051_Layer-52.png deleted file mode 100644 index a1470c1..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0051_Layer-52.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0052_Layer-53.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0052_Layer-53.png deleted file mode 100644 index 7b5711c..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0052_Layer-53.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0053_Layer-54.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0053_Layer-54.png deleted file mode 100644 index 0047c8c..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0053_Layer-54.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0054_Layer-55.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0054_Layer-55.png deleted file mode 100644 index e8930bb..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0054_Layer-55.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0055_Layer-56.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0055_Layer-56.png deleted file mode 100644 index d0e820d..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0055_Layer-56.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0056_Layer-57.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0056_Layer-57.png deleted file mode 100644 index 2f09fa8..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0056_Layer-57.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0057_Layer-58.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0057_Layer-58.png deleted file mode 100644 index 0facdc6..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0057_Layer-58.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0058_Layer-59.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0058_Layer-59.png deleted file mode 100644 index 8bcd07b..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0058_Layer-59.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0059_Layer-60.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0059_Layer-60.png deleted file mode 100644 index 4ad861b..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0059_Layer-60.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0060_Layer-0.png b/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0060_Layer-0.png deleted file mode 100644 index d5acd84..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Environment/objects_house_0060_Layer-0.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0000_Layer-1.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0000_Layer-1.png deleted file mode 100644 index fe36619..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0000_Layer-1.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0001_Layer-2.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0001_Layer-2.png deleted file mode 100644 index e5b9f39..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0001_Layer-2.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0002_Layer-3.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0002_Layer-3.png deleted file mode 100644 index e31b605..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0002_Layer-3.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0003_Layer-4.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0003_Layer-4.png deleted file mode 100644 index 09ab958..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0003_Layer-4.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0004_Layer-5.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0004_Layer-5.png deleted file mode 100644 index 0c520e5..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0004_Layer-5.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0005_Layer-6.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0005_Layer-6.png deleted file mode 100644 index 13c0408..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0005_Layer-6.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0006_Layer-7.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0006_Layer-7.png deleted file mode 100644 index 36bf1ba..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0006_Layer-7.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0007_Layer-8.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0007_Layer-8.png deleted file mode 100644 index d39616c..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0007_Layer-8.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0008_Layer-9.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0008_Layer-9.png deleted file mode 100644 index 48ad4d7..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0008_Layer-9.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0009_Layer-10.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0009_Layer-10.png deleted file mode 100644 index 5d1f2ca..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0009_Layer-10.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0010_Layer-11.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0010_Layer-11.png deleted file mode 100644 index ab4c856..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0010_Layer-11.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0011_Layer-12.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0011_Layer-12.png deleted file mode 100644 index 4b8f0d0..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0011_Layer-12.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0012_Layer-13.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0012_Layer-13.png deleted file mode 100644 index 9e25f96..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0012_Layer-13.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0013_Layer-14.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0013_Layer-14.png deleted file mode 100644 index 3319e48..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0013_Layer-14.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0014_Layer-15.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0014_Layer-15.png deleted file mode 100644 index 24f5bba..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0014_Layer-15.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0015_Layer-16.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0015_Layer-16.png deleted file mode 100644 index 31f7a36..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0015_Layer-16.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0016_Layer-17.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0016_Layer-17.png deleted file mode 100644 index 224400a..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0016_Layer-17.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0017_Layer-18.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0017_Layer-18.png deleted file mode 100644 index 1facb1f..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0017_Layer-18.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0018_Layer-19.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0018_Layer-19.png deleted file mode 100644 index 1d20c2f..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0018_Layer-19.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0019_Layer-20.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0019_Layer-20.png deleted file mode 100644 index 30abbfb..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0019_Layer-20.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0020_Layer-21.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0020_Layer-21.png deleted file mode 100644 index cd32dda..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0020_Layer-21.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0021_Layer-22.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0021_Layer-22.png deleted file mode 100644 index 2414a5d..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0021_Layer-22.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0022_Layer-23.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0022_Layer-23.png deleted file mode 100644 index 46cebba..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0022_Layer-23.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0023_Layer-24.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0023_Layer-24.png deleted file mode 100644 index 95e467f..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0023_Layer-24.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0024_Layer-25.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0024_Layer-25.png deleted file mode 100644 index 1f81a4c..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0024_Layer-25.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0025_Layer-26.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0025_Layer-26.png deleted file mode 100644 index 4f13a41..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0025_Layer-26.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0026_Layer-27.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0026_Layer-27.png deleted file mode 100644 index 827f729..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0026_Layer-27.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0027_Layer-28.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0027_Layer-28.png deleted file mode 100644 index 56ab75e..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0027_Layer-28.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0028_Layer-29.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0028_Layer-29.png deleted file mode 100644 index 6caeaeb..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0028_Layer-29.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0029_Layer-30.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0029_Layer-30.png deleted file mode 100644 index dc6eab7..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0029_Layer-30.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0030_Layer-31.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0030_Layer-31.png deleted file mode 100644 index 663615f..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0030_Layer-31.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0031_Layer-32.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0031_Layer-32.png deleted file mode 100644 index 95cd3ca..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0031_Layer-32.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0032_Layer-33.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0032_Layer-33.png deleted file mode 100644 index 1861b3e..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0032_Layer-33.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0033_Layer-34.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0033_Layer-34.png deleted file mode 100644 index 3ef79e1..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0033_Layer-34.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0034_Layer-35.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0034_Layer-35.png deleted file mode 100644 index 8186f19..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0034_Layer-35.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0035_Layer-36.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0035_Layer-36.png deleted file mode 100644 index eb5194d..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0035_Layer-36.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Roof/roof_0036_Layer-0.png b/ZoFo/Content/Textures/StopObjects/Roof/roof_0036_Layer-0.png deleted file mode 100644 index e94a995..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Roof/roof_0036_Layer-0.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0000_Layer-1.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0000_Layer-1.png deleted file mode 100644 index c6e23e7..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0000_Layer-1.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0001_Layer-2.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0001_Layer-2.png deleted file mode 100644 index 1c8205c..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0001_Layer-2.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0002_Layer-3.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0002_Layer-3.png deleted file mode 100644 index adeab17..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0002_Layer-3.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0003_Layer-4.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0003_Layer-4.png deleted file mode 100644 index fcd01a8..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0003_Layer-4.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0004_Layer-5.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0004_Layer-5.png deleted file mode 100644 index a715cf5..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0004_Layer-5.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0005_Layer-6.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0005_Layer-6.png deleted file mode 100644 index 443b2d7..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0005_Layer-6.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0006_Layer-7.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0006_Layer-7.png deleted file mode 100644 index 375a15f..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0006_Layer-7.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0007_Layer-8.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0007_Layer-8.png deleted file mode 100644 index 66d1f0e..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0007_Layer-8.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0008_Layer-9.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0008_Layer-9.png deleted file mode 100644 index 183c938..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0008_Layer-9.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0009_Layer-10.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0009_Layer-10.png deleted file mode 100644 index 0082f7c..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0009_Layer-10.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0010_Layer-11.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0010_Layer-11.png deleted file mode 100644 index c02a29b..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0010_Layer-11.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0011_Layer-12.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0011_Layer-12.png deleted file mode 100644 index 9ec94d7..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0011_Layer-12.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0012_Layer-13.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0012_Layer-13.png deleted file mode 100644 index 50c376f..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0012_Layer-13.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0013_Layer-14.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0013_Layer-14.png deleted file mode 100644 index 099baa7..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0013_Layer-14.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0014_Layer-15.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0014_Layer-15.png deleted file mode 100644 index 51b7d43..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0014_Layer-15.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0015_Layer-16.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0015_Layer-16.png deleted file mode 100644 index 99b0f10..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0015_Layer-16.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0016_Layer-17.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0016_Layer-17.png deleted file mode 100644 index a9f1329..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0016_Layer-17.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0017_Layer-18.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0017_Layer-18.png deleted file mode 100644 index 38f9c00..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0017_Layer-18.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0018_Layer-19.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0018_Layer-19.png deleted file mode 100644 index a8367dd..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0018_Layer-19.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0019_Layer-20.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0019_Layer-20.png deleted file mode 100644 index c1b2805..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0019_Layer-20.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0020_Layer-21.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0020_Layer-21.png deleted file mode 100644 index bc18b15..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0020_Layer-21.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0021_Layer-22.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0021_Layer-22.png deleted file mode 100644 index d8599d6..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0021_Layer-22.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0022_Layer-23.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0022_Layer-23.png deleted file mode 100644 index 4e3336e..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0022_Layer-23.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0023_Layer-24.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0023_Layer-24.png deleted file mode 100644 index 95b8964..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0023_Layer-24.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0024_Layer-25.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0024_Layer-25.png deleted file mode 100644 index 7b8e21a..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0024_Layer-25.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0025_Layer-26.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0025_Layer-26.png deleted file mode 100644 index ad088f8..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0025_Layer-26.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0026_Layer-27.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0026_Layer-27.png deleted file mode 100644 index dbc20bb..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0026_Layer-27.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0027_Layer-28.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0027_Layer-28.png deleted file mode 100644 index 220d937..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0027_Layer-28.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0028_Layer-29.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0028_Layer-29.png deleted file mode 100644 index d990509..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0028_Layer-29.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0029_Layer-30.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0029_Layer-30.png deleted file mode 100644 index 4bbe70a..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0029_Layer-30.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0030_Layer-31.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0030_Layer-31.png deleted file mode 100644 index 3185cce..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0030_Layer-31.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0031_Layer-32.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0031_Layer-32.png deleted file mode 100644 index 01cf9d8..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0031_Layer-32.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0032_Layer-33.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0032_Layer-33.png deleted file mode 100644 index 80cfa34..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0032_Layer-33.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0033_Layer-34.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0033_Layer-34.png deleted file mode 100644 index 8472016..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0033_Layer-34.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0034_Layer-35.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0034_Layer-35.png deleted file mode 100644 index 742552f..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0034_Layer-35.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0035_Layer-36.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0035_Layer-36.png deleted file mode 100644 index 328595e..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0035_Layer-36.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0036_Layer-37.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0036_Layer-37.png deleted file mode 100644 index ec80148..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0036_Layer-37.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0037_Layer-38.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0037_Layer-38.png deleted file mode 100644 index e7e7a39..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0037_Layer-38.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0038_Layer-39.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0038_Layer-39.png deleted file mode 100644 index c03fabe..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0038_Layer-39.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0039_Layer-40.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0039_Layer-40.png deleted file mode 100644 index c281b0d..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0039_Layer-40.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0040_Layer-41.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0040_Layer-41.png deleted file mode 100644 index 3325002..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0040_Layer-41.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0041_Layer-42.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0041_Layer-42.png deleted file mode 100644 index 1ecbd46..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0041_Layer-42.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0042_Layer-43.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0042_Layer-43.png deleted file mode 100644 index bcdb8d1..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0042_Layer-43.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0043_Layer-44.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0043_Layer-44.png deleted file mode 100644 index d411060..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0043_Layer-44.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0044_Layer-45.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0044_Layer-45.png deleted file mode 100644 index 0d9981c..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0044_Layer-45.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0045_Layer-46.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0045_Layer-46.png deleted file mode 100644 index 395d4b7..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0045_Layer-46.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0046_Layer-47.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0046_Layer-47.png deleted file mode 100644 index 9df9a3e..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0046_Layer-47.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0047_Layer-48.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0047_Layer-48.png deleted file mode 100644 index 32a5283..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0047_Layer-48.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0048_Layer-49.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0048_Layer-49.png deleted file mode 100644 index ae9b2ef..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0048_Layer-49.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0049_Layer-50.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0049_Layer-50.png deleted file mode 100644 index b28e5b7..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0049_Layer-50.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0050_Layer-51.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0050_Layer-51.png deleted file mode 100644 index 702d9d9..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0050_Layer-51.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Walls/walls_0051_Layer-0.png b/ZoFo/Content/Textures/StopObjects/Walls/walls_0051_Layer-0.png deleted file mode 100644 index b984c11..0000000 Binary files a/ZoFo/Content/Textures/StopObjects/Walls/walls_0051_Layer-0.png and /dev/null differ diff --git a/ZoFo/Content/Textures/StopObjects/Tilelist1.png b/ZoFo/Content/Textures/TileSetImages/Tilelist1.png similarity index 100% rename from ZoFo/Content/Textures/StopObjects/Tilelist1.png rename to ZoFo/Content/Textures/TileSetImages/Tilelist1.png diff --git a/ZoFo/Content/Textures/StopObjects/Tilelist2.png b/ZoFo/Content/Textures/TileSetImages/Tilelist2.png similarity index 100% rename from ZoFo/Content/Textures/StopObjects/Tilelist2.png rename to ZoFo/Content/Textures/TileSetImages/Tilelist2.png diff --git a/ZoFo/Content/Textures/StopObjects/Tilelist3.png b/ZoFo/Content/Textures/TileSetImages/Tilelist3.png similarity index 100% rename from ZoFo/Content/Textures/StopObjects/Tilelist3.png rename to ZoFo/Content/Textures/TileSetImages/Tilelist3.png diff --git a/ZoFo/Content/Textures/StopObjects/Tilelist4.png b/ZoFo/Content/Textures/TileSetImages/Tilelist4.png similarity index 100% rename from ZoFo/Content/Textures/StopObjects/Tilelist4.png rename to ZoFo/Content/Textures/TileSetImages/Tilelist4.png diff --git a/ZoFo/GameCore/Client.cs b/ZoFo/GameCore/Client.cs index f49020f..8d14374 100644 --- a/ZoFo/GameCore/Client.cs +++ b/ZoFo/GameCore/Client.cs @@ -10,7 +10,6 @@ using System; using ZoFo.GameCore.GameObjects; using ZoFo.GameCore.GameObjects.MapObjects; using ZoFo.GameCore.GameManagers.NetworkManager.Updates.ServerToClient; -using ZoFo.GameCore.GameObjects.MapObjects.Tiles; using System.Drawing; using System.Reflection; using ZoFo.GameCore.GameObjects.Entities; diff --git a/ZoFo/GameCore/GameManagers/AppManager.cs b/ZoFo/GameCore/GameManagers/AppManager.cs index 909423b..224dba2 100644 --- a/ZoFo/GameCore/GameManagers/AppManager.cs +++ b/ZoFo/GameCore/GameManagers/AppManager.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Reflection.Metadata; using System.Text; using System.Threading.Tasks; -using DangerousD.GameCore.Graphics; +using ZoFo.GameCore.Graphics; using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Input; diff --git a/ZoFo/GameCore/GameManagers/CollisionManager/CollisionComponent.cs b/ZoFo/GameCore/GameManagers/CollisionManager/CollisionComponent.cs index 146d173..a00c3eb 100644 --- a/ZoFo/GameCore/GameManagers/CollisionManager/CollisionComponent.cs +++ b/ZoFo/GameCore/GameManagers/CollisionManager/CollisionComponent.cs @@ -38,11 +38,13 @@ namespace ZoFo.GameCore.GameManagers.CollisionManager - //events + //events DoorInteraction public event EventHandler OnTriggerEnter; public event EventHandler OnTriggerZone; public event EventHandler OnTriggerExit; + public event EventHandler OnTriggerInteract; + // methods-event public void TriggerEnter(object component, Player player, EventArgs e) diff --git a/ZoFo/GameCore/GameManagers/MapManager/MapElements/Object.cs b/ZoFo/GameCore/GameManagers/MapManager/MapElements/Object.cs new file mode 100644 index 0000000..702ffb2 --- /dev/null +++ b/ZoFo/GameCore/GameManagers/MapManager/MapElements/Object.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZoFo.GameCore.GameManagers.MapManager.MapElements +{ + public class Object + { + public int Height { get; set; } + public int Width { get; set; } + public int X { get; set; } + public int Y { get; set; } + } +} diff --git a/ZoFo/GameCore/GameManagers/MapManager/MapElements/ObjectGroup.cs b/ZoFo/GameCore/GameManagers/MapManager/MapElements/ObjectGroup.cs new file mode 100644 index 0000000..ac77f14 --- /dev/null +++ b/ZoFo/GameCore/GameManagers/MapManager/MapElements/ObjectGroup.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZoFo.GameCore.GameManagers.MapManager.MapElements +{ + public class ObjectGroup + { + public string Name { get; set; } + public List Objects { get; set; } + } +} diff --git a/ZoFo/GameCore/GameManagers/MapManager/MapElements/Tile.cs b/ZoFo/GameCore/GameManagers/MapManager/MapElements/Tile.cs new file mode 100644 index 0000000..13aa10c --- /dev/null +++ b/ZoFo/GameCore/GameManagers/MapManager/MapElements/Tile.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ZoFo.GameCore.GameManagers.MapManager.MapElements +{ + public class Tile + { + public int Id { get; set; } + public string Type { get; set; } + public List Objectgroup { get; set; } + } +} diff --git a/ZoFo/GameCore/GameManagers/MapManager/MapElements/TileSet.cs b/ZoFo/GameCore/GameManagers/MapManager/MapElements/TileSet.cs index 61eddce..a271d8b 100644 --- a/ZoFo/GameCore/GameManagers/MapManager/MapElements/TileSet.cs +++ b/ZoFo/GameCore/GameManagers/MapManager/MapElements/TileSet.cs @@ -20,5 +20,6 @@ namespace ZoFo.GameCore.GameManagers.MapManager.MapElements public int TileWidth { get; set; } public int Columns { get; set; } public int FirstGid { get; set; } + public List Tiles { get; set; } } } diff --git a/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs b/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs index d65d74c..46c2aac 100644 --- a/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs +++ b/ZoFo/GameCore/GameManagers/MapManager/MapManager.cs @@ -11,7 +11,6 @@ using System.Threading.Tasks; using ZoFo.GameCore.GameManagers.MapManager.MapElements; using ZoFo.GameCore.GameObjects.MapObjects; using ZoFo.GameCore.GameObjects.MapObjects.StopObjects; -using ZoFo.GameCore.GameObjects.MapObjects.Tiles; namespace ZoFo.GameCore.GameManagers.MapManager { @@ -57,22 +56,27 @@ namespace ZoFo.GameCore.GameManagers.MapManager int number = chunk.Data[i] - tileSet.FirstGid; int relativeColumn = number % tileSet.Columns; - int relativeRow = 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) ; + (i / chunk.Height) * tileSet.TileHeight + chunk.Y * tileSet.TileHeight); + + Tile tile = tileSet.Tiles[i]; // По факту может быть StopObjectom, но на уровне Tiled это все в первую очередь Tile - switch (layer.Class) + switch (tile.Type) { 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": - // new StopObject(position, new Vector2(tileSet.TileWidth * _scale, tileSet.TileHeight * _scale), sourceRectangle, tileSet.Name); + 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", ""))); + // TODO: изменить конструктор, засунув коллизии. break; default: break; @@ -102,5 +106,22 @@ namespace ZoFo.GameCore.GameManagers.MapManager return JsonSerializer.Deserialize(data, options); } } + + /// + /// Загружает все квадраты коллизии тайла. + /// + /// + /// + private List LoadRectangles(Tile tile) { + List collisionRectangles = new List(); + foreach (var objectGroup in tile.Objectgroup) + { + foreach (var obj in objectGroup.Objects) + { + collisionRectangles.Add(new Rectangle(obj.X, obj.Y, obj.Width, obj.Height)); + } + } + return collisionRectangles; + } } } diff --git a/ZoFo/GameCore/GameManagers/NetworkManager/Updates/ServerToClient/UpdateGameObjectDeleted.cs b/ZoFo/GameCore/GameManagers/NetworkManager/Updates/ServerToClient/UpdateGameObjectDeleted.cs index 88d4e98..25415e1 100644 --- a/ZoFo/GameCore/GameManagers/NetworkManager/Updates/ServerToClient/UpdateGameObjectDeleted.cs +++ b/ZoFo/GameCore/GameManagers/NetworkManager/Updates/ServerToClient/UpdateGameObjectDeleted.cs @@ -12,5 +12,6 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager.Updates.ServerToClient public class UpdateGameObjectDeleted : UpdateData { public UpdateGameObjectDeleted() { UpdateType = "UpdateGameObjectDeleted"; } + public string GameObjectType; } } \ No newline at end of file diff --git a/ZoFo/GameCore/GameManagers/NetworkManager/Updates/ServerToClient/UpdateInteraction.cs b/ZoFo/GameCore/GameManagers/NetworkManager/Updates/ServerToClient/UpdateInteraction.cs index e42f0f4..09b0bc3 100644 --- a/ZoFo/GameCore/GameManagers/NetworkManager/Updates/ServerToClient/UpdateInteraction.cs +++ b/ZoFo/GameCore/GameManagers/NetworkManager/Updates/ServerToClient/UpdateInteraction.cs @@ -5,6 +5,11 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager.Updates.ServerToClient; /// public class UpdateInteraction : UpdateData { + public UpdateInteraction(int id) + { + IdEntity = id; + } + public int IdEntity { get; set; } public string UpdateType { get; set; } } \ No newline at end of file diff --git a/ZoFo/GameCore/GameManagers/NetworkManager/Updates/UpdateData.cs b/ZoFo/GameCore/GameManagers/NetworkManager/Updates/UpdateData.cs index a96b270..65ef2d2 100644 --- a/ZoFo/GameCore/GameManagers/NetworkManager/Updates/UpdateData.cs +++ b/ZoFo/GameCore/GameManagers/NetworkManager/Updates/UpdateData.cs @@ -26,7 +26,17 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager.Updates public class UpdateData { - public int IdEntity { get; set; } //Id объекта + public int IdEntity { get; set; } //Id объекта public string UpdateType { get; protected set; } //тип обновления + + public UpdateData() + { + + } + + public UpdateData(int idEntity) + { + this.IdEntity = idEntity; + } } } diff --git a/ZoFo/GameCore/GameObjects/Entities/EntittyForAnimationTests.cs b/ZoFo/GameCore/GameObjects/Entities/EntittyForAnimationTests.cs index 00cde0f..9336e76 100644 --- a/ZoFo/GameCore/GameObjects/Entities/EntittyForAnimationTests.cs +++ b/ZoFo/GameCore/GameObjects/Entities/EntittyForAnimationTests.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using ZoFo.GameCore.ZoFo_graphics; +using ZoFo.GameCore.Graphics; namespace ZoFo.GameCore.GameObjects.Entities { diff --git a/ZoFo/GameCore/GameObjects/Entities/Entity.cs b/ZoFo/GameCore/GameObjects/Entities/Entity.cs index c0a192d..db68013 100644 --- a/ZoFo/GameCore/GameObjects/Entities/Entity.cs +++ b/ZoFo/GameCore/GameObjects/Entities/Entity.cs @@ -4,7 +4,6 @@ using System.Text; using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; using ZoFo.GameCore.GameManagers.CollisionManager; -using ZoFo.GameCore.ZoFo_graphics; namespace ZoFo.GameCore.GameObjects.Entities { diff --git a/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Collectable.cs b/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Collectable.cs index d31d536..9bb5227 100644 --- a/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Collectable.cs +++ b/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Collectable.cs @@ -1,5 +1,8 @@ using Microsoft.Xna.Framework; using System; +using ZoFo.GameCore.GameManagers; +using ZoFo.GameCore.GameManagers.CollisionManager; +using ZoFo.GameCore.GameManagers.NetworkManager.Updates.ServerToClient; namespace ZoFo.GameCore.GameObjects.Entities.Interactables.Collectables; public class Collectable : Interactable @@ -7,4 +10,11 @@ public class Collectable : Interactable public Collectable(Vector2 position) : base(position) { } + + public override void OnInteraction(object sender, CollisionComponent e) + { + // + AppManager.Instance.server.AddData(new UpdateLoot()); + AppManager.Instance.server.DeleteObject(this); + } } diff --git a/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Wood.cs b/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Wood.cs new file mode 100644 index 0000000..2c6b0b8 --- /dev/null +++ b/ZoFo/GameCore/GameObjects/Entities/Interactables/Collectables/Wood.cs @@ -0,0 +1,14 @@ +using System.Collections.Generic; +using Microsoft.Xna.Framework; +using ZoFo.GameCore.Graphics; + +namespace ZoFo.GameCore.GameObjects.Entities.Interactables.Collectables; + +public class Wood : Collectable +{ + public override GraphicsComponent graphicsComponent { get; } = new(new List { "Wood" }, "Wood"); + + public Wood(Vector2 position) : base(position) + { + } +} \ No newline at end of file diff --git a/ZoFo/GameCore/GameObjects/Entities/Interactables/Door.cs b/ZoFo/GameCore/GameObjects/Entities/Interactables/Door.cs index 711a50b..640c9c1 100644 --- a/ZoFo/GameCore/GameObjects/Entities/Interactables/Door.cs +++ b/ZoFo/GameCore/GameObjects/Entities/Interactables/Door.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using Microsoft.Xna.Framework; -using ZoFo.GameCore.ZoFo_graphics; +using ZoFo.GameCore.GameManagers.CollisionManager; +using ZoFo.GameCore.Graphics; namespace ZoFo.GameCore.GameObjects.Entities.Interactables; @@ -15,11 +16,9 @@ public class Door : Interactable graphicsComponent.OnAnimationEnd += _ => { isOpened = !isOpened; }; } - public override void OnInteraction() + public override void OnInteraction(object sender, CollisionComponent e) { - graphicsComponent.AnimationInit("DoorInteraction", isOpened); - graphicsComponent.StartAnimation(); + graphicsComponent.AnimationSelect("DoorInteraction", isOpened); + graphicsComponent.AnimationStep(); } - - } \ No newline at end of file diff --git a/ZoFo/GameCore/GameObjects/Entities/Interactables/Interactable.cs b/ZoFo/GameCore/GameObjects/Entities/Interactables/Interactable.cs index 35a124f..bfe1b42 100644 --- a/ZoFo/GameCore/GameObjects/Entities/Interactables/Interactable.cs +++ b/ZoFo/GameCore/GameObjects/Entities/Interactables/Interactable.cs @@ -3,7 +3,7 @@ using ZoFo.GameCore.GameManagers; using ZoFo.GameCore.GameManagers.CollisionManager; using ZoFo.GameCore.GameManagers.NetworkManager.Updates.ServerToClient; using ZoFo.GameCore.GameObjects.Entities.LivingEntities.Player; -using ZoFo.GameCore.ZoFo_graphics; +using ZoFo.GameCore.Graphics; namespace ZoFo.GameCore.GameObjects.Entities.Interactables; @@ -15,6 +15,7 @@ public class Interactable : Entity { collisionComponent.OnTriggerEnter += (sender, e) => ChangeInteraction(sender, e, true); collisionComponent.OnTriggerExit += (sender, e) => ChangeInteraction(sender, e, false); + collisionComponent.OnTriggerInteract += OnInteraction; } private void ChangeInteraction(object sender, CollisionComponent e, bool isReady) @@ -22,7 +23,7 @@ public class Interactable : Entity AppManager.Instance.server.AddData(new UpdateInteractionReady((sender as Player).Id, isReady)); } - public virtual void OnInteraction() + public virtual void OnInteraction(object sender, CollisionComponent e) { } diff --git a/ZoFo/GameCore/GameObjects/Entities/LivingEntities/LivingEntity.cs b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/LivingEntity.cs index 02cc503..e7e15f1 100644 --- a/ZoFo/GameCore/GameObjects/Entities/LivingEntities/LivingEntity.cs +++ b/ZoFo/GameCore/GameObjects/Entities/LivingEntities/LivingEntity.cs @@ -2,9 +2,9 @@ using Microsoft.Xna.Framework.Graphics; using System; using ZoFo.GameCore.GameObjects.Entities; -using ZoFo.GameCore.ZoFo_graphics; using ZoFo.GameCore.GameManagers; using ZoFo.GameCore.GameManagers.CollisionManager; +using ZoFo.GameCore.Graphics; namespace ZoFo.GameCore.GameObjects.Entities.LivingEntities; public class LivingEntity : Entity diff --git a/ZoFo/GameCore/GameObjects/GameObject.cs b/ZoFo/GameCore/GameObjects/GameObject.cs index d0fa9bb..66cb30d 100644 --- a/ZoFo/GameCore/GameObjects/GameObject.cs +++ b/ZoFo/GameCore/GameObjects/GameObject.cs @@ -3,8 +3,8 @@ using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; using System; using ZoFo.GameCore.GameManagers; -using ZoFo.GameCore.ZoFo_graphics; using ZoFo.GameCore; +using ZoFo.GameCore.Graphics; namespace ZoFo.GameCore.GameObjects; diff --git a/ZoFo/GameCore/GameObjects/MapObjects/MapObject.cs b/ZoFo/GameCore/GameObjects/MapObjects/MapObject.cs index 51a3a4e..15ac53c 100644 --- a/ZoFo/GameCore/GameObjects/MapObjects/MapObject.cs +++ b/ZoFo/GameCore/GameObjects/MapObjects/MapObject.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using ZoFo.GameCore.GameManagers; using ZoFo.GameCore.GameManagers.NetworkManager.Updates.ServerToClient; -using ZoFo.GameCore.ZoFo_graphics; +using ZoFo.GameCore.Graphics; namespace ZoFo.GameCore.GameObjects.MapObjects { diff --git a/ZoFo/GameCore/GameObjects/MapObjects/StopObjects/StopObject.cs b/ZoFo/GameCore/GameObjects/MapObjects/StopObjects/StopObject.cs index 56429c3..9b53cf6 100644 --- a/ZoFo/GameCore/GameObjects/MapObjects/StopObjects/StopObject.cs +++ b/ZoFo/GameCore/GameObjects/MapObjects/StopObjects/StopObject.cs @@ -2,7 +2,6 @@ using System; using System.Diagnostics; using ZoFo.GameCore.GameManagers.CollisionManager; -using ZoFo.GameCore.ZoFo_graphics; namespace ZoFo.GameCore.GameObjects.MapObjects.StopObjects; @@ -10,7 +9,8 @@ public class StopObject : MapObject { CollisionComponent[] collisionComponent; - protected StopObject(Vector2 position, Vector2 size, Rectangle sourceRectangle, string textureName, Rectangle[] collisions) : base(position, size, sourceRectangle, textureName) + + protected StopObject(Vector2 position, Vector2 size, Rectangle sourceRectangle, string textureName, Rectangle[] collisions) : base(position, size, s { collisionComponent = new CollisionComponent[collisions.Length]; for (int i = 0; i < collisionComponent.Length; i++) diff --git a/ZoFo/GameCore/GameObjects/MapObjects/Tiles/Tile.cs b/ZoFo/GameCore/GameObjects/MapObjects/Tiles/Tile.cs deleted file mode 100644 index eb166b8..0000000 --- a/ZoFo/GameCore/GameObjects/MapObjects/Tiles/Tile.cs +++ /dev/null @@ -1,8 +0,0 @@ -using System; - -namespace ZoFo.GameCore.GameObjects.MapObjects.Tiles; - -public class Tile -{ - -} diff --git a/ZoFo/GameCore/Graphics/AnimationBuilder.cs b/ZoFo/GameCore/Graphics/AnimationBuilder.cs index 04b2cbf..2ff7ac4 100644 --- a/ZoFo/GameCore/Graphics/AnimationBuilder.cs +++ b/ZoFo/GameCore/Graphics/AnimationBuilder.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using System.Text; using System.IO; using Newtonsoft.Json; -using Zofo.GameCore.ZoFo_grafics; -namespace DangerousD.GameCore.Graphics +namespace ZoFo.GameCore.Graphics { public class AnimationBuilder { @@ -13,7 +12,7 @@ namespace DangerousD.GameCore.Graphics public void LoadAnimations() { Animations = new List(); - string[] animationFilesNames = Directory.GetFiles("../../../Content/Textures/Animations"); + string[] animationFilesNames = Directory.GetFiles("Content/Textures/Animations"); StreamReader reader; foreach (var fileName in animationFilesNames) diff --git a/ZoFo/GameCore/Graphics/AnimationContainer.cs b/ZoFo/GameCore/Graphics/AnimationContainer.cs index 36596d0..2ffc974 100644 --- a/ZoFo/GameCore/Graphics/AnimationContainer.cs +++ b/ZoFo/GameCore/Graphics/AnimationContainer.cs @@ -1,10 +1,9 @@ -using Microsoft.Xna.Framework; -using Newtonsoft.Json; -using System; +using System; using System.Collections.Generic; -using System.Text; +using Microsoft.Xna.Framework; +using Newtonsoft.Json; -namespace Zofo.GameCore.ZoFo_grafics +namespace ZoFo.GameCore.Graphics { [Serializable] public class AnimationContainer diff --git a/ZoFo/GameCore/Graphics/GraphicsComponent.cs b/ZoFo/GameCore/Graphics/GraphicsComponent.cs index 0d2734f..e8f9f17 100644 --- a/ZoFo/GameCore/Graphics/GraphicsComponent.cs +++ b/ZoFo/GameCore/Graphics/GraphicsComponent.cs @@ -1,16 +1,11 @@ -using ZoFo.GameCore.GameObjects; -using ZoFo.GameCore.GameManagers; -using Microsoft.Xna.Framework; -using Microsoft.Xna.Framework.Content; -using Microsoft.Xna.Framework.Graphics; -using System; +using System; using System.Collections.Generic; using System.Linq; -using System.Security.Cryptography.X509Certificates; -using System.Text; -using Zofo.GameCore.ZoFo_grafics; +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; +using ZoFo.GameCore.GameManagers; -namespace ZoFo.GameCore.ZoFo_graphics +namespace ZoFo.GameCore.Graphics { public class GraphicsComponent @@ -129,7 +124,7 @@ namespace ZoFo.GameCore.ZoFo_graphics } } - public void AnimationInit(string animationId, bool reverse = false) + public void AnimationSelect(string animationId, bool reverse = false) { currentAnimation = animations.Find(x => x.Id == animationId); if (reverse) @@ -151,7 +146,7 @@ namespace ZoFo.GameCore.ZoFo_graphics animating = true; } - public void StepAnimation() + public void AnimationStep() { currentFrame += step; } diff --git a/ZoFo/GameCore/Server.cs b/ZoFo/GameCore/Server.cs index ae53f38..ecd3683 100644 --- a/ZoFo/GameCore/Server.cs +++ b/ZoFo/GameCore/Server.cs @@ -149,11 +149,24 @@ namespace ZoFo.GameCore } AddData(new UpdateGameObjectCreated() - { GameObjectType = gameObject.GetType().Name } + { GameObjectType = gameObject.GetType().Name } ); } + + /// + /// Удаляет игровой объект + /// + /// + public void DeleteObject(GameObject gameObject) + { + gameObjects.Remove(gameObject); + AddData(new UpdateGameObjectDeleted() + { GameObjectType = gameObject.GetType().Name} + ); + } } + #endregion #endregion diff --git a/ZoFo/GameSettings.txt b/ZoFo/GameSettings.txt new file mode 100644 index 0000000..f5dcd93 --- /dev/null +++ b/ZoFo/GameSettings.txt @@ -0,0 +1 @@ +{"IsFullScreen":false,"MainVolume":1.0,"MusicVolume":1.0,"SoundEffectsVolume":1.0,"Resolution":{"X":1440,"Y":900}} \ No newline at end of file diff --git a/architecture.drawio.png b/architecture.drawio.png index c83ffee..4cb9f0f 100644 Binary files a/architecture.drawio.png and b/architecture.drawio.png differ