diff --git a/assets/config.json b/assets/config.json index 3d545f2..a38faba 100644 --- a/assets/config.json +++ b/assets/config.json @@ -214,6 +214,11 @@ {"path": "assets/sprites/dead_body.png", "frame_width": 256, "frame_height": 256 + }, + "dead_body_lootable": + {"path": "assets/sprites/dead_body_lootable.png", + "frame_width": 256, + "frame_height": 256 } }, "worldgen": { diff --git a/assets/devices.json b/assets/devices.json index 210e47f..58b7897 100644 --- a/assets/devices.json +++ b/assets/devices.json @@ -76,14 +76,28 @@ {"_type": "Sound", "attack": "pickup", "death": "blank"} ] }, + "DEAD_BODY_LOOTABLE": { + "id": "DEAD_BODY_LOOTABLE", + "name": "Grave Stone", + "description": "Something died here. Was this your doing?", + "components": [ + {"_type": "Tile", "display": 1890, + "foreground": "devices/fg:dead_body_lootable", + "background": "devices/bg:dead_body_lootable" + }, + {"_type": "Device", "config": {}, "events": ["LOOT_CONTAINER"]}, + {"_type": "Sprite", "name": "dead_body_lootable", "width": 256, "height": 256, "scale": 1.0}, + {"_type": "Sound", "attack": "pickup", "death": "blank"} + ] + }, "DEAD_BODY": { "id": "DEAD_BODY", "name": "Something Dead", "description": "You can't loot this, weirdo.", "components": [ - {"_type": "Tile", "display": 42613, - "foreground": "devices/fg:grave_stone", - "background": "devices/bg:grave_stone" + {"_type": "Tile", "display": 1939, + "foreground": "devices/fg:dead_body", + "background": "devices/bg:dead_body" }, {"_type": "Sprite", "name": "dead_body", "width": 256, "height": 256, "scale": 1.0} ] diff --git a/assets/enemies.json b/assets/enemies.json index 3ad2eac..c477614 100644 --- a/assets/enemies.json +++ b/assets/enemies.json @@ -30,7 +30,7 @@ }, "KNIGHT": { "components": [ - {"_type": "Tile", "display": 2189, + {"_type": "Tile", "display": 2216, "foreground": "enemies/fg:knight", "background": "color:transparent" }, diff --git a/assets/items/broken_locket.png b/assets/items/broken_locket.png index 8297513..13cd650 100644 Binary files a/assets/items/broken_locket.png and b/assets/items/broken_locket.png differ diff --git a/assets/items/broken_pen_knife.png b/assets/items/broken_pen_knife.png index 493141d..b13d566 100644 Binary files a/assets/items/broken_pen_knife.png and b/assets/items/broken_pen_knife.png differ diff --git a/assets/items/broken_yoyo.png b/assets/items/broken_yoyo.png index 5ea335e..b51e581 100644 Binary files a/assets/items/broken_yoyo.png and b/assets/items/broken_yoyo.png differ diff --git a/assets/items/chess_pawn.png b/assets/items/chess_pawn.png index 55d3686..bbdf568 100644 Binary files a/assets/items/chess_pawn.png and b/assets/items/chess_pawn.png differ diff --git a/assets/items/cinqueda.png b/assets/items/cinqueda.png index 1da5227..def23fe 100644 Binary files a/assets/items/cinqueda.png and b/assets/items/cinqueda.png differ diff --git a/assets/items/dirty_kerchief.png b/assets/items/dirty_kerchief.png index 2305bd9..c168efe 100644 Binary files a/assets/items/dirty_kerchief.png and b/assets/items/dirty_kerchief.png differ diff --git a/assets/items/dubious_combination.png b/assets/items/dubious_combination.png index 350d891..1847a1e 100644 Binary files a/assets/items/dubious_combination.png and b/assets/items/dubious_combination.png differ diff --git a/assets/items/healing_potion_small.png b/assets/items/healing_potion_small.png index a73f794..eb5552e 100644 Binary files a/assets/items/healing_potion_small.png and b/assets/items/healing_potion_small.png differ diff --git a/assets/items/leather_pouch.png b/assets/items/leather_pouch.png index ebf4750..d553504 100644 Binary files a/assets/items/leather_pouch.png and b/assets/items/leather_pouch.png differ diff --git a/assets/items/mushroom.png b/assets/items/mushroom.png index 499f3ca..1873f6e 100644 Binary files a/assets/items/mushroom.png and b/assets/items/mushroom.png differ diff --git a/assets/items/pocket_watch.png b/assets/items/pocket_watch.png index 7bdd4e9..739b1df 100644 Binary files a/assets/items/pocket_watch.png and b/assets/items/pocket_watch.png differ diff --git a/assets/items/rusty_nails.png b/assets/items/rusty_nails.png index ec5a177..0c5e4cf 100644 Binary files a/assets/items/rusty_nails.png and b/assets/items/rusty_nails.png differ diff --git a/assets/items/severed_finger.png b/assets/items/severed_finger.png index b2b1281..5e03af2 100644 Binary files a/assets/items/severed_finger.png and b/assets/items/severed_finger.png differ diff --git a/assets/items/stone_doll_cursed.png b/assets/items/stone_doll_cursed.png index e1588bd..d5ae705 100644 Binary files a/assets/items/stone_doll_cursed.png and b/assets/items/stone_doll_cursed.png differ diff --git a/assets/items/torch_crappy.png b/assets/items/torch_crappy.png index 649917a..1de2a4b 100644 Binary files a/assets/items/torch_crappy.png and b/assets/items/torch_crappy.png differ diff --git a/assets/items/torch_horizontal_floor.png b/assets/items/torch_horizontal_floor.png index e47b469..ea8a3f4 100644 Binary files a/assets/items/torch_horizontal_floor.png and b/assets/items/torch_horizontal_floor.png differ diff --git a/assets/items/wood_barrel_small.png b/assets/items/wood_barrel_small.png index 0cb3193..3eb74e0 100644 Binary files a/assets/items/wood_barrel_small.png and b/assets/items/wood_barrel_small.png differ diff --git a/assets/map_tiles.json b/assets/map_tiles.json index ad01672..a0e2623 100644 --- a/assets/map_tiles.json +++ b/assets/map_tiles.json @@ -67,68 +67,74 @@ }, { "centered": true, - "display": 42613, + "display": 1939, "x": 64, "y": 64 }, { "centered": true, - "display": 8687, + "display": 1890, "x": 128, "y": 64 }, { "centered": true, - "display": 6105, + "display": 8687, "x": 192, "y": 64 }, { "centered": true, - "display": 8793, + "display": 6105, "x": 256, "y": 64 }, { "centered": true, - "display": 95, + "display": 8793, "x": 320, "y": 64 }, { "centered": true, - "display": 1898, + "display": 95, "x": 384, "y": 64 }, { "centered": true, - "display": 42586, + "display": 1898, "x": 448, "y": 64 }, { "centered": true, - "display": 2189, + "display": 42586, "x": 512, "y": 64 }, { "centered": true, - "display": 10733, + "display": 2216, "x": 576, "y": 64 }, { "centered": true, - "display": 2220, + "display": 10733, "x": 0, "y": 128 }, { "centered": true, - "display": 1218, + "display": 2220, "x": 64, "y": 128 + }, + { + "centered": true, + "display": 1218, + "x": 128, + "y": 128 } ] diff --git a/assets/map_tiles.png b/assets/map_tiles.png index 2270f94..67c5ae3 100644 Binary files a/assets/map_tiles.png and b/assets/map_tiles.png differ diff --git a/assets/palette.json b/assets/palette.json index 49f621d..3fde82c 100644 --- a/assets/palette.json +++ b/assets/palette.json @@ -65,13 +65,17 @@ "stairs_up": [24, 205, 189], "tripwire": [24, 205, 189], "barrel": [150, 100, 189], - "grave_stone": [32, 123, 164] + "grave_stone": [32, 123, 164], + "dead_body": [32, 123, 164], + "dead_body_lootable": [32, 123, 164] }, "devices/bg": { "stairs_down": [24, 205, 189], "stairs_up": [24, 205, 189], "tripwire": [24, 205, 189], "barrel": [150, 100, 189], - "grave_stone": [24, 205, 189] + "grave_stone": [24, 205, 189], + "dead_body": [24, 205, 189], + "dead_body_lootable": [24, 205, 189] } } diff --git a/assets/sprites/armored_knight_1.png b/assets/sprites/armored_knight_1.png index 4f2970d..e27e278 100644 Binary files a/assets/sprites/armored_knight_1.png and b/assets/sprites/armored_knight_1.png differ diff --git a/assets/sprites/axe_ranger.png b/assets/sprites/axe_ranger.png index a28b17a..d64002a 100644 Binary files a/assets/sprites/axe_ranger.png and b/assets/sprites/axe_ranger.png differ diff --git a/assets/sprites/dead_body.png b/assets/sprites/dead_body.png index 995b381..c5c9a08 100644 Binary files a/assets/sprites/dead_body.png and b/assets/sprites/dead_body.png differ diff --git a/assets/sprites/dead_body_lootable.png b/assets/sprites/dead_body_lootable.png new file mode 100644 index 0000000..d2e62ce Binary files /dev/null and b/assets/sprites/dead_body_lootable.png differ diff --git a/assets/sprites/gold_savior.png b/assets/sprites/gold_savior.png index ec764d8..822487f 100644 Binary files a/assets/sprites/gold_savior.png and b/assets/sprites/gold_savior.png differ diff --git a/assets/sprites/grave_stone.png b/assets/sprites/grave_stone.png index 6a904eb..0c53cb5 100644 Binary files a/assets/sprites/grave_stone.png and b/assets/sprites/grave_stone.png differ diff --git a/assets/sprites/hairy_spider.png b/assets/sprites/hairy_spider.png index 6cfeefb..9d494bf 100644 Binary files a/assets/sprites/hairy_spider.png and b/assets/sprites/hairy_spider.png differ diff --git a/assets/sprites/peasant_girl_2.png b/assets/sprites/peasant_girl_2.png index e93114b..386b1df 100644 Binary files a/assets/sprites/peasant_girl_2.png and b/assets/sprites/peasant_girl_2.png differ diff --git a/assets/sprites/rat_with_sword.png b/assets/sprites/rat_with_sword.png index 7223eb5..2d050fb 100644 Binary files a/assets/sprites/rat_with_sword.png and b/assets/sprites/rat_with_sword.png differ diff --git a/assets/sprites/rope_vines_up.png b/assets/sprites/rope_vines_up.png index 67c4655..adae4c3 100644 Binary files a/assets/sprites/rope_vines_up.png and b/assets/sprites/rope_vines_up.png differ diff --git a/assets/sprites/torch_pillar.png b/assets/sprites/torch_pillar.png index fbacd66..c05f879 100644 Binary files a/assets/sprites/torch_pillar.png and b/assets/sprites/torch_pillar.png differ diff --git a/assets/sprites/tripwire_trap.png b/assets/sprites/tripwire_trap.png index ba0dde2..7f3fd37 100644 Binary files a/assets/sprites/tripwire_trap.png and b/assets/sprites/tripwire_trap.png differ diff --git a/assets/sprites/undead_peasant.png b/assets/sprites/undead_peasant.png index df82d40..0aa4324 100644 Binary files a/assets/sprites/undead_peasant.png and b/assets/sprites/undead_peasant.png differ diff --git a/assets/sprites/well_down.png b/assets/sprites/well_down.png index 48c04cd..0589083 100644 Binary files a/assets/sprites/well_down.png and b/assets/sprites/well_down.png differ diff --git a/assets/textures/ceiling_black.png b/assets/textures/ceiling_black.png index edc8392..c30afce 100644 Binary files a/assets/textures/ceiling_black.png and b/assets/textures/ceiling_black.png differ diff --git a/assets/textures/ceiling_blue_light.png b/assets/textures/ceiling_blue_light.png index 7e59270..2bd0323 100644 Binary files a/assets/textures/ceiling_blue_light.png and b/assets/textures/ceiling_blue_light.png differ diff --git a/assets/textures/floor_gray_stone.png b/assets/textures/floor_gray_stone.png index d47c226..d12c421 100644 Binary files a/assets/textures/floor_gray_stone.png and b/assets/textures/floor_gray_stone.png differ diff --git a/assets/textures/glowing_moss_wall.png b/assets/textures/glowing_moss_wall.png index afb8c37..73f987d 100644 Binary files a/assets/textures/glowing_moss_wall.png and b/assets/textures/glowing_moss_wall.png differ diff --git a/assets/textures/gray_stone_floor_light.png b/assets/textures/gray_stone_floor_light.png index ec55f1c..8d4f111 100644 Binary files a/assets/textures/gray_stone_floor_light.png and b/assets/textures/gray_stone_floor_light.png differ diff --git a/assets/textures/lava_floor.png b/assets/textures/lava_floor.png index 318b417..a58fd58 100644 Binary files a/assets/textures/lava_floor.png and b/assets/textures/lava_floor.png differ diff --git a/assets/textures/wall_plain.png b/assets/textures/wall_plain.png index eca9006..06f40a3 100644 Binary files a/assets/textures/wall_plain.png and b/assets/textures/wall_plain.png differ diff --git a/assets/textures/wood_wall.png b/assets/textures/wood_wall.png index 74cb80a..37c0ca7 100644 Binary files a/assets/textures/wood_wall.png and b/assets/textures/wood_wall.png differ