diff --git a/TODO.md b/TODO.md index b9559db..6f5a2f7 100644 --- a/TODO.md +++ b/TODO.md @@ -29,9 +29,14 @@ - Player can collect collectible hidden under obstacle (should be fixed when above is fixed) -- Remove Sprite from Tile{}, not used anymore +- Get rid of particle system, rather add an animation component, which + determines if an animation must be played according to LDTK entity + settings. Say, something like a boolean value "DetonateAfterHit", if + true, we load the sprites specified in the string value + "AnimationSpritesPattern", where we could have something like + "collectible-detonating*.png" or we could use an animation map and + specify a list of coordinates, etcpp. -- Implement pair_system using switch+door, relation is already setup, see grid:189 ## Collider Rework [abandoned: see branch collider-system, fails] diff --git a/assets/levels/openquell.ldtk b/assets/levels/openquell.ldtk index d249cd0..f0cf787 100644 --- a/assets/levels/openquell.ldtk +++ b/assets/levels/openquell.ldtk @@ -207,7 +207,7 @@ "showName": true, "tilesetId": 57, "tileRenderMode": "FitInside", - "tileRect": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "tileRect": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "uiTileRect": null, "nineSliceBorders": [], "maxCount": 0, @@ -1153,7 +1153,7 @@ { "__cWid": 8, "__cHei": 14, - "identifier": "Primarymap", + "identifier": "Tilemap", "uid": 50, "relPath": "../sprites/primarymap.png", "embedAtlas": null, @@ -1173,14 +1173,14 @@ } }, { - "__cWid": 4, - "__cHei": 7, + "__cWid": 8, + "__cHei": 14, "identifier": "Entitymap", "uid": 57, "relPath": "../sprites/entitymap.png", "embedAtlas": null, - "pxWid": 128, - "pxHei": 224, + "pxWid": 256, + "pxHei": 448, "tileGridSize": 32, "spacing": 0, "padding": 0, @@ -1190,8 +1190,8 @@ "customData": [], "savedSelections": [], "cachedPixelData": { - "opaqueTiles": "0000000001111111111111000000", - "averageColors": "1b47987d687d3b355c355c355c355c353c96faa8f166f299f5b7f853f799f777f222f888f444f765f555f532e866ab85000000003743aa95" + "opaqueTiles": "0000000000000000011100001111000011110000110000000000000000000000000000000000000000000000000000000000000000000000", + "averageColors": "1b47987d687d3b3507430a531a7419745c355c355c355c350ba40b851b851a753c96faa8f166f29907430a531ca81ba8f5b7f853f799f7770ba40b851cb91ca9f222f888f444f7650a630b831dcb1dcbf555f532e866ab850ca50b851ddb1dcb5a7500003743aa9509640a742ddc2ddc00000000000000000b950a752ddc2ddc00000000000000001a740a742dca1dcb00000000000000001b951a751ddb2cba00000000000000001a741a741a741a7400000000000000001b951a751b951a7500000000000000001a741a751a741a7400000000000000001b951a751b951a75" } } ], "enums": [], "externalEnums": [], "levelFields": [ @@ -1422,7 +1422,7 @@ "__grid": [11,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "f2b2ff50-d7b0-11ee-98fb-b34c447bc14d", "width": 32, @@ -1438,7 +1438,7 @@ "__grid": [9,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "5dbb7c20-d7b0-11ee-84a6-d1c69ca7fab5", "width": 32, @@ -1454,7 +1454,7 @@ "__grid": [12,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "b3028a20-d7b0-11ee-84a6-e73fb360996b", "width": 32, @@ -1606,7 +1606,7 @@ "__grid": [4,9], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "a1dfb440-d7b0-11ee-98fb-933f35aeb72b", "width": 32, @@ -1622,7 +1622,7 @@ "__grid": [15,6], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "4fe334b0-d7b0-11ee-8ccf-131b7b178844", "width": 32, @@ -1779,7 +1779,7 @@ "__grid": [3,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "6b04ac30-d7b0-11ee-8ccf-cf7206025bb7", "width": 32, @@ -1899,7 +1899,7 @@ "__grid": [14,4], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "abd59430-d7b0-11ee-8ccf-2f5d9e97d1c2", "width": 32, @@ -1915,7 +1915,7 @@ "__grid": [4,12], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "0bca9cc0-d7b0-11ee-bb29-030d1778ceb9", "width": 32, @@ -2088,7 +2088,7 @@ "__grid": [9,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "a39b8830-d7b0-11ee-8ccf-4734d5e9d2c9", "width": 32, @@ -2152,7 +2152,7 @@ "__grid": [11,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "dcdf1bc0-d7b0-11ee-8ccf-b55f8ddc98bc", "width": 32, @@ -2342,7 +2342,7 @@ "__grid": [9,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "8b1ab9f0-d7b0-11ee-8ccf-958757e1394a", "width": 32, @@ -2564,7 +2564,7 @@ "__grid": [3,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "af4816f0-d7b0-11ee-8ccf-f707f0bee477", "width": 32, @@ -2612,7 +2612,7 @@ "__grid": [10,11], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "23632480-d7b0-11ee-8ccf-d163eddfc1d8", "width": 32, @@ -2644,7 +2644,7 @@ "__grid": [4,4], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "3661f750-d7b0-11ee-8ccf-bb2cd30d54aa", "width": 32, @@ -2824,7 +2824,7 @@ "__grid": [7,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "53aec530-d7b0-11ee-8ccf-f3b9ab85d060", "width": 32, @@ -2856,7 +2856,7 @@ "__grid": [13,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "8b150d40-d7b0-11ee-8ccf-fd95c8bcb1ea", "width": 32, @@ -2904,7 +2904,7 @@ "__grid": [9,9], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "d7caa7d0-d7b0-11ee-8ccf-a7060a56511e", "width": 32, @@ -3082,7 +3082,7 @@ "__grid": [5,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "d059ca20-d7b0-11ee-8ccf-4bf2422f5f59", "width": 32, @@ -3098,7 +3098,7 @@ "__grid": [6,9], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "d4400500-d7b0-11ee-8ccf-2d065d1c4ab1", "width": 32, @@ -3302,7 +3302,7 @@ "__grid": [11,9], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "da1ecec0-d7b0-11ee-ae12-f7f9886ed1cd", "width": 32, @@ -3554,7 +3554,7 @@ "__grid": [13,9], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "594c24a0-d7b0-11ee-9466-6127ba975759", "width": 32, @@ -3602,7 +3602,7 @@ "__grid": [13,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "b6846e70-d7b0-11ee-9466-970fd010c48c", "width": 32, @@ -3910,7 +3910,7 @@ "__grid": [6,8], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "577e6220-d7b0-11ee-9466-298e82b77210", "width": 32, @@ -4106,7 +4106,7 @@ "__grid": [10,6], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "d8b1ae50-d7b0-11ee-9466-a115ca8ca9a5", "width": 32, @@ -4122,7 +4122,7 @@ "__grid": [9,8], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "d9a2c510-d7b0-11ee-9466-bfc4c6a038ad", "width": 32, @@ -4138,7 +4138,7 @@ "__grid": [11,8], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "da384e50-d7b0-11ee-9466-db659c31cf29", "width": 32, @@ -4362,7 +4362,7 @@ "__grid": [5,10], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "d7c4aba0-d7b0-11ee-abff-e3d544dbcc82", "width": 32, @@ -4378,7 +4378,7 @@ "__grid": [6,10], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "d8bc2b00-d7b0-11ee-abff-ad5e8ed6b553", "width": 32, @@ -4410,7 +4410,7 @@ "__grid": [13,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "07ebf0e0-d7b0-11ee-abff-798296fd50b0", "width": 32, @@ -4616,7 +4616,7 @@ "__grid": [15,10], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "0bf5c3e0-d7b0-11ee-abff-9b99ef5a36bd", "width": 32, @@ -4648,7 +4648,7 @@ "__grid": [9,6], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "4e1d7ec0-d7b0-11ee-abff-259725ea147a", "width": 32, @@ -4680,7 +4680,7 @@ "__grid": [11,4], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "3d936000-d7b0-11ee-abff-c5bd27851004", "width": 32, @@ -4696,7 +4696,7 @@ "__grid": [6,9], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "401db460-d7b0-11ee-abff-df18cc278d81", "width": 32, @@ -5099,7 +5099,7 @@ "__grid": [7,6], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "c14dcc40-d7b0-11ee-abff-bd1799f8848d", "width": 32, @@ -5262,7 +5262,7 @@ "__grid": [8,7], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "4cd3f580-d7b0-11ee-abff-ddf515ed4adc", "width": 32, @@ -5518,7 +5518,7 @@ "__grid": [12,8], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "7d5ec210-d7b0-11ee-abff-9de92320bc9f", "width": 32, @@ -5598,7 +5598,7 @@ "__grid": [11,6], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "b0bf1240-d7b0-11ee-abff-17c882415fdc", "width": 32, @@ -5760,7 +5760,7 @@ "__grid": [10,8], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "4c913540-d7b0-11ee-abff-ef4663dcce24", "width": 32, @@ -5776,7 +5776,7 @@ "__grid": [7,4], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "4f803ee0-d7b0-11ee-abff-93922024d6c9", "width": 32, @@ -5792,7 +5792,7 @@ "__grid": [12,10], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "575407a0-d7b0-11ee-abff-5b03a64a2a83", "width": 32, @@ -5990,7 +5990,7 @@ "__grid": [13,11], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "00ba6c80-d7b0-11ee-abff-7b197ece2945", "width": 32, @@ -6006,7 +6006,7 @@ "__grid": [5,4], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "3c285a20-d7b0-11ee-abff-373f4da12c99", "width": 32, @@ -6248,7 +6248,7 @@ "__grid": [5,5], "__pivot": [0,0], "__tags": [], - "__tile": { "tilesetUid": 57, "x": 0, "y": 64, "w": 32, "h": 32 }, + "__tile": { "tilesetUid": 57, "x": 0, "y": 192, "w": 32, "h": 32 }, "__smartColor": "#FEAE34", "iid": "a056be00-d7b0-11ee-9add-01e4d4e8f475", "width": 32, diff --git a/assets/loader-levels.go b/assets/loader-levels.go index 1a46435..df6b5d4 100644 --- a/assets/loader-levels.go +++ b/assets/loader-levels.go @@ -193,12 +193,21 @@ func InitTiles() TileRegistry { "ObstacleWest": NewTileObstacle(config.West), "ObstacleEast": NewTileObstacle(config.East), "Particle": NewTileParticle([]string{ - "particle-ring-1", - "particle-ring-2", - "particle-ring-3", - "particle-ring-4", - "particle-ring-5", - "particle-ring-6", + "collectible-detonating1", + "collectible-detonating2", + "collectible-detonating3", + "collectible-detonating4", + "collectible-detonating5", + "collectible-detonating6", + "collectible-detonating7", + "collectible-detonating8", + "collectible-detonating9", + "collectible-detonating10", + "collectible-detonating11", + "collectible-detonating12", + "collectible-detonating13", + "collectible-detonating14", + "collectible-detonating15", }), "Transient": NewTileTranswall(), "HiddenDoor": NewTileHiddenDoor("damage"), diff --git a/assets/sprites/collectible-detonating.ase b/assets/sprites/collectible-detonating.ase new file mode 100644 index 0000000..8b64fb0 Binary files /dev/null and b/assets/sprites/collectible-detonating.ase differ diff --git a/assets/sprites/collectible-detonating1.png b/assets/sprites/collectible-detonating1.png new file mode 100644 index 0000000..43936fc Binary files /dev/null and b/assets/sprites/collectible-detonating1.png differ diff --git a/assets/sprites/collectible-detonating10.png b/assets/sprites/collectible-detonating10.png new file mode 100644 index 0000000..812b751 Binary files /dev/null and b/assets/sprites/collectible-detonating10.png differ diff --git a/assets/sprites/collectible-detonating11.png b/assets/sprites/collectible-detonating11.png new file mode 100644 index 0000000..ee089af Binary files /dev/null and b/assets/sprites/collectible-detonating11.png differ diff --git a/assets/sprites/collectible-detonating12.png b/assets/sprites/collectible-detonating12.png new file mode 100644 index 0000000..6d98ec6 Binary files /dev/null and b/assets/sprites/collectible-detonating12.png differ diff --git a/assets/sprites/collectible-detonating13.png b/assets/sprites/collectible-detonating13.png new file mode 100644 index 0000000..bced4ea Binary files /dev/null and b/assets/sprites/collectible-detonating13.png differ diff --git a/assets/sprites/collectible-detonating14.png b/assets/sprites/collectible-detonating14.png new file mode 100644 index 0000000..d070759 Binary files /dev/null and b/assets/sprites/collectible-detonating14.png differ diff --git a/assets/sprites/collectible-detonating15.png b/assets/sprites/collectible-detonating15.png new file mode 100644 index 0000000..2975c47 Binary files /dev/null and b/assets/sprites/collectible-detonating15.png differ diff --git a/assets/sprites/collectible-detonating2.png b/assets/sprites/collectible-detonating2.png new file mode 100644 index 0000000..5ccb7e5 Binary files /dev/null and b/assets/sprites/collectible-detonating2.png differ diff --git a/assets/sprites/collectible-detonating3.png b/assets/sprites/collectible-detonating3.png new file mode 100644 index 0000000..a6da1e3 Binary files /dev/null and b/assets/sprites/collectible-detonating3.png differ diff --git a/assets/sprites/collectible-detonating4.png b/assets/sprites/collectible-detonating4.png new file mode 100644 index 0000000..4cfdb09 Binary files /dev/null and b/assets/sprites/collectible-detonating4.png differ diff --git a/assets/sprites/collectible-detonating5.png b/assets/sprites/collectible-detonating5.png new file mode 100644 index 0000000..64b727d Binary files /dev/null and b/assets/sprites/collectible-detonating5.png differ diff --git a/assets/sprites/collectible-detonating6.png b/assets/sprites/collectible-detonating6.png new file mode 100644 index 0000000..d19f62a Binary files /dev/null and b/assets/sprites/collectible-detonating6.png differ diff --git a/assets/sprites/collectible-detonating7.png b/assets/sprites/collectible-detonating7.png new file mode 100644 index 0000000..df36726 Binary files /dev/null and b/assets/sprites/collectible-detonating7.png differ diff --git a/assets/sprites/collectible-detonating8.png b/assets/sprites/collectible-detonating8.png new file mode 100644 index 0000000..7d088f2 Binary files /dev/null and b/assets/sprites/collectible-detonating8.png differ diff --git a/assets/sprites/collectible-detonating9.png b/assets/sprites/collectible-detonating9.png new file mode 100644 index 0000000..3ba4503 Binary files /dev/null and b/assets/sprites/collectible-detonating9.png differ diff --git a/assets/sprites/collectible.ase b/assets/sprites/collectible.ase new file mode 100644 index 0000000..e1a441e Binary files /dev/null and b/assets/sprites/collectible.ase differ diff --git a/assets/sprites/collectible.png b/assets/sprites/collectible.png new file mode 100644 index 0000000..4823780 Binary files /dev/null and b/assets/sprites/collectible.png differ diff --git a/assets/sprites/entitymap.png b/assets/sprites/entitymap.png index d4a8753..dcbe29d 100644 Binary files a/assets/sprites/entitymap.png and b/assets/sprites/entitymap.png differ diff --git a/components/timer.go b/components/timer.go index 38f7ffc..b315268 100644 --- a/components/timer.go +++ b/components/timer.go @@ -19,6 +19,8 @@ func NewTimer() *Timer { } func (timer *Timer) Start(duration time.Duration) { + timer.Reset() + min := int(1000 / ebiten.TPS()) // 16.66ms == 1 tick dur := duration diff --git a/config/static.go b/config/static.go index 4517b06..a5d8f62 100644 --- a/config/static.go +++ b/config/static.go @@ -14,10 +14,11 @@ const ( ) const ( - PLAYERSPEED int = 5 - PARTICLE_LOOPWAIT time.Duration = 250 * time.Millisecond - LEVEL_END_WAIT time.Duration = 500 * time.Millisecond - version string = "1.2.3" + PLAYERSPEED int = 5 + PARTICLE_STARTWAIT time.Duration = 30 * time.Millisecond // how long to wait to start collectible particle + PARTICLE_LOOPWAIT time.Duration = 40 * time.Millisecond // how much time to wait between the sprites + LEVEL_END_WAIT time.Duration = 500 * time.Millisecond + version string = "1.2.3" MenuRectX int = 600 MenuRectY int = 0 diff --git a/src/entitymap.xcf b/src/entitymap.xcf index 779d134..f75c1ac 100644 Binary files a/src/entitymap.xcf and b/src/entitymap.xcf differ diff --git a/systems/collectible_system.go b/systems/collectible_system.go index 8699d34..40c5761 100644 --- a/systems/collectible_system.go +++ b/systems/collectible_system.go @@ -123,5 +123,5 @@ func (system *CollectibleSystem) AddParticle(position *components.Position) { 64, ) - timer.Start(config.PARTICLE_LOOPWAIT) + timer.Start(config.PARTICLE_STARTWAIT) }