diff --git a/assets/sprites/apollo.pal b/assets/oldsprites/sprites/apollo.pal similarity index 100% rename from assets/sprites/apollo.pal rename to assets/oldsprites/sprites/apollo.pal diff --git a/assets/sprites/background-popup-wide.png b/assets/oldsprites/sprites/background-popup-wide.png similarity index 100% rename from assets/sprites/background-popup-wide.png rename to assets/oldsprites/sprites/background-popup-wide.png diff --git a/assets/sprites/background-popup.png b/assets/oldsprites/sprites/background-popup.png similarity index 100% rename from assets/sprites/background-popup.png rename to assets/oldsprites/sprites/background-popup.png diff --git a/assets/sprites/background1.png b/assets/oldsprites/sprites/background1.png similarity index 100% rename from assets/sprites/background1.png rename to assets/oldsprites/sprites/background1.png diff --git a/assets/sprites/background2.png b/assets/oldsprites/sprites/background2.png similarity index 100% rename from assets/sprites/background2.png rename to assets/oldsprites/sprites/background2.png diff --git a/assets/sprites/background3.png b/assets/oldsprites/sprites/background3.png similarity index 100% rename from assets/sprites/background3.png rename to assets/oldsprites/sprites/background3.png diff --git a/assets/sprites/background4.png b/assets/oldsprites/sprites/background4.png similarity index 100% rename from assets/sprites/background4.png rename to assets/oldsprites/sprites/background4.png diff --git a/assets/sprites/backgroundstars-animated.json b/assets/oldsprites/sprites/backgroundstars-animated.json similarity index 100% rename from assets/sprites/backgroundstars-animated.json rename to assets/oldsprites/sprites/backgroundstars-animated.json diff --git a/assets/sprites/backgroundstars-animated.png b/assets/oldsprites/sprites/backgroundstars-animated.png similarity index 100% rename from assets/sprites/backgroundstars-animated.png rename to assets/oldsprites/sprites/backgroundstars-animated.png diff --git a/assets/sprites/backgroundstars.ase b/assets/oldsprites/sprites/backgroundstars.ase similarity index 100% rename from assets/sprites/backgroundstars.ase rename to assets/oldsprites/sprites/backgroundstars.ase diff --git a/assets/sprites/backgroundstars.png b/assets/oldsprites/sprites/backgroundstars.png similarity index 100% rename from assets/sprites/backgroundstars.png rename to assets/oldsprites/sprites/backgroundstars.png diff --git a/assets/sprites/collectible-detonating.json b/assets/oldsprites/sprites/collectible-detonating.json similarity index 100% rename from assets/sprites/collectible-detonating.json rename to assets/oldsprites/sprites/collectible-detonating.json diff --git a/assets/sprites/collectible-detonating.png b/assets/oldsprites/sprites/collectible-detonating.png similarity index 100% rename from assets/sprites/collectible-detonating.png rename to assets/oldsprites/sprites/collectible-detonating.png diff --git a/assets/sprites/collectible-idle.ase b/assets/oldsprites/sprites/collectible-idle.ase similarity index 100% rename from assets/sprites/collectible-idle.ase rename to assets/oldsprites/sprites/collectible-idle.ase diff --git a/assets/sprites/collectible-idle.json b/assets/oldsprites/sprites/collectible-idle.json similarity index 100% rename from assets/sprites/collectible-idle.json rename to assets/oldsprites/sprites/collectible-idle.json diff --git a/assets/sprites/collectible-idle.png b/assets/oldsprites/sprites/collectible-idle.png similarity index 100% rename from assets/sprites/collectible-idle.png rename to assets/oldsprites/sprites/collectible-idle.png diff --git a/assets/oldsprites/sprites/collectible.ase b/assets/oldsprites/sprites/collectible.ase new file mode 100644 index 0000000..a599a0d Binary files /dev/null and b/assets/oldsprites/sprites/collectible.ase differ diff --git a/assets/oldsprites/sprites/collectible.png b/assets/oldsprites/sprites/collectible.png new file mode 100644 index 0000000..f228bf7 Binary files /dev/null and b/assets/oldsprites/sprites/collectible.png differ diff --git a/assets/sprites/door.ase b/assets/oldsprites/sprites/door.ase similarity index 100% rename from assets/sprites/door.ase rename to assets/oldsprites/sprites/door.ase diff --git a/assets/sprites/door1.png b/assets/oldsprites/sprites/door1.png similarity index 100% rename from assets/sprites/door1.png rename to assets/oldsprites/sprites/door1.png diff --git a/assets/sprites/door2.png b/assets/oldsprites/sprites/door2.png similarity index 100% rename from assets/sprites/door2.png rename to assets/oldsprites/sprites/door2.png diff --git a/assets/oldsprites/sprites/entitymap.png b/assets/oldsprites/sprites/entitymap.png new file mode 100644 index 0000000..fe857e5 Binary files /dev/null and b/assets/oldsprites/sprites/entitymap.png differ diff --git a/assets/sprites/entitymap.xcf b/assets/oldsprites/sprites/entitymap.xcf similarity index 100% rename from assets/sprites/entitymap.xcf rename to assets/oldsprites/sprites/entitymap.xcf diff --git a/assets/sprites/hud.png b/assets/oldsprites/sprites/hud.png similarity index 100% rename from assets/sprites/hud.png rename to assets/oldsprites/sprites/hud.png diff --git a/assets/sprites/menu.png b/assets/oldsprites/sprites/menu.png similarity index 100% rename from assets/sprites/menu.png rename to assets/oldsprites/sprites/menu.png diff --git a/assets/sprites/obstacle-east.png b/assets/oldsprites/sprites/obstacle-east.png similarity index 100% rename from assets/sprites/obstacle-east.png rename to assets/oldsprites/sprites/obstacle-east.png diff --git a/assets/sprites/obstacle-north.png b/assets/oldsprites/sprites/obstacle-north.png similarity index 100% rename from assets/sprites/obstacle-north.png rename to assets/oldsprites/sprites/obstacle-north.png diff --git a/assets/sprites/obstacle-south.png b/assets/oldsprites/sprites/obstacle-south.png similarity index 100% rename from assets/sprites/obstacle-south.png rename to assets/oldsprites/sprites/obstacle-south.png diff --git a/assets/sprites/obstacle-star.png b/assets/oldsprites/sprites/obstacle-star.png similarity index 100% rename from assets/sprites/obstacle-star.png rename to assets/oldsprites/sprites/obstacle-star.png diff --git a/assets/sprites/obstacle-west.png b/assets/oldsprites/sprites/obstacle-west.png similarity index 100% rename from assets/sprites/obstacle-west.png rename to assets/oldsprites/sprites/obstacle-west.png diff --git a/assets/sprites/primarymap.png b/assets/oldsprites/sprites/primarymap.png similarity index 100% rename from assets/sprites/primarymap.png rename to assets/oldsprites/sprites/primarymap.png diff --git a/assets/sprites/sphere-small.ase b/assets/oldsprites/sprites/sphere-small.ase similarity index 100% rename from assets/sprites/sphere-small.ase rename to assets/oldsprites/sprites/sphere-small.ase diff --git a/assets/sprites/sphere-small.png b/assets/oldsprites/sprites/sphere-small.png similarity index 100% rename from assets/sprites/sphere-small.png rename to assets/oldsprites/sprites/sphere-small.png diff --git a/assets/sprites/sphere.ase b/assets/oldsprites/sprites/sphere.ase similarity index 100% rename from assets/sprites/sphere.ase rename to assets/oldsprites/sprites/sphere.ase diff --git a/assets/sprites/sphere.png b/assets/oldsprites/sprites/sphere.png similarity index 100% rename from assets/sprites/sphere.png rename to assets/oldsprites/sprites/sphere.png diff --git a/assets/sprites/stars.ase b/assets/oldsprites/sprites/stars.ase similarity index 100% rename from assets/sprites/stars.ase rename to assets/oldsprites/sprites/stars.ase diff --git a/assets/sprites/switch.ase b/assets/oldsprites/sprites/switch.ase similarity index 100% rename from assets/sprites/switch.ase rename to assets/oldsprites/sprites/switch.ase diff --git a/assets/sprites/switch1.png b/assets/oldsprites/sprites/switch1.png similarity index 100% rename from assets/sprites/switch1.png rename to assets/oldsprites/sprites/switch1.png diff --git a/assets/sprites/switch2.png b/assets/oldsprites/sprites/switch2.png similarity index 100% rename from assets/sprites/switch2.png rename to assets/oldsprites/sprites/switch2.png diff --git a/assets/oldsprites/sprites/tilemap-oil.png b/assets/oldsprites/sprites/tilemap-oil.png new file mode 100644 index 0000000..c711c56 Binary files /dev/null and b/assets/oldsprites/sprites/tilemap-oil.png differ diff --git a/assets/sprites/transwall.png b/assets/oldsprites/sprites/transwall.png similarity index 100% rename from assets/sprites/transwall.png rename to assets/oldsprites/sprites/transwall.png diff --git a/assets/sprites/woddendoor.ase b/assets/oldsprites/sprites/woddendoor.ase similarity index 100% rename from assets/sprites/woddendoor.ase rename to assets/oldsprites/sprites/woddendoor.ase diff --git a/assets/space/collectible.ase b/assets/space/collectible.ase index 8990ae8..94fa86a 100644 Binary files a/assets/space/collectible.ase and b/assets/space/collectible.ase differ diff --git a/assets/space/correct-oil-palette.ase b/assets/space/correct-oil-palette.ase new file mode 100644 index 0000000..737c16d Binary files /dev/null and b/assets/space/correct-oil-palette.ase differ diff --git a/assets/space/correct-oil.pal b/assets/space/correct-oil.pal new file mode 100644 index 0000000..c630986 --- /dev/null +++ b/assets/space/correct-oil.pal @@ -0,0 +1,39 @@ +JASC-PAL +0100 +36 +0 0 0 +0 0 0 +14 14 14 +29 29 29 +51 51 51 +80 80 80 +99 99 99 +122 122 122 +167 167 167 +192 192 192 +228 228 228 +251 245 239 +242 211 171 +237 193 132 +229 164 88 +222 112 44 +181 52 28 +139 22 22 +198 159 165 +183 134 134 +164 102 102 +133 79 79 +110 65 83 +74 44 65 +174 166 195 +160 130 170 +139 109 156 +119 86 127 +108 76 112 +64 53 79 +89 97 153 +73 77 126 +49 57 85 +37 38 63 +24 23 38 +16 13 21 diff --git a/assets/space/obstacle-alldirections.ase b/assets/space/obstacle-alldirections.ase index 38da6de..35de407 100644 Binary files a/assets/space/obstacle-alldirections.ase and b/assets/space/obstacle-alldirections.ase differ diff --git a/assets/space/obstacle.ase b/assets/space/obstacle.ase index 0173b7d..b31e785 100644 Binary files a/assets/space/obstacle.ase and b/assets/space/obstacle.ase differ diff --git a/assets/space/player.ase b/assets/space/player.ase index 0baf39e..7944c64 100644 Binary files a/assets/space/player.ase and b/assets/space/player.ase differ diff --git a/assets/space/robot.ase b/assets/space/robot.ase index 51f6744..f994717 100644 Binary files a/assets/space/robot.ase and b/assets/space/robot.ase differ diff --git a/assets/space/robot.gif b/assets/space/robot.gif new file mode 100644 index 0000000..3f858d4 Binary files /dev/null and b/assets/space/robot.gif differ diff --git a/assets/space/tilemap-oil.ase b/assets/space/tilemap-oil.ase index 06888a2..1b5bb3d 100644 Binary files a/assets/space/tilemap-oil.ase and b/assets/space/tilemap-oil.ase differ diff --git a/assets/space/tilemap-oil/tilemap-oil_space bg.png b/assets/space/tilemap-oil/tilemap-oil_space bg.png new file mode 100644 index 0000000..2ec94a5 Binary files /dev/null and b/assets/space/tilemap-oil/tilemap-oil_space bg.png differ diff --git a/assets/space/tilemap-oil/tilemap-oil_space machinery.png b/assets/space/tilemap-oil/tilemap-oil_space machinery.png new file mode 100644 index 0000000..c823e5a Binary files /dev/null and b/assets/space/tilemap-oil/tilemap-oil_space machinery.png differ diff --git a/assets/sprites/Makefile b/assets/sprites/Makefile new file mode 100644 index 0000000..b965566 --- /dev/null +++ b/assets/sprites/Makefile @@ -0,0 +1,5 @@ +all: + @echo noting + +clean: + fd '[0-9]' --exec rm diff --git a/assets/sprites/collectible.ase b/assets/sprites/collectible.ase index a599a0d..94fa86a 100644 Binary files a/assets/sprites/collectible.ase and b/assets/sprites/collectible.ase differ diff --git a/assets/sprites/collectible.png b/assets/sprites/collectible.png index f228bf7..9a7661b 100644 Binary files a/assets/sprites/collectible.png and b/assets/sprites/collectible.png differ diff --git a/assets/sprites/correct-oil-palette.ase b/assets/sprites/correct-oil-palette.ase new file mode 100644 index 0000000..737c16d Binary files /dev/null and b/assets/sprites/correct-oil-palette.ase differ diff --git a/assets/sprites/correct-oil.pal b/assets/sprites/correct-oil.pal new file mode 100644 index 0000000..c630986 --- /dev/null +++ b/assets/sprites/correct-oil.pal @@ -0,0 +1,39 @@ +JASC-PAL +0100 +36 +0 0 0 +0 0 0 +14 14 14 +29 29 29 +51 51 51 +80 80 80 +99 99 99 +122 122 122 +167 167 167 +192 192 192 +228 228 228 +251 245 239 +242 211 171 +237 193 132 +229 164 88 +222 112 44 +181 52 28 +139 22 22 +198 159 165 +183 134 134 +164 102 102 +133 79 79 +110 65 83 +74 44 65 +174 166 195 +160 130 170 +139 109 156 +119 86 127 +108 76 112 +64 53 79 +89 97 153 +73 77 126 +49 57 85 +37 38 63 +24 23 38 +16 13 21 diff --git a/assets/sprites/entitymap.png b/assets/sprites/entitymap.png deleted file mode 100644 index fe857e5..0000000 Binary files a/assets/sprites/entitymap.png and /dev/null differ diff --git a/assets/sprites/entitymap.png b/assets/sprites/entitymap.png new file mode 120000 index 0000000..52210aa --- /dev/null +++ b/assets/sprites/entitymap.png @@ -0,0 +1 @@ +../oldsprites/entitymap.png \ No newline at end of file diff --git a/assets/sprites/obstacle-alldirections-idle.json b/assets/sprites/obstacle-alldirections-idle.json new file mode 100644 index 0000000..645cda5 --- /dev/null +++ b/assets/sprites/obstacle-alldirections-idle.json @@ -0,0 +1,70 @@ +{ "frames": { + "obstacle-alldirections 0.ase": { + "frame": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-alldirections 1.ase": { + "frame": { "x": 32, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-alldirections 2.ase": { + "frame": { "x": 64, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-alldirections 3.ase": { + "frame": { "x": 96, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-alldirections 4.ase": { + "frame": { "x": 128, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-alldirections 5.ase": { + "frame": { "x": 160, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + } + }, + "meta": { + "app": "http://www.aseprite.org/", + "version": "1.x-dev", + "image": "obstacle-alldirections-idle.png", + "format": "I8", + "size": { "w": 192, "h": 32 }, + "scale": "1", + "frameTags": [ + ], + "layers": [ + { "name": "enemybot-jets", "opacity": 255, "blendMode": "normal" }, + { "name": "enemybot-body", "opacity": 255, "blendMode": "normal" }, + { "name": "enemybot-turm", "opacity": 255, "blendMode": "normal" }, + { "name": "enemybot-turret", "opacity": 255, "blendMode": "normal" }, + { "name": "enemybot-turret-head", "opacity": 255, "blendMode": "normal" } + ], + "slices": [ + ] + } +} diff --git a/assets/sprites/obstacle-alldirections-idle.png b/assets/sprites/obstacle-alldirections-idle.png new file mode 100644 index 0000000..81e57bb Binary files /dev/null and b/assets/sprites/obstacle-alldirections-idle.png differ diff --git a/assets/sprites/obstacle-alldirections.ase b/assets/sprites/obstacle-alldirections.ase new file mode 100644 index 0000000..35de407 Binary files /dev/null and b/assets/sprites/obstacle-alldirections.ase differ diff --git a/assets/sprites/obstacle-east-idle.json b/assets/sprites/obstacle-east-idle.json new file mode 100644 index 0000000..6dde68b --- /dev/null +++ b/assets/sprites/obstacle-east-idle.json @@ -0,0 +1,92 @@ +{ "frames": { + "obstacle-east 0.ase": { + "frame": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-east 1.ase": { + "frame": { "x": 32, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-east 2.ase": { + "frame": { "x": 64, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-east 3.ase": { + "frame": { "x": 96, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-east 4.ase": { + "frame": { "x": 128, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-east 5.ase": { + "frame": { "x": 160, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-east 6.ase": { + "frame": { "x": 192, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-east 7.ase": { + "frame": { "x": 224, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-east 8.ase": { + "frame": { "x": 256, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + } + }, + "meta": { + "app": "http://www.aseprite.org/", + "version": "1.x-dev", + "image": "obstacle-east-idle.png", + "format": "I8", + "size": { "w": 288, "h": 32 }, + "scale": "1", + "frameTags": [ + ], + "layers": [ + { "name": "enemybot-jets", "opacity": 255, "blendMode": "normal" }, + { "name": "enemybot-turret", "opacity": 255, "blendMode": "normal" }, + { "name": "enemybot-body", "opacity": 255, "blendMode": "normal" } + ], + "slices": [ + ] + } +} diff --git a/assets/sprites/obstacle-east-idle.png b/assets/sprites/obstacle-east-idle.png new file mode 100644 index 0000000..b21febd Binary files /dev/null and b/assets/sprites/obstacle-east-idle.png differ diff --git a/assets/sprites/obstacle-east.ase b/assets/sprites/obstacle-east.ase new file mode 100644 index 0000000..5fc3397 Binary files /dev/null and b/assets/sprites/obstacle-east.ase differ diff --git a/assets/sprites/obstacle-north-idle.json b/assets/sprites/obstacle-north-idle.json new file mode 100644 index 0000000..131b7b8 --- /dev/null +++ b/assets/sprites/obstacle-north-idle.json @@ -0,0 +1,92 @@ +{ "frames": { + "obstacle-north 0.ase": { + "frame": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-north 1.ase": { + "frame": { "x": 32, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-north 2.ase": { + "frame": { "x": 64, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-north 3.ase": { + "frame": { "x": 96, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-north 4.ase": { + "frame": { "x": 128, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-north 5.ase": { + "frame": { "x": 160, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-north 6.ase": { + "frame": { "x": 192, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-north 7.ase": { + "frame": { "x": 224, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-north 8.ase": { + "frame": { "x": 256, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + } + }, + "meta": { + "app": "http://www.aseprite.org/", + "version": "1.x-dev", + "image": "obstacle-north-idle.png", + "format": "I8", + "size": { "w": 288, "h": 32 }, + "scale": "1", + "frameTags": [ + ], + "layers": [ + { "name": "enemybot-jets", "opacity": 255, "blendMode": "normal" }, + { "name": "enemybot-turret", "opacity": 255, "blendMode": "normal" }, + { "name": "enemybot-body", "opacity": 255, "blendMode": "normal" } + ], + "slices": [ + ] + } +} diff --git a/assets/sprites/obstacle-north-idle.png b/assets/sprites/obstacle-north-idle.png new file mode 100644 index 0000000..f85ef82 Binary files /dev/null and b/assets/sprites/obstacle-north-idle.png differ diff --git a/assets/sprites/obstacle-north.ase b/assets/sprites/obstacle-north.ase new file mode 100644 index 0000000..b31e785 Binary files /dev/null and b/assets/sprites/obstacle-north.ase differ diff --git a/assets/sprites/obstacle-south-idle.json b/assets/sprites/obstacle-south-idle.json new file mode 100644 index 0000000..8c10378 --- /dev/null +++ b/assets/sprites/obstacle-south-idle.json @@ -0,0 +1,92 @@ +{ "frames": { + "obstacle-south 0.ase": { + "frame": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-south 1.ase": { + "frame": { "x": 32, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-south 2.ase": { + "frame": { "x": 64, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-south 3.ase": { + "frame": { "x": 96, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-south 4.ase": { + "frame": { "x": 128, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-south 5.ase": { + "frame": { "x": 160, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-south 6.ase": { + "frame": { "x": 192, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-south 7.ase": { + "frame": { "x": 224, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-south 8.ase": { + "frame": { "x": 256, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + } + }, + "meta": { + "app": "http://www.aseprite.org/", + "version": "1.x-dev", + "image": "obstacle-south-idle.png", + "format": "I8", + "size": { "w": 288, "h": 32 }, + "scale": "1", + "frameTags": [ + ], + "layers": [ + { "name": "enemybot-jets", "opacity": 255, "blendMode": "normal" }, + { "name": "enemybot-turret", "opacity": 255, "blendMode": "normal" }, + { "name": "enemybot-body", "opacity": 255, "blendMode": "normal" } + ], + "slices": [ + ] + } +} diff --git a/assets/sprites/obstacle-south-idle.png b/assets/sprites/obstacle-south-idle.png new file mode 100644 index 0000000..45f93e9 Binary files /dev/null and b/assets/sprites/obstacle-south-idle.png differ diff --git a/assets/sprites/obstacle-south.ase b/assets/sprites/obstacle-south.ase new file mode 100644 index 0000000..e5fce5a Binary files /dev/null and b/assets/sprites/obstacle-south.ase differ diff --git a/assets/sprites/obstacle-west-idle.json b/assets/sprites/obstacle-west-idle.json new file mode 100644 index 0000000..169529a --- /dev/null +++ b/assets/sprites/obstacle-west-idle.json @@ -0,0 +1,92 @@ +{ "frames": { + "obstacle-west 0.png": { + "frame": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-west 1.png": { + "frame": { "x": 32, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-west 2.png": { + "frame": { "x": 64, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-west 3.png": { + "frame": { "x": 96, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-west 4.png": { + "frame": { "x": 128, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-west 5.png": { + "frame": { "x": 160, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-west 6.png": { + "frame": { "x": 192, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-west 7.png": { + "frame": { "x": 224, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "obstacle-west 8.png": { + "frame": { "x": 256, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + } + }, + "meta": { + "app": "http://www.aseprite.org/", + "version": "1.x-dev", + "image": "obstacle-west-idle.png", + "format": "I8", + "size": { "w": 288, "h": 32 }, + "scale": "1", + "frameTags": [ + ], + "layers": [ + { "name": "enemybot-jets", "opacity": 255, "blendMode": "normal" }, + { "name": "enemybot-turret", "opacity": 255, "blendMode": "normal" }, + { "name": "enemybot-body", "opacity": 255, "blendMode": "normal" } + ], + "slices": [ + ] + } +} diff --git a/assets/sprites/obstacle-west-idle.png b/assets/sprites/obstacle-west-idle.png new file mode 100644 index 0000000..4b65b85 Binary files /dev/null and b/assets/sprites/obstacle-west-idle.png differ diff --git a/assets/sprites/obstacle-west.ase b/assets/sprites/obstacle-west.ase new file mode 100644 index 0000000..d7079e9 Binary files /dev/null and b/assets/sprites/obstacle-west.ase differ diff --git a/assets/sprites/obstacle.ase b/assets/sprites/obstacle.ase new file mode 100644 index 0000000..b31e785 Binary files /dev/null and b/assets/sprites/obstacle.ase differ diff --git a/assets/sprites/robot-idle.json b/assets/sprites/robot-idle.json new file mode 100644 index 0000000..5775dbd --- /dev/null +++ b/assets/sprites/robot-idle.json @@ -0,0 +1,104 @@ +{ "frames": { + "robot #idle 0.ase": { + "frame": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "robot #idle 1.ase": { + "frame": { "x": 32, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "robot #idle 2.ase": { + "frame": { "x": 64, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "robot #idle 3.ase": { + "frame": { "x": 96, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "robot #idle 4.ase": { + "frame": { "x": 128, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "robot #idle 5.ase": { + "frame": { "x": 160, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "robot #idle 6.ase": { + "frame": { "x": 192, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "robot #idle 7.ase": { + "frame": { "x": 224, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "robot #idle 8.ase": { + "frame": { "x": 256, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + }, + "robot #idle 9.ase": { + "frame": { "x": 288, "y": 0, "w": 32, "h": 32 }, + "rotated": false, + "trimmed": false, + "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, + "sourceSize": { "w": 32, "h": 32 }, + "duration": 100 + } + }, + "meta": { + "app": "http://www.aseprite.org/", + "version": "1.x-dev", + "image": "robot-idle.png", + "format": "I8", + "size": { "w": 320, "h": 32 }, + "scale": "1", + "frameTags": [ + { "name": "Inactive", "from": 0, "to": 0, "direction": "forward", "color": "#000000ff" }, + { "name": "idle", "from": 1, "to": 10, "direction": "forward", "color": "#000000ff" } + ], + "layers": [ + { "name": "fire", "opacity": 255, "blendMode": "normal" }, + { "name": "engines", "opacity": 255, "blendMode": "normal" }, + { "name": "getriebe", "opacity": 255, "blendMode": "normal" }, + { "name": "head", "opacity": 255, "blendMode": "normal" }, + { "name": "noise", "opacity": 255, "blendMode": "normal" } + ], + "slices": [ + ] + } +} diff --git a/assets/sprites/robot-idle.png b/assets/sprites/robot-idle.png new file mode 100644 index 0000000..f80fc64 Binary files /dev/null and b/assets/sprites/robot-idle.png differ diff --git a/assets/sprites/robot-inactive.png b/assets/sprites/robot-inactive.png new file mode 100644 index 0000000..7978d4f Binary files /dev/null and b/assets/sprites/robot-inactive.png differ diff --git a/assets/sprites/robot.ase b/assets/sprites/robot.ase new file mode 100644 index 0000000..2dd673c Binary files /dev/null and b/assets/sprites/robot.ase differ diff --git a/assets/sprites/robot.png b/assets/sprites/robot.png new file mode 100644 index 0000000..7978d4f Binary files /dev/null and b/assets/sprites/robot.png differ diff --git a/assets/sprites/simpletiles.ase b/assets/sprites/simpletiles.ase new file mode 100644 index 0000000..03ab14b Binary files /dev/null and b/assets/sprites/simpletiles.ase differ diff --git a/assets/sprites/tilemap-oil.png b/assets/sprites/tilemap-oil.png deleted file mode 100644 index c711c56..0000000 Binary files a/assets/sprites/tilemap-oil.png and /dev/null differ diff --git a/assets/sprites/tilemap-oil.png b/assets/sprites/tilemap-oil.png new file mode 120000 index 0000000..6d54bd6 --- /dev/null +++ b/assets/sprites/tilemap-oil.png @@ -0,0 +1 @@ +tilemap.png \ No newline at end of file diff --git a/assets/sprites/tilemap.png b/assets/sprites/tilemap.png new file mode 100644 index 0000000..0e94298 Binary files /dev/null and b/assets/sprites/tilemap.png differ diff --git a/game/levels.go b/game/levels.go index be3acd9..3d9bf80 100644 --- a/game/levels.go +++ b/game/levels.go @@ -151,7 +151,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-oil"].SubImage( + tile.Sprite = assets.Assets["tilemap"].SubImage( image.Rect(tileData.Src[0], tileData.Src[1], tileData.Src[0]+layer.GridSize,