diff --git a/Makefile b/Makefile index ca4ba17..54a92f6 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ clean: meson compile --clean -C builddir debug_test: build - gdb --nx -x .gdbinit --ex run --args builddir/runtests -e + gdb --nx -x .gdbinit --ex run --args builddir/runtests -e "[map]" win_installer: powershell 'start "C:\Program Files (x86)\solicus\InstallForge\bin\ifbuilderenvx86.exe" scripts\win_installer.ifp' diff --git a/assets/config.json b/assets/config.json index b4ff6c5..3d545f2 100644 --- a/assets/config.json +++ b/assets/config.json @@ -209,6 +209,11 @@ {"path": "assets/items/dubious_combination.png", "frame_width": 256, "frame_height": 256 + }, + "dead_body": + {"path": "assets/sprites/dead_body.png", + "frame_width": 256, + "frame_height": 256 } }, "worldgen": { diff --git a/assets/devices.json b/assets/devices.json index 1ab700a..210e47f 100644 --- a/assets/devices.json +++ b/assets/devices.json @@ -85,7 +85,7 @@ "foreground": "devices/fg:grave_stone", "background": "devices/bg:grave_stone" }, - {"_type": "Sprite", "name": "dubious_combination", "width": 256, "height": 256, "scale": 1.0} + {"_type": "Sprite", "name": "dead_body", "width": 256, "height": 256, "scale": 1.0} ] } } diff --git a/assets/items/broken_locket.png b/assets/items/broken_locket.png index 3bcea22..8297513 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 3b8e0a4..493141d 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 492183f..5ea335e 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 341187c..55d3686 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 1331cc6..1da5227 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 d0eeac1..2305bd9 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 4c1f3d8..350d891 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 ed0bd66..a73f794 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 4dd5a00..ebf4750 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 2ffd569..499f3ca 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 19b573f..7bdd4e9 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 7dc7f0d..ec5a177 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 28ad896..b2b1281 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 413be9d..e1588bd 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 e850ba6..649917a 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 bb5e3ee..e47b469 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 1207a53..0cb3193 100644 Binary files a/assets/items/wood_barrel_small.png and b/assets/items/wood_barrel_small.png differ diff --git a/assets/sprites/armored_knight_1.png b/assets/sprites/armored_knight_1.png index a1a5ba5..4f2970d 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 e6bf585..a28b17a 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 new file mode 100644 index 0000000..995b381 Binary files /dev/null and b/assets/sprites/dead_body.png differ diff --git a/assets/sprites/gold_savior.png b/assets/sprites/gold_savior.png index 7de5cdb..ec764d8 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 c91a222..6a904eb 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 842f60c..6cfeefb 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 905cf95..e93114b 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 73ec745..7223eb5 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 f62b7ad..67c4655 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 c887434..fbacd66 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 54a2cfd..ba0dde2 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 c69e9ab..df82d40 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 7e4f059..48c04cd 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 bc2b930..edc8392 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 bcdc065..7e59270 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 17835e7..d47c226 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 956879b..afb8c37 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 c891290..ec55f1c 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 b85dd5f..318b417 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 a3e72d6..eca9006 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 ad04962..74cb80a 100644 Binary files a/assets/textures/wood_wall.png and b/assets/textures/wood_wall.png differ diff --git a/scripts/pixelize.ps1 b/scripts/pixelize.ps1 index 9b62d10..d6974ff 100644 --- a/scripts/pixelize.ps1 +++ b/scripts/pixelize.ps1 @@ -9,8 +9,8 @@ Param ( 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 +magick temp.png -posterize $Colors -quantize sRGB -dither FloydSteinberg poster.png -bash ./scripts/magick/pixelize -s $Pixel -m 2 color.png pixels.png +bash ./scripts/magick/pixelize -s $Pixel -m 2 poster.png pixels.png magick.exe pixels.png -interpolate nearest -interpolative-resize $Size $OutFile diff --git a/tests/map.cpp b/tests/map.cpp index 4c76de5..3c571af 100644 --- a/tests/map.cpp +++ b/tests/map.cpp @@ -34,7 +34,7 @@ TEST_CASE("camera control", "[map]") { REQUIRE(translation.y == 2); } -TEST_CASE("map placement test", "[map:placement]") { +TEST_CASE("map placement test", "[map]") { textures::init(); components::init(); for(int i = 0; i < 20; i++) { @@ -81,7 +81,7 @@ TEST_CASE("dijkstra algo test", "[map]") { } } -TEST_CASE("map image test", "[map-sprite]") { +TEST_CASE("map image test", "[map]") { components::init(); textures::init();