From 97fe02d99d1feaad60c92a0b018d9869f15a809c Mon Sep 17 00:00:00 2001 From: "Zed A. Shaw" Date: Wed, 6 Aug 2025 23:13:29 -0400 Subject: [PATCH] Add a new dead_body sprite for things that are dead but you can't loot them. --- Makefile | 2 +- assets/config.json | 5 +++++ assets/devices.json | 2 +- assets/items/broken_locket.png | Bin 16988 -> 16988 bytes assets/items/broken_pen_knife.png | Bin 15316 -> 15316 bytes assets/items/broken_yoyo.png | Bin 13115 -> 13115 bytes assets/items/chess_pawn.png | Bin 8544 -> 8544 bytes assets/items/cinqueda.png | Bin 11440 -> 11440 bytes assets/items/dirty_kerchief.png | Bin 11971 -> 11971 bytes assets/items/dubious_combination.png | Bin 7220 -> 7220 bytes assets/items/healing_potion_small.png | Bin 4614 -> 4614 bytes assets/items/leather_pouch.png | Bin 12723 -> 12723 bytes assets/items/mushroom.png | Bin 15684 -> 15684 bytes assets/items/pocket_watch.png | Bin 19206 -> 19206 bytes assets/items/rusty_nails.png | Bin 7964 -> 7964 bytes assets/items/severed_finger.png | Bin 12769 -> 12769 bytes assets/items/stone_doll_cursed.png | Bin 11613 -> 11613 bytes assets/items/torch_crappy.png | Bin 7718 -> 7718 bytes assets/items/torch_horizontal_floor.png | Bin 5911 -> 5911 bytes assets/items/wood_barrel_small.png | Bin 4151 -> 4151 bytes assets/sprites/armored_knight_1.png | Bin 29292 -> 29292 bytes assets/sprites/axe_ranger.png | Bin 18793 -> 18793 bytes assets/sprites/dead_body.png | Bin 0 -> 1999 bytes assets/sprites/gold_savior.png | Bin 24180 -> 24180 bytes assets/sprites/grave_stone.png | Bin 16825 -> 16825 bytes assets/sprites/hairy_spider.png | Bin 34303 -> 34303 bytes assets/sprites/peasant_girl_2.png | Bin 20421 -> 20421 bytes assets/sprites/rat_with_sword.png | Bin 14027 -> 14027 bytes assets/sprites/rope_vines_up.png | Bin 18485 -> 18485 bytes assets/sprites/torch_pillar.png | Bin 10079 -> 10079 bytes assets/sprites/tripwire_trap.png | Bin 5255 -> 5255 bytes assets/sprites/undead_peasant.png | Bin 28562 -> 28562 bytes assets/sprites/well_down.png | Bin 22532 -> 22532 bytes assets/textures/ceiling_black.png | Bin 11552 -> 11552 bytes assets/textures/ceiling_blue_light.png | Bin 37152 -> 37152 bytes assets/textures/floor_gray_stone.png | Bin 25429 -> 25429 bytes assets/textures/glowing_moss_wall.png | Bin 59031 -> 59031 bytes assets/textures/gray_stone_floor_light.png | Bin 44507 -> 44507 bytes assets/textures/lava_floor.png | Bin 60809 -> 60809 bytes assets/textures/wall_plain.png | Bin 30596 -> 30596 bytes assets/textures/wood_wall.png | Bin 23145 -> 23145 bytes scripts/pixelize.ps1 | 4 ++-- tests/map.cpp | 4 ++-- 43 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 assets/sprites/dead_body.png 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 3bcea22aa1ee039cd2056ee40ca65a193eb8731b..829751377836a6cc8b01e6ac7567fd180fe8b29c 100644 GIT binary patch delta 129 zcmcc9!g!~Jal<1PP7ZcvPQjNv+X^2&ZGB&p|G1fLPure@^?OidA zfq_A_#5JNMC9x#cDmOnRGp&-r$iT={*8rly*vi1t%FrC5q3h7rtjQUUvf^0e?p~j= Jb@Cj?0|2^p7lbyyW-+z#Fx53S3^6dWGPJZZw$wH-ure?>wD;;8 z1_lPz64!{5l*E!$tK9sQ%(O}dBLgE-T?3c~BMU2IQ-}tp1TN{x8IH2zSmZ)WwU11m H<9Gl7|_mO~oyA4a`FfjI4~!txSxy4GgRd3}ky(Oq;yk kN(w4xY-M0+WoQnO>pHYGYw`mtS!{B5uTR-JS;YDP0C2n?z5oCK delta 106 zcmcaoex-ba11l%1Jd=#dldrBDH+!=Bn~Iz28XJZf7+D!wS{Ykv8yHv_7#!Mr_08n< iR#I>|BMU2IGl-mVhd|rp2UfD!<$ diff --git a/assets/items/chess_pawn.png b/assets/items/chess_pawn.png index 341187c4bac07091a83021f780986e1f72656303..55d3686239a20f7e5279f54959556502937cab5d 100644 GIT binary patch delta 106 zcmaFh^uTGu7G_Qkc4kgtcBbnwoA)xO%ZOX(8kmO|7+D#cTbUSZ8yHv_7|8anm^Rs3 kK?*8oY-M0+WoQYJyY=^+`Q#i0S!{B>FW$eHyg=aq05pUjivR!s delta 106 zcmaFh^uTGu7G_RXc_tav$)8HqH}7Rmmk~GBH8u<}FtReVv@*8THZZUYK^d i3Q}-6BMU2IbBNs3|I$X2a};E;$sKxS^>*?Cg#!S~Hz0rj diff --git a/assets/items/cinqueda.png b/assets/items/cinqueda.png index 1331cc655efdaf522948fc7439a5332f3acfe7bd..1da52274b418f5891f8d52795fa1188c4d72cc16 100644 GIT binary patch delta 112 zcmdlGxgl~w9VZ7nGpESRG^hU?+ZSq!Tj&~?hZq=H8Jk;~7;76CSQ!||_O6&V*E_d`mLjL3e9a&|VJ|wwGR~cdpLH3A2TlpJ2R)~yTqbQ1_s7mlNDJ-Hy1FAYl&Ov8kmO|7+D#cTbUSZ8yHv_ s7|8anm^OKyt`t3X4X3Z0P?CIG5`Po delta 114 zcmX>cdpLH3A2TnjJd=!i?H>_t1_s7mlNDJ-Hy1FAYl)lc8XJZf7+D!wS{Ykv8yHv_ n7#!Mr_08mYx>9gCBMZ3P(E|zjlh5nQVw0P6)p5gQX1xOdEwLcl diff --git a/assets/items/dubious_combination.png b/assets/items/dubious_combination.png index 4c1f3d8a87c67ced0c0dab60d158d6d7061364f1..350d891ac77201f3bbf7a52937e72d63deeb4e1a 100644 GIT binary patch delta 160 zcmdmDvBhG;UnWitc4kh|cZo%ro7tF`Nz_~D8kmO|7+D#cTbUSZ8yHv_7|8ann8v`s zpjzS@QIe8al4_NkpOTqY$zWt)WU6Zb(O_(4U}(8UHx3vIVCg!09O_)IsgCw delta 160 zcmdmDvBhG;UnWjgc_tZ+x6YiiHnTA=lc+bKg_I z2GtVRh?11Vl2ohQ{FKbJN(LhXBU4=im*4L-tpe)dWbkzLb6Mw<&;$Uty(~rm diff --git a/assets/items/healing_potion_small.png b/assets/items/healing_potion_small.png index ed0bd66c193909a045b12c90c5fa4cf5a49f2db6..a73f794c6a8debd8e0be43018deb6256747c423a 100644 GIT binary patch delta 158 zcmZouX;Ya{$H~FY%qdo$p?rB``*(qQ3ta>A5CbDCV{54Imnftqd%!jEo=}!b<1r0X1mAHI!uLrWThZ<`&@A V!U|>)! zag8WRNi0dV%FR#7OsixtGB7gLHGpX_vam8SglPElN?j1BK?AO#Br`X)xFj*R0Jomi U|Jlv~^>8wHy85}Sb4q9e05xqa@c;k- diff --git a/assets/items/leather_pouch.png b/assets/items/leather_pouch.png index 4dd5a00ebd02eb9b8dad54ef058d7a5d4b9b1984..ebf475082ec785422d15da3d47f5edaaf9cab420 100644 GIT binary patch delta 114 zcmdm-yg7M83^OkWJ2R&^L%y&p0|Vo($@;9Ko9mc=>WEwD8kmO|7+D#cTbUSZ8yHv_ r7|8anm^Qi3Knf~nY-M0+WdxP`z%*^vbc delta 114 zcmdm-yg7M83^OmQJd=zTvv0;W1_s7mll56eH`g)$)Dbt;H8u<}FtReVv@*8THZZU< qFgUdL>YK@Z22yZ2BMU1NBZ%BtCflCL`we8V$;}d%37-7f-~a$iSs;Y~ diff --git a/assets/items/mushroom.png b/assets/items/mushroom.png index 2ffd569863b9565df8d890c6d5dfbb3be1d6fe87..499f3ca019db92707404070ce55b513cdca9d800 100644 GIT binary patch delta 114 zcmX?7b);&8Ju5EYK^(Hd1goBMU1NBZ%BtCflCL0XDMO1W#_UIRF3>>mLyS diff --git a/assets/items/pocket_watch.png b/assets/items/pocket_watch.png index 19b573f4627a1279e01c12a9b44584de92e19e0a..7bdd4e93c7812a6f0ad86eb5ef0fa8c581bfc7b5 100644 GIT binary patch delta 139 zcmZph#@IHEal<_pUJiCnRs;3ta>A5CbDCV{?>9s%vZ*Vqj!tXlZ3^scm3j zWnge<@6|VxA9_l8!{m%CtW1m{a@nP377Ppw8YQj~B`Jv|sa7SKxv9k^iMa&~Mg~Tv Rx&~PE*d&NQpX}y!008p5C)5A{ diff --git a/assets/items/rusty_nails.png b/assets/items/rusty_nails.png index 7dc7f0d318db490df3a46dc83473eea49b92c43f..ec5a177672d71413e9e08c41ad174448ea8f5c01 100644 GIT binary patch delta 127 zcmbPZH^**63o|DNJ2R)`^Xqm_n|qmqr93Qj4a`FfjI4~!txSxy4GgRd3}ky(Ok-eR zP%UwdC`m~yNwvz&PsvQHWH2%?GSxMJXfU=iu(UEVg=m<3Y4L)|8gjDYSmcfzZ>pah HBX(h0QTilh diff --git a/assets/items/severed_finger.png b/assets/items/severed_finger.png index 28ad8964c40ae4a6300e97dcfa1ce5733fd6d61e..b2b1281fe9d61a99266ce2bf4a834994410be614 100644 GIT binary patch delta 106 zcmaEu{4jaLL>5jCc4kh==hy9=HqT<=))BYRH82k`FtRc>w=yx-HZZUUf5 k11YGSv6X?Pm60h#Zt|tY3nsrcki{l<Z0RR91 delta 106 zcmaEu{4jaLL>5j~c_ta1S9)igH_u|>))6<=H8u<}FtReVv@*8THZZUYK@X i45Z+4Miy2kCJ?!GmpHaferq6$P44G$&CJP)h6ex&LLm+S diff --git a/assets/items/stone_doll_cursed.png b/assets/items/stone_doll_cursed.png index 413be9db88d0e8bbcc038cb3cf6b931df49b9bd4..e1588bd17186744e8b1d79585f98780fdbdcbc9d 100644 GIT binary patch delta 127 zcmcZ`bvJ55Bnu}8J2R(L-M#!Do0C}ft9w}J8kmO|7+D#cTbUSZ8yHv_7|8ann8v`s zpjzS@QIe8al4_NkpOTqY$zWt)WU6Zb(O_(4U}T+P3to0C}ft9zL08XJZf7+D!wS{Ykv8yHv_7#!Mr^$i09 zgKCLuL`h0wNvc(DeoAIqC4-THk*Tf$OoNeym5C`t1IJQkrpcK)vf^0e;x{PWojh0P F003=sekrd2W+85o)B8bCA{TNzkd8JR;gu=sB31ZvQLYbeRgO)V}-%q_sJ VCpcnq7*G!}e|5 diff --git a/assets/items/torch_horizontal_floor.png b/assets/items/torch_horizontal_floor.png index bb5e3eec64949a8608713dd96f952182d985ebc5..e47b469e4b90077a9e28016934aabe9e811c6641 100644 GIT binary patch delta 133 zcmbQPH(hT+9VZ7nGpAhT=G6~3wsVMiSm+vzm7AZEnO4bQWME{fYXH$;Y-M0+Wo!V^!0XU6bMkdDS!FD8QK4(yfQB)6 My85}Sb4q9e0Jnl8%K!iX delta 133 zcmbQPH(hT+9Ve?ilZ;`f#=@wL?Hpnrrn<(4AqGZPhL%>wmf8jeRt5%#_FjF%z`&qd z;u=wsl30>zm7AZEnO4bQWME{fYXH+=WMO3j)o`9QvuyHpFqdv1_o9J28Z@ueZ#=O zpjzS@QIe8al4_NkpOTqY$zWt)WU6Zb(_my_WdhZ3o;9-!s6hj+p(HamwYVfPw*a@E P83Gzmvv4FO#mG9A&US2 delta 114 zcmaF!gz?Q2#tC(ttny4U!Z98X_HAsBEfhD^H8u<}FtReVv@*8THZZUYK^G q3#H(4MixM6h+O;AbfL*QMY75;eMoW_KDeD_00K`}KbLh*2~7ZoA0xH^ diff --git a/assets/sprites/axe_ranger.png b/assets/sprites/axe_ranger.png index e6bf5851df916d93bea1764d9fdae69b87d63a14..a28b17ae7c8a27e7c261c84e648b534a13955dd2 100644 GIT binary patch delta 135 zcmaDkiSgwm#tC(t9PG@TOu3uBuiMxj<>6tWYhWH?U}R-%Ze?PuZD3$!U?AJOVj2Sj zgKCLuL`h0wNvc(DeoAIqC4-THk*Tf$M1!%Ffu)s!5k!MXz^vfOnx3-CSmc~tclQ7d OWAJqKb6Mw<&;$UL4<$SR delta 135 zcmaDkiSgwm#tC(ttny4UqFc3HyEnE+d3c!W8XJZf7+D!wS{Ykv8yHv_7#!Mr^$i09 zgKCLuL`h0wNvc(DeoAIqC4-THk*Tf$OoNeym60JtgH@~Ew8@&DvdUQGawqV60u5vE MboFyt=akR{0IX>xX8-^I diff --git a/assets/sprites/dead_body.png b/assets/sprites/dead_body.png new file mode 100644 index 0000000000000000000000000000000000000000..995b381683852ba397e9a5b77a24621979508a6e GIT binary patch literal 1999 zcmb_cYgAKL7QPf29)g$|UIWe0ULPp01|kBn;=&1#@Gy};@x@CZP6|=Pz$GGz(!w1n z3Y5TH8qft4>J_1e0VEM9u%>`>6RH6pU{V|m3r1a&5XJ+b zp@<#gXEVX4K2@ z0b_XAqiQ$v#O@+zf%8#Cy(IOknVyUrqAymn4m|Xbk}KXp!{zD0%^@vlSXyc!HQA>NEh_&3cMTVTXGbXpZ zU2#?_uDWNp_ex|G)X(cu26811Ur#MJ2Dg#&&6{)Qwj|e5eWq60tv5LqFw&2`akhhg zmzP&)YMlDA_msGYrI%JDSeCz6;hA1+OzE>g?ee#?okMEAANFzBmyEpszUBEP_5q_4i6budPLqGk9<>qYa`bYzS*$n5=U>rGzhoNth77?gE(YJ$ z)HtT?-8V2U?pae^quNzdg+Bg=)q9lV0^GEFaJVXA_iB6S#DasYu~Ns<-*2_;CU>T^ zME3T&{f%HA&xHF?>B6ccva^>6TFjmgaxk69zxvZr_07#Qe%el6)`xFogLB94us-n- zK<%IItxd2S2!MY-qDwhC=V9W&u@bHf+~Peh4!+qZ>FPS$IKUCB=lNGV@gb7?ojQ^V?@{Ci_cD ztrM2ayH$ZL!+E16q)B2^S*$cUil^lB-0iPl?ub+`y;`VSk*qdoCPa^tIAI>GR#ten z0q0Dq^4z#;oa$`w)VQ(HrO#&~twrt|;@1|%+1*h>mBi0Q_wG|sMYG4%Z%-8<1v;lF z)?!n(VdE2P*JADJ_4`j$(en7fF*;p4a-lBZO7!j4z}C58M4TI-=l|klSyY8oT2c7? z%k6^!@qHJ6puFzi*IalnTw&}hjeMVfx$jXbz=&aij5sdOdiDZy1 z*fb;*EW_ffT{LCcK@Y1_Yikjc_4R>^n$s;E&CQQbx2X3_SLf$Qw~pq_zk6iYOG!`4 zOP(HDDnE_1{mA*pJxb4PinOryyv_G#J8n4YnvPxGrte$Ub@Fh2w{@4rO)hIGvcr|C z&2N4mdiE64rH{AIgb#T7cQ%RJj`)y$Z(>C%pdBvr#5jok8q zM*B3qT;9IGF0zb`t9tVKm93~uNtYc|sea@5dSv%^Tc5WJS&OoXzNU+{50516>B>1# zG&lD2#}mfY?jJ=jdWai>t)Fdk)luITy#2u7UdB>SM1yFI-EqLpZC2fX_G9ZaOL@dn zYpeHuFPUv`a;uwb^yaDM_bf=wD{aRm-QV(PQwtX}XGU6b&FxpCepoYd+h&E3O==H){3 z45PU-=$?!{bSD~(L8DRgzbW|@L3k!!z!(3DKxfdr8MI#rGKa!(K-l%)3L=3p;hZQ| YnEbyvI`?nE^9n(1zeCLWgE3eB4cz&K5C8xG literal 0 HcmV?d00001 diff --git a/assets/sprites/gold_savior.png b/assets/sprites/gold_savior.png index 7de5cdb41ca671c842727aa8ffb18d68e548af78..ec764d8668ee2b52381b5ee0a1623538c9d1f821 100644 GIT binary patch delta 160 zcmeyehw;lE#tC(t9PG@TEG-vw=yx-HZZU8wHy85}Sb4q9e03vNItN;K2 delta 160 zcmeyehw;lE#tC(ttny4UVmeA9h8x>cW9vm48uAw9|H?_DVF}DD> Vo|p>JD?mM*44$rjF6*2UngENREA0RP diff --git a/assets/sprites/grave_stone.png b/assets/sprites/grave_stone.png index c91a22213420964cfcd673a1abd06722ff44334f..6a904eb6a2e754726f45b0ca4e0d145200e940e7 100644 GIT binary patch delta 135 zcmdnl%(%0eaY7v@2Rkz->*s4pyc^qBIe1v;8kmO|7+D#cTbUSZ8yHv_7|8ann8v`s zpjzS@QIe8al4_NkpOTqY$zWt)WU6Zb(O_(4U}hb&vdUQGe(}pC01adC MboFyt=akR{0CrU+jsO4v diff --git a/assets/sprites/hairy_spider.png b/assets/sprites/hairy_spider.png index 842f60c23fc78ff6fb9e263c5d4472f13a790428..6cfeefb96bfe5b02fd728daa7280a96b6fbc5dd9 100644 GIT binary patch delta 114 zcmez0&Gf&UX+j+*2Rkz-Th@K!?Hk)aw1`{i8kmO|7+D#cTbUSZ8yHv_7|8anm^Qhu tRSGI+Y-M0+Wnc!8dmz8hVeYK@Z utx|9~BMU1d6Np^KUPi;o`&(s|VfsLFrVzQA_qC%KfWXt$&t;ucLK6T_QX+Z) diff --git a/assets/sprites/peasant_girl_2.png b/assets/sprites/peasant_girl_2.png index 905cf957c9e05bf1d0ac8f9f74153f5d8466041e..e93114b6d2ae9b67a46dd21858ca1ed51d7e9b90 100644 GIT binary patch delta 160 zcmX>)pYiB?#tC(t9PG@T9KGps8#cCY^Q*VeH82k`FtRc>w=yx-HZZUFVdQ&MBb@0GR?UP5=M^ delta 160 zcmX>)pYiB?#tC(ttny4UQmRuTq&Bv1^Q$-2H8u<}FtReVv@*8THZZUKg_I z2GtVRh?11Vl2ohQ{FKbJN(LhXBU4=imu$>8bg=d#Wzp$P!hYb@sg diff --git a/assets/sprites/rat_with_sword.png b/assets/sprites/rat_with_sword.png index 73ec74527e6bfc1a55af5e89531a9eeed5058b24..7223eb5e3dec344cc2916e2b9f1288540c51ee44 100644 GIT binary patch delta 127 zcmX?|dpdW+A4X0Nc4kh_UkQ3@n^~EKg_I z2GtVRh?11Vl2ohQ{FKbJN(LhXBU4=im z7*tDKBT7;dOH!?J^HVa@DjAFnj7)V6U>b}ptc;)_Y0E)f6# diff --git a/assets/sprites/torch_pillar.png b/assets/sprites/torch_pillar.png index c887434425d05d1f05baef0e6442ddae3165af73..fbacd6625265d94f0ef9cec17bac45878698b572 100644 GIT binary patch delta 112 zcmccbci(S99VZ7nGbc|M*R7Qs+XK|ZEp!dcLkx_pjLoe~jI|96tPBifdsj@G{7y{@ rDranEU}3w&pFH++XK|ZO?8b8Lkx_p3@xpUEwv2{tPBhe?Y;VD@;fyt pxSWxNm9YUtE+9g6&t!RZS!I|$Bsq3pmShGX@O1TaS?83{1OQJN9%ldm diff --git a/assets/sprites/tripwire_trap.png b/assets/sprites/tripwire_trap.png index 54a2cfdf715cd1733b034dd5847d62f687b62a2d..ba0dde299171c76dd564338ba8479368d559a461 100644 GIT binary patch delta 133 zcmZqIY}cGn$H~FY%*mI+vb%L-dxfxvg|2~lh=GxnvALCrv9^JMm4Sh5?}}**3=FCz zt`Q|Ei6yC4x%nxXX_X8{21cg31`rL#RtA<wmf8jeRt5%#_FjF%z`&qd z;u=wsl30>zm7AZEnO4bQWME{fYXH+=WMO4&1krH(xXIMX?jo|vSmY*L67>Qa#^CAd K=d#Wzp$PzMeI?`o diff --git a/assets/sprites/undead_peasant.png b/assets/sprites/undead_peasant.png index c69e9abd6f59f0c7c41d46a0ff8a0bb115881dd8..df82d400e4af2c65a1a97a49dd1c6920c5098b4f 100644 GIT binary patch delta 138 zcmbPqpK;QC#tC(t9PG@T{KCxL!W-M0^TaK54a`FfjI4~!txSxy4GgRd3}ky(Oq;Bj zFBJ}vGqy6Yv@$e>%Ec~mW?*2@C~=J_Nl7e8wJOQXO)V}-%q?IrGB7gLHNc|B%cFG; PP!EHrtDnm{r-UW|Fij-g delta 138 zcmbPqpK;QC#tC(ttny4Uic{uqwANo2#0~a}3=9k!C9V-ADTyViRwbFasl_FUxdjYH21cg323Yi%EtUHR P)WhKE>gTe~DWM4ffe|Pp diff --git a/assets/sprites/well_down.png b/assets/sprites/well_down.png index 7e4f05920721752fd4158a075a0cadd409e8528a..48c04cdf38f06047dcc43c8e9bb051e033f472f2 100644 GIT binary patch delta 160 zcmZqKz}T{ZaY7v@2Rk#Tz&!4@XB*qUhSgi>8kmO|7+D#cTbUSZ8yHv_7|8ann8v`s zpjzS@QIe8al4_NkpOTqY$zWt)WU6Zb(O_(4U}BUp1`W7|lFZ!H;*!MN Y0^EA47tCh_>fvPYboFyt=akR{0NaW!QUCw| delta 160 zcmZqKz}T{ZaY7v@t2~p8a@E8OLL1w^hSi(u8XJZf7+D!wS{Ykv8yHv_7#!Mr^$i09 zgKCLuL`h0wNvc(DeoAIqC4-THk*Tf$OoNeym9Z&A15*N*G*E*ETti7_ZfbE!Vr~I$ WJ)x!AM}T@b89ZJ6T-G@yGywqo^(?sn diff --git a/assets/textures/ceiling_black.png b/assets/textures/ceiling_black.png index bc2b930dadf8571691309cc770c8c2660f7caf9b..edc83923c7f829dca5a31dd00ee7b00db93145dd 100644 GIT binary patch delta 114 zcmZ1wwIFJPCo?ApJ2Qvw{fgh)HU}}gX^LCu8kmO|7+D#cTbUSZ8yHv_7|8anm^OL6 tjuceR*vi1d%ES~Rx2yi3zmvv4FO#pPqAq4;c delta 114 zcmZ1wwIFJPCo?CjJd+Hw-`i5n*W^HU2oFHzYYhWH?U}R-%Ze?PuZD3$!U?AJOV%p^O u6QrPW##ROvRwm{UIo$^r3?@IAAgc_~hay+?_2YX6AnT0*Vr(`z{twb(#qIU+rYrez~Io{t8XT+ spCAR7GqSKUFonqVyyyKf`N0HPWtcuBx!b>V)ER)l)78&qol`;+05Y5-G5`Po diff --git a/assets/textures/floor_gray_stone.png b/assets/textures/floor_gray_stone.png index 17835e7e70213b6fff89a14e13b23904c1ac5048..d47c2263f2e083049aa33f9b8c50a88a61ea10e6 100644 GIT binary patch delta 160 zcmcb5jPdF*#tC(t9PG>-hNml+|J>N_mQ-({YhWH?U}R-%Ze?PuZD3$!U?AJOVj2Sj zgKCLuL`h0wNvc(DeoAIqC4-THk*Tf$M1!%FfrXWcB}7B*{nfcZ4H|F_C7HRY#U+Wk Y1-SKSo$A^I)WgZ(>FVdQ&MBb@0FTrz;s5{u delta 160 zcmcb5jPdF*#tC(ttny4U>~51x4sUFCOR6{3H8u<}FtReVv@*8THZZUKg_I z2GtVRh?11Vl2ohQ{FKbJN(LhXBU4=im-CcA}$%Qm)mJoT{9H82k`FtRc>w=yx-HZZU-W}&i1Q5)OOtP!`+H82k`FtRc>w=yx-HZZUP|z sS}CZUv6X>^l_^wCl=aKr$+OqWDns<4$TFVdQ&MBb@0Kdm1Q2+n{ diff --git a/assets/textures/lava_floor.png b/assets/textures/lava_floor.png index b85dd5f48ebe90f5c44dfa9753d6b87a44c8816b..318b41794ec1d25bf215b987d3dcef9500c7a512 100644 GIT binary patch delta 135 zcmeCY&D?pLc|sj02Rk!|#iph5u^Zc~-gsE(8kmO|7+D#cTbUSZ8yHv_7|8ann8v`s zpjzS@QIe8al4_NkpOTqY$zWt)WU6Zb(O_(4U}0ry2GQVdds}L<=UZ82EOG)Gzm5V8 OWAJqKb6Mw<&;$Ue8YVsf delta 135 zcmeCY&D?pLc|sj0t2~nozlZ0Zj~m;o-gubm8XJZf7+D!wS{Ykv8yHv_7#!Mr^$i09 zgKCLuL`h0wNvc(DeoAIqC4-THk*Tf$OoNeym7xhl!!skcOOrj{$|@tvnL^~m19Wx* P4P)?h^>bP0l+XkKS`{a@ diff --git a/assets/textures/wall_plain.png b/assets/textures/wall_plain.png index a3e72d6533f2835f86c6aad906cca19854825d21..eca900621c29e6cf33ba03d7798a6c16767a9fe4 100644 GIT binary patch delta 160 zcmZp9&)D*waY7v@2Rk!|Rm|$T!j0{vW%U-i2Ie6KMpnk=Rwl;U1_o9J2C}^?rZF%u zsFt`!l%yncnd%xqG#FbMSXh}_Ks1OmEpP{F(12?w$;?eHE=kNS Xz^%tYym1Cl4=01CtDnm{r-UW|lNc+! delta 160 zcmZp9&)D*waY7v@t2~p8z){DIEF0TP%j!*ajSWK#jI0bTt&AVDEZ=ePZxQ3F<+|=Td#M}bh WdenB9sQ~qGGI+ZBxvX-*4k_Qo^NcAiuAD1H82k`FtRc>w=yx-HZZUFUpuHKSyevB*73=+Xfi O#^CAd=d#Wzp$P!X!zS1O delta 135 zcmaF4h4JMU#tC(ttny4ULfZZpG&Z(JMS7U(8XJZf7+D!wS{Ykv8yHv_7#!Mr^$i09 zgKCLuL`h0wNvc(DeoAIqC4-THk*Tf$OoNeym7xVhgW{x|Ws^0dWRgGNB{r; 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();