diff --git a/TODO.md b/TODO.md index 836b941..0e6c7ba 100644 --- a/TODO.md +++ b/TODO.md @@ -29,12 +29,9 @@ - Player can collect collectible hidden under obstacle (should be fixed when above is fixed) -- With new tileset images, hidden doors visually not working - anymore. So I need entit-tiles containing the wall tiles AND I need - to add a shader for a wall destruct animation. Otherwise I'd have to - store lots of images pairs, and I can't do that in LDTK. - -- https://www.quasilyte.dev/blog/post/ebitengine-shaders/#round-1-applying-the-damage-mask +- Star Obstacle doesn't do any damage! + +- Remove Sprite from Tile{}, not used anymore ## Collider Rework [abandoned: see branch collider-system, fails] diff --git a/assets/levels/openquell.ldtk b/assets/levels/openquell.ldtk index 0fd1207..2e0ecd9 100644 --- a/assets/levels/openquell.ldtk +++ b/assets/levels/openquell.ldtk @@ -11,7 +11,7 @@ "iid": "267e9380-d7b0-11ee-a97e-35bec9c19d52", "jsonVersion": "1.5.3", "appBuildId": 473703, - "nextUid": 50, + "nextUid": 57, "identifierStyle": "Capitalize", "toc": [], "worldLayout": "Free", @@ -106,7 +106,7 @@ "intGridValuesGroups": [], "autoRuleGroups": [], "autoSourceLayerDefUid": null, - "tilesetDefUid": 48, + "tilesetDefUid": 50, "tilePivotX": 0, "tilePivotY": 0, "biomeFieldUid": null @@ -135,9 +135,9 @@ "color": "#2F3BBE", "renderMode": "Tile", "showName": true, - "tilesetId": 1, + "tilesetId": 50, "tileRenderMode": "FitInside", - "tileRect": { "tilesetUid": 1, "x": 32, "y": 96, "w": 32, "h": 32 }, + "tileRect": { "tilesetUid": 50, "x": 32, "y": 416, "w": 32, "h": 32 }, "uiTileRect": null, "nineSliceBorders": [], "maxCount": 0, @@ -170,9 +170,9 @@ "color": "#272DC5", "renderMode": "Tile", "showName": true, - "tilesetId": 1, + "tilesetId": 50, "tileRenderMode": "FitInside", - "tileRect": { "tilesetUid": 1, "x": 64, "y": 96, "w": 32, "h": 32 }, + "tileRect": { "tilesetUid": 50, "x": 0, "y": 416, "w": 32, "h": 32 }, "uiTileRect": null, "nineSliceBorders": [], "maxCount": 0, @@ -205,9 +205,9 @@ "color": "#FEAE34", "renderMode": "Tile", "showName": true, - "tilesetId": 1, + "tilesetId": 50, "tileRenderMode": "FitInside", - "tileRect": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "tileRect": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "uiTileRect": null, "nineSliceBorders": [], "maxCount": 0, @@ -240,9 +240,9 @@ "color": "#BE4A2F", "renderMode": "Tile", "showName": true, - "tilesetId": 1, + "tilesetId": 50, "tileRenderMode": "FitInside", - "tileRect": { "tilesetUid": 1, "x": 0, "y": 96, "w": 32, "h": 32 }, + "tileRect": { "tilesetUid": 50, "x": 96, "y": 416, "w": 32, "h": 32 }, "uiTileRect": null, "nineSliceBorders": [], "maxCount": 0, @@ -275,9 +275,9 @@ "color": "#D77643", "renderMode": "Tile", "showName": true, - "tilesetId": 1, + "tilesetId": 50, "tileRenderMode": "FitInside", - "tileRect": { "tilesetUid": 1, "x": 64, "y": 32, "w": 32, "h": 32 }, + "tileRect": { "tilesetUid": 50, "x": 192, "y": 416, "w": 32, "h": 32 }, "uiTileRect": null, "nineSliceBorders": [], "maxCount": 0, @@ -310,9 +310,9 @@ "color": "#F77622", "renderMode": "Tile", "showName": true, - "tilesetId": 1, + "tilesetId": 50, "tileRenderMode": "FitInside", - "tileRect": { "tilesetUid": 1, "x": 0, "y": 64, "w": 32, "h": 32 }, + "tileRect": { "tilesetUid": 50, "x": 128, "y": 416, "w": 32, "h": 32 }, "uiTileRect": null, "nineSliceBorders": [], "maxCount": 0, @@ -345,9 +345,9 @@ "color": "#E43B44", "renderMode": "Tile", "showName": true, - "tilesetId": 1, + "tilesetId": 50, "tileRenderMode": "FitInside", - "tileRect": { "tilesetUid": 1, "x": 32, "y": 64, "w": 32, "h": 32 }, + "tileRect": { "tilesetUid": 50, "x": 224, "y": 416, "w": 32, "h": 32 }, "uiTileRect": null, "nineSliceBorders": [], "maxCount": 0, @@ -380,44 +380,9 @@ "color": "#A22633", "renderMode": "Tile", "showName": true, - "tilesetId": 1, + "tilesetId": 50, "tileRenderMode": "FitInside", - "tileRect": { "tilesetUid": 1, "x": 64, "y": 64, "w": 32, "h": 32 }, - "uiTileRect": null, - "nineSliceBorders": [], - "maxCount": 0, - "limitScope": "PerLevel", - "limitBehavior": "MoveLastOne", - "pivotX": 0, - "pivotY": 0, - "fieldDefs": [] - }, - { - "identifier": "HiddenDoor", - "uid": 23, - "tags": [], - "exportToToc": false, - "allowOutOfBounds": false, - "doc": null, - "width": 32, - "height": 32, - "resizableX": false, - "resizableY": false, - "minWidth": null, - "maxWidth": null, - "minHeight": null, - "maxHeight": null, - "keepAspectRatio": false, - "tileOpacity": 1, - "fillOpacity": 0.08, - "lineOpacity": 0, - "hollow": false, - "color": "#348D3F", - "renderMode": "Tile", - "showName": true, - "tilesetId": 1, - "tileRenderMode": "FitInside", - "tileRect": { "tilesetUid": 1, "x": 64, "y": 0, "w": 32, "h": 32 }, + "tileRect": { "tilesetUid": 50, "x": 160, "y": 416, "w": 32, "h": 32 }, "uiTileRect": null, "nineSliceBorders": [], "maxCount": 0, @@ -450,9 +415,254 @@ "color": "#2CE8F5", "renderMode": "Tile", "showName": true, - "tilesetId": 1, + "tilesetId": 50, "tileRenderMode": "FitInside", - "tileRect": { "tilesetUid": 1, "x": 0, "y": 128, "w": 32, "h": 32 }, + "tileRect": { "tilesetUid": 50, "x": 64, "y": 416, "w": 32, "h": 32 }, + "uiTileRect": null, + "nineSliceBorders": [], + "maxCount": 0, + "limitScope": "PerLevel", + "limitBehavior": "MoveLastOne", + "pivotX": 0, + "pivotY": 0, + "fieldDefs": [] + }, + { + "identifier": "HiddenDoor", + "uid": 23, + "tags": [], + "exportToToc": false, + "allowOutOfBounds": false, + "doc": null, + "width": 32, + "height": 32, + "resizableX": false, + "resizableY": false, + "minWidth": null, + "maxWidth": null, + "minHeight": null, + "maxHeight": null, + "keepAspectRatio": false, + "tileOpacity": 1, + "fillOpacity": 0.08, + "lineOpacity": 0, + "hollow": false, + "color": "#5A6988", + "renderMode": "Tile", + "showName": true, + "tilesetId": 50, + "tileRenderMode": "FitInside", + "tileRect": { "tilesetUid": 50, "x": 96, "y": 256, "w": 32, "h": 32 }, + "uiTileRect": null, + "nineSliceBorders": [], + "maxCount": 0, + "limitScope": "PerLevel", + "limitBehavior": "MoveLastOne", + "pivotX": 0, + "pivotY": 0, + "fieldDefs": [] + }, + { + "identifier": "HiddenDoor2", + "uid": 51, + "tags": [], + "exportToToc": false, + "allowOutOfBounds": false, + "doc": null, + "width": 32, + "height": 32, + "resizableX": false, + "resizableY": false, + "minWidth": null, + "maxWidth": null, + "minHeight": null, + "maxHeight": null, + "keepAspectRatio": false, + "tileOpacity": 1, + "fillOpacity": 0.08, + "lineOpacity": 0, + "hollow": false, + "color": "#EAD4AA", + "renderMode": "Tile", + "showName": true, + "tilesetId": 50, + "tileRenderMode": "FitInside", + "tileRect": { "tilesetUid": 50, "x": 224, "y": 64, "w": 32, "h": 32 }, + "uiTileRect": null, + "nineSliceBorders": [], + "maxCount": 0, + "limitScope": "PerLevel", + "limitBehavior": "MoveLastOne", + "pivotX": 0, + "pivotY": 0, + "fieldDefs": [] + }, + { + "identifier": "HiddenDoor3", + "uid": 52, + "tags": [], + "exportToToc": false, + "allowOutOfBounds": false, + "doc": null, + "width": 32, + "height": 32, + "resizableX": false, + "resizableY": false, + "minWidth": null, + "maxWidth": null, + "minHeight": null, + "maxHeight": null, + "keepAspectRatio": false, + "tileOpacity": 1, + "fillOpacity": 0.08, + "lineOpacity": 0, + "hollow": false, + "color": "#5A6988", + "renderMode": "Tile", + "showName": true, + "tilesetId": 50, + "tileRenderMode": "FitInside", + "tileRect": { "tilesetUid": 50, "x": 224, "y": 192, "w": 32, "h": 32 }, + "uiTileRect": null, + "nineSliceBorders": [], + "maxCount": 0, + "limitScope": "PerLevel", + "limitBehavior": "MoveLastOne", + "pivotX": 0, + "pivotY": 0, + "fieldDefs": [] + }, + { + "identifier": "HiddenDoor4", + "uid": 53, + "tags": [], + "exportToToc": false, + "allowOutOfBounds": false, + "doc": null, + "width": 32, + "height": 32, + "resizableX": false, + "resizableY": false, + "minWidth": null, + "maxWidth": null, + "minHeight": null, + "maxHeight": null, + "keepAspectRatio": false, + "tileOpacity": 1, + "fillOpacity": 0.08, + "lineOpacity": 0, + "hollow": false, + "color": "#5A6988", + "renderMode": "Tile", + "showName": true, + "tilesetId": 50, + "tileRenderMode": "FitInside", + "tileRect": { "tilesetUid": 50, "x": 96, "y": 288, "w": 32, "h": 32 }, + "uiTileRect": null, + "nineSliceBorders": [], + "maxCount": 0, + "limitScope": "PerLevel", + "limitBehavior": "MoveLastOne", + "pivotX": 0, + "pivotY": 0, + "fieldDefs": [] + }, + { + "identifier": "HiddenDoor5", + "uid": 54, + "tags": [], + "exportToToc": false, + "allowOutOfBounds": false, + "doc": null, + "width": 32, + "height": 32, + "resizableX": false, + "resizableY": false, + "minWidth": null, + "maxWidth": null, + "minHeight": null, + "maxHeight": null, + "keepAspectRatio": false, + "tileOpacity": 1, + "fillOpacity": 0.08, + "lineOpacity": 0, + "hollow": false, + "color": "#5A6988", + "renderMode": "Tile", + "showName": true, + "tilesetId": 50, + "tileRenderMode": "FitInside", + "tileRect": { "tilesetUid": 50, "x": 64, "y": 320, "w": 32, "h": 32 }, + "uiTileRect": null, + "nineSliceBorders": [], + "maxCount": 0, + "limitScope": "PerLevel", + "limitBehavior": "MoveLastOne", + "pivotX": 0, + "pivotY": 0, + "fieldDefs": [] + }, + { + "identifier": "HiddenDoor6", + "uid": 55, + "tags": [], + "exportToToc": false, + "allowOutOfBounds": false, + "doc": null, + "width": 32, + "height": 32, + "resizableX": false, + "resizableY": false, + "minWidth": null, + "maxWidth": null, + "minHeight": null, + "maxHeight": null, + "keepAspectRatio": false, + "tileOpacity": 1, + "fillOpacity": 0.08, + "lineOpacity": 0, + "hollow": false, + "color": "#5A6988", + "renderMode": "Tile", + "showName": true, + "tilesetId": 50, + "tileRenderMode": "FitInside", + "tileRect": { "tilesetUid": 50, "x": 224, "y": 320, "w": 32, "h": 32 }, + "uiTileRect": null, + "nineSliceBorders": [], + "maxCount": 0, + "limitScope": "PerLevel", + "limitBehavior": "MoveLastOne", + "pivotX": 0, + "pivotY": 0, + "fieldDefs": [] + }, + { + "identifier": "HiddenDoor7", + "uid": 56, + "tags": [], + "exportToToc": false, + "allowOutOfBounds": false, + "doc": null, + "width": 32, + "height": 32, + "resizableX": false, + "resizableY": false, + "minWidth": null, + "maxWidth": null, + "minHeight": null, + "maxHeight": null, + "keepAspectRatio": false, + "tileOpacity": 1, + "fillOpacity": 0.08, + "lineOpacity": 0, + "hollow": false, + "color": "#5A6988", + "renderMode": "Tile", + "showName": true, + "tilesetId": 50, + "tileRenderMode": "FitInside", + "tileRect": { "tilesetUid": 50, "x": 96, "y": 0, "w": 32, "h": 32 }, "uiTileRect": null, "nineSliceBorders": [], "maxCount": 0, @@ -463,34 +673,15 @@ "fieldDefs": [] } ], "tilesets": [ - { - "__cWid": 3, - "__cHei": 5, - "identifier": "Map2", - "uid": 1, - "relPath": "../sprites/map.png", - "embedAtlas": null, - "pxWid": 96, - "pxHei": 160, - "tileGridSize": 32, - "spacing": 0, - "padding": 0, - "tags": [], - "tagsSourceEnumUid": null, - "enumTags": [], - "customData": [], - "savedSelections": [], - "cachedPixelData": { "opaqueTiles": "110000000000000", "averageColors": "f777f766f766f9533c965c355c355c354b355c35987d687d1b4700000000" } - }, { "__cWid": 8, - "__cHei": 15, - "identifier": "Opengame_Tiles", - "uid": 48, - "relPath": "../sprites/tilemap.png", + "__cHei": 14, + "identifier": "Primarymap", + "uid": 50, + "relPath": "../sprites/primarymap.png", "embedAtlas": null, "pxWid": 256, - "pxHei": 480, + "pxHei": 448, "tileGridSize": 32, "spacing": 0, "padding": 0, @@ -500,28 +691,9 @@ "customData": [], "savedSelections": [], "cachedPixelData": { - "opaqueTiles": "111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111", - "averageColors": "fa97fa97faa8faa8faa8f166f166f166f055f055f055f166f299f288f188f299f299f2aaf2aaf2aaf3aaf299f188f188f299f288f447f544f455f454f46af5aaf777f6a5f94af954f545f544faaafa95f5a8f5a6f5b7f385f5b7f496f496f433f433f643f533f533f333f333f853f853f953f853f853f842f689f799f689f799f799f799f799f799f699f799f699f799f844f555f555f555f555f532f532f532f532f595f595f595f653f765f543f764f765f643f765f643f333f444f333f333f444f333f444f333f888f888f777f888f888f777f888f777f222f222f222f222f666f777f666f666ffffffffffffffff" + "opaqueTiles": "1111111111111111111111111111111111110000000000000011111111111111111111111111111111111111111111111111111000000000", + "averageColors": "f532f532f532f532f555f555f555f555f844f689f799f689f799f699f799f699f799f799f799f799f799f953f853f853f533f533f643f433f433f496f496f5b7f385f5b7f5a6f5a8ea84e999f533f435f355f353f359e4aaf777e6a4f939e943f433f336f299f299f188f3aaf288f299fa97f166f166f166f166f055f055f055faa8faa8faa8fa97f595f595f595f765f888f765f643f765f764f653f543f643f777f888f777f444f333f444f333f444f333f333f333f222f888f888f777f888f222f222f222f666f777f666f6663c96687d987d1b475c355c354b355c355c35" } - }, - { - "__cWid": 0, - "__cHei": 0, - "identifier": "Tileset", - "uid": 49, - "relPath": null, - "embedAtlas": null, - "pxWid": 0, - "pxHei": 0, - "tileGridSize": 16, - "spacing": 0, - "padding": 0, - "tags": [], - "tagsSourceEnumUid": null, - "enumTags": [], - "customData": [], - "savedSelections": [], - "cachedPixelData": null } ], "enums": [], "externalEnums": [], "levelFields": [ { @@ -735,7 +907,7 @@ "__grid": [7,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 32, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2F3BBE", "iid": "c33a2c20-d7b0-11ee-a97e-03409aba0392", "width": 32, @@ -751,7 +923,7 @@ "__grid": [11,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "f2b2ff50-d7b0-11ee-98fb-b34c447bc14d", "width": 32, @@ -767,7 +939,7 @@ "__grid": [9,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "5dbb7c20-d7b0-11ee-84a6-d1c69ca7fab5", "width": 32, @@ -783,7 +955,7 @@ "__grid": [12,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "b3028a20-d7b0-11ee-84a6-e73fb360996b", "width": 32, @@ -805,8 +977,8 @@ "__opacity": 1, "__pxTotalOffsetX": 0, "__pxTotalOffsetY": 0, - "__tilesetDefUid": 48, - "__tilesetRelPath": "../sprites/tilemap.png", + "__tilesetDefUid": 50, + "__tilesetRelPath": "../sprites/primarymap.png", "iid": "3f368c70-d7b0-11ee-a97e-65a98b860ebf", "levelId": 0, "layerDefUid": 2, @@ -919,7 +1091,7 @@ "__grid": [4,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 32, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2F3BBE", "iid": "8d2c2c90-d7b0-11ee-98fb-d523a27935ba", "width": 32, @@ -935,7 +1107,7 @@ "__grid": [4,9], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "a1dfb440-d7b0-11ee-98fb-933f35aeb72b", "width": 32, @@ -951,7 +1123,7 @@ "__grid": [15,6], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "4fe334b0-d7b0-11ee-8ccf-131b7b178844", "width": 32, @@ -973,8 +1145,8 @@ "__opacity": 1, "__pxTotalOffsetX": 0, "__pxTotalOffsetY": 0, - "__tilesetDefUid": 48, - "__tilesetRelPath": "../sprites/tilemap.png", + "__tilesetDefUid": 50, + "__tilesetRelPath": "../sprites/primarymap.png", "iid": "0243b801-d7b0-11ee-98fb-79b1102fb094", "levelId": 6, "layerDefUid": 2, @@ -1092,7 +1264,7 @@ "__grid": [2,3], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 32, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2F3BBE", "iid": "f2e5f0b0-d7b0-11ee-8ccf-694a964ef9e3", "width": 32, @@ -1108,7 +1280,7 @@ "__grid": [3,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "6b04ac30-d7b0-11ee-8ccf-cf7206025bb7", "width": 32, @@ -1130,8 +1302,8 @@ "__opacity": 1, "__pxTotalOffsetX": 0, "__pxTotalOffsetY": 0, - "__tilesetDefUid": 48, - "__tilesetRelPath": "../sprites/tilemap.png", + "__tilesetDefUid": 50, + "__tilesetRelPath": "../sprites/primarymap.png", "iid": "93368c62-d7b0-11ee-8ccf-393e0aa3b048", "levelId": 16, "layerDefUid": 2, @@ -1212,7 +1384,7 @@ "__grid": [6,4], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 32, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2F3BBE", "iid": "9c3f8ee0-d7b0-11ee-8ccf-f1e314a1529a", "width": 32, @@ -1228,7 +1400,7 @@ "__grid": [14,4], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "abd59430-d7b0-11ee-8ccf-2f5d9e97d1c2", "width": 32, @@ -1244,7 +1416,7 @@ "__grid": [4,12], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "0bca9cc0-d7b0-11ee-bb29-030d1778ceb9", "width": 32, @@ -1266,8 +1438,8 @@ "__opacity": 1, "__pxTotalOffsetX": 0, "__pxTotalOffsetY": 0, - "__tilesetDefUid": 48, - "__tilesetRelPath": "../sprites/tilemap.png", + "__tilesetDefUid": 50, + "__tilesetRelPath": "../sprites/primarymap.png", "iid": "a2d63931-d7b0-11ee-8ccf-fd86276f5b0d", "levelId": 17, "layerDefUid": 2, @@ -1280,63 +1452,63 @@ "seed": 339229, "overrideTilesetUid": null, "gridTiles": [ - { "px": [96,96], "src": [128,416], "f": 0, "t": 108, "d": [63], "a": 1 }, - { "px": [128,96], "src": [128,416], "f": 0, "t": 108, "d": [64], "a": 1 }, - { "px": [160,96], "src": [128,416], "f": 0, "t": 108, "d": [65], "a": 1 }, - { "px": [192,96], "src": [128,416], "f": 0, "t": 108, "d": [66], "a": 1 }, - { "px": [224,96], "src": [128,416], "f": 0, "t": 108, "d": [67], "a": 1 }, - { "px": [384,96], "src": [128,416], "f": 0, "t": 108, "d": [72], "a": 1 }, - { "px": [416,96], "src": [128,416], "f": 0, "t": 108, "d": [73], "a": 1 }, - { "px": [448,96], "src": [128,416], "f": 0, "t": 108, "d": [74], "a": 1 }, - { "px": [480,96], "src": [128,416], "f": 0, "t": 108, "d": [75], "a": 1 }, - { "px": [512,96], "src": [128,416], "f": 0, "t": 108, "d": [76], "a": 1 }, - { "px": [96,128], "src": [128,416], "f": 0, "t": 108, "d": [83], "a": 1 }, - { "px": [224,128], "src": [128,416], "f": 0, "t": 108, "d": [87], "a": 1 }, - { "px": [384,128], "src": [128,416], "f": 0, "t": 108, "d": [92], "a": 1 }, - { "px": [512,128], "src": [128,416], "f": 0, "t": 108, "d": [96], "a": 1 }, - { "px": [64,160], "src": [128,416], "f": 0, "t": 108, "d": [102], "a": 1 }, - { "px": [192,160], "src": [128,416], "f": 0, "t": 108, "d": [106], "a": 1 }, - { "px": [256,160], "src": [128,416], "f": 0, "t": 108, "d": [108], "a": 1 }, - { "px": [352,160], "src": [128,416], "f": 0, "t": 108, "d": [111], "a": 1 }, - { "px": [544,160], "src": [128,416], "f": 0, "t": 108, "d": [117], "a": 1 }, - { "px": [64,192], "src": [128,416], "f": 0, "t": 108, "d": [122], "a": 1 }, - { "px": [160,192], "src": [128,416], "f": 0, "t": 108, "d": [125], "a": 1 }, - { "px": [352,192], "src": [128,416], "f": 0, "t": 108, "d": [131], "a": 1 }, - { "px": [416,192], "src": [128,416], "f": 0, "t": 108, "d": [133], "a": 1 }, - { "px": [544,192], "src": [128,416], "f": 0, "t": 108, "d": [137], "a": 1 }, - { "px": [96,224], "src": [128,416], "f": 0, "t": 108, "d": [143], "a": 1 }, - { "px": [224,224], "src": [128,416], "f": 0, "t": 108, "d": [147], "a": 1 }, - { "px": [352,224], "src": [128,416], "f": 0, "t": 108, "d": [151], "a": 1 }, - { "px": [416,224], "src": [128,416], "f": 0, "t": 108, "d": [153], "a": 1 }, - { "px": [448,224], "src": [128,416], "f": 0, "t": 108, "d": [154], "a": 1 }, - { "px": [480,224], "src": [128,416], "f": 0, "t": 108, "d": [155], "a": 1 }, - { "px": [512,224], "src": [128,416], "f": 0, "t": 108, "d": [156], "a": 1 }, - { "px": [96,256], "src": [128,416], "f": 0, "t": 108, "d": [163], "a": 1 }, - { "px": [128,256], "src": [128,416], "f": 0, "t": 108, "d": [164], "a": 1 }, - { "px": [160,256], "src": [128,416], "f": 0, "t": 108, "d": [165], "a": 1 }, - { "px": [192,256], "src": [128,416], "f": 0, "t": 108, "d": [166], "a": 1 }, - { "px": [224,256], "src": [128,416], "f": 0, "t": 108, "d": [167], "a": 1 }, - { "px": [352,256], "src": [128,416], "f": 0, "t": 108, "d": [171], "a": 1 }, - { "px": [352,288], "src": [128,416], "f": 0, "t": 108, "d": [191], "a": 1 }, - { "px": [352,320], "src": [128,416], "f": 0, "t": 108, "d": [211], "a": 1 }, - { "px": [64,352], "src": [128,416], "f": 0, "t": 108, "d": [222], "a": 1 }, - { "px": [96,352], "src": [128,416], "f": 0, "t": 108, "d": [223], "a": 1 }, - { "px": [128,352], "src": [128,416], "f": 0, "t": 108, "d": [224], "a": 1 }, - { "px": [160,352], "src": [128,416], "f": 0, "t": 108, "d": [225], "a": 1 }, - { "px": [192,352], "src": [128,416], "f": 0, "t": 108, "d": [226], "a": 1 }, - { "px": [224,352], "src": [128,416], "f": 0, "t": 108, "d": [227], "a": 1 }, - { "px": [256,352], "src": [128,416], "f": 0, "t": 108, "d": [228], "a": 1 }, - { "px": [288,352], "src": [128,416], "f": 0, "t": 108, "d": [229], "a": 1 }, - { "px": [320,352], "src": [128,416], "f": 0, "t": 108, "d": [230], "a": 1 }, - { "px": [352,352], "src": [128,416], "f": 0, "t": 108, "d": [231], "a": 1 }, - { "px": [384,352], "src": [128,416], "f": 0, "t": 108, "d": [232], "a": 1 }, - { "px": [416,352], "src": [128,416], "f": 0, "t": 108, "d": [233], "a": 1 }, - { "px": [448,352], "src": [128,416], "f": 0, "t": 108, "d": [234], "a": 1 }, - { "px": [480,352], "src": [128,416], "f": 0, "t": 108, "d": [235], "a": 1 }, - { "px": [512,352], "src": [128,416], "f": 0, "t": 108, "d": [236], "a": 1 }, - { "px": [544,352], "src": [128,416], "f": 0, "t": 108, "d": [237], "a": 1 }, - { "px": [64,384], "src": [128,416], "f": 0, "t": 108, "d": [242], "a": 1 }, - { "px": [96,384], "src": [128,416], "f": 0, "t": 108, "d": [243], "a": 1 } + { "px": [96,96], "src": [224,192], "f": 0, "t": 55, "d": [63], "a": 1 }, + { "px": [128,96], "src": [224,192], "f": 0, "t": 55, "d": [64], "a": 1 }, + { "px": [160,96], "src": [224,192], "f": 0, "t": 55, "d": [65], "a": 1 }, + { "px": [192,96], "src": [224,192], "f": 0, "t": 55, "d": [66], "a": 1 }, + { "px": [224,96], "src": [224,192], "f": 0, "t": 55, "d": [67], "a": 1 }, + { "px": [384,96], "src": [224,192], "f": 0, "t": 55, "d": [72], "a": 1 }, + { "px": [416,96], "src": [224,192], "f": 0, "t": 55, "d": [73], "a": 1 }, + { "px": [448,96], "src": [224,192], "f": 0, "t": 55, "d": [74], "a": 1 }, + { "px": [480,96], "src": [224,192], "f": 0, "t": 55, "d": [75], "a": 1 }, + { "px": [512,96], "src": [224,192], "f": 0, "t": 55, "d": [76], "a": 1 }, + { "px": [96,128], "src": [224,192], "f": 0, "t": 55, "d": [83], "a": 1 }, + { "px": [224,128], "src": [224,192], "f": 0, "t": 55, "d": [87], "a": 1 }, + { "px": [384,128], "src": [224,192], "f": 0, "t": 55, "d": [92], "a": 1 }, + { "px": [512,128], "src": [224,192], "f": 0, "t": 55, "d": [96], "a": 1 }, + { "px": [64,160], "src": [224,192], "f": 0, "t": 55, "d": [102], "a": 1 }, + { "px": [192,160], "src": [224,192], "f": 0, "t": 55, "d": [106], "a": 1 }, + { "px": [256,160], "src": [224,192], "f": 0, "t": 55, "d": [108], "a": 1 }, + { "px": [352,160], "src": [224,192], "f": 0, "t": 55, "d": [111], "a": 1 }, + { "px": [544,160], "src": [224,192], "f": 0, "t": 55, "d": [117], "a": 1 }, + { "px": [64,192], "src": [224,192], "f": 0, "t": 55, "d": [122], "a": 1 }, + { "px": [160,192], "src": [224,192], "f": 0, "t": 55, "d": [125], "a": 1 }, + { "px": [352,192], "src": [224,192], "f": 0, "t": 55, "d": [131], "a": 1 }, + { "px": [416,192], "src": [224,192], "f": 0, "t": 55, "d": [133], "a": 1 }, + { "px": [544,192], "src": [224,192], "f": 0, "t": 55, "d": [137], "a": 1 }, + { "px": [96,224], "src": [224,192], "f": 0, "t": 55, "d": [143], "a": 1 }, + { "px": [224,224], "src": [224,192], "f": 0, "t": 55, "d": [147], "a": 1 }, + { "px": [352,224], "src": [224,192], "f": 0, "t": 55, "d": [151], "a": 1 }, + { "px": [416,224], "src": [224,192], "f": 0, "t": 55, "d": [153], "a": 1 }, + { "px": [448,224], "src": [224,192], "f": 0, "t": 55, "d": [154], "a": 1 }, + { "px": [480,224], "src": [224,192], "f": 0, "t": 55, "d": [155], "a": 1 }, + { "px": [512,224], "src": [224,192], "f": 0, "t": 55, "d": [156], "a": 1 }, + { "px": [96,256], "src": [224,192], "f": 0, "t": 55, "d": [163], "a": 1 }, + { "px": [128,256], "src": [224,192], "f": 0, "t": 55, "d": [164], "a": 1 }, + { "px": [160,256], "src": [224,192], "f": 0, "t": 55, "d": [165], "a": 1 }, + { "px": [192,256], "src": [224,192], "f": 0, "t": 55, "d": [166], "a": 1 }, + { "px": [224,256], "src": [224,192], "f": 0, "t": 55, "d": [167], "a": 1 }, + { "px": [352,256], "src": [224,192], "f": 0, "t": 55, "d": [171], "a": 1 }, + { "px": [352,288], "src": [224,192], "f": 0, "t": 55, "d": [191], "a": 1 }, + { "px": [352,320], "src": [224,192], "f": 0, "t": 55, "d": [211], "a": 1 }, + { "px": [64,352], "src": [224,192], "f": 0, "t": 55, "d": [222], "a": 1 }, + { "px": [96,352], "src": [224,192], "f": 0, "t": 55, "d": [223], "a": 1 }, + { "px": [128,352], "src": [224,192], "f": 0, "t": 55, "d": [224], "a": 1 }, + { "px": [160,352], "src": [224,192], "f": 0, "t": 55, "d": [225], "a": 1 }, + { "px": [192,352], "src": [224,192], "f": 0, "t": 55, "d": [226], "a": 1 }, + { "px": [224,352], "src": [224,192], "f": 0, "t": 55, "d": [227], "a": 1 }, + { "px": [256,352], "src": [224,192], "f": 0, "t": 55, "d": [228], "a": 1 }, + { "px": [288,352], "src": [224,192], "f": 0, "t": 55, "d": [229], "a": 1 }, + { "px": [320,352], "src": [224,192], "f": 0, "t": 55, "d": [230], "a": 1 }, + { "px": [352,352], "src": [224,192], "f": 0, "t": 55, "d": [231], "a": 1 }, + { "px": [384,352], "src": [224,192], "f": 0, "t": 55, "d": [232], "a": 1 }, + { "px": [416,352], "src": [224,192], "f": 0, "t": 55, "d": [233], "a": 1 }, + { "px": [448,352], "src": [224,192], "f": 0, "t": 55, "d": [234], "a": 1 }, + { "px": [480,352], "src": [224,192], "f": 0, "t": 55, "d": [235], "a": 1 }, + { "px": [512,352], "src": [224,192], "f": 0, "t": 55, "d": [236], "a": 1 }, + { "px": [544,352], "src": [224,192], "f": 0, "t": 55, "d": [237], "a": 1 }, + { "px": [64,384], "src": [224,192], "f": 0, "t": 55, "d": [242], "a": 1 }, + { "px": [96,384], "src": [224,192], "f": 0, "t": 55, "d": [243], "a": 1 } ], "entityInstances": [] } @@ -1401,7 +1573,7 @@ "__grid": [10,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 32, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2F3BBE", "iid": "5d1ca830-d7b0-11ee-8ccf-f5cfae4bd567", "width": 32, @@ -1417,7 +1589,7 @@ "__grid": [9,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "a39b8830-d7b0-11ee-8ccf-4734d5e9d2c9", "width": 32, @@ -1433,7 +1605,7 @@ "__grid": [7,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 192, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#D77643", "iid": "a63bfca0-d7b0-11ee-8ccf-b38ea3896fae", "width": 32, @@ -1449,7 +1621,7 @@ "__grid": [13,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 96, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#BE4A2F", "iid": "b6087b40-d7b0-11ee-8ccf-a337d752a74e", "width": 32, @@ -1465,7 +1637,7 @@ "__grid": [8,4], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#E43B44", "iid": "d5991410-d7b0-11ee-8ccf-bb37dd5e5b46", "width": 32, @@ -1481,7 +1653,7 @@ "__grid": [11,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "dcdf1bc0-d7b0-11ee-8ccf-b55f8ddc98bc", "width": 32, @@ -1497,7 +1669,7 @@ "__grid": [8,8], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 192, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#D77643", "iid": "ed255e40-d7b0-11ee-8ccf-093827b3e604", "width": 32, @@ -1519,8 +1691,8 @@ "__opacity": 1, "__pxTotalOffsetX": 0, "__pxTotalOffsetY": 0, - "__tilesetDefUid": 48, - "__tilesetRelPath": "../sprites/tilemap.png", + "__tilesetDefUid": 50, + "__tilesetRelPath": "../sprites/primarymap.png", "iid": "f6b46102-d7b0-11ee-8ccf-07cad60c5c1f", "levelId": 18, "layerDefUid": 2, @@ -1639,7 +1811,7 @@ "__grid": [7,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 32, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2F3BBE", "iid": "7a8d5c50-d7b0-11ee-8ccf-ade95c271383", "width": 32, @@ -1655,7 +1827,7 @@ "__grid": [10,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#E43B44", "iid": "88a01d00-d7b0-11ee-8ccf-ab5745607267", "width": 32, @@ -1671,7 +1843,7 @@ "__grid": [9,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "8b1ab9f0-d7b0-11ee-8ccf-958757e1394a", "width": 32, @@ -1687,7 +1859,7 @@ "__grid": [9,8], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 128, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#F77622", "iid": "941612c0-d7b0-11ee-8ccf-85ddfa694aa3", "width": 32, @@ -1703,7 +1875,7 @@ "__grid": [7,9], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 192, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#D77643", "iid": "a0336c10-d7b0-11ee-8ccf-892258732d11", "width": 32, @@ -1725,8 +1897,8 @@ "__opacity": 1, "__pxTotalOffsetX": 0, "__pxTotalOffsetY": 0, - "__tilesetDefUid": 48, - "__tilesetRelPath": "../sprites/tilemap.png", + "__tilesetDefUid": 50, + "__tilesetRelPath": "../sprites/primarymap.png", "iid": "21e87d50-d7b0-11ee-8ccf-0b72273915bf", "levelId": 19, "layerDefUid": 2, @@ -1845,7 +2017,7 @@ "__grid": [13,6], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 96, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#BE4A2F", "iid": "fad92420-d7b0-11ee-8ccf-b13b8ea63424", "width": 32, @@ -1861,7 +2033,7 @@ "__grid": [6,6], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 192, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#D77643", "iid": "07fc54b0-d7b0-11ee-8ccf-5343da31b4a9", "width": 32, @@ -1877,7 +2049,7 @@ "__grid": [9,6], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 32, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2F3BBE", "iid": "0edb8440-d7b0-11ee-8ccf-23b26365b126", "width": 32, @@ -1893,7 +2065,7 @@ "__grid": [3,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "af4816f0-d7b0-11ee-8ccf-f707f0bee477", "width": 32, @@ -1909,7 +2081,7 @@ "__grid": [5,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 96, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#BE4A2F", "iid": "ba941680-d7b0-11ee-8ccf-87c36d8f8eac", "width": 32, @@ -1925,7 +2097,7 @@ "__grid": [9,9], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 192, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#D77643", "iid": "f0a0c200-d7b0-11ee-8ccf-71183d61b5f1", "width": 32, @@ -1941,7 +2113,7 @@ "__grid": [10,11], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "23632480-d7b0-11ee-8ccf-d163eddfc1d8", "width": 32, @@ -1957,7 +2129,7 @@ "__grid": [5,11], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 192, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#D77643", "iid": "32e72870-d7b0-11ee-8ccf-0989861ca171", "width": 32, @@ -1973,7 +2145,7 @@ "__grid": [4,4], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "3661f750-d7b0-11ee-8ccf-bb2cd30d54aa", "width": 32, @@ -1989,7 +2161,7 @@ "__grid": [5,8], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 96, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#BE4A2F", "iid": "c18d4140-d7b0-11ee-8ccf-b7c4141033fe", "width": 32, @@ -2005,7 +2177,7 @@ "__grid": [9,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#E43B44", "iid": "ce2fa910-d7b0-11ee-8ccf-b7a5edb91306", "width": 32, @@ -2027,8 +2199,8 @@ "__opacity": 1, "__pxTotalOffsetX": 0, "__pxTotalOffsetY": 0, - "__tilesetDefUid": 48, - "__tilesetRelPath": "../sprites/tilemap.png", + "__tilesetDefUid": 50, + "__tilesetRelPath": "../sprites/primarymap.png", "iid": "d4791331-d7b0-11ee-8ccf-4796221636b5", "levelId": 20, "layerDefUid": 2, @@ -2121,7 +2293,7 @@ "__grid": [5,9], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 32, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2F3BBE", "iid": "417a2030-d7b0-11ee-8ccf-c3afcaf4d0cf", "width": 32, @@ -2137,7 +2309,7 @@ "__grid": [5,4], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 192, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#D77643", "iid": "48541fa0-d7b0-11ee-8ccf-5788550b76d9", "width": 32, @@ -2153,7 +2325,7 @@ "__grid": [7,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "53aec530-d7b0-11ee-8ccf-f3b9ab85d060", "width": 32, @@ -2169,7 +2341,7 @@ "__grid": [10,4], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#E43B44", "iid": "8359fca0-d7b0-11ee-8ccf-dd3fda3d0c4f", "width": 32, @@ -2185,7 +2357,7 @@ "__grid": [13,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "8b150d40-d7b0-11ee-8ccf-fd95c8bcb1ea", "width": 32, @@ -2201,7 +2373,7 @@ "__grid": [9,8], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 160, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#A22633", "iid": "b8bdbdf0-d7b0-11ee-8ccf-03c9cd536733", "width": 32, @@ -2217,7 +2389,7 @@ "__grid": [8,10], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 96, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#BE4A2F", "iid": "d57d5c70-d7b0-11ee-8ccf-2f226d41dffa", "width": 32, @@ -2233,7 +2405,7 @@ "__grid": [9,9], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "d7caa7d0-d7b0-11ee-8ccf-a7060a56511e", "width": 32, @@ -2249,7 +2421,7 @@ "__grid": [8,9], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 128, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#F77622", "iid": "e0500d50-d7b0-11ee-8ccf-116ff4426e46", "width": 32, @@ -2271,8 +2443,8 @@ "__opacity": 1, "__pxTotalOffsetX": 0, "__pxTotalOffsetY": 0, - "__tilesetDefUid": 48, - "__tilesetRelPath": "../sprites/tilemap.png", + "__tilesetDefUid": 50, + "__tilesetRelPath": "../sprites/primarymap.png", "iid": "09b23021-d7b0-11ee-8ccf-318e20d47de0", "levelId": 21, "layerDefUid": 2, @@ -2390,28 +2562,12 @@ "overrideTilesetUid": null, "gridTiles": [], "entityInstances": [ - { - "__identifier": "HiddenDoor", - "__grid": [15,6], - "__pivot": [0,0], - "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 0, "w": 32, "h": 32 }, - "__smartColor": "#348D3F", - "iid": "aea1bd70-d7b0-11ee-8ccf-4f07c1b316c2", - "width": 32, - "height": 32, - "defUid": 23, - "px": [480,192], - "fieldInstances": [], - "__worldX": 256, - "__worldY": 1280 - }, { "__identifier": "PlayerPrimary", "__grid": [13,6], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 32, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2F3BBE", "iid": "b4b51180-d7b0-11ee-8ccf-2d1bf52a8fb8", "width": 32, @@ -2427,7 +2583,7 @@ "__grid": [5,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "d059ca20-d7b0-11ee-8ccf-4bf2422f5f59", "width": 32, @@ -2443,7 +2599,7 @@ "__grid": [6,9], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "d4400500-d7b0-11ee-8ccf-2d065d1c4ab1", "width": 32, @@ -2459,7 +2615,7 @@ "__grid": [10,6], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 96, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#BE4A2F", "iid": "e8caf610-d7b0-11ee-8ccf-9d5cca1d9a28", "width": 32, @@ -2471,20 +2627,36 @@ "__worldY": 1280 }, { - "__identifier": "HiddenDoor", + "__identifier": "HiddenDoor2", "__grid": [6,4], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 0, "w": 32, "h": 32 }, - "__smartColor": "#348D3F", - "iid": "507506a0-d7b0-11ee-ae12-d71a619d7e46", + "__tile": { "tilesetUid": 50, "x": 224, "y": 64, "w": 32, "h": 32 }, + "__smartColor": "#EAD4AA", + "iid": "dfec6920-d7b0-11ee-abcc-89d15c190e6b", "width": 32, "height": 32, - "defUid": 23, + "defUid": 51, "px": [192,128], "fieldInstances": [], "__worldX": -32, "__worldY": 1216 + }, + { + "__identifier": "HiddenDoor2", + "__grid": [15,6], + "__pivot": [0,0], + "__tags": [], + "__tile": { "tilesetUid": 50, "x": 224, "y": 64, "w": 32, "h": 32 }, + "__smartColor": "#EAD4AA", + "iid": "e4739ef0-d7b0-11ee-abcc-3703514bcfcf", + "width": 32, + "height": 32, + "defUid": 51, + "px": [480,192], + "fieldInstances": [], + "__worldX": 256, + "__worldY": 1280 } ] }, @@ -2497,8 +2669,8 @@ "__opacity": 1, "__pxTotalOffsetX": 0, "__pxTotalOffsetY": 0, - "__tilesetDefUid": 48, - "__tilesetRelPath": "../sprites/tilemap.png", + "__tilesetDefUid": 50, + "__tilesetRelPath": "../sprites/primarymap.png", "iid": "12dedcb1-d7b0-11ee-8ccf-db9f9b23dea3", "levelId": 22, "layerDefUid": 2, @@ -2511,30 +2683,30 @@ "seed": 1039638, "overrideTilesetUid": null, "gridTiles": [ - { "px": [128,128], "src": [64,0], "f": 0, "t": 2, "d": [84], "a": 1 }, - { "px": [160,128], "src": [64,0], "f": 0, "t": 2, "d": [85], "a": 1 }, - { "px": [224,128], "src": [64,0], "f": 0, "t": 2, "d": [87], "a": 1 }, - { "px": [384,128], "src": [64,0], "f": 0, "t": 2, "d": [92], "a": 1 }, - { "px": [416,128], "src": [64,0], "f": 0, "t": 2, "d": [93], "a": 1 }, - { "px": [448,128], "src": [64,0], "f": 0, "t": 2, "d": [94], "a": 1 }, - { "px": [480,128], "src": [64,0], "f": 0, "t": 2, "d": [95], "a": 1 }, - { "px": [128,160], "src": [64,0], "f": 0, "t": 2, "d": [104], "a": 1 }, - { "px": [224,160], "src": [64,0], "f": 0, "t": 2, "d": [107], "a": 1 }, - { "px": [384,160], "src": [64,0], "f": 0, "t": 2, "d": [112], "a": 1 }, - { "px": [480,160], "src": [64,0], "f": 0, "t": 2, "d": [115], "a": 1 }, - { "px": [224,192], "src": [64,0], "f": 0, "t": 2, "d": [127], "a": 1 }, - { "px": [128,224], "src": [64,0], "f": 0, "t": 2, "d": [144], "a": 1 }, - { "px": [224,224], "src": [64,0], "f": 0, "t": 2, "d": [147], "a": 1 }, - { "px": [384,224], "src": [64,0], "f": 0, "t": 2, "d": [152], "a": 1 }, - { "px": [480,224], "src": [64,0], "f": 0, "t": 2, "d": [155], "a": 1 }, - { "px": [128,256], "src": [64,0], "f": 0, "t": 2, "d": [164], "a": 1 }, - { "px": [160,256], "src": [64,0], "f": 0, "t": 2, "d": [165], "a": 1 }, - { "px": [192,256], "src": [64,0], "f": 0, "t": 2, "d": [166], "a": 1 }, - { "px": [224,256], "src": [64,0], "f": 0, "t": 2, "d": [167], "a": 1 }, - { "px": [384,256], "src": [64,0], "f": 0, "t": 2, "d": [172], "a": 1 }, - { "px": [416,256], "src": [64,0], "f": 0, "t": 2, "d": [173], "a": 1 }, - { "px": [448,256], "src": [64,0], "f": 0, "t": 2, "d": [174], "a": 1 }, - { "px": [480,256], "src": [64,0], "f": 0, "t": 2, "d": [175], "a": 1 } + { "px": [128,128], "src": [224,64], "f": 0, "t": 23, "d": [84], "a": 1 }, + { "px": [160,128], "src": [224,64], "f": 0, "t": 23, "d": [85], "a": 1 }, + { "px": [224,128], "src": [224,64], "f": 0, "t": 23, "d": [87], "a": 1 }, + { "px": [384,128], "src": [224,64], "f": 0, "t": 23, "d": [92], "a": 1 }, + { "px": [416,128], "src": [224,64], "f": 0, "t": 23, "d": [93], "a": 1 }, + { "px": [448,128], "src": [224,64], "f": 0, "t": 23, "d": [94], "a": 1 }, + { "px": [480,128], "src": [224,64], "f": 0, "t": 23, "d": [95], "a": 1 }, + { "px": [128,160], "src": [224,64], "f": 0, "t": 23, "d": [104], "a": 1 }, + { "px": [224,160], "src": [224,64], "f": 0, "t": 23, "d": [107], "a": 1 }, + { "px": [384,160], "src": [224,64], "f": 0, "t": 23, "d": [112], "a": 1 }, + { "px": [480,160], "src": [224,64], "f": 0, "t": 23, "d": [115], "a": 1 }, + { "px": [224,192], "src": [224,64], "f": 0, "t": 23, "d": [127], "a": 1 }, + { "px": [128,224], "src": [224,64], "f": 0, "t": 23, "d": [144], "a": 1 }, + { "px": [224,224], "src": [224,64], "f": 0, "t": 23, "d": [147], "a": 1 }, + { "px": [384,224], "src": [224,64], "f": 0, "t": 23, "d": [152], "a": 1 }, + { "px": [480,224], "src": [224,64], "f": 0, "t": 23, "d": [155], "a": 1 }, + { "px": [128,256], "src": [224,64], "f": 0, "t": 23, "d": [164], "a": 1 }, + { "px": [160,256], "src": [224,64], "f": 0, "t": 23, "d": [165], "a": 1 }, + { "px": [192,256], "src": [224,64], "f": 0, "t": 23, "d": [166], "a": 1 }, + { "px": [224,256], "src": [224,64], "f": 0, "t": 23, "d": [167], "a": 1 }, + { "px": [384,256], "src": [224,64], "f": 0, "t": 23, "d": [172], "a": 1 }, + { "px": [416,256], "src": [224,64], "f": 0, "t": 23, "d": [173], "a": 1 }, + { "px": [448,256], "src": [224,64], "f": 0, "t": 23, "d": [174], "a": 1 }, + { "px": [480,256], "src": [224,64], "f": 0, "t": 23, "d": [175], "a": 1 } ], "entityInstances": [] } @@ -2594,28 +2766,12 @@ "overrideTilesetUid": null, "gridTiles": [], "entityInstances": [ - { - "__identifier": "HiddenDoor", - "__grid": [8,8], - "__pivot": [0,0], - "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 0, "w": 32, "h": 32 }, - "__smartColor": "#348D3F", - "iid": "ecd02fc0-d7b0-11ee-ae12-739689daabc0", - "width": 32, - "height": 32, - "defUid": 23, - "px": [256,256], - "fieldInstances": [], - "__worldX": 736, - "__worldY": 1344 - }, { "__identifier": "ObstacleEast", "__grid": [5,9], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 192, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#D77643", "iid": "72e30af0-d7b0-11ee-ae12-ddec78814011", "width": 32, @@ -2631,7 +2787,7 @@ "__grid": [12,11], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 128, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#F77622", "iid": "b4ca1350-d7b0-11ee-ae12-0dbbc69c2232", "width": 32, @@ -2647,7 +2803,7 @@ "__grid": [11,9], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "da1ecec0-d7b0-11ee-ae12-f7f9886ed1cd", "width": 32, @@ -2663,7 +2819,7 @@ "__grid": [8,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 32, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2F3BBE", "iid": "3ccc57e0-d7b0-11ee-ae12-2b6f395bf32e", "width": 32, @@ -2679,7 +2835,7 @@ "__grid": [6,8], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 96, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#BE4A2F", "iid": "7acd2560-d7b0-11ee-ae12-753fb6432bd7", "width": 32, @@ -2695,7 +2851,7 @@ "__grid": [7,9], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#E43B44", "iid": "7d862ae0-d7b0-11ee-ae12-6d2b3abea170", "width": 32, @@ -2705,6 +2861,22 @@ "fieldInstances": [], "__worldX": 704, "__worldY": 1376 + }, + { + "__identifier": "HiddenDoor7", + "__grid": [8,8], + "__pivot": [0,0], + "__tags": [], + "__tile": { "tilesetUid": 50, "x": 96, "y": 0, "w": 32, "h": 32 }, + "__smartColor": "#5A6988", + "iid": "66575290-d7b0-11ee-abcc-4b33fb4125e0", + "width": 32, + "height": 32, + "defUid": 56, + "px": [256,256], + "fieldInstances": [], + "__worldX": 736, + "__worldY": 1344 } ] }, @@ -2717,8 +2889,8 @@ "__opacity": 1, "__pxTotalOffsetX": 0, "__pxTotalOffsetY": 0, - "__tilesetDefUid": 48, - "__tilesetRelPath": "../sprites/tilemap.png", + "__tilesetDefUid": 50, + "__tilesetRelPath": "../sprites/primarymap.png", "iid": "5d8d13a1-d7b0-11ee-ae12-23f843b1ba2a", "levelId": 25, "layerDefUid": 2, @@ -2867,7 +3039,7 @@ "__grid": [14,9], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 96, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#BE4A2F", "iid": "567b7870-d7b0-11ee-9466-99895345dd51", "width": 32, @@ -2883,7 +3055,7 @@ "__grid": [13,9], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "594c24a0-d7b0-11ee-9466-6127ba975759", "width": 32, @@ -2894,28 +3066,12 @@ "__worldX": 1600, "__worldY": 1376 }, - { - "__identifier": "HiddenDoor", - "__grid": [11,9], - "__pivot": [0,0], - "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 0, "w": 32, "h": 32 }, - "__smartColor": "#348D3F", - "iid": "5d365720-d7b0-11ee-9466-47d5ab1a27c1", - "width": 32, - "height": 32, - "defUid": 23, - "px": [352,288], - "fieldInstances": [], - "__worldX": 1536, - "__worldY": 1376 - }, { "__identifier": "PlayerPrimary", "__grid": [6,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 32, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2F3BBE", "iid": "95381be0-d7b0-11ee-9466-a18d2c6bf4ac", "width": 32, @@ -2926,60 +3082,12 @@ "__worldX": 1376, "__worldY": 1312 }, - { - "__identifier": "HiddenDoor", - "__grid": [8,5], - "__pivot": [0,0], - "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 0, "w": 32, "h": 32 }, - "__smartColor": "#348D3F", - "iid": "97bfd830-d7b0-11ee-9466-154107776b45", - "width": 32, - "height": 32, - "defUid": 23, - "px": [256,160], - "fieldInstances": [], - "__worldX": 1440, - "__worldY": 1248 - }, - { - "__identifier": "HiddenDoor", - "__grid": [9,10], - "__pivot": [0,0], - "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 0, "w": 32, "h": 32 }, - "__smartColor": "#348D3F", - "iid": "98745b20-d7b0-11ee-9466-cf88bc436e46", - "width": 32, - "height": 32, - "defUid": 23, - "px": [288,320], - "fieldInstances": [], - "__worldX": 1472, - "__worldY": 1408 - }, - { - "__identifier": "HiddenDoor", - "__grid": [14,4], - "__pivot": [0,0], - "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 0, "w": 32, "h": 32 }, - "__smartColor": "#348D3F", - "iid": "99253490-d7b0-11ee-9466-9fa2276be246", - "width": 32, - "height": 32, - "defUid": 23, - "px": [448,128], - "fieldInstances": [], - "__worldX": 1632, - "__worldY": 1216 - }, { "__identifier": "ObstacleEast", "__grid": [13,6], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 192, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#D77643", "iid": "afa67760-d7b0-11ee-9466-d5127520dfa7", "width": 32, @@ -2995,7 +3103,7 @@ "__grid": [13,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "b6846e70-d7b0-11ee-9466-970fd010c48c", "width": 32, @@ -3011,7 +3119,7 @@ "__grid": [12,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 192, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#D77643", "iid": "cac38970-d7b0-11ee-9466-bb162b8e0eff", "width": 32, @@ -3021,6 +3129,70 @@ "fieldInstances": [], "__worldX": 1568, "__worldY": 1248 + }, + { + "__identifier": "HiddenDoor7", + "__grid": [8,5], + "__pivot": [0,0], + "__tags": [], + "__tile": { "tilesetUid": 50, "x": 96, "y": 0, "w": 32, "h": 32 }, + "__smartColor": "#5A6988", + "iid": "e4064f70-d7b0-11ee-abcc-5951cc17e3b8", + "width": 32, + "height": 32, + "defUid": 56, + "px": [256,160], + "fieldInstances": [], + "__worldX": 1440, + "__worldY": 1248 + }, + { + "__identifier": "HiddenDoor7", + "__grid": [9,10], + "__pivot": [0,0], + "__tags": [], + "__tile": { "tilesetUid": 50, "x": 96, "y": 0, "w": 32, "h": 32 }, + "__smartColor": "#5A6988", + "iid": "e4c69230-d7b0-11ee-abcc-4fa523647f67", + "width": 32, + "height": 32, + "defUid": 56, + "px": [288,320], + "fieldInstances": [], + "__worldX": 1472, + "__worldY": 1408 + }, + { + "__identifier": "HiddenDoor7", + "__grid": [14,4], + "__pivot": [0,0], + "__tags": [], + "__tile": { "tilesetUid": 50, "x": 96, "y": 0, "w": 32, "h": 32 }, + "__smartColor": "#5A6988", + "iid": "e608fd40-d7b0-11ee-abcc-ad173d12436e", + "width": 32, + "height": 32, + "defUid": 56, + "px": [448,128], + "fieldInstances": [], + "__worldX": 1632, + "__worldY": 1216 + }, + { + "__identifier": "HiddenDoor7", + "__grid": [11,9], + "__pivot": [0,0], + "__tags": [], + "__tile": { "tilesetUid": 50, "x": 96, "y": 0, "w": 32, "h": 32 }, + "__smartColor": "#5A6988", + "iid": "e8972230-d7b0-11ee-abcc-4d1a1037baa7", + "width": 32, + "height": 32, + "defUid": 56, + "px": [352,288], + "fieldInstances": [], + "__worldX": 1536, + "__worldY": 1376 } ] }, @@ -3033,8 +3205,8 @@ "__opacity": 1, "__pxTotalOffsetX": 0, "__pxTotalOffsetY": 0, - "__tilesetDefUid": 48, - "__tilesetRelPath": "../sprites/tilemap.png", + "__tilesetDefUid": 50, + "__tilesetRelPath": "../sprites/primarymap.png", "iid": "076d9601-d7b0-11ee-9466-fd5c4daa9c7e", "levelId": 26, "layerDefUid": 2, @@ -3202,44 +3374,12 @@ "overrideTilesetUid": null, "gridTiles": [], "entityInstances": [ - { - "__identifier": "HiddenDoor", - "__grid": [6,6], - "__pivot": [0,0], - "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 0, "w": 32, "h": 32 }, - "__smartColor": "#348D3F", - "iid": "37767670-d7b0-11ee-9466-6d3ea5217d45", - "width": 32, - "height": 32, - "defUid": 23, - "px": [192,192], - "fieldInstances": [], - "__worldX": 2080, - "__worldY": 1280 - }, - { - "__identifier": "HiddenDoor", - "__grid": [13,6], - "__pivot": [0,0], - "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 0, "w": 32, "h": 32 }, - "__smartColor": "#348D3F", - "iid": "384f7150-d7b0-11ee-9466-af54ed4d8ac3", - "width": 32, - "height": 32, - "defUid": 23, - "px": [416,192], - "fieldInstances": [], - "__worldX": 2304, - "__worldY": 1280 - }, { "__identifier": "PlayerPrimary", "__grid": [9,4], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 32, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2F3BBE", "iid": "3b4d9620-d7b0-11ee-9466-83d1411023b9", "width": 32, @@ -3255,7 +3395,7 @@ "__grid": [5,6], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 96, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#BE4A2F", "iid": "413b12b0-d7b0-11ee-9466-f7aabb774c61", "width": 32, @@ -3271,7 +3411,7 @@ "__grid": [6,8], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "577e6220-d7b0-11ee-9466-298e82b77210", "width": 32, @@ -3281,6 +3421,38 @@ "fieldInstances": [], "__worldX": 2080, "__worldY": 1344 + }, + { + "__identifier": "HiddenDoor7", + "__grid": [6,6], + "__pivot": [0,0], + "__tags": [], + "__tile": { "tilesetUid": 50, "x": 96, "y": 0, "w": 32, "h": 32 }, + "__smartColor": "#5A6988", + "iid": "ee3df8d0-d7b0-11ee-abcc-c90387171f04", + "width": 32, + "height": 32, + "defUid": 56, + "px": [192,192], + "fieldInstances": [], + "__worldX": 2080, + "__worldY": 1280 + }, + { + "__identifier": "HiddenDoor7", + "__grid": [13,6], + "__pivot": [0,0], + "__tags": [], + "__tile": { "tilesetUid": 50, "x": 96, "y": 0, "w": 32, "h": 32 }, + "__smartColor": "#5A6988", + "iid": "ef840d60-d7b0-11ee-abcc-73b81ba1d497", + "width": 32, + "height": 32, + "defUid": 56, + "px": [416,192], + "fieldInstances": [], + "__worldX": 2304, + "__worldY": 1280 } ] }, @@ -3293,8 +3465,8 @@ "__opacity": 1, "__pxTotalOffsetX": 0, "__pxTotalOffsetY": 0, - "__tilesetDefUid": 48, - "__tilesetRelPath": "../sprites/tilemap.png", + "__tilesetDefUid": 50, + "__tilesetRelPath": "../sprites/primarymap.png", "iid": "8ab72292-d7b0-11ee-9466-1380451e17ee", "levelId": 27, "layerDefUid": 2, @@ -3387,7 +3559,7 @@ "__grid": [8,6], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 32, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2F3BBE", "iid": "a9e6c4c0-d7b0-11ee-9466-219f1f594ac2", "width": 32, @@ -3403,7 +3575,7 @@ "__grid": [6,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 128, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 64, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2CE8F5", "iid": "ae137e80-d7b0-11ee-9466-7933174435f5", "width": 32, @@ -3419,7 +3591,7 @@ "__grid": [10,10], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 128, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 64, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2CE8F5", "iid": "afdad100-d7b0-11ee-9466-d172c1350bca", "width": 32, @@ -3435,7 +3607,7 @@ "__grid": [10,6], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "d8b1ae50-d7b0-11ee-9466-a115ca8ca9a5", "width": 32, @@ -3451,7 +3623,7 @@ "__grid": [9,8], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "d9a2c510-d7b0-11ee-9466-bfc4c6a038ad", "width": 32, @@ -3467,7 +3639,7 @@ "__grid": [11,8], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "da384e50-d7b0-11ee-9466-db659c31cf29", "width": 32, @@ -3483,7 +3655,7 @@ "__grid": [13,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 128, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 64, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2CE8F5", "iid": "0ed7d540-d7b0-11ee-9466-ad01df9c8ae8", "width": 32, @@ -3505,8 +3677,8 @@ "__opacity": 1, "__pxTotalOffsetX": 0, "__pxTotalOffsetY": 0, - "__tilesetDefUid": 48, - "__tilesetRelPath": "../sprites/tilemap.png", + "__tilesetDefUid": 50, + "__tilesetRelPath": "../sprites/primarymap.png", "iid": "8e66c7a2-d7b0-11ee-9466-9f1ef8aac66a", "levelId": 28, "layerDefUid": 2, @@ -3627,7 +3799,7 @@ "__grid": [8,4], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 32, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2F3BBE", "iid": "821258b0-d7b0-11ee-abff-915a4c86096e", "width": 32, @@ -3643,7 +3815,7 @@ "__grid": [6,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 128, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 64, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2CE8F5", "iid": "93d13170-d7b0-11ee-abff-f152e686eea8", "width": 32, @@ -3659,7 +3831,7 @@ "__grid": [16,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 192, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#D77643", "iid": "9f48fbf0-d7b0-11ee-abff-8dd00d4c3fa4", "width": 32, @@ -3670,28 +3842,12 @@ "__worldX": 992, "__worldY": 1856 }, - { - "__identifier": "HiddenDoor", - "__grid": [5,5], - "__pivot": [0,0], - "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 0, "w": 32, "h": 32 }, - "__smartColor": "#348D3F", - "iid": "af804a50-d7b0-11ee-abff-598bc56acf85", - "width": 32, - "height": 32, - "defUid": 23, - "px": [160,160], - "fieldInstances": [], - "__worldX": 640, - "__worldY": 1792 - }, { "__identifier": "ObstacleEast", "__grid": [7,10], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 192, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#D77643", "iid": "cb94b4b0-d7b0-11ee-abff-835315d4f93f", "width": 32, @@ -3707,7 +3863,7 @@ "__grid": [5,10], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "d7c4aba0-d7b0-11ee-abff-e3d544dbcc82", "width": 32, @@ -3723,7 +3879,7 @@ "__grid": [6,10], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "d8bc2b00-d7b0-11ee-abff-ad5e8ed6b553", "width": 32, @@ -3739,7 +3895,7 @@ "__grid": [6,3], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 128, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 64, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2CE8F5", "iid": "f6259e10-d7b0-11ee-abff-61e9db8d37d0", "width": 32, @@ -3755,7 +3911,7 @@ "__grid": [13,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "07ebf0e0-d7b0-11ee-abff-798296fd50b0", "width": 32, @@ -3765,6 +3921,22 @@ "fieldInstances": [], "__worldX": 896, "__worldY": 1856 + }, + { + "__identifier": "HiddenDoor7", + "__grid": [5,5], + "__pivot": [0,0], + "__tags": [], + "__tile": { "tilesetUid": 50, "x": 96, "y": 0, "w": 32, "h": 32 }, + "__smartColor": "#5A6988", + "iid": "fca89d80-d7b0-11ee-abcc-259672524e85", + "width": 32, + "height": 32, + "defUid": 56, + "px": [160,160], + "fieldInstances": [], + "__worldX": 640, + "__worldY": 1792 } ] }, @@ -3777,8 +3949,8 @@ "__opacity": 1, "__pxTotalOffsetX": 0, "__pxTotalOffsetY": 0, - "__tilesetDefUid": 48, - "__tilesetRelPath": "../sprites/tilemap.png", + "__tilesetDefUid": 50, + "__tilesetRelPath": "../sprites/primarymap.png", "iid": "df3a04b2-d7b0-11ee-b56f-99f67bd5211d", "levelId": 32, "layerDefUid": 2, @@ -3897,7 +4069,7 @@ "__grid": [14,12], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 192, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#D77643", "iid": "b18091b0-d7b0-11ee-abff-734b1d542671", "width": 32, @@ -3908,28 +4080,12 @@ "__worldX": 1632, "__worldY": 2016 }, - { - "__identifier": "HiddenDoor", - "__grid": [13,11], - "__pivot": [0,0], - "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 0, "w": 32, "h": 32 }, - "__smartColor": "#348D3F", - "iid": "b6cc7710-d7b0-11ee-abff-69bfcb896bca", - "width": 32, - "height": 32, - "defUid": 23, - "px": [416,352], - "fieldInstances": [], - "__worldX": 1600, - "__worldY": 1984 - }, { "__identifier": "PlayerPrimary", "__grid": [17,12], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 32, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2F3BBE", "iid": "e9731430-d7b0-11ee-abff-45c7c02abccc", "width": 32, @@ -3945,7 +4101,7 @@ "__grid": [2,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 128, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 64, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2CE8F5", "iid": "ff7f4e10-d7b0-11ee-abff-b9e129e621a3", "width": 32, @@ -3961,7 +4117,7 @@ "__grid": [15,10], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "0bf5c3e0-d7b0-11ee-abff-9b99ef5a36bd", "width": 32, @@ -3972,28 +4128,12 @@ "__worldX": 1664, "__worldY": 1952 }, - { - "__identifier": "HiddenDoor", - "__grid": [3,8], - "__pivot": [0,0], - "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 0, "w": 32, "h": 32 }, - "__smartColor": "#348D3F", - "iid": "1da1b0e0-d7b0-11ee-abff-1952f388641f", - "width": 32, - "height": 32, - "defUid": 23, - "px": [96,256], - "fieldInstances": [], - "__worldX": 1280, - "__worldY": 1888 - }, { "__identifier": "Transient", "__grid": [4,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 128, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 64, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2CE8F5", "iid": "29c21770-d7b0-11ee-abff-b50fc6d9e2f4", "width": 32, @@ -4009,7 +4149,7 @@ "__grid": [9,6], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "4e1d7ec0-d7b0-11ee-abff-259725ea147a", "width": 32, @@ -4025,7 +4165,7 @@ "__grid": [11,6], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 96, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#BE4A2F", "iid": "87d1d580-d7b0-11ee-abff-ff50c675e3aa", "width": 32, @@ -4041,7 +4181,7 @@ "__grid": [11,4], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "3d936000-d7b0-11ee-abff-c5bd27851004", "width": 32, @@ -4057,7 +4197,7 @@ "__grid": [6,9], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "401db460-d7b0-11ee-abff-df18cc278d81", "width": 32, @@ -4067,6 +4207,38 @@ "fieldInstances": [], "__worldX": 1376, "__worldY": 1920 + }, + { + "__identifier": "HiddenDoor7", + "__grid": [3,8], + "__pivot": [0,0], + "__tags": [], + "__tile": { "tilesetUid": 50, "x": 96, "y": 0, "w": 32, "h": 32 }, + "__smartColor": "#5A6988", + "iid": "0160f570-d7b0-11ee-abcc-557494d2cc4b", + "width": 32, + "height": 32, + "defUid": 56, + "px": [96,256], + "fieldInstances": [], + "__worldX": 1280, + "__worldY": 1888 + }, + { + "__identifier": "HiddenDoor7", + "__grid": [13,11], + "__pivot": [0,0], + "__tags": [], + "__tile": { "tilesetUid": 50, "x": 96, "y": 0, "w": 32, "h": 32 }, + "__smartColor": "#5A6988", + "iid": "024254c0-d7b0-11ee-abcc-734ebf579258", + "width": 32, + "height": 32, + "defUid": 56, + "px": [416,352], + "fieldInstances": [], + "__worldX": 1600, + "__worldY": 1984 } ] }, @@ -4079,8 +4251,8 @@ "__opacity": 1, "__pxTotalOffsetX": 0, "__pxTotalOffsetY": 0, - "__tilesetDefUid": 48, - "__tilesetRelPath": "../sprites/tilemap.png", + "__tilesetDefUid": 50, + "__tilesetRelPath": "../sprites/primarymap.png", "iid": "532dd732-d7b0-11ee-abff-bb576826e627", "levelId": 33, "layerDefUid": 2, @@ -4284,7 +4456,7 @@ "__grid": [13,3], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 128, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 64, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2CE8F5", "iid": "a5e1f360-d7b0-11ee-abff-7b5a00bcd61c", "width": 32, @@ -4300,7 +4472,7 @@ "__grid": [13,11], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 128, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 64, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2CE8F5", "iid": "a6dc31e0-d7b0-11ee-abff-6b53e30f792e", "width": 32, @@ -4316,7 +4488,7 @@ "__grid": [13,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 32, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2F3BBE", "iid": "aa1dc850-d7b0-11ee-abff-331df4f5bc80", "width": 32, @@ -4332,7 +4504,7 @@ "__grid": [13,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#E43B44", "iid": "beeb8ec0-d7b0-11ee-abff-43c76f04a78a", "width": 32, @@ -4348,7 +4520,7 @@ "__grid": [9,4], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 128, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 64, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2CE8F5", "iid": "cff918e0-d7b0-11ee-abff-b1e087436314", "width": 32, @@ -4364,7 +4536,7 @@ "__grid": [6,8], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 128, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 64, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2CE8F5", "iid": "0b499370-d7b0-11ee-abff-c35f71af2577", "width": 32, @@ -4380,7 +4552,7 @@ "__grid": [15,9], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 128, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 64, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2CE8F5", "iid": "ac51c9e0-d7b0-11ee-abff-5d5489abbc5f", "width": 32, @@ -4396,7 +4568,7 @@ "__grid": [15,2], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 128, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 64, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2CE8F5", "iid": "ad9f0a60-d7b0-11ee-abff-63fecbd829a6", "width": 32, @@ -4412,7 +4584,7 @@ "__grid": [16,4], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 128, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 64, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2CE8F5", "iid": "ae9ec720-d7b0-11ee-abff-45e10e8bf9ba", "width": 32, @@ -4428,7 +4600,7 @@ "__grid": [7,6], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "c14dcc40-d7b0-11ee-abff-bd1799f8848d", "width": 32, @@ -4450,8 +4622,8 @@ "__opacity": 1, "__pxTotalOffsetX": 0, "__pxTotalOffsetY": 0, - "__tilesetDefUid": 48, - "__tilesetRelPath": "../sprites/tilemap.png", + "__tilesetDefUid": 50, + "__tilesetRelPath": "../sprites/primarymap.png", "iid": "6b268ce2-d7b0-11ee-abff-e93e247fd9d7", "levelId": 34, "layerDefUid": 2, @@ -4527,7 +4699,7 @@ "__grid": [12,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 0, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#272DC5", "iid": "08b28d80-d7b0-11ee-abff-476c657d5cc2", "width": 32, @@ -4543,7 +4715,7 @@ "__grid": [12,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#E43B44", "iid": "0d5f9ad0-d7b0-11ee-abff-fb08af357174", "width": 32, @@ -4559,7 +4731,7 @@ "__grid": [9,8], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 96, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#BE4A2F", "iid": "199efb10-d7b0-11ee-abff-b3596c7a60e6", "width": 32, @@ -4575,7 +4747,7 @@ "__grid": [6,6], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 32, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2F3BBE", "iid": "45923390-d7b0-11ee-abff-07560ac33c59", "width": 32, @@ -4591,7 +4763,7 @@ "__grid": [8,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "4cd3f580-d7b0-11ee-abff-ddf515ed4adc", "width": 32, @@ -4607,7 +4779,7 @@ "__grid": [9,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 192, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#D77643", "iid": "52bf9d50-d7b0-11ee-abff-ebb2121e8b34", "width": 32, @@ -4629,8 +4801,8 @@ "__opacity": 1, "__pxTotalOffsetX": 0, "__pxTotalOffsetY": 0, - "__tilesetDefUid": 48, - "__tilesetRelPath": "../sprites/tilemap.png", + "__tilesetDefUid": 50, + "__tilesetRelPath": "../sprites/primarymap.png", "iid": "8dfa8982-d7b0-11ee-abff-8d8bbcb225b3", "levelId": 35, "layerDefUid": 2, @@ -4735,7 +4907,7 @@ "__grid": [12,4], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#E43B44", "iid": "0e3e6ca0-d7b0-11ee-abff-edb1f42c3bee", "width": 32, @@ -4751,7 +4923,7 @@ "__grid": [4,6], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 192, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#D77643", "iid": "1c107ad0-d7b0-11ee-abff-d33f908c15de", "width": 32, @@ -4767,7 +4939,7 @@ "__grid": [8,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 0, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#272DC5", "iid": "2659b060-d7b0-11ee-abff-2dc431d02f12", "width": 32, @@ -4783,7 +4955,7 @@ "__grid": [8,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 160, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#A22633", "iid": "298a08c0-d7b0-11ee-abff-eda4f40aa1e8", "width": 32, @@ -4799,7 +4971,7 @@ "__grid": [8,9], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 160, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#A22633", "iid": "358bc3c0-d7b0-11ee-abff-f90f8ab7ecfc", "width": 32, @@ -4815,7 +4987,7 @@ "__grid": [12,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 32, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2F3BBE", "iid": "70b97410-d7b0-11ee-abff-f18b8bf2b599", "width": 32, @@ -4831,7 +5003,7 @@ "__grid": [12,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 128, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#F77622", "iid": "74dda250-d7b0-11ee-abff-9b8a9052793f", "width": 32, @@ -4847,7 +5019,7 @@ "__grid": [12,8], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "7d5ec210-d7b0-11ee-abff-9de92320bc9f", "width": 32, @@ -4863,7 +5035,7 @@ "__grid": [12,9], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 128, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#F77622", "iid": "87d8cba0-d7b0-11ee-abff-9d4169091b3c", "width": 32, @@ -4879,7 +5051,7 @@ "__grid": [14,8], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 96, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#BE4A2F", "iid": "8c94cd10-d7b0-11ee-abff-3922c011412d", "width": 32, @@ -4895,7 +5067,7 @@ "__grid": [14,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 96, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#BE4A2F", "iid": "8e710720-d7b0-11ee-abff-1709fc04d69f", "width": 32, @@ -4911,7 +5083,7 @@ "__grid": [11,4], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 160, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#A22633", "iid": "a14dfa10-d7b0-11ee-abff-7f7a88459f3b", "width": 32, @@ -4927,7 +5099,7 @@ "__grid": [11,6], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "b0bf1240-d7b0-11ee-abff-17c882415fdc", "width": 32, @@ -4949,8 +5121,8 @@ "__opacity": 1, "__pxTotalOffsetX": 0, "__pxTotalOffsetY": 0, - "__tilesetDefUid": 48, - "__tilesetRelPath": "../sprites/tilemap.png", + "__tilesetDefUid": 50, + "__tilesetRelPath": "../sprites/primarymap.png", "iid": "73d3eff2-d7b0-11ee-abff-65b8baa237fd", "levelId": 37, "layerDefUid": 2, @@ -5057,7 +5229,7 @@ "__grid": [6,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 32, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2F3BBE", "iid": "39f17260-d7b0-11ee-abff-6b99ca4b03a1", "width": 32, @@ -5073,7 +5245,7 @@ "__grid": [10,6], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 32, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2F3BBE", "iid": "40b3f230-d7b0-11ee-abff-2fda792ea6a3", "width": 32, @@ -5089,7 +5261,7 @@ "__grid": [10,8], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "4c913540-d7b0-11ee-abff-ef4663dcce24", "width": 32, @@ -5105,7 +5277,7 @@ "__grid": [7,4], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "4f803ee0-d7b0-11ee-abff-93922024d6c9", "width": 32, @@ -5121,7 +5293,7 @@ "__grid": [12,10], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "575407a0-d7b0-11ee-abff-5b03a64a2a83", "width": 32, @@ -5143,8 +5315,8 @@ "__opacity": 1, "__pxTotalOffsetX": 0, "__pxTotalOffsetY": 0, - "__tilesetDefUid": 48, - "__tilesetRelPath": "../sprites/tilemap.png", + "__tilesetDefUid": 50, + "__tilesetRelPath": "../sprites/primarymap.png", "iid": "d89c4d52-d7b0-11ee-abff-af5815dca567", "levelId": 38, "layerDefUid": 2, @@ -5255,7 +5427,7 @@ "__grid": [4,3], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 32, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2F3BBE", "iid": "e887a920-d7b0-11ee-abff-5dce5f76b281", "width": 32, @@ -5271,7 +5443,7 @@ "__grid": [5,3], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 64, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 192, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#D77643", "iid": "ef1472f0-d7b0-11ee-abff-4307328d1d28", "width": 32, @@ -5287,7 +5459,7 @@ "__grid": [15,9], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 32, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#2F3BBE", "iid": "f6d1f490-d7b0-11ee-abff-f5d3bfdc33ea", "width": 32, @@ -5303,7 +5475,7 @@ "__grid": [15,11], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 128, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#F77622", "iid": "fba91f20-d7b0-11ee-abff-dd3dc2e2610d", "width": 32, @@ -5319,7 +5491,7 @@ "__grid": [13,11], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "00ba6c80-d7b0-11ee-abff-7b197ece2945", "width": 32, @@ -5335,7 +5507,7 @@ "__grid": [5,4], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 32, "y": 32, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 224, "y": 384, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "3c285a20-d7b0-11ee-abff-373f4da12c99", "width": 32, @@ -5351,7 +5523,7 @@ "__grid": [14,11], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 1, "x": 0, "y": 96, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 50, "x": 96, "y": 416, "w": 32, "h": 32 }, "__smartColor": "#BE4A2F", "iid": "3fbca470-d7b0-11ee-abff-318ea625a2f5", "width": 32, @@ -5373,8 +5545,8 @@ "__opacity": 1, "__pxTotalOffsetX": 0, "__pxTotalOffsetY": 0, - "__tilesetDefUid": 48, - "__tilesetRelPath": "../sprites/tilemap.png", + "__tilesetDefUid": 50, + "__tilesetRelPath": "../sprites/primarymap.png", "iid": "77fb67a1-d7b0-11ee-abff-fde52a88e8aa", "levelId": 39, "layerDefUid": 2, diff --git a/assets/loader-levels.go b/assets/loader-levels.go index ec59e13..752d5fd 100644 --- a/assets/loader-levels.go +++ b/assets/loader-levels.go @@ -33,6 +33,8 @@ type Tile struct { TileNames []string // same thing, only the names Obstacle bool // is an obstacle/enemy Direction int // obstacle business end shows into this direction + Shader *ebiten.Shader + Alpha *ebiten.Image } func (tile *Tile) Clone() *Tile { @@ -53,6 +55,8 @@ func (tile *Tile) Clone() *Tile { TileNames: tile.TileNames, Obstacle: tile.Obstacle, Direction: tile.Direction, + Alpha: tile.Alpha, + Shader: tile.Shader, } return newtile @@ -158,24 +162,16 @@ func NewTileTranswall(class []string) *Tile { } } -func NewTileHiddenDoor(class []string) *Tile { - sprites := []*ebiten.Image{} - names := []string{} - - for _, sprite := range class { - sprites = append(sprites, Assets[sprite]) - names = append(names, sprite) - } - +func NewTileHiddenDoor(class, alpha string) *Tile { return &Tile{ Id: 'W', Class: "hiddendoor", Solid: false, Renderable: true, Destroyable: true, - Tiles: sprites, - Sprite: sprites[0], // initially use the first - TileNames: names, + Sprite: Assets[class], + Alpha: Assets[alpha], + Shader: Shaders["destruct"], } } @@ -196,15 +192,21 @@ func InitTiles() TileRegistry { "ObstacleWest": NewTileObstacle("obstacle-west", config.West), "ObstacleEast": NewTileObstacle("obstacle-east", config.East), "Particle": NewTileParticle([]string{ - //"particle-ring-1", + "particle-ring-1", "particle-ring-2", "particle-ring-3", "particle-ring-4", "particle-ring-5", "particle-ring-6", }), - "Transient": NewTileTranswall([]string{"transwall", "block-orange-32"}), - "HiddenDoor": NewTileHiddenDoor([]string{"block-greycolored", "block-greycolored-damaged"}), + "Transient": NewTileTranswall([]string{"transwall", "block-orange-32"}), + "HiddenDoor": NewTileHiddenDoor("block-greycolored", "damage"), + "HiddenDoor2": NewTileHiddenDoor("block-greycolored", "damage"), + "HiddenDoor3": NewTileHiddenDoor("block-greycolored", "damage"), + "HiddenDoor4": NewTileHiddenDoor("block-greycolored", "damage"), + "HiddenDoor5": NewTileHiddenDoor("block-greycolored", "damage"), + "HiddenDoor6": NewTileHiddenDoor("block-greycolored", "damage"), + "HiddenDoor7": NewTileHiddenDoor("block-greycolored", "damage"), } } diff --git a/assets/loader-shaders.go b/assets/loader-shaders.go new file mode 100644 index 0000000..ea786fe --- /dev/null +++ b/assets/loader-shaders.go @@ -0,0 +1,49 @@ +package assets + +import ( + "bytes" + "log" + "log/slog" + "path/filepath" + "strings" + + "github.com/hajimehoshi/ebiten/v2" +) + +type ShaderRegistry map[string]*ebiten.Shader + +var Shaders = LoadShaders("shaders") + +func LoadShaders(dir string) ShaderRegistry { + shaders := ShaderRegistry{} + + entries, err := assetfs.ReadDir(dir) + if err != nil { + log.Fatalf("failed to read shaders dir %s: %s", dir, err) + } + + for _, file := range entries { + path := filepath.Join(dir, file.Name()) + fd, err := assetfs.Open(path) + if err != nil { + log.Fatalf("failed to open shader file %s: %s", file.Name(), err) + } + defer fd.Close() + + name := strings.TrimSuffix(file.Name(), ".kg") + + buf := new(bytes.Buffer) + buf.ReadFrom(fd) + + shader, err := ebiten.NewShader([]byte(buf.Bytes())) + if err != nil { + log.Fatal(err) + } + + shaders[name] = shader + + slog.Debug("loaded shader asset", "path", path) + } + + return shaders +} diff --git a/assets/loader-sprites.go b/assets/loader-sprites.go index 1d77d69..90735a3 100644 --- a/assets/loader-sprites.go +++ b/assets/loader-sprites.go @@ -15,7 +15,7 @@ import ( // Maps image name to image data type AssetRegistry map[string]*ebiten.Image -//go:embed sprites/*.png fonts/*.ttf levels/*.ldtk +//go:embed sprites/*.png fonts/*.ttf levels/*.ldtk shaders/*.kg var assetfs embed.FS var Assets = LoadImages("sprites") diff --git a/assets/shaders/destruct.kg b/assets/shaders/destruct.kg new file mode 100644 index 0000000..a4b274a --- /dev/null +++ b/assets/shaders/destruct.kg @@ -0,0 +1,36 @@ +// Copyright 2020 The Ebiten Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//go:build ignore + +//kage:unit pixels + +package main + +var Damaged int + +const HP float = 0 + +func Fragment(_ vec4, texCoord vec2, _ vec4) vec4 { + wallpx := imageSrc0At(texCoord) // A pixel from the wall tile + mask := imageSrc1At(texCoord) // A pixel from the damage mask image + + if Damaged == 1 && (wallpx.a != 0.0 && mask.a != 0.0) { + alpha := clamp(HP+(1.0-mask.a), 0.0, 1.0) + // Create a darker pixel if it's inside a damage mask. + return vec4(wallpx.r*alpha, wallpx.g*alpha, wallpx.b*alpha, wallpx.a) + } + + return wallpx // Otherwise, leave a pixel color as is +} diff --git a/assets/sprites/damage.png b/assets/sprites/damage.png new file mode 100644 index 0000000..ad7e4c8 Binary files /dev/null and b/assets/sprites/damage.png differ diff --git a/assets/sprites/primarymap.png b/assets/sprites/primarymap.png new file mode 100644 index 0000000..0a27cb1 Binary files /dev/null and b/assets/sprites/primarymap.png differ diff --git a/components/components.go b/components/components.go index c4757f9..18b8744 100644 --- a/components/components.go +++ b/components/components.go @@ -7,7 +7,10 @@ import ( // virtual location, aka tile address type Renderable struct { - Image *ebiten.Image + Image *ebiten.Image + DamageImage *ebiten.Image + Damaged int + Shader *ebiten.Shader } type Particle struct { diff --git a/game/levels.go b/game/levels.go index 785c0c5..0dd1068 100644 --- a/game/levels.go +++ b/game/levels.go @@ -52,7 +52,8 @@ func NewLevel(game *Game, cellsize int, plan *ldtkgo.Level) *Level { systemlist = append(systemlist, systems.NewTransientSystem(game.World, gridcontainer)) - systemlist = append(systemlist, systems.NewDestroyableSystem(game.World, gridcontainer)) + systemlist = append(systemlist, systems.NewDestroyableSystem(game.World, gridcontainer, + game.Cellsize)) systemlist = append(systemlist, systems.NewHudSystem(game.World, plan)) @@ -146,7 +147,7 @@ func LevelToSlice(game *Game, level *ldtkgo.Level, tilesize int) (Map, Map) { tile := assets.Tiles["default"] // FIXME: load from LDTK file - tile.Sprite = assets.Assets["tilemap"].SubImage( + tile.Sprite = assets.Assets["primarymap"].SubImage( image.Rect(tileData.Src[0], tileData.Src[1], tileData.Src[0]+layer.GridSize, @@ -163,14 +164,15 @@ func LevelToSlice(game *Game, level *ldtkgo.Level, tilesize int) (Map, Map) { case ldtkgo.LayerTypeEntity: // load mobile tiles (they call them entities) using static map map.png. - tileset := assets.Assets["map"] + tileset := assets.Assets["primarymap"] for _, entity := range layer.Entities { if entity.TileRect != nil { tile := assets.Tiles[entity.Identifier] + slog.Debug("LOAD TILE", "tile", entity.TileRect) + tileRect := entity.TileRect - //slog.Debug("tilerect", "x", tileRect.X, "y", tileRect.Y, "which", entity.Identifier) tile.Sprite = tileset.SubImage( image.Rect(tileRect.X, tileRect.Y, diff --git a/grid/grid.go b/grid/grid.go index 658e451..8cf6a81 100644 --- a/grid/grid.go +++ b/grid/grid.go @@ -109,10 +109,17 @@ func NewGrid(world *ecs.World, entity := doormapper.New() pos, render, destroyable = doormapper.Get(entity) destroyable.Sprites = tile.Tiles + render.DamageImage = tile.Alpha + render.Shader = tile.Shader + render.Damaged = 0 default: log.Fatalln("unsupported tile type encountered") } + // FIXME: this image is never being used because it is + // being overwritten in game/levels.go:LevelToSlice(). The + // image is taken from the LDTK map, not from the Tile{} + // definition anymore render.Image = tile.Sprite default: diff --git a/src/mixed-walls/church_0.png b/src/mixed-walls/church_0.png new file mode 100644 index 0000000..4fd15d9 Binary files /dev/null and b/src/mixed-walls/church_0.png differ diff --git a/src/mixed-walls/church_1.png b/src/mixed-walls/church_1.png new file mode 100644 index 0000000..e43e294 Binary files /dev/null and b/src/mixed-walls/church_1.png differ diff --git a/src/mixed-walls/church_2.png b/src/mixed-walls/church_2.png new file mode 100644 index 0000000..d249b72 Binary files /dev/null and b/src/mixed-walls/church_2.png differ diff --git a/src/mixed-walls/church_3.png b/src/mixed-walls/church_3.png new file mode 100644 index 0000000..2a5ef82 Binary files /dev/null and b/src/mixed-walls/church_3.png differ diff --git a/src/mixed-walls/church_4.png b/src/mixed-walls/church_4.png new file mode 100644 index 0000000..b78822c Binary files /dev/null and b/src/mixed-walls/church_4.png differ diff --git a/src/mixed-walls/cobalt_stone_10.png b/src/mixed-walls/cobalt_stone_10.png new file mode 100644 index 0000000..4ef7ef6 Binary files /dev/null and b/src/mixed-walls/cobalt_stone_10.png differ diff --git a/src/mixed-walls/cobalt_stone_11.png b/src/mixed-walls/cobalt_stone_11.png new file mode 100644 index 0000000..074221b Binary files /dev/null and b/src/mixed-walls/cobalt_stone_11.png differ diff --git a/src/mixed-walls/cobalt_stone_12.png b/src/mixed-walls/cobalt_stone_12.png new file mode 100644 index 0000000..42c9edb Binary files /dev/null and b/src/mixed-walls/cobalt_stone_12.png differ diff --git a/src/mixed-walls/cobalt_stone_6.png b/src/mixed-walls/cobalt_stone_6.png new file mode 100644 index 0000000..dc8d138 Binary files /dev/null and b/src/mixed-walls/cobalt_stone_6.png differ diff --git a/src/mixed-walls/cobalt_stone_7.png b/src/mixed-walls/cobalt_stone_7.png new file mode 100644 index 0000000..13a602e Binary files /dev/null and b/src/mixed-walls/cobalt_stone_7.png differ diff --git a/src/mixed-walls/cobalt_stone_8.png b/src/mixed-walls/cobalt_stone_8.png new file mode 100644 index 0000000..8b38893 Binary files /dev/null and b/src/mixed-walls/cobalt_stone_8.png differ diff --git a/src/mixed-walls/cobalt_stone_9.png b/src/mixed-walls/cobalt_stone_9.png new file mode 100644 index 0000000..072d1a5 Binary files /dev/null and b/src/mixed-walls/cobalt_stone_9.png differ diff --git a/src/mixed-walls/crystal_wall_0.png b/src/mixed-walls/crystal_wall_0.png new file mode 100644 index 0000000..e30f9de Binary files /dev/null and b/src/mixed-walls/crystal_wall_0.png differ diff --git a/src/mixed-walls/crystal_wall_12.png b/src/mixed-walls/crystal_wall_12.png new file mode 100644 index 0000000..5c94477 Binary files /dev/null and b/src/mixed-walls/crystal_wall_12.png differ diff --git a/src/mixed-walls/crystal_wall_1_0.png b/src/mixed-walls/crystal_wall_1_0.png new file mode 100644 index 0000000..ee0f514 Binary files /dev/null and b/src/mixed-walls/crystal_wall_1_0.png differ diff --git a/src/mixed-walls/crystal_wall_4.png b/src/mixed-walls/crystal_wall_4.png new file mode 100644 index 0000000..88780db Binary files /dev/null and b/src/mixed-walls/crystal_wall_4.png differ diff --git a/src/mixed-walls/crystal_wall_6.png b/src/mixed-walls/crystal_wall_6.png new file mode 100644 index 0000000..03ded18 Binary files /dev/null and b/src/mixed-walls/crystal_wall_6.png differ diff --git a/src/mixed-walls/crystal_wall_8.png b/src/mixed-walls/crystal_wall_8.png new file mode 100644 index 0000000..8537a53 Binary files /dev/null and b/src/mixed-walls/crystal_wall_8.png differ diff --git a/src/mixed-walls/crystal_wall_blue.png b/src/mixed-walls/crystal_wall_blue.png new file mode 100644 index 0000000..f497b81 Binary files /dev/null and b/src/mixed-walls/crystal_wall_blue.png differ diff --git a/src/mixed-walls/crystal_wall_brown.png b/src/mixed-walls/crystal_wall_brown.png new file mode 100644 index 0000000..4a9e922 Binary files /dev/null and b/src/mixed-walls/crystal_wall_brown.png differ diff --git a/src/mixed-walls/crystal_wall_cyan.png b/src/mixed-walls/crystal_wall_cyan.png new file mode 100644 index 0000000..a44585f Binary files /dev/null and b/src/mixed-walls/crystal_wall_cyan.png differ diff --git a/src/mixed-walls/crystal_wall_green.png b/src/mixed-walls/crystal_wall_green.png new file mode 100644 index 0000000..a28e964 Binary files /dev/null and b/src/mixed-walls/crystal_wall_green.png differ diff --git a/src/mixed-walls/crystal_wall_lightblue.png b/src/mixed-walls/crystal_wall_lightblue.png new file mode 100644 index 0000000..18125df Binary files /dev/null and b/src/mixed-walls/crystal_wall_lightblue.png differ diff --git a/src/mixed-walls/crystal_wall_lightcyan.png b/src/mixed-walls/crystal_wall_lightcyan.png new file mode 100644 index 0000000..058eb29 Binary files /dev/null and b/src/mixed-walls/crystal_wall_lightcyan.png differ diff --git a/src/mixed-walls/crystal_wall_lightgray.png b/src/mixed-walls/crystal_wall_lightgray.png new file mode 100644 index 0000000..280d0de Binary files /dev/null and b/src/mixed-walls/crystal_wall_lightgray.png differ diff --git a/src/mixed-walls/crystal_wall_lightgreen.png b/src/mixed-walls/crystal_wall_lightgreen.png new file mode 100644 index 0000000..1f4a54f Binary files /dev/null and b/src/mixed-walls/crystal_wall_lightgreen.png differ diff --git a/src/mixed-walls/crystal_wall_lightmagenta.png b/src/mixed-walls/crystal_wall_lightmagenta.png new file mode 100644 index 0000000..a6c63db Binary files /dev/null and b/src/mixed-walls/crystal_wall_lightmagenta.png differ diff --git a/src/mixed-walls/crystal_wall_lightred.png b/src/mixed-walls/crystal_wall_lightred.png new file mode 100644 index 0000000..a75c52f Binary files /dev/null and b/src/mixed-walls/crystal_wall_lightred.png differ diff --git a/src/mixed-walls/crystal_wall_magenta.png b/src/mixed-walls/crystal_wall_magenta.png new file mode 100644 index 0000000..41b7442 Binary files /dev/null and b/src/mixed-walls/crystal_wall_magenta.png differ diff --git a/src/mixed-walls/crystal_wall_red.png b/src/mixed-walls/crystal_wall_red.png new file mode 100644 index 0000000..9294c98 Binary files /dev/null and b/src/mixed-walls/crystal_wall_red.png differ diff --git a/src/mixed-walls/crystal_wall_white.png b/src/mixed-walls/crystal_wall_white.png new file mode 100644 index 0000000..9263ae8 Binary files /dev/null and b/src/mixed-walls/crystal_wall_white.png differ diff --git a/src/mixed-walls/crystal_wall_yellow.png b/src/mixed-walls/crystal_wall_yellow.png new file mode 100644 index 0000000..d853f15 Binary files /dev/null and b/src/mixed-walls/crystal_wall_yellow.png differ diff --git a/src/mixed-walls/emerald_1.png b/src/mixed-walls/emerald_1.png new file mode 100644 index 0000000..bb4ee3b Binary files /dev/null and b/src/mixed-walls/emerald_1.png differ diff --git a/src/mixed-walls/emerald_2.png b/src/mixed-walls/emerald_2.png new file mode 100644 index 0000000..762c659 Binary files /dev/null and b/src/mixed-walls/emerald_2.png differ diff --git a/src/mixed-walls/emerald_3.png b/src/mixed-walls/emerald_3.png new file mode 100644 index 0000000..56cbb1f Binary files /dev/null and b/src/mixed-walls/emerald_3.png differ diff --git a/src/mixed-walls/emerald_4.png b/src/mixed-walls/emerald_4.png new file mode 100644 index 0000000..a404651 Binary files /dev/null and b/src/mixed-walls/emerald_4.png differ diff --git a/src/mixed-walls/emerald_5.png b/src/mixed-walls/emerald_5.png new file mode 100644 index 0000000..d682d27 Binary files /dev/null and b/src/mixed-walls/emerald_5.png differ diff --git a/src/mixed-walls/emerald_6.png b/src/mixed-walls/emerald_6.png new file mode 100644 index 0000000..e9e9f2c Binary files /dev/null and b/src/mixed-walls/emerald_6.png differ diff --git a/src/mixed-walls/emerald_8.png b/src/mixed-walls/emerald_8.png new file mode 100644 index 0000000..a33f8f6 Binary files /dev/null and b/src/mixed-walls/emerald_8.png differ diff --git a/src/mixed-walls/lab-metal_0.png b/src/mixed-walls/lab-metal_0.png new file mode 100644 index 0000000..847b09e Binary files /dev/null and b/src/mixed-walls/lab-metal_0.png differ diff --git a/src/mixed-walls/lab-metal_1.png b/src/mixed-walls/lab-metal_1.png new file mode 100644 index 0000000..2a20f11 Binary files /dev/null and b/src/mixed-walls/lab-metal_1.png differ diff --git a/src/mixed-walls/lab-metal_2.png b/src/mixed-walls/lab-metal_2.png new file mode 100644 index 0000000..94a26f2 Binary files /dev/null and b/src/mixed-walls/lab-metal_2.png differ diff --git a/src/mixed-walls/lab-metal_3.png b/src/mixed-walls/lab-metal_3.png new file mode 100644 index 0000000..92dc346 Binary files /dev/null and b/src/mixed-walls/lab-metal_3.png differ diff --git a/src/mixed-walls/lab-metal_4.png b/src/mixed-walls/lab-metal_4.png new file mode 100644 index 0000000..f86f0a7 Binary files /dev/null and b/src/mixed-walls/lab-metal_4.png differ diff --git a/src/mixed-walls/lab-stone_0.png b/src/mixed-walls/lab-stone_0.png new file mode 100644 index 0000000..0377b45 Binary files /dev/null and b/src/mixed-walls/lab-stone_0.png differ diff --git a/src/mixed-walls/lab-stone_1.png b/src/mixed-walls/lab-stone_1.png new file mode 100644 index 0000000..d2bece1 Binary files /dev/null and b/src/mixed-walls/lab-stone_1.png differ diff --git a/src/mixed-walls/lab-stone_2.png b/src/mixed-walls/lab-stone_2.png new file mode 100644 index 0000000..4f00a61 Binary files /dev/null and b/src/mixed-walls/lab-stone_2.png differ diff --git a/src/mixed-walls/marble_wall_1.png b/src/mixed-walls/marble_wall_1.png new file mode 100644 index 0000000..b974b51 Binary files /dev/null and b/src/mixed-walls/marble_wall_1.png differ diff --git a/src/mixed-walls/marble_wall_10.png b/src/mixed-walls/marble_wall_10.png new file mode 100644 index 0000000..cc9aeb9 Binary files /dev/null and b/src/mixed-walls/marble_wall_10.png differ diff --git a/src/mixed-walls/marble_wall_11.png b/src/mixed-walls/marble_wall_11.png new file mode 100644 index 0000000..7b0cbf9 Binary files /dev/null and b/src/mixed-walls/marble_wall_11.png differ diff --git a/src/mixed-walls/marble_wall_12.png b/src/mixed-walls/marble_wall_12.png new file mode 100644 index 0000000..6ed676b Binary files /dev/null and b/src/mixed-walls/marble_wall_12.png differ diff --git a/src/mixed-walls/marble_wall_2.png b/src/mixed-walls/marble_wall_2.png new file mode 100644 index 0000000..f62557e Binary files /dev/null and b/src/mixed-walls/marble_wall_2.png differ diff --git a/src/mixed-walls/marble_wall_3.png b/src/mixed-walls/marble_wall_3.png new file mode 100644 index 0000000..175a9d3 Binary files /dev/null and b/src/mixed-walls/marble_wall_3.png differ diff --git a/src/mixed-walls/marble_wall_4.png b/src/mixed-walls/marble_wall_4.png new file mode 100644 index 0000000..a815b24 Binary files /dev/null and b/src/mixed-walls/marble_wall_4.png differ diff --git a/src/mixed-walls/marble_wall_5.png b/src/mixed-walls/marble_wall_5.png new file mode 100644 index 0000000..3744dfd Binary files /dev/null and b/src/mixed-walls/marble_wall_5.png differ diff --git a/src/mixed-walls/marble_wall_6.png b/src/mixed-walls/marble_wall_6.png new file mode 100644 index 0000000..af7e7a6 Binary files /dev/null and b/src/mixed-walls/marble_wall_6.png differ diff --git a/src/mixed-walls/marble_wall_7.png b/src/mixed-walls/marble_wall_7.png new file mode 100644 index 0000000..8a530ca Binary files /dev/null and b/src/mixed-walls/marble_wall_7.png differ diff --git a/src/mixed-walls/marble_wall_8.png b/src/mixed-walls/marble_wall_8.png new file mode 100644 index 0000000..7ca71c7 Binary files /dev/null and b/src/mixed-walls/marble_wall_8.png differ diff --git a/src/mixed-walls/marble_wall_9.png b/src/mixed-walls/marble_wall_9.png new file mode 100644 index 0000000..f346259 Binary files /dev/null and b/src/mixed-walls/marble_wall_9.png differ diff --git a/src/mixed-walls/permarock_red_0.png b/src/mixed-walls/permarock_red_0.png new file mode 100644 index 0000000..c8a8e4c Binary files /dev/null and b/src/mixed-walls/permarock_red_0.png differ diff --git a/src/mixed-walls/relief_0.png b/src/mixed-walls/relief_0.png new file mode 100644 index 0000000..8f4b720 Binary files /dev/null and b/src/mixed-walls/relief_0.png differ diff --git a/src/mixed-walls/relief_1.png b/src/mixed-walls/relief_1.png new file mode 100644 index 0000000..b13044f Binary files /dev/null and b/src/mixed-walls/relief_1.png differ diff --git a/src/mixed-walls/relief_2.png b/src/mixed-walls/relief_2.png new file mode 100644 index 0000000..41a6e50 Binary files /dev/null and b/src/mixed-walls/relief_2.png differ diff --git a/src/mixed-walls/relief_3.png b/src/mixed-walls/relief_3.png new file mode 100644 index 0000000..3698ab7 Binary files /dev/null and b/src/mixed-walls/relief_3.png differ diff --git a/src/mixed-walls/relief_brown_0.png b/src/mixed-walls/relief_brown_0.png new file mode 100644 index 0000000..3948baa Binary files /dev/null and b/src/mixed-walls/relief_brown_0.png differ diff --git a/src/mixed-walls/relief_brown_1.png b/src/mixed-walls/relief_brown_1.png new file mode 100644 index 0000000..0ec7308 Binary files /dev/null and b/src/mixed-walls/relief_brown_1.png differ diff --git a/src/mixed-walls/relief_brown_2.png b/src/mixed-walls/relief_brown_2.png new file mode 100644 index 0000000..9748898 Binary files /dev/null and b/src/mixed-walls/relief_brown_2.png differ diff --git a/src/mixed-walls/relief_brown_3.png b/src/mixed-walls/relief_brown_3.png new file mode 100644 index 0000000..0107fac Binary files /dev/null and b/src/mixed-walls/relief_brown_3.png differ diff --git a/src/mixed-walls/slime_stone_0.png b/src/mixed-walls/slime_stone_0.png new file mode 100644 index 0000000..82f3098 Binary files /dev/null and b/src/mixed-walls/slime_stone_0.png differ diff --git a/src/mixed-walls/slime_stone_1.png b/src/mixed-walls/slime_stone_1.png new file mode 100644 index 0000000..250a9a7 Binary files /dev/null and b/src/mixed-walls/slime_stone_1.png differ diff --git a/src/mixed-walls/slime_stone_2.png b/src/mixed-walls/slime_stone_2.png new file mode 100644 index 0000000..d8cd558 Binary files /dev/null and b/src/mixed-walls/slime_stone_2.png differ diff --git a/src/mixed-walls/stone2_brown_2_new.png b/src/mixed-walls/stone2_brown_2_new.png new file mode 100644 index 0000000..a16eac9 Binary files /dev/null and b/src/mixed-walls/stone2_brown_2_new.png differ diff --git a/src/mixed-walls/stone2_brown_2_old.png b/src/mixed-walls/stone2_brown_2_old.png new file mode 100644 index 0000000..67b967a Binary files /dev/null and b/src/mixed-walls/stone2_brown_2_old.png differ diff --git a/src/mixed-walls/stone2_brown_3_new.png b/src/mixed-walls/stone2_brown_3_new.png new file mode 100644 index 0000000..bfe6701 Binary files /dev/null and b/src/mixed-walls/stone2_brown_3_new.png differ diff --git a/src/mixed-walls/stone2_brown_3_old.png b/src/mixed-walls/stone2_brown_3_old.png new file mode 100644 index 0000000..1ff9c97 Binary files /dev/null and b/src/mixed-walls/stone2_brown_3_old.png differ diff --git a/src/mixed-walls/stone2_dark_2_new.png b/src/mixed-walls/stone2_dark_2_new.png new file mode 100644 index 0000000..9bcf374 Binary files /dev/null and b/src/mixed-walls/stone2_dark_2_new.png differ diff --git a/src/mixed-walls/stone2_dark_2_old.png b/src/mixed-walls/stone2_dark_2_old.png new file mode 100644 index 0000000..427b698 Binary files /dev/null and b/src/mixed-walls/stone2_dark_2_old.png differ diff --git a/src/mixed-walls/stone2_dark_3_new.png b/src/mixed-walls/stone2_dark_3_new.png new file mode 100644 index 0000000..7e31f3b Binary files /dev/null and b/src/mixed-walls/stone2_dark_3_new.png differ diff --git a/src/mixed-walls/stone2_dark_3_old.png b/src/mixed-walls/stone2_dark_3_old.png new file mode 100644 index 0000000..c0d37e6 Binary files /dev/null and b/src/mixed-walls/stone2_dark_3_old.png differ diff --git a/src/mixed-walls/stone2_gray_2_new.png b/src/mixed-walls/stone2_gray_2_new.png new file mode 100644 index 0000000..777fc1d Binary files /dev/null and b/src/mixed-walls/stone2_gray_2_new.png differ diff --git a/src/mixed-walls/stone2_gray_2_old.png b/src/mixed-walls/stone2_gray_2_old.png new file mode 100644 index 0000000..95d80b7 Binary files /dev/null and b/src/mixed-walls/stone2_gray_2_old.png differ diff --git a/src/mixed-walls/stone2_gray_3_new.png b/src/mixed-walls/stone2_gray_3_new.png new file mode 100644 index 0000000..5a26bb4 Binary files /dev/null and b/src/mixed-walls/stone2_gray_3_new.png differ diff --git a/src/mixed-walls/stone2_gray_3_old.png b/src/mixed-walls/stone2_gray_3_old.png new file mode 100644 index 0000000..37148fc Binary files /dev/null and b/src/mixed-walls/stone2_gray_3_old.png differ diff --git a/src/mixed-walls/stone_2_brown0.png b/src/mixed-walls/stone_2_brown0.png new file mode 100644 index 0000000..30be714 Binary files /dev/null and b/src/mixed-walls/stone_2_brown0.png differ diff --git a/src/mixed-walls/stone_2_brown1.png b/src/mixed-walls/stone_2_brown1.png new file mode 100644 index 0000000..935a412 Binary files /dev/null and b/src/mixed-walls/stone_2_brown1.png differ diff --git a/src/mixed-walls/stone_2_brown_0.png b/src/mixed-walls/stone_2_brown_0.png new file mode 100644 index 0000000..d4bdb5a Binary files /dev/null and b/src/mixed-walls/stone_2_brown_0.png differ diff --git a/src/mixed-walls/stone_2_brown_1.png b/src/mixed-walls/stone_2_brown_1.png new file mode 100644 index 0000000..53e64d6 Binary files /dev/null and b/src/mixed-walls/stone_2_brown_1.png differ diff --git a/src/mixed-walls/stone_2_dark0.png b/src/mixed-walls/stone_2_dark0.png new file mode 100644 index 0000000..c03234e Binary files /dev/null and b/src/mixed-walls/stone_2_dark0.png differ diff --git a/src/mixed-walls/stone_2_dark1.png b/src/mixed-walls/stone_2_dark1.png new file mode 100644 index 0000000..41e95f5 Binary files /dev/null and b/src/mixed-walls/stone_2_dark1.png differ diff --git a/src/mixed-walls/stone_2_dark_0.png b/src/mixed-walls/stone_2_dark_0.png new file mode 100644 index 0000000..f80422b Binary files /dev/null and b/src/mixed-walls/stone_2_dark_0.png differ diff --git a/src/mixed-walls/stone_2_dark_1.png b/src/mixed-walls/stone_2_dark_1.png new file mode 100644 index 0000000..aa7733b Binary files /dev/null and b/src/mixed-walls/stone_2_dark_1.png differ diff --git a/src/mixed-walls/stone_2_gray0.png b/src/mixed-walls/stone_2_gray0.png new file mode 100644 index 0000000..7ee3eb7 Binary files /dev/null and b/src/mixed-walls/stone_2_gray0.png differ diff --git a/src/mixed-walls/stone_2_gray1.png b/src/mixed-walls/stone_2_gray1.png new file mode 100644 index 0000000..b451a33 Binary files /dev/null and b/src/mixed-walls/stone_2_gray1.png differ diff --git a/src/mixed-walls/stone_2_gray_0.png b/src/mixed-walls/stone_2_gray_0.png new file mode 100644 index 0000000..fd04eba Binary files /dev/null and b/src/mixed-walls/stone_2_gray_0.png differ diff --git a/src/mixed-walls/stone_2_gray_1.png b/src/mixed-walls/stone_2_gray_1.png new file mode 100644 index 0000000..9c8738b Binary files /dev/null and b/src/mixed-walls/stone_2_gray_1.png differ diff --git a/src/mixed-walls/stone_dark_0.png b/src/mixed-walls/stone_dark_0.png new file mode 100644 index 0000000..f5c288a Binary files /dev/null and b/src/mixed-walls/stone_dark_0.png differ diff --git a/src/mixed-walls/stone_dark_1.png b/src/mixed-walls/stone_dark_1.png new file mode 100644 index 0000000..edd8369 Binary files /dev/null and b/src/mixed-walls/stone_dark_1.png differ diff --git a/src/mixed-walls/stone_dark_2.png b/src/mixed-walls/stone_dark_2.png new file mode 100644 index 0000000..90eac15 Binary files /dev/null and b/src/mixed-walls/stone_dark_2.png differ diff --git a/src/mixed-walls/stone_dark_3.png b/src/mixed-walls/stone_dark_3.png new file mode 100644 index 0000000..0cbf16d Binary files /dev/null and b/src/mixed-walls/stone_dark_3.png differ diff --git a/src/mixed-walls/stone_gray_0.png b/src/mixed-walls/stone_gray_0.png new file mode 100644 index 0000000..1d67f59 Binary files /dev/null and b/src/mixed-walls/stone_gray_0.png differ diff --git a/src/mixed-walls/stone_gray_1.png b/src/mixed-walls/stone_gray_1.png new file mode 100644 index 0000000..c5e8a8b Binary files /dev/null and b/src/mixed-walls/stone_gray_1.png differ diff --git a/src/mixed-walls/stone_gray_2.png b/src/mixed-walls/stone_gray_2.png new file mode 100644 index 0000000..5180dc2 Binary files /dev/null and b/src/mixed-walls/stone_gray_2.png differ diff --git a/src/mixed-walls/stone_gray_3.png b/src/mixed-walls/stone_gray_3.png new file mode 100644 index 0000000..2b2386a Binary files /dev/null and b/src/mixed-walls/stone_gray_3.png differ diff --git a/src/primarymap.xcf b/src/primarymap.xcf new file mode 100644 index 0000000..fe27186 Binary files /dev/null and b/src/primarymap.xcf differ diff --git a/systems/destroyable_system.go b/systems/destroyable_system.go index 3964388..a7000b2 100644 --- a/systems/destroyable_system.go +++ b/systems/destroyable_system.go @@ -23,6 +23,7 @@ type DestroyableSystem struct { components.Renderable, components.Tilish, components.Solid] + Cellsize int } type DoorToRemove struct { @@ -30,7 +31,9 @@ type DoorToRemove struct { Position *components.Position } -func NewDestroyableSystem(world *ecs.World, gridcontainer *grid.GridContainer) System { +func NewDestroyableSystem(world *ecs.World, gridcontainer *grid.GridContainer, + cellsize int) System { + solidmapper := generic.NewMap4[ components.Position, components.Renderable, @@ -42,6 +45,7 @@ func NewDestroyableSystem(world *ecs.World, gridcontainer *grid.GridContainer) S World: world, GridContainer: gridcontainer, SolidMapper: solidmapper, + Cellsize: cellsize, } return system @@ -81,7 +85,7 @@ func (system *DestroyableSystem) Update() error { } else { slog.Debug("activating destroyable", "doorpos", doorposition) door.Activated = true - renderable.Image = door.GetNext() + renderable.Damaged = 1 } } } @@ -99,14 +103,24 @@ func (system *DestroyableSystem) Update() error { func (system *DestroyableSystem) Draw(screen *ebiten.Image) { // write transients (these are no tiles!) - op := &ebiten.DrawImageOptions{} + op := &ebiten.DrawRectShaderOptions{} + query := system.Selector.Query(system.World) for query.Next() { pos, render, _ := query.Get() op.GeoM.Reset() + + op.Uniforms = map[string]any{ + "Damaged": render.Damaged, + } + + op.Images[0] = render.Image + op.Images[1] = render.DamageImage + op.GeoM.Translate(float64(pos.X), float64(pos.Y)) - screen.DrawImage(render.Image, op) + + screen.DrawRectShader(system.Cellsize, system.Cellsize, render.Shader, op) } }