diff --git a/assets/armored_knight_1-256.png b/assets/armored_knight_1-256.png deleted file mode 100644 index cdd9c90..0000000 Binary files a/assets/armored_knight_1-256.png and /dev/null differ diff --git a/assets/armored_knight_1-512.png b/assets/armored_knight_1-512.png deleted file mode 100644 index a8f780a..0000000 Binary files a/assets/armored_knight_1-512.png and /dev/null differ diff --git a/assets/axe_ranger-256.png b/assets/axe_ranger-256.png deleted file mode 100644 index 867de02..0000000 Binary files a/assets/axe_ranger-256.png and /dev/null differ diff --git a/assets/blood_splatter-256.png b/assets/blood_splatter-256.png deleted file mode 100644 index fb76a8d..0000000 Binary files a/assets/blood_splatter-256.png and /dev/null differ diff --git a/assets/devils_fingers_background.jpg b/assets/bossfights/devils_fingers_background.jpg similarity index 100% rename from assets/devils_fingers_background.jpg rename to assets/bossfights/devils_fingers_background.jpg diff --git a/assets/devils_fingers_sprite.png b/assets/bossfights/devils_fingers_sprite.png similarity index 100% rename from assets/devils_fingers_sprite.png rename to assets/bossfights/devils_fingers_sprite.png diff --git a/assets/devils_fingers_stage.png b/assets/bossfights/devils_fingers_stage.png similarity index 100% rename from assets/devils_fingers_stage.png rename to assets/bossfights/devils_fingers_stage.png diff --git a/assets/down_the_well.jpg b/assets/bossfights/down_the_well.jpg similarity index 100% rename from assets/down_the_well.jpg rename to assets/bossfights/down_the_well.jpg diff --git a/assets/rat_king_2_frame_animation.png b/assets/bossfights/rat_king_2_frame_animation.png similarity index 100% rename from assets/rat_king_2_frame_animation.png rename to assets/bossfights/rat_king_2_frame_animation.png diff --git a/assets/rat_king_boss_fight_background.jpg b/assets/bossfights/rat_king_boss_fight_background.jpg similarity index 100% rename from assets/rat_king_boss_fight_background.jpg rename to assets/bossfights/rat_king_boss_fight_background.jpg diff --git a/assets/rat_king_boss_fight_sprite.png b/assets/bossfights/rat_king_boss_fight_sprite.png similarity index 100% rename from assets/rat_king_boss_fight_sprite.png rename to assets/bossfights/rat_king_boss_fight_sprite.png diff --git a/assets/tunnel_with_rocks.png b/assets/bossfights/tunnel_with_rocks.png similarity index 100% rename from assets/tunnel_with_rocks.png rename to assets/bossfights/tunnel_with_rocks.png diff --git a/assets/tunnel_with_rocks_stage.png b/assets/bossfights/tunnel_with_rocks_stage.png similarity index 100% rename from assets/tunnel_with_rocks_stage.png rename to assets/bossfights/tunnel_with_rocks_stage.png diff --git a/assets/ceiling_moss_brick_blue_light-256.png b/assets/ceiling_moss_brick_blue_light-256.png deleted file mode 100644 index 90abd19..0000000 Binary files a/assets/ceiling_moss_brick_blue_light-256.png and /dev/null differ diff --git a/assets/ceiling_test-256.png b/assets/ceiling_test-256.png deleted file mode 100644 index 8ca552b..0000000 Binary files a/assets/ceiling_test-256.png and /dev/null differ diff --git a/assets/ceiling_test-512.png b/assets/ceiling_test-512.png deleted file mode 100644 index c1ad1f3..0000000 Binary files a/assets/ceiling_test-512.png and /dev/null differ diff --git a/assets/ceiling_worm-256.png b/assets/ceiling_worm-256.png deleted file mode 100644 index 805dafe..0000000 Binary files a/assets/ceiling_worm-256.png and /dev/null differ diff --git a/assets/cinqueda_1-256.png b/assets/cinqueda_1-256.png deleted file mode 100644 index f40dd84..0000000 Binary files a/assets/cinqueda_1-256.png and /dev/null differ diff --git a/assets/cinqueda_1-512.png b/assets/cinqueda_1-512.png deleted file mode 100644 index 772abd2..0000000 Binary files a/assets/cinqueda_1-512.png and /dev/null differ diff --git a/assets/config.json b/assets/config.json index 0a83810..fa61427 100644 --- a/assets/config.json +++ b/assets/config.json @@ -31,304 +31,184 @@ }, "sprites": { "gold_savior": - {"path": "assets/gold_savior_oil-256.png", + {"path": "assets/sprites/gold_savior.png", "frame_width": 256, "frame_height": 256 }, "armored_knight": - {"path": "assets/armored_knight_1-256.png", + {"path": "assets/sprites/armored_knight_1.png", "frame_width": 256, "frame_height": 256 }, - "sword": - {"path": "assets/cinqueda_1-256.png", + "axe_ranger": + {"path": "assets/sprites/axe_ranger.png", "frame_width": 256, "frame_height": 256 }, - "rat_with_sword": - {"path": "assets/rat_with_sword-256.png", + "hairy_spider": + {"path": "assets/sprites/hairy_spider.png", "frame_width": 256, "frame_height": 256 }, - "rat_king": - {"path": "assets/rat_king-256.png", + "rat_with_sword": + {"path": "assets/sprites/rat_with_sword.png", "frame_width": 256, "frame_height": 256 }, "rat_king_boss": - {"path": "assets/rat_king_2_frame_animation.png", + {"path": "assets/bossfights/rat_king_2_frame_animation.png", "frame_width": 720, "frame_height": 720 }, "barrel_small": - {"path": "assets/wood_barrel_small-256.png", + {"path": "assets/items/wood_barrel_small.png", "frame_width": 256, "frame_height": 256 }, "torch_pillar": - {"path": "assets/torch_pillar-256.png", + {"path": "assets/sprites/torch_pillar.png", "frame_width": 256, "frame_height": 256 }, "torch_crappy": - {"path": "assets/torch_crappy-256.png", + {"path": "assets/items/torch_crappy.png", "frame_width": 256, "frame_height": 256 }, "torch_horizontal_floor": - {"path": "assets/torch_horizontal_floor-256.png", - "frame_width": 256, - "frame_height": 256 - }, - "evil_eye": - {"path": "assets/evil_eye-sprites.png", + {"path": "assets/items/torch_horizontal_floor.png", "frame_width": 256, "frame_height": 256 }, "peasant_girl": - {"path": "assets/peasant_girl_2-256.png", + {"path": "assets/sprites/peasant_girl_2.png", "frame_width": 256, "frame_height": 256 }, "grave_stone": - {"path": "assets/grave_stone-256.png", - "frame_width": 256, - "frame_height": 256 - }, - "moss_wall": - {"path": "assets/glowing_moss_wall-256.png", - "frame_width": 256, - "frame_height": 256 - }, - "floor": - {"path": "assets/floor_tile_test-256.png", - "frame_width": 256, - "frame_height": 256 - }, - "lava_floor": - {"path": "assets/lava_floor-256.png", - "frame_width": 256, - "frame_height": 256 - }, - "ceiling": - {"path": "assets/ceiling_test-256.png", + {"path": "assets/sprites/grave_stone.png", "frame_width": 256, "frame_height": 256 }, "healing_potion_small": - {"path": "assets/healing_potion_small-256.png", + {"path": "assets/items/healing_potion_small.png", "frame_width": 256, "frame_height": 256 }, "well_down": - {"path": "assets/well_down-256.png", + {"path": "assets/sprites/well_down.png", "frame_width": 256, "frame_height": 256 }, "rope_vines_up": - {"path": "assets/rope_vines_up-256.png", + {"path": "assets/sprites/rope_vines_up.png", "frame_width": 256, "frame_height": 256 }, "tripwire_trap": - {"path": "assets/tripwire_trap-256.png", + {"path": "assets/sprites/tripwire_trap.png", "frame_width": 256, "frame_height": 256 }, - "cinqueda": - {"path": "assets/cinqueda_1-256.png", - "frame_width": 256, - "frame_height": 256 - }, - "blood_splatter": - {"path": "assets/blood_splatter-256.png", - "frame_width": 256, - "frame_height": 256 - }, - "axe_ranger": - {"path": "assets/axe_ranger-256.png", - "frame_width": 256, - "frame_height": 256 - }, - "hairy_spider": - {"path": "assets/hairy_spider-256.png", - "frame_width": 256, - "frame_height": 256 - }, - "down_the_well": - {"path": "assets/down_the_well.jpg", - "frame_width": 900, - "frame_height": 600 - }, "boss_fight_background": - {"path": "assets/rat_king_boss_fight_background.jpg", + {"path": "assets/bossfights/rat_king_boss_fight_background.jpg", "frame_width": 1080, "frame_height": 720 }, "devils_fingers_background": - {"path": "assets/devils_fingers_background.jpg", + {"path": "assets/bossfights/devils_fingers_background.jpg", "frame_width": 1080, "frame_height": 720 }, "devils_fingers_sprite": - {"path": "assets/devils_fingers_sprite.png", + {"path": "assets/bossfights/devils_fingers_sprite.png", "frame_width": 720, "frame_height": 720 }, "devils_fingers_stage": - {"path": "assets/devils_fingers_stage.png", + {"path": "assets/bossfights/devils_fingers_stage.png", "frame_width": 1080, "frame_height": 720 }, "tunnel_with_rocks": - {"path": "assets/tunnel_with_rocks.png", + {"path": "assets/bossfights/tunnel_with_rocks.png", "frame_width": 1080, "frame_height": 720 }, "tunnel_with_rocks_stage": - {"path": "assets/tunnel_with_rocks_stage.png", + {"path": "assets/bossfights/tunnel_with_rocks_stage.png", "frame_width": 1080, "frame_height": 720 }, "ritual_crafting_area": - {"path": "assets/ritual_crafting_area.png", - "frame_width": 380, - "frame_height": 720 - }, - "the_ritual_circle": - {"path": "assets/the_ritual_circle.png", - "frame_width": 380, - "frame_height": 380 - }, - "paper_ui_background": - {"path": "assets/paper_ui_background.png", + {"path": "assets/ui/ritual_crafting_area.png", "frame_width": 380, "frame_height": 720 }, "full_screen_paper": - {"path": "assets/full_screen_paper.png", + {"path": "assets/ui/full_screen_paper.png", "frame_width": 1280, "frame_height": 720 }, - "broken_locket-64": - {"path": "assets/rituals/broken_locket-64.png", - "frame_width": 64, - "frame_height": 64 - }, - "broken_locket-128": - {"path": "assets/rituals/broken_locket-128.png", - "frame_width": 128, - "frame_height": 128 - }, - "broken_pen_knife-64": - {"path": "assets/rituals/broken_pen_knife-64.png", - "frame_width": 64, - "frame_height": 64 - }, - "broken_pen_knife-128": - {"path": "assets/rituals/broken_pen_knife-128.png", - "frame_width": 128, - "frame_height": 128 - }, - "broken_yoyo-64": - {"path": "assets/rituals/broken_yoyo-64.png", - "frame_width": 64, - "frame_height": 64 - }, - "broken_yoyo-128": - {"path": "assets/rituals/broken_yoyo-128.png", - "frame_width": 128, - "frame_height": 128 - }, - "chess_pawn-64": - {"path": "assets/rituals/chess_pawn-64.png", - "frame_width": 64, - "frame_height": 64 - }, - "chess_pawn-128": - {"path": "assets/rituals/chess_pawn-128.png", - "frame_width": 128, - "frame_height": 128 - }, - "dirty_kerchief-64": - {"path": "assets/rituals/dirty_kerchief-64.png", - "frame_width": 64, - "frame_height": 64 - }, - "dirty_kerchief-128": - {"path": "assets/rituals/dirty_kerchief-128.png", - "frame_width": 128, - "frame_height": 128 - }, - "leather_pouch-64": - {"path": "assets/rituals/leather_pouch-64.png", - "frame_width": 64, - "frame_height": 64 - }, - "leather_pouch-128": - {"path": "assets/rituals/leather_pouch-128.png", - "frame_width": 128, - "frame_height": 128 - }, - "mushroom-64": - {"path": "assets/rituals/mushroom-64.png", - "frame_width": 64, - "frame_height": 64 - }, - "mushroom-128": - {"path": "assets/rituals/mushroom-128.png", - "frame_width": 128, - "frame_height": 128 - }, - "pocket_watch-64": - {"path": "assets/rituals/pocket_watch-64.png", - "frame_width": 64, - "frame_height": 64 - }, - "pocket_watch-128": - {"path": "assets/rituals/pocket_watch-128.png", - "frame_width": 128, - "frame_height": 128 - }, - "rusty_nails-64": - {"path": "assets/rituals/rusty_nails-64.png", - "frame_width": 64, - "frame_height": 64 - }, - "rusty_nails-128": - {"path": "assets/rituals/rusty_nails-128.png", - "frame_width": 128, - "frame_height": 128 - }, - "severed_finger-64": - {"path": "assets/rituals/severed_finger-64.png", - "frame_width": 64, - "frame_height": 64 - }, - "severed_finger-128": - {"path": "assets/rituals/severed_finger-128.png", - "frame_width": 128, - "frame_height": 128 - }, - "stone_doll_cursed-64": - {"path": "assets/rituals/stone_doll_cursed-64.png", - "frame_width": 64, - "frame_height": 64 - }, - "stone_doll_cursed-128": - {"path": "assets/rituals/stone_doll_cursed-128.png", - "frame_width": 128, - "frame_height": 128 - }, - "dubious_combination-64": - {"path": "assets/rituals/dubious_combination-64.png", - "frame_width": 64, - "frame_height": 64 - }, - "dubious_combination-128": - {"path": "assets/rituals/dubious_combination-128.png", - "frame_width": 128, - "frame_height": 128 + "broken_locket": + {"path": "assets/items/broken_locket.png", + "frame_width": 256, + "frame_height": 256 + }, + "broken_pen_knife": + {"path": "assets/items/broken_pen_knife.png", + "frame_width": 256, + "frame_height": 256 + }, + "broken_yoyo": + {"path": "assets/items/broken_yoyo.png", + "frame_width": 256, + "frame_height": 256 + }, + "chess_pawn": + {"path": "assets/items/chess_pawn.png", + "frame_width": 256, + "frame_height": 256 + }, + "dirty_kerchief": + {"path": "assets/items/dirty_kerchief.png", + "frame_width": 256, + "frame_height": 256 + }, + "leather_pouch": + {"path": "assets/items/leather_pouch.png", + "frame_width": 256, + "frame_height": 256 + }, + "mushroom": + {"path": "assets/items/mushroom.png", + "frame_width": 256, + "frame_height": 256 + }, + "pocket_watch": + {"path": "assets/items/pocket_watch.png", + "frame_width": 256, + "frame_height": 256 + }, + "rusty_nails": + {"path": "assets/items/rusty_nails.png", + "frame_width": 256, + "frame_height": 256 + }, + "severed_finger": + {"path": "assets/items/severed_finger.png", + "frame_width": 256, + "frame_height": 256 + }, + "stone_doll_cursed": + {"path": "assets/items/stone_doll_cursed.png", + "frame_width": 256, + "frame_height": 256 + }, + "dubious_combination": + {"path": "assets/items/dubious_combination.png", + "frame_width": 256, + "frame_height": 256 } }, "worldgen": { diff --git a/assets/evil_eye-sprites.png b/assets/evil_eye-sprites.png deleted file mode 100644 index eb07d29..0000000 Binary files a/assets/evil_eye-sprites.png and /dev/null differ diff --git a/assets/evil_eye_test-256.png b/assets/evil_eye_test-256.png deleted file mode 100644 index c6364c3..0000000 Binary files a/assets/evil_eye_test-256.png and /dev/null differ diff --git a/assets/evil_eye_test-512.png b/assets/evil_eye_test-512.png deleted file mode 100644 index 0c9ee45..0000000 Binary files a/assets/evil_eye_test-512.png and /dev/null differ diff --git a/assets/floor_tile_test-256.png b/assets/floor_tile_test-256.png deleted file mode 100644 index 435d1fb..0000000 Binary files a/assets/floor_tile_test-256.png and /dev/null differ diff --git a/assets/floor_tile_test-512.png b/assets/floor_tile_test-512.png deleted file mode 100644 index 26df65f..0000000 Binary files a/assets/floor_tile_test-512.png and /dev/null differ diff --git a/assets/glowing_moss_wall-256.png b/assets/glowing_moss_wall-256.png deleted file mode 100644 index 0c15981..0000000 Binary files a/assets/glowing_moss_wall-256.png and /dev/null differ diff --git a/assets/gold_savior-256.png b/assets/gold_savior-256.png deleted file mode 100644 index de66a7d..0000000 Binary files a/assets/gold_savior-256.png and /dev/null differ diff --git a/assets/gold_savior_oil-256.png b/assets/gold_savior_oil-256.png deleted file mode 100644 index 987ae92..0000000 Binary files a/assets/gold_savior_oil-256.png and /dev/null differ diff --git a/assets/grave_stone-256.png b/assets/grave_stone-256.png deleted file mode 100644 index 4bd9d4b..0000000 Binary files a/assets/grave_stone-256.png and /dev/null differ diff --git a/assets/hairy_spider-256.png b/assets/hairy_spider-256.png deleted file mode 100644 index 1bed6f9..0000000 Binary files a/assets/hairy_spider-256.png and /dev/null differ diff --git a/assets/hanging_brazier-256.png b/assets/hanging_brazier-256.png deleted file mode 100644 index 005defd..0000000 Binary files a/assets/hanging_brazier-256.png and /dev/null differ diff --git a/assets/healing_potion_small-256.png b/assets/healing_potion_small-256.png deleted file mode 100644 index 0a6c770..0000000 Binary files a/assets/healing_potion_small-256.png and /dev/null differ diff --git a/assets/items/broken_locket.png b/assets/items/broken_locket.png new file mode 100644 index 0000000..a2102ea Binary files /dev/null and b/assets/items/broken_locket.png differ diff --git a/assets/items/broken_pen_knife.png b/assets/items/broken_pen_knife.png new file mode 100644 index 0000000..99984aa Binary files /dev/null and b/assets/items/broken_pen_knife.png differ diff --git a/assets/items/broken_yoyo.png b/assets/items/broken_yoyo.png new file mode 100644 index 0000000..2823691 Binary files /dev/null and b/assets/items/broken_yoyo.png differ diff --git a/assets/items/chess_pawn.png b/assets/items/chess_pawn.png new file mode 100644 index 0000000..1e30ed0 Binary files /dev/null and b/assets/items/chess_pawn.png differ diff --git a/assets/items/cinqueda.png b/assets/items/cinqueda.png new file mode 100644 index 0000000..ff09a80 Binary files /dev/null and b/assets/items/cinqueda.png differ diff --git a/assets/items/dirty_kerchief.png b/assets/items/dirty_kerchief.png new file mode 100644 index 0000000..e21b48f Binary files /dev/null and b/assets/items/dirty_kerchief.png differ diff --git a/assets/items/dubious_combination.png b/assets/items/dubious_combination.png new file mode 100644 index 0000000..8ee42cd Binary files /dev/null and b/assets/items/dubious_combination.png differ diff --git a/assets/items/healing_potion_small.png b/assets/items/healing_potion_small.png new file mode 100644 index 0000000..d7f9021 Binary files /dev/null and b/assets/items/healing_potion_small.png differ diff --git a/assets/items/leather_pouch.png b/assets/items/leather_pouch.png new file mode 100644 index 0000000..fb1aa85 Binary files /dev/null and b/assets/items/leather_pouch.png differ diff --git a/assets/items/mushroom.png b/assets/items/mushroom.png new file mode 100644 index 0000000..402058b Binary files /dev/null and b/assets/items/mushroom.png differ diff --git a/assets/items/pocket_watch.png b/assets/items/pocket_watch.png new file mode 100644 index 0000000..108f53e Binary files /dev/null and b/assets/items/pocket_watch.png differ diff --git a/assets/items/rusty_nails.png b/assets/items/rusty_nails.png new file mode 100644 index 0000000..38d9638 Binary files /dev/null and b/assets/items/rusty_nails.png differ diff --git a/assets/items/severed_finger.png b/assets/items/severed_finger.png new file mode 100644 index 0000000..39b531f Binary files /dev/null and b/assets/items/severed_finger.png differ diff --git a/assets/items/stone_doll_cursed.png b/assets/items/stone_doll_cursed.png new file mode 100644 index 0000000..ac35bfd Binary files /dev/null and b/assets/items/stone_doll_cursed.png differ diff --git a/assets/items/torch_crappy.png b/assets/items/torch_crappy.png new file mode 100644 index 0000000..f244bfd Binary files /dev/null and b/assets/items/torch_crappy.png differ diff --git a/assets/items/torch_horizontal_floor.png b/assets/items/torch_horizontal_floor.png new file mode 100644 index 0000000..a99161f Binary files /dev/null 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 new file mode 100644 index 0000000..fa58d30 Binary files /dev/null and b/assets/items/wood_barrel_small.png differ diff --git a/assets/large_stone_floor-256.png b/assets/large_stone_floor-256.png deleted file mode 100644 index db35a09..0000000 Binary files a/assets/large_stone_floor-256.png and /dev/null differ diff --git a/assets/lava_floor-256.png b/assets/lava_floor-256.png deleted file mode 100644 index 2a09974..0000000 Binary files a/assets/lava_floor-256.png and /dev/null differ diff --git a/assets/paper_ui_background.png b/assets/paper_ui_background.png deleted file mode 100644 index 13013f7..0000000 Binary files a/assets/paper_ui_background.png and /dev/null differ diff --git a/assets/peasant_girl_2-256.png b/assets/peasant_girl_2-256.png deleted file mode 100644 index 8f49779..0000000 Binary files a/assets/peasant_girl_2-256.png and /dev/null differ diff --git a/assets/rat-king-boss-fight-test-small.jpg b/assets/rat-king-boss-fight-test-small.jpg deleted file mode 100644 index 5ad3dd6..0000000 Binary files a/assets/rat-king-boss-fight-test-small.jpg and /dev/null differ diff --git a/assets/rat_king-256.png b/assets/rat_king-256.png deleted file mode 100644 index a2315c4..0000000 Binary files a/assets/rat_king-256.png and /dev/null differ diff --git a/assets/rat_with_sword-256.png b/assets/rat_with_sword-256.png deleted file mode 100644 index 86e8ecb..0000000 Binary files a/assets/rat_with_sword-256.png and /dev/null differ diff --git a/assets/rope_vines_up-256.png b/assets/rope_vines_up-256.png deleted file mode 100644 index 31159e9..0000000 Binary files a/assets/rope_vines_up-256.png and /dev/null differ diff --git a/assets/sprites/armored_knight_1.png b/assets/sprites/armored_knight_1.png new file mode 100644 index 0000000..ba3e07a Binary files /dev/null and b/assets/sprites/armored_knight_1.png differ diff --git a/assets/sprites/axe_ranger.png b/assets/sprites/axe_ranger.png new file mode 100644 index 0000000..bc33311 Binary files /dev/null and b/assets/sprites/axe_ranger.png differ diff --git a/assets/sprites/gold_savior.png b/assets/sprites/gold_savior.png new file mode 100644 index 0000000..6cbacc3 Binary files /dev/null and b/assets/sprites/gold_savior.png differ diff --git a/assets/sprites/grave_stone.png b/assets/sprites/grave_stone.png new file mode 100644 index 0000000..734354e Binary files /dev/null and b/assets/sprites/grave_stone.png differ diff --git a/assets/sprites/hairy_spider.png b/assets/sprites/hairy_spider.png new file mode 100644 index 0000000..1ebaf2f Binary files /dev/null and b/assets/sprites/hairy_spider.png differ diff --git a/assets/sprites/peasant_girl_2.png b/assets/sprites/peasant_girl_2.png new file mode 100644 index 0000000..42cf6ba Binary files /dev/null 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 new file mode 100644 index 0000000..fb16f6d Binary files /dev/null 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 new file mode 100644 index 0000000..2ce99da Binary files /dev/null and b/assets/sprites/rope_vines_up.png differ diff --git a/assets/sprites/torch_pillar.png b/assets/sprites/torch_pillar.png new file mode 100644 index 0000000..b2be61f Binary files /dev/null and b/assets/sprites/torch_pillar.png differ diff --git a/assets/sprites/tripwire_trap.png b/assets/sprites/tripwire_trap.png new file mode 100644 index 0000000..7507902 Binary files /dev/null and b/assets/sprites/tripwire_trap.png differ diff --git a/assets/sprites/undead_peasant.png b/assets/sprites/undead_peasant.png new file mode 100644 index 0000000..d7cd9ad Binary files /dev/null and b/assets/sprites/undead_peasant.png differ diff --git a/assets/sprites/well_down.png b/assets/sprites/well_down.png new file mode 100644 index 0000000..b8e07cc Binary files /dev/null and b/assets/sprites/well_down.png differ diff --git a/assets/textures/ceiling_black.png b/assets/textures/ceiling_black.png new file mode 100644 index 0000000..e81fde0 Binary files /dev/null and b/assets/textures/ceiling_black.png differ diff --git a/assets/textures/ceiling_blue_light.png b/assets/textures/ceiling_blue_light.png new file mode 100644 index 0000000..1313103 Binary files /dev/null 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 new file mode 100644 index 0000000..9b47b82 Binary files /dev/null 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 new file mode 100644 index 0000000..18f6202 Binary files /dev/null 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 new file mode 100644 index 0000000..5e317cb Binary files /dev/null and b/assets/textures/gray_stone_floor_light.png differ diff --git a/assets/textures/lava_floor.png b/assets/textures/lava_floor.png new file mode 100644 index 0000000..71a7362 Binary files /dev/null and b/assets/textures/lava_floor.png differ diff --git a/assets/textures/wall_plain.png b/assets/textures/wall_plain.png new file mode 100644 index 0000000..926ca81 Binary files /dev/null and b/assets/textures/wall_plain.png differ diff --git a/assets/textures/wood_wall.png b/assets/textures/wood_wall.png new file mode 100644 index 0000000..ed571ad Binary files /dev/null and b/assets/textures/wood_wall.png differ diff --git a/assets/the_ritual_circle.png b/assets/the_ritual_circle.png deleted file mode 100644 index 8f6d447..0000000 Binary files a/assets/the_ritual_circle.png and /dev/null differ diff --git a/assets/tiles.json b/assets/tiles.json index 18df268..e1d3d53 100644 --- a/assets/tiles.json +++ b/assets/tiles.json @@ -1,58 +1,51 @@ { "floor_tile": { - "texture": "assets/floor_tile_test-256.png", + "texture": "assets/textures/floor_gray_stone.png", "collision": false, "display": 10398, - "ceiling": "ceiling_plain", + "ceiling": "ceiling_black", "light": 0, "id": 0 }, "wall_plain": { - "texture": "assets/wall_texture_test-256.png", + "texture": "assets/textures/wall_plain.png", "collision": true, "display": 9608, "light": 0, "id": 1 }, "wall_moss": { - "texture": "assets/glowing_moss_wall-256.png", + "texture": "assets/textures/glowing_moss_wall.png", "collision": true, "display": 8820, "light": 20, "id": 2 }, - "wall_vines": { - "texture": "assets/wall_with_vines-256.png", - "collision": true, - "display": 35, - "light": 0, - "id": 3 - }, - "ceiling_plain": { - "texture": "assets/ceiling_test-256.png", + "ceiling_black": { + "texture": "assets/textures/ceiling_black.png", "collision": false, "display": 35, "light": 0, "id": 4 }, "lava_floor": { - "texture": "assets/lava_floor-256.png", + "texture": "assets/textures/lava_floor.png", "collision": false, "display": 35, - "ceiling": "ceiling_plain", + "ceiling": "ceiling_black", "light": 20, "id": 5 }, - "large_stone_floor": { - "texture": "assets/large_stone_floor-256.png", + "gray_stone_floor_light": { + "texture": "assets/textures/gray_stone_floor_light.png", "collision": false, "display": 35, - "ceiling": "ceiling_moss_brick_blue_light", + "ceiling": "ceiling_blue_light", "light": 40, "id": 6 }, - "ceiling_moss_brick_blue_light": { - "texture": "assets/ceiling_moss_brick_blue_light-256.png", + "ceiling_blue_light": { + "texture": "assets/textures/ceiling_blue_light.png", "collision": false, "display": 35, "light": 0, diff --git a/assets/torch_crappy-256.png b/assets/torch_crappy-256.png deleted file mode 100644 index 1fbab99..0000000 Binary files a/assets/torch_crappy-256.png and /dev/null differ diff --git a/assets/torch_horizontal_floor-256.png b/assets/torch_horizontal_floor-256.png deleted file mode 100644 index aad2ca6..0000000 Binary files a/assets/torch_horizontal_floor-256.png and /dev/null differ diff --git a/assets/torch_pillar-256.png b/assets/torch_pillar-256.png deleted file mode 100644 index 1b16004..0000000 Binary files a/assets/torch_pillar-256.png and /dev/null differ diff --git a/assets/torch_pillar-512.png b/assets/torch_pillar-512.png deleted file mode 100644 index d7f580e..0000000 Binary files a/assets/torch_pillar-512.png and /dev/null differ diff --git a/assets/tripwire_trap-256.png b/assets/tripwire_trap-256.png deleted file mode 100644 index 1a6b4c0..0000000 Binary files a/assets/tripwire_trap-256.png and /dev/null differ diff --git a/assets/full_screen_paper.png b/assets/ui/UI/full_screen_paper.png similarity index 100% rename from assets/full_screen_paper.png rename to assets/ui/UI/full_screen_paper.png diff --git a/assets/ui/UI/ritual_crafting_area.png b/assets/ui/UI/ritual_crafting_area.png new file mode 100644 index 0000000..120d921 Binary files /dev/null and b/assets/ui/UI/ritual_crafting_area.png differ diff --git a/assets/ui/full_screen_paper.png b/assets/ui/full_screen_paper.png new file mode 100644 index 0000000..12b5cfd Binary files /dev/null and b/assets/ui/full_screen_paper.png differ diff --git a/assets/ritual_crafting_area.png b/assets/ui/ritual_crafting_area.png similarity index 100% rename from assets/ritual_crafting_area.png rename to assets/ui/ritual_crafting_area.png diff --git a/assets/undead_peasant-256.png b/assets/undead_peasant-256.png deleted file mode 100644 index eed23a3..0000000 Binary files a/assets/undead_peasant-256.png and /dev/null differ diff --git a/assets/undead_peasant-spritesheet.png b/assets/undead_peasant-spritesheet.png deleted file mode 100644 index bb82572..0000000 Binary files a/assets/undead_peasant-spritesheet.png and /dev/null differ diff --git a/assets/wall_simple-256.png b/assets/wall_simple-256.png deleted file mode 100644 index 6c76722..0000000 Binary files a/assets/wall_simple-256.png and /dev/null differ diff --git a/assets/wall_texture_test-256.png b/assets/wall_texture_test-256.png deleted file mode 100644 index c3bcb1d..0000000 Binary files a/assets/wall_texture_test-256.png and /dev/null differ diff --git a/assets/wall_texture_test-512.png b/assets/wall_texture_test-512.png deleted file mode 100644 index e68dd88..0000000 Binary files a/assets/wall_texture_test-512.png and /dev/null differ diff --git a/assets/wall_with_pillars-256.png b/assets/wall_with_pillars-256.png deleted file mode 100644 index 7715274..0000000 Binary files a/assets/wall_with_pillars-256.png and /dev/null differ diff --git a/assets/wall_with_vines-256.png b/assets/wall_with_vines-256.png deleted file mode 100644 index da524ac..0000000 Binary files a/assets/wall_with_vines-256.png and /dev/null differ diff --git a/assets/well_down-256.png b/assets/well_down-256.png deleted file mode 100644 index 514de63..0000000 Binary files a/assets/well_down-256.png and /dev/null differ diff --git a/assets/wood_barrel_large-256.png b/assets/wood_barrel_large-256.png deleted file mode 100644 index 6cf2732..0000000 Binary files a/assets/wood_barrel_large-256.png and /dev/null differ diff --git a/assets/wood_barrel_large-512.png b/assets/wood_barrel_large-512.png deleted file mode 100644 index 37b1898..0000000 Binary files a/assets/wood_barrel_large-512.png and /dev/null differ diff --git a/assets/wood_barrel_small-256.png b/assets/wood_barrel_small-256.png deleted file mode 100644 index 43aede2..0000000 Binary files a/assets/wood_barrel_small-256.png and /dev/null differ diff --git a/assets/wood_wall-256.png b/assets/wood_wall-256.png deleted file mode 100644 index 6851bdc..0000000 Binary files a/assets/wood_wall-256.png and /dev/null differ diff --git a/assets/wood_wall-512.png b/assets/wood_wall-512.png deleted file mode 100644 index 8924713..0000000 Binary files a/assets/wood_wall-512.png and /dev/null differ diff --git a/gui/combat_ui.cpp b/gui/combat_ui.cpp index ee4e285..495ffe7 100644 --- a/gui/combat_ui.cpp +++ b/gui/combat_ui.cpp @@ -50,21 +50,21 @@ namespace gui { switch(ritual.element) { case FIRE: make_button(name, Events::GUI::ATTACK, - slot, "broken_yoyo-64", "fireball_01", "flame"); + slot, "broken_yoyo", "fireball_01", "flame"); break; case LIGHTNING: make_button(name, Events::GUI::ATTACK, - slot, "pocket_watch-64", "electric_shock_01", "lightning"); + slot, "pocket_watch", "electric_shock_01", "lightning"); break; default: make_button(name, Events::GUI::ATTACK, - slot, "severed_finger-64", "punch_cartoony", "ui_shader"); + slot, "severed_finger", "punch_cartoony", "ui_shader"); } } } auto hp_gauge = $gui.entity("hp_gauge"); - $gui.set(hp_gauge, {"stone_doll_cursed-64"}); + $gui.set(hp_gauge, {"stone_doll_cursed"}); $gui.set(hp_gauge, guecs::make_action(*$level.world, Events::GUI::HP_STATUS, {})); diff --git a/gui/loot_ui.cpp b/gui/loot_ui.cpp index b8a6c84..7c29b01 100644 --- a/gui/loot_ui.cpp +++ b/gui/loot_ui.cpp @@ -38,7 +38,7 @@ namespace gui { $gui.set(id, { [=](auto, auto) { fmt::println("clicked button_{}", i); } }); - $gui.set(id, {"broken_yoyo-64"}); + $gui.set(id, {"broken_yoyo"}); } auto close = $gui.entity("close"); diff --git a/gui/main_ui.cpp b/gui/main_ui.cpp index aaa7cb5..3ecbd76 100644 --- a/gui/main_ui.cpp +++ b/gui/main_ui.cpp @@ -28,12 +28,6 @@ namespace gui { $rayview.set_position(RAY_VIEW_X, RAY_VIEW_Y); $rayview.position_camera(player.x + 0.5, player.y + 0.5); - auto st = textures::get("down_the_well"); - auto bounds = st.sprite->getLocalBounds(); - st.sprite->setPosition({RAY_VIEW_X + bounds.size.x / 2, - RAY_VIEW_Y + bounds.size.y / 2}); - st.sprite->setOrigin({bounds.size.x / 2, bounds.size.y / 2}); - $overlay_ui.init(); } diff --git a/gui/ritual_ui.cpp b/gui/ritual_ui.cpp index 6a9a548..3eb300e 100644 --- a/gui/ritual_ui.cpp +++ b/gui/ritual_ui.cpp @@ -170,9 +170,8 @@ namespace gui { int i = 0; for(auto& [item_id, item] : $blanket.contents) { auto slot_id = $gui.entity("inv_slot", i++); - auto icon_name = fmt::format("{}-64", item); - $gui.set_init(slot_id, {icon_name}); + $gui.set_init(slot_id, {item}); $gui.set(slot_id, { [&, slot_id, item_id](auto, auto) { auto data = std::make_any(slot_id, item_id); @@ -223,13 +222,13 @@ namespace gui { switch(ritual.element) { case FIRE: - $gui.show_sprite("result_image", "broken_yoyo-64"); + $gui.show_sprite("result_image", "broken_yoyo"); break; case LIGHTNING: - $gui.show_sprite("result_image", "pocket_watch-64"); + $gui.show_sprite("result_image", "pocket_watch"); break; default: - $gui.show_sprite("result_image", "severed_finger-64"); + $gui.show_sprite("result_image", "severed_finger"); } $gui.set(combine, { @@ -237,7 +236,7 @@ namespace gui { }); } else { $gui.show_label("result_text", L"That won't work."); - $gui.show_sprite("result_image", "dubious_combination-128"); + $gui.show_sprite("result_image", "dubious_combination"); $gui.remove(combine); return; } diff --git a/scripts/build_assets.ps1 b/scripts/build_assets.ps1 new file mode 100644 index 0000000..ccbbc02 --- /dev/null +++ b/scripts/build_assets.ps1 @@ -0,0 +1,32 @@ +Param ( + [string]$Colors=16, + [string]$Size="256x256" + ) + + +function Build-Images { + param ( + [string]$source, + [string]$pixel_count + ) + + $files = Get-ChildItem -Path "C:\Users\lcthw\Pictures\Games\Renders\Raycaster\$source" + $out_dir = ".\assets\" + $source.ToLower() + mkdir -force $out_dir + + foreach($file in $files) { + $in_name = $file.Name + $out_file = "$out_dir\$in_name" + Write-Output "In file: $in_name" + Write-Output "Out file: $out_file" + Write-Output "Size: $Size" + + .\scripts\pixelize.ps1 -InFile $file.FullName -OutFile $out_file -Colors $Colors -Pixel $pixel_count -Size $Size + } +} + +Build-Images -Source "Textures" -pixel_count 12 +Build-Images -Source "Sprites" -pixel_count 6 +Build-Images -Source "Items" -pixel_count 2 + +cp -recurse C:\Users\lcthw\Pictures\Games\Renders\Raycaster\UI assets\ui diff --git a/scripts/pixelize.ps1 b/scripts/pixelize.ps1 index 87390f2..9b62d10 100644 --- a/scripts/pixelize.ps1 +++ b/scripts/pixelize.ps1 @@ -10,5 +10,7 @@ cp $InFile temp.png # magick temp.png -colors $Colors -quantize sRGB -dither FloydSteinberg color.png magick temp.png -posterize $Colors -quantize sRGB -dither FloydSteinberg color.png + bash ./scripts/magick/pixelize -s $Pixel -m 2 color.png pixels.png + magick.exe pixels.png -interpolate nearest -interpolative-resize $Size $OutFile diff --git a/tests/textures.cpp b/tests/textures.cpp index 8e80161..aec4d8c 100644 --- a/tests/textures.cpp +++ b/tests/textures.cpp @@ -12,7 +12,7 @@ TEST_CASE("test texture management", "[textures]") { REQUIRE(spider.sprite != nullptr); REQUIRE(spider.texture != nullptr); - auto image = textures::load_image("assets/hairy_spider-256.png"); + auto image = textures::load_image("assets/sprites/hairy_spider.png"); auto img_ptr = textures::get_surface(0); REQUIRE(img_ptr != nullptr);