Add a new dead_body sprite for things that are dead but you can't loot them.

master
Zed A. Shaw 3 days ago
parent 0d889cd0ff
commit 97fe02d99d
  1. 2
      Makefile
  2. 5
      assets/config.json
  3. 2
      assets/devices.json
  4. BIN
      assets/items/broken_locket.png
  5. BIN
      assets/items/broken_pen_knife.png
  6. BIN
      assets/items/broken_yoyo.png
  7. BIN
      assets/items/chess_pawn.png
  8. BIN
      assets/items/cinqueda.png
  9. BIN
      assets/items/dirty_kerchief.png
  10. BIN
      assets/items/dubious_combination.png
  11. BIN
      assets/items/healing_potion_small.png
  12. BIN
      assets/items/leather_pouch.png
  13. BIN
      assets/items/mushroom.png
  14. BIN
      assets/items/pocket_watch.png
  15. BIN
      assets/items/rusty_nails.png
  16. BIN
      assets/items/severed_finger.png
  17. BIN
      assets/items/stone_doll_cursed.png
  18. BIN
      assets/items/torch_crappy.png
  19. BIN
      assets/items/torch_horizontal_floor.png
  20. BIN
      assets/items/wood_barrel_small.png
  21. BIN
      assets/sprites/armored_knight_1.png
  22. BIN
      assets/sprites/axe_ranger.png
  23. BIN
      assets/sprites/dead_body.png
  24. BIN
      assets/sprites/gold_savior.png
  25. BIN
      assets/sprites/grave_stone.png
  26. BIN
      assets/sprites/hairy_spider.png
  27. BIN
      assets/sprites/peasant_girl_2.png
  28. BIN
      assets/sprites/rat_with_sword.png
  29. BIN
      assets/sprites/rope_vines_up.png
  30. BIN
      assets/sprites/torch_pillar.png
  31. BIN
      assets/sprites/tripwire_trap.png
  32. BIN
      assets/sprites/undead_peasant.png
  33. BIN
      assets/sprites/well_down.png
  34. BIN
      assets/textures/ceiling_black.png
  35. BIN
      assets/textures/ceiling_blue_light.png
  36. BIN
      assets/textures/floor_gray_stone.png
  37. BIN
      assets/textures/glowing_moss_wall.png
  38. BIN
      assets/textures/gray_stone_floor_light.png
  39. BIN
      assets/textures/lava_floor.png
  40. BIN
      assets/textures/wall_plain.png
  41. BIN
      assets/textures/wood_wall.png
  42. 4
      scripts/pixelize.ps1
  43. 4
      tests/map.cpp

@ -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'

@ -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": {

@ -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}
]
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

@ -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

@ -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();

Loading…
Cancel
Save