From 37af5081e9ef16b905997bb3373837e917ca53c4 Mon Sep 17 00:00:00 2001 From: mibi88 <76903855+mibi88@users.noreply.github.com> Date: Sat, 27 Jul 2024 00:33:31 +0200 Subject: [PATCH 1/9] Improving graphics on cg using an EGA64 palette. --- assets-cg/npc/face/npc_female.png | Bin 510 -> 831 bytes assets-cg/npc/face/npc_male.png | Bin 494 -> 820 bytes assets-cg/npc/face/npc_milkman.png | Bin 544 -> 686 bytes assets-cg/npc/face/npc_police.png | Bin 555 -> 708 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/assets-cg/npc/face/npc_female.png b/assets-cg/npc/face/npc_female.png index 16321ae9686c47ee3c62fd877c6c897e4b36d061..b9027f64e54df2c35dce3f777d6cb3f05be8cd64 100644 GIT binary patch delta 819 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 VT`g>hO6ULp002ovPDHLkV1ir+-6#M6 diff --git a/assets-cg/npc/face/npc_milkman.png b/assets-cg/npc/face/npc_milkman.png index 98b92bfda1f2cec54fc9a2b23eab17ab935e6568..758a8bce6eb9dc091a7ca704a74b18bc95660dc4 100644 GIT binary patch delta 673 zcmV;S0$%-~1g-^;8Gi-<0063Kaozv`0(D75K~#90?VB-@!Y~X)zZvcVC!pm9P^BYx z;V#gnqN1ivNx^WNY_X%=#2aDB7707{Zy1cNBN5Y0ARP<0RXD10stHi2LQnF zcys`8ytR9asaSce1Crz^m@PF0RWH31HfienUyn|%zA=wik@c;(^&bd(ptjUP=4ie`fo6W`nK-;#1^6Uvv z&jYM9wWsvFV}J0>*%J`-fK+jrcFu|F#mdh-H#!sotOH6j>DTj#(8ddin->%UQUh3J zXfCfP1ZW#fHGXr~v-XNYz}z>WmDDRpq19pb1epIOXx&F+`fY-<7Q z%*Uz_FxQ2xGp}`jQuYL>M}gjXfsdLQYTchy2uNrvB4EGYCtL!!TrMv^kL~-ULO^Uo ztryTIwV z`ghIs`+r3iakD4jZ6`#m*86@OZl@?#g@Dum+-Y(yW7@q%u72z(c3;^OFxgt*=YoMg ztc{a8A1DNbD$xH3o2GerTKwIoxw!ZoQPMR+A%Oe9&%Abgk0m1YM2LT%ArcA!egT*H zKMfkpKtreSb*qO(oKuz&dT%0H=cU zzS7Zqay zu{#0tJE3(`QaLMxs?2iG8LN{1A}Yr#DL()qFJHcr7XTAy7LFYgta!!~MROe@uP>O$&qW Uis=fL01E&B07*qoM6N<$f)Xe35C8xG diff --git a/assets-cg/npc/face/npc_police.png b/assets-cg/npc/face/npc_police.png index 8888672a56d275dbd0ae005736ab013596e74211..cb58f619d1f0c1de08d8349f0d4d2d4910834ab8 100644 GIT binary patch delta 695 zcmV;o0!aO<1jGf98Gi-<0063Kaozv`0*gsRK~#90?VGWYt1u9Te|fG0G8%B^7U;l^ z$n5Iu%#rDU7F+}wHTVVZ?F{U&l2(Z0?rHzTgOFCT_R~s$zE z{F4I!=N$e=9rkX(-ugNoj}8D1hrfM6zwh@O0B|~;c52%9sDF3@k_UEGRRDl-96#Aw zvqDu>IRF^PQB}?eh|O5nH2`23hMC7{_Sjop*Uhf$x^@6C41>3v5unIBTQB@{O^ERR zMyz?v6;D8N42bm@Db^#Y z_C57j4Df07EPueI9sAnyv34dh0(@Fcz~?hhrZ-2SsI0xu^GWqC$O!OBO#ttC(eOs^ z5EJS*0(?@h1Y;HJsl8!AXk^ilD0)IAp76>V~=Tl__>{W4Y&ugPU zsdxg^vp~}{0D!*lf7HrQ8~sT}z>2a_1Y9nc6;%MQ*UNi9b?lRjfYgH8Snzl}0L*rv zE{cc=d7hLy_DM!S1{H~*7I%Kx+OcYG6L2b`0jPV+NjTE1Z1=|bNyCp z{b^DTyMM(Kko{?pJfG`%pWDg()!7JGYhW@9%+e)~g@}mFFV(A6@dRW$F_LTNh}KT( zNfA=<1O#J%bW((RoOW-=j@?}Q1gPGw>lO{#iIGT&1Co1w(&Lz3OXBsq;x7=7zb|DIWb2 zh>|3_k)bWKoi_q&tKwsL?v*lHAbWsp)qe>T?}j~P`+pF&CGt<8;Wm?H zWGM-)T(-4Toj}ozNy%x6Ws|!t0S5#|b3opfoVlEOYvWsTM$iJCF!X<85~FXqobji( zCh^?gie5&Zwu^nH6#Nj7(Zem;Hu){<($f$b`EGc|Zvl&f9|G1*nKl<>UCfTDjU Date: Sat, 27 Jul 2024 12:25:42 +0200 Subject: [PATCH 2/9] Improved NPC female. --- assets-cg/npc/face/npc_female.png | Bin 831 -> 472 bytes assets-fx/npc/face/npc_female.png | Bin 327 -> 323 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/assets-cg/npc/face/npc_female.png b/assets-cg/npc/face/npc_female.png index b9027f64e54df2c35dce3f777d6cb3f05be8cd64..e407f5b3883e5917c9d0f3bc5e0f62dda4b15038 100644 GIT binary patch delta 457 zcmV;)0XF`>2G|3T8Gi%-0001Bxm5rF0iQ`kK~!jg?U_50!Y~j-TNHQMjHBRaGmb|_ z#2#fYWCBE49?w@$HF6c580$aJ4I_(!88`#@1#kg?0u(Tsxk5wiKx-X3hW)6HKjpcK z1Au=3C$5ze{TaZYRQc+skVq$>KPAU=R|z;~N+)m>YkFL-X@3SwA)SEi0Ve?=F!yYO z5(q@E4`k1lPC)(^7^09uUTBm~AnXB;Jya5;GMzxk1KuCUh#&StAetJy6!t-&H!*rB z?1KQXjfA7(X+t$2fq8pd>UFAR_onP6t&Qe`0SO42udw2@{^C-7ZB_pTW5J%3C4Ch&;$9bf-VBUlK*e@>WZEz+y?=rI503@kxn4=X5^(1IV(yh5b}U`|7X4x zHS?rtcr$Pgof0)&ZbONjgdQZOF{@yXi zBOtAw6Sp(cyuwi!i-2_Yr$xn4X!}x83h4wMTNPDV`WT1j00000NkvXXu0mjfDAvT! delta 819 zcmV-31I+x`1HT548Gi-<0063Kaozv`0|rS%K~#90?OR*2;vf(`OwDpEw~$pNKd#Ro zS;bvh&qu;FLV#{)K*yY_TUQO~$KlX`K?8sQV4i0Hzzn)J5r=pc|HIOSPuYk$lDg+%wQ+drvgR? zFdAP^fMnJ5X*Iwhnd8?hKyy2M2%^W~=f*55?Q6ju0%G~c5_xg%B~@|{1IZlK3E(90 z62O*F>3y80#eWxfU=biqq83aN`V_(5$!q!i`dL7QfDyf~<-5r=D4pV3+e!Lhv`H2~ zKNw>c5E1P1YI=SUj4|xsrFIepvENEC7Bm3Z#ej%dm0QaW2kJ#|AM|3^zoTot?BvjF z7T5>8R6O%gu#+6Zszs0<^Yir_X%qRpg&hvmi{L0^YJWmB&vPL(I)GN&TrP$aFd8QT zBb~1cp0PzVM?ljrLPsYLoI~Iw;9CfY4&`qlAd3HjfSScr^9LhUTR{MLDD8S8$Zdx7 zz7BUh%$bCitv8v8*FGQUHw0WhsRNP1oW%+Yun_ zb**QFDSrZ*JP_4DVbyP61A6T3wSA};!ImVnuw6ocLGF=rgFqQJvvD0kN`UcR2Tq9| zYb~fh|Nn%wPrG3}ehke{i>C~S*XCJ=1Z!i9Cs{nT4P%(52>|f(^FxQTfFmKd0uve10`ObphzLaQb8>bc&lV$XF=r7S0y_qetNR5cR&wiLF8vNRp4K;2(G1T7d#eGc83B!3D?L_t(YiKSFa7Q-M29P@HMdx73A?z-v;>7ttQ8PxYm77BrJ zAQJ(pa)}7EN&0M=DX9yPgA}h1NC7q}>b$Z75SQZXGy__`qUC2m3C$ohKa&@W3Uw0( z>`cys0%Vj~oB+%^j_*#EHoBEbBr=e(6bLG+Qh<)+{JPTR)_;E$$k%Md{t-n1^rb1( zCjhueF_i?sS|n{Nr%K$h1;A`*TLA0-`|lR0kO1J}{C8jJ?EpaCgu||TSLJ8^W(=QE z_uT-z)amB@Ob2djtPqC|k@v}?$$b!$gCe?nTGv91V2KI0rJqsYZ-H53W`JD2gM}ZY un!!r8LUsy(zaefks=dPpe5cKLQ8ph|k*uS&*@Eo=0000=W7B!3P`L_t(YiLF#ivcn(@6PccmcY)rn*>%+ustX{MT|4kHRTh9h zvT$np0`X-vC{og1~dlt z~*c;c@ILKk#qk*KgE&?*N_> z-Ni2|G1baSSAydfSxhG1s5fU(P#|NZN@D0$eG_Lvqo63=wc>P|@7XI*;zFq1toMAG y Date: Sat, 27 Jul 2024 12:59:44 +0200 Subject: [PATCH 3/9] Better male and female faces with EGA color palette --- assets-cg/npc/face/npc_female.png | Bin 472 -> 792 bytes assets-cg/npc/face/npc_male.png | Bin 820 -> 861 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/assets-cg/npc/face/npc_female.png b/assets-cg/npc/face/npc_female.png index e407f5b3883e5917c9d0f3bc5e0f62dda4b15038..c0edcfd6d429ec3bc9e41fbd4adbb693e13fd640 100644 GIT binary patch delta 780 zcmV+n1M~dY1DFPo8Gi-<0063Kaozv`0^dnQK~#90?OQ>T;~)%dw(^%;rt%y6hkJ=H zdCT7NmK>Oa<0;26Ac+=uchgl>Dh48s5b7%)9Q=kLo065m4z0sDxF z>$OO=XTphT>ts|ki01|>NMQAnz ztfVT2govBF0Dr9BGzwAV=Q;$Kq3ks*+ywA&*u$nq0CD(xCNZ{cdIYq{;LJ9t0<@gI zSZ&b+=uyft+WhZVgA@UJEo2yN(|3hS1&h>SmYrfd!uyg_;M$Q8M#MPZI*qTUhiiP^ z6N=7T>?8#1QweUJPF-tdCkMI!YX`?^{@MFmD?25)&3^)Ghe!2051O4~^~%cu+BZAH zuz%fXCzCX@9H~jLC#(W|3ZdQ(khjCtkO*+(w?NhC9s#}4Re-tT>zhOm^Jb_QK0~0l z1HJJPptl3P@lOa)Q%rfB6MTjK_}eQ|izX5zi=kpAD4Na|9ZH0zQFh-Gg5E#KVrb!$ ziwGro27f3K04R!@H~yOo3i86SpXKPE1Ge~ygza@*ud`N>vD<)a!BoRZC(kcj(^8Xg=3@ofBv)~Zo!&-DsrTzwiisZ zK#cL{07FZp#I5m1EI?@<_DWjX$kNseA^}{;DRzo1?Mt886W}G5G>sqaeDKb*Z{s8z z0q%2g?S7#EB@RgeWdGR_yT0CDpC-#8$EA8LP%VNn3Z&#q_y$PnRL1FwG?f4V002ov KP6b4+LSTYK1Zv{| delta 457 zcmV;)0XF`a2G|3T8Gi%-0001Bxm5rF0iQ`kK~!jg?U_50!Y~j-TNHQMjHBRaGmb|_ z#2#fYWCBE49?w@$HF6c580$aJ4I_(!88`#@1#kg?0u(Tsxk5wiKx-X3hW)6HKjpcK z1Au=3C$5ze{TaZYRQc+skVq$>KPAU=R|z;~N+)m>YkFL-X@3SwA)SEi0Ve?=F!yYO z5(q@E4`k1lPC)(^7^09uUTBm~AnXB;Jya5;GMzxk1KuCUh#&StAetJy6!t-&H!*rB z?1KQXjfA7(X+t$2fq8pd>UFAR_onP6t&Qe`0SO42udw2@{^C-7ZB_pTW5J%3C4Ch&;$9bf-VBUlK*e@>WZEz+y?=rI503@kxn4=X5^(1IV(yh5b}U`|7X4x zHS?rtcr$Pgof0)&ZbONjgdQZOF{@yXi zBOtAw6Sp(cyuwi!i-2_Yr$xn4X!}x83h4wMTNPDV`WT1j00000NkvXXu0mjf<0!uHGgHwPn-?#Lma>=BE zTuc*j3n{{f%(wy{$id*j{1Lm-3NZ7%3u6P)zNe?v3UELLkmor7Ic0sk|85S9{C3Vc zo>4Imy8Q;>&7zSSa}n?M7bV2o;c##Ox7!VXTmBn>zwhq=9Dk3;doR6#?gg?GqJ;Pq z+40ik+X#v!)IMt>-i3-&hyZIQ-$2YOW(uqs;z801@Cu`^!d4w1#+C&Txm6>;=IjsK zc7O;U0xTWC($Ew_!8xF+PNBB~;9L=Pd+^B)R07139z%c_^9hiO^caLj}uIVzYXAc=W#2Y*;YV}DQz;EK{wmb!?1?FAG^ z)>za5OOuDd?*pn+UXibFXQ;J5Y%m9Cmut0RO$UFze_53aLPj4V9N>!5yEyMjs+_fO>P(@bNi9N!|h` ziAwt!URESW)0uh`^ce@<`*XxxNRJru=)_)j5Epb=iz_sHDL9_tBuGhyabFm1} z&kvdrcLgQ)qVn@@=U`?5PM+@sR3e0+CjaQKeJX&@_?$t5mg8#qx6v>UQ R2Fm~d002ovPDHLkV1hoTe4PLQ delta 798 zcmV+(1L6GL2DAo{BYy(>Nkl~Vwe zCDF-*T*U41qJ;Q5olXP*x7!T>a8rK)0RO(f0RZRo`98`b(SM6T_Ck~pe zv4q;EB;qz$oI(UBnY@8Fub3%NGQ5+-72p-J&%#k1;Ef{-;N@110Ee?baBK&7;UmD_ z0qhOVMku%jX#Ep_H#ulJt@&=q3SpvKQc`n|5C&+m$PVm?ZxR#_)_el3= zL-M`AZ?JZ7L@kI~cF@xOtwC%GxPqOxakjD2{W-_soUHZF%RCgB#M$Kc_C=5-08uOQ zLb4=y3(z!8$~Z(p)S_t`uVn2$1tbcY3qDC>TUxphN`Eb9cAxO%wz~tQ!66R>2q0Mq zQ)HiuT^+DDc_2`LQkO$c^*14=e|L34Pf6K89vV(!6YvMvGv@$7A*K% z4Gi)`Eq|0!)J06Q{HuV%><8ELcEu)-DS;}&G0_f~?F)3St?hir7gG7>5OqMxd;3&l zNbc!>Ye1$SM~K9pqz0sLLMnHO3!t@z)><^+`*VYPztTv$3W&V8NL*KF)(5JbTr(c3v(7SJJAg0Dl12>s15pOf3duh9mfQ{Ulc41S1x~>5L<2XK~#wdQdTmUTpRp!cMXeGD%H{mo5-j#9g_*+i+IKXa*&Abb?BeoztuFDA@2duP-X1)~69QeTb c?H3*JA30YRWaUj3@Bjb+07*qoM6N<$f|50P3;+NC From 0919808be66d51fea9f585eef2527372d435b4e9 Mon Sep 17 00:00:00 2001 From: mibi88 <76903855+mibi88@users.noreply.github.com> Date: Sat, 27 Jul 2024 13:20:11 +0200 Subject: [PATCH 4/9] Police and milkman faces with EGA palette --- assets-cg/npc/face/npc_milkman.ase | Bin 0 -> 1264 bytes assets-cg/npc/face/npc_milkman.png | Bin 686 -> 1000 bytes assets-cg/npc/face/npc_police.ase | Bin 0 -> 1217 bytes assets-cg/npc/face/npc_police.png | Bin 708 -> 969 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 assets-cg/npc/face/npc_milkman.ase create mode 100644 assets-cg/npc/face/npc_police.ase diff --git a/assets-cg/npc/face/npc_milkman.ase b/assets-cg/npc/face/npc_milkman.ase new file mode 100644 index 0000000000000000000000000000000000000000..6993b2e93bf7bc9c9d0f537ebae48939bb50c219 GIT binary patch literal 1264 zcmcJNYfMvT7=Ta9Z5<*m*&sL#&8%ERC@pd+WkpFW$VF+F6aQlwluacMa1V4Je3 zIB0}UM%!78Fa?1EqcFM@6)$XH$Jl5oEfyxwuoS64N?Etqy~H?@{n)>KC+EqRoSZz* zch39V89`=SFvvl;@CXJ$kW+APE&SH@f7yKie*22+KUO_heDJTVzW;VQ5ab>F0pQ_) z7$BQM0t#7F;LI66;8YVExO`s>{Btz|*tn1iUrR(;V+;A7J^7R`hiuI7l4Hv4)8dO3FO691KY`D;8a>3a8jTI z3L6rE)!a}A2hQTW`Gq$R2Zw+YKt8lXI8;M2^g=9@LMAjqAk;w`bU_ppLC$82!vPhL z0Dh2z8MNR8A=p6WyJ^BZ0beahK-`ez95lZSPx|l2WDFKTT<|a7bin@Qih=nkmp;=Q zy3gZxxSr%c4_2ptw$~mP$(lbTs#)>3<`6Z0K%h2Jj4G?uc(b-$ZlhTV+z~t9 z!k}<(qbjU%ra-F8K+3EfYuX zFm_@_&1$jvo=bLpls`_3n-&@*lK2`QgJ)jwO5as~v|BrA;B{#SEyTH&^vn=>&c{Xuc~)xwJKd0dLrqLm*rve4^9@Qo{r;Yb+mU^DRf0{ zS)xwE4ea~F28ZUT`>ZI-(011Rcw28Gf3A)EvD3^QF{{fadwY4Jw{2SZBz>iVp$^J1 zKKgm}b9)9w&ESSF8b|Yu*5Z+*6566h+AtzryuJ|guB>RRyWSRlhPKD#S@Csmzd2gg zvVUH1OXQ~X?3;P<6iq1iE=tf;c1&4vV!UzO;^~|AENn)}sqNRhDrmkkDdT~vu_up? zTQl+MzIT^W1g(;x>aw(G;WUM)QL=4@OIL=Db4)$obcTh@jepe|Zd&IM7Bttq`~UDv z_~mHe6ZqpUcnpGrVci-4GU5dTpwW$ce1hNRocbsSTiJLH)eY|@5$Z%2%TsSz>*%rQ zz|I;Hy?#zQ+EDd{LOVY$+7UO9GJK_pq_{njHs~{4f8@w9oQLk$j-V9RiHWjjOQV9Z zvL?S~V(rapG|Y z3dkm`^eVUt6nI88-~tgEhy;OMU_sJ1{>dFB62O00?gFF;fCYfA>i_^9hVk$1*!^+; zkTHZ0q|X`GSk6gJ(+~i>y}f00v7X47Xi0`nJbV&HU%Q-oNa!pB^baQ$lAGs z1)yzPoX_WM0KQ@{fOLd3O#?s=P_-Peq^^5Bo&uRBSwDY_QoUukjj7B&N2L)0$g0fl z08AwXBF!P99Dm@Bw}JtPfh7HjszC6=4PgNM3iI;vLa(o{vvZ08BrjSSP-6Wt^IN?N z5QQ1n0^?Vi)a?SSR0gf>XP-GRYea}Kgr;dIlo+c42$>Fjzb1%~Q~{(+$FA{jl^QUX z%AyK@9OJPzYQylQPzKA*$3$eteqOTPPiEZ1~9EYm7;ScN}0+!00 zhB%YP27hoqpNj^wg*ap0JOZ>O34cHcfXqOwCym_pG8RYL+B5>THV)_9iue*wZoY@BoB7n@WtKa(Ms>sA%azXCw18Y1HDlMB#z~d`? zaq~qH(6%i<7dQ^7a|gpaZ&b<`%na}wwSr+0p$Tc$ZK2c7SP`d zI0)LR1h&p*NE<@MsH(Rc)Phj+mV!bVj4p_L2vQS?>s-I3RiOSlz!~6z$OV?E>`Zz% z9De`+*XtEMU_0*PttEp}<77Yp`Qyk@F@WFK>;08E8v-!T50V)tg8{ci<(I>OfRzFC zk>3f3AmnH?fA7!#D#K6mg5&WB0Qh;ih<=2l4q|+R6ss#fjBm#y0l?*Qi8s6SMXvGL zph`h7j0gK2|E54h0hF457?2c1rtw+7xJ*G{1JIiJrNICImSA`Nkc;`Y?|4c5s8(!e_f#{cn6|xl%$GOVw3;?002ovPDHLkV1kat B#%=%r delta 663 zcmV;I0%-l{2d)K>BYy&QNklk%>kCxYU{j%NEgk(>^GE`x^-2wn^x0@<3jUrlc-a)b^BzpoR z9-!*`sp7nYWbGl@6Cm*b2LR5wQ3R~Xi1iK<=OLTT#sNUvwuAEQ2~f`itTeT!^t@y6 z%-ItV^ng@xnSXZ9iR#75&pbCe6auURN;B!#^NG;L3yGT-6arEMSY>D~uP6j)8%#BR zbJw%>ibBBLH=vc&D@dW$VfF-=|0ZbNM`Ppl+P!?n>X_`eNWkzm!A{djc0q5X{P3D9@|>0b~4;eWGbPrz(z0qe}ist_>Og{?EM zb$?R!1gJ-W-g$wKni*={pHv7)Xe%OMzuzZZ0=Qf*FF%j%`=mlZY(uRV&|Y0=|DT8n zWu6q<_eq5SgBVHY2b-oDyw_&Fswy`YN2)?VYJjQd1*xv@s}NuqYmoYP&Gq|57ICvD z;B6;Ftbf+~ejIM6C{~4l)BxORaxP=qy+y8m>?w9%*%L6?THxn`fj+E_lR6(L1cWNk z{|K9=d3jp=-KV*@_#9EvH9{eP`@qk1Vks+O2Eyrf1r0r-OD@R+UQV)`H zMbWiVUCn^G$$$-ME9;SXz-07TmeEq~4k*kC9^DGD3*EO_7|H(FfBU_>PkzbEd!Ntm z{ocE~8bKynypTjVP{a#CkP~pO40L7szs&Z5|HU)!f2>1b*@`Y(vHy0u5hMiN1w6Qu z2&Biy0_!spfa4$U09tR*f%Eqpfv)Fo0xI7>M@j;G!$SWvDWB>ay-UW#m^zS>}FD*ZT2;WEfwYi~v z#plqCn4|L(?C6PDjVP#Yws*KZq-o~`ym;4WifU`cKz=jRn}<10_owMU`jo=TeTS7J z!7A%?lV)pKwW4=m@sTN$H>@m~bB&b*dRrKcIRTe`6ZSQzzVM8sYTwY92++U z^0wdu;{1oKnw+HO>m$^mwcG}NOWRtye@EAbi6lWwN+RKhh@w7Rpw^X0$6It(aq>+xa#ic7ai9pat#i?|sd zNcH7Ai?62AZapW>w9RB7NzRyKaW3*8NnX#=XFbr$KDYQjnla3Um4)x2 zIgjl=zh&CU&FiM+-72Y_SNVjVCk*Hdv})6xnoNs^N@I7t{Y3MV;}`f(o?fb~?}FXN zpkBy&1cR(>eI&98wtn<-n%^1J_dxe5;YhU$d$6{#^29?iZKLe>`*#$nhq%#w0^y4v zl_J7xeB@ literal 0 HcmV?d00001 diff --git a/assets-cg/npc/face/npc_police.png b/assets-cg/npc/face/npc_police.png index cb58f619d1f0c1de08d8349f0d4d2d4910834ab8..57d50a57f9a37a7d11ad801a7d7c40a3000d4538 100644 GIT binary patch delta 948 zcmV;l155nG1<41HBYy*sNkli)l*mIT599YE7G05tgic>X;ci2QC_ z2hg_yJdQVn4_iC1H69)xA05EybOPYi`~=|l(-Q#C&(8oj_kX4WE5^gp1@}t)9X+zc zyW8ymI3ACknKuR4?RE~}cs#1wsRXF1io@YB{5%tHqL*J6mtpA4Y2s@Xi!~sC+af+- z@W(S`q$s%BTcEo+;xU{vVv*l}KM&9da1+JO8k$=mEI{m*@R9SS(Ait$r!Ioc!~yS_ zJLTush2VX-&ws@>0()K<0Cfh0oShoekk_=)wDrOwm~{(ioSir%Mvje$tt7{+Q9w%u zbc77aFQU8%_K-Tggdn zh~9_oMv&x~Ex^=)sWUNx5^|~QLgc5mr>9c(vIIyukbiK*1R1t%1&}z9G`Jv4Y5xH` zc15t;msdC|f>yZO)u2>pO$ImwE5cZc=SJSTzbQ=S0Rx1l?7LfS7c?MWR zlm4I-z<;&gnLUXhZ*pXfO*3F?@{sv@yxTY3)t-GRpiO_c!y2F+uGNYS27Z10bW>T7 z6MZPi0N47v*gRB3;#O)wZuG(Uc|Z`Q!=_N+x~{V(YegAQ*R{MB3_2`67jI?P^(cux z6x0Cq;^?x6Cy^0K@)j^DWU5*)W$TaX8X4A^8|;5}cy z|8Y>hO0}H{8ZMNQHVlO}o6KD5fU$$GFzVat7O-Cn3?f)#C1KZD3|Wh?VpgrU8nhB& z&07kCVK6x%8jGMMvCwX?TRIA?KMxoPSZxt8hQ$XH?4fIUCtti1+a>I z%ozY;VvJstT27`@A_N6kgZ$K?5Y}8vHZ6pUdi5>g>#s>3|ko z1Q|8>1@G+)?68tnh~w^Q|HOlkR01k)0eL=tP_Zt9kI-PcE+V`k<0+I)IRaF3haeo{?*;=zgRaH3v7{^gn z&IpLjSl2ZGU>Js($7%N1TV2=9uIsvX05A-Lx1156$U9pv{B%u-@cu_5K#_Mb+Dk<6 zF_}vV^%(&^eQ68a@AujD?RJaG$HmKq@@wmp@^KYUKynO-^%yDEBdPX1^;it>Y4t3? zr5*d)^09U%GJgVmT1~*`Gf$>BN1>>!z0dPW^)AQ=@JUSo?|ISiM(+?4>Nf&>Qm+JK z73-Ox93x31b^&Rac<9Rqd%#50@SlW(=-5p zzVCn3%1|5qNk+hmvQY$FE|(Qm0I%1}dp~vTlZ=4Wg4$T{csu~icAzebhzWU~lsfiF zMnDD|s@Z@@AU&VY*|pa5ZQHsfJFzkX)*ATkb-~)G&t(K;v^8`6R%`ufQVzSt6OjFB zkUXF3d4HeV$^F&Y2v}=iG7HSoC69%Oh|Mq6t5xv?WIHjEYv+j8PU=Y!Qt<=?V}Nv0 zgnFEIZ^w?^T>Av5-mdEw4cdv3NQncIdw$a6m|jcb`}eh;mpmS-kGC^Kf)T(IB+rw$ zXL*nFbg5iu=ZEBRI@?U*?*X(V7y%1us?%YyF(yGO$5)IYI}!n*c1WkliYMR?;Q2s* T&~`2#00000NkvXXu0mjfh0{)= From 05199df22ae639d52d0e3be9879fcbb2bb2b29bf Mon Sep 17 00:00:00 2001 From: mibi88 <76903855+mibi88@users.noreply.github.com> Date: Sat, 27 Jul 2024 13:55:08 +0200 Subject: [PATCH 5/9] Removed auto scaling to allow for more detail in the graphics. --- assets-cg/INFO_Icon.png | Bin 7171 -> 671 bytes assets-cg/NPC_Icon_2.png | Bin 650 -> 494 bytes assets-cg/SGN_Icon.png | Bin 683 -> 496 bytes assets-cg/SignAction.png | Bin 4952 -> 143 bytes assets-cg/demo_player.png | Bin 107 -> 144 bytes assets-cg/fxconv-metadata.txt | 3 --- assets-cg/player_face.png | Bin 5972 -> 246 bytes 7 files changed, 3 deletions(-) diff --git a/assets-cg/INFO_Icon.png b/assets-cg/INFO_Icon.png index ce5e50043e65a0ffe8fc5649692a1eded1fcbb88..e6e1ae1a60dcb7c2a341fe5e211d4ae350973e69 100644 GIT binary patch literal 671 zcmV;Q0$}}#P)um&R7S8JIXXTSyUo;p*n z1)gBY25!ZG11^EGMfwz3-?~_4z~Q~&2k-@Ws@A^ZeOv3aOUggMy<{%3@=4%jxZDN< z$}L#{dk%6nH=`P#<1IU)SJ!F}c&{LwF9oJpU?9Wm`B>2qrA;LVl`{f{FaY(aNH|l7 z1qMC?A6#=`)|^@^GT_((13Odatud#PI;Y)_*M(>|*H~ZxnwGq2{YUIOD-4W*3^+95 z1!G(~$1`w+1qLn!aFr(vjqU4zjcoW4_y&9*Q0J`!IaN(zBO5wc+5l{xffIa9Ap)lu zV4xNUx}+cC89JNx?TL7dkvJd@-{VhRyQI3u>q6eMrg4tff5Z$641n(oGz%IR_-Zy~ zMpw(aQts*}Qu~PWHW+|93lTatq>OEo^KD)ppDrQn9R;?e+*g!23 zwmp|PwXhK1NB#m{x#9kwBIW}-ai9-r+ZYO{0&%*CJ&Okth*JsxY`hmcMu+Dwpx8;}8RpFLjO`R74 zM;#acXADqfQSiOr^oEN@XJCshw%9@%Mc?LbYQ^Z0@E>;|o(a^!h1mcA002ovPDHLk FV1j36A=>}| literal 7171 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%0DU&;vlak=pSo|n={xQlV-O?P8hpJdbo z*c&wiU@+Qa${!PbN}QY!A2WS?ixGa2p-j1>3-k7Tzvv^^Gpg9!x0if&>HO&tTRqOK z&jR?2!0e@;l_qFcCFV&l9X4X@ipBS>k9e&0<--vs^+U5uf7tZOTgi!7%IqPO{N#ex z!3W3te7=XsAxAaK1}<3tM%yL9s;O7rd8DyWG*a-z!fM49bBgt=_)9zE)ZRhMS01nV zKzQoly2vcOV7|rLvROL#YRimRldJXAmY<|2v(Ik$dbW7QT#@td@rfsXpsZVoCxGtQ= z9%t{&lh9Qz}OBXLBbY4>+D*1I}wt%X)RN z27!^aHS_>rY65^71vM>H-W&KPCLqjSf}+NPnF;8TkeHSjN0KHm0fC`iKtI!+aB{q) z1~ve%o=RMg&+6Uq*x=;%(M$^~imqbFR>@(zhS1$P2j1J>C~I`veg)VCp}X=_XG4mgv_%l_O6d{#qPf2+DR=i+V3p#ygU*8s#n kqyMfyVB0C~1g-)60qkONB^3R&`Tzg`07*qoM6N<$f^>n`$N&HU literal 650 zcmV;50(Jd~P)kdg0003aX+uL$Nkc;* zaB^>EX>4Tx04R~2kg-a`P!xv0RM8^ZrQ#qC8C(l4W^%A91VJIj3Pz_iX|b5Zkfapf zz&Fu{=^zNcg1dsV|BVg~X7R$||2UlU|My;K*-4a^i~EpfRpI*m;4-+fm)~g9rNa)L zFe>xD=bg}aK3}nnzVwV&^W2|jDIS%Pbgs&xyr{t16FajiH>_g)cHke1AH;T?X0iB5 zyd9^pVYBO}$u#=$G`CqDWf$kBuiC=pm{UA#hD@1|P|=fS>Kx&)D|IOdxu+zOCXCdZ zX{O>vRLaTaKr|5PHVt{3b)Kh`p*$w?G6{F2@-%sv|NUP3IIB0Ujd>mxVcl9#wZ>z3 ze}uIFy3eq3-H_G({kDb~r=I!e8@~V?Zcu)MTEd|K0007FOGiWi0IH26G5`Po32;bR za{vGf6951U69E94oEQKA00(qQO+^Ri2onzt2IAPRZvX%Q>`6pHR7l6IRNEGVFbE@@ z{r@j#4^u~Ng4K-&k5w)qq#%?rv|;6w3ywf=_D`LXTQ1g|ROxf7&nRISQwU29A6vM< z&5i?p9*D-!A;9RtqudEvk6=cM5!Vp&iUlEXy(5JIWhQe>>gqgk5vGA@jQiA45Y!W= zel9qGmS5k(Jrg7{+|VH+l;}uT3y)gBgTEUF6hdKqU3zi>e%k`d8}7GIFAoj>?OmXE zbYo&)};qw(3Ni8cb_O(y~t>&*@6WlWQ8nDb!?NPnmV;2RddS3Mqyz>gl#QE`+=ZoL(4 z!wC@Z7tgs}w&n_b{u2QU0{OsaW0~EzMnx$KSg{EZ`tm{1ZzuqPuROr&-93=ctUMlo zKzg;-IImHTWB>xF&)co?asm*Afb`TWe1UgO*hkll00d})|LxYB2c#WMmdC~uxauB| zc32kW;RM{f;7rBOgje1JB@HKFei5Bj9Z6fBh7-s}K~F9yR!C_6&6x1K06fX|so?~Qj;=fDEa?+wO-bMDEE_i= z0PHAubtK6FW1Xe=1b{t-Qb+a3?tuUVs%yg;pLn*k^MQkHmf-~IeW1`sAT{{^e85w0 mXYKw3+`FJs_a|_BA9w@Ig?cf*d#(up0000kdg0003aX+uL$Nkc;* zaB^>EX>4Tx04R~2kg-a`P!xv0RM8^ZrQ#qC8C(l4W^%A91VJIj3Pz_iX|b5Zkfapf zz&Fu{=^zNcg1dsV|BVg~X7R$||2UlU|My;K*-4a^i~EpfRpI*m;4-+fm)~g9rNa)L zFe>xD=bg}aK3}nnzVwV&^W2|jDIS%Pbgs&xyr{t16FajiH>_g)cHke1AH;T?X0iB5 zyd9^pVYBO}$u#=$G`CqDWf$kBuiC=pm{UA#hD@1|P|=fS>Kx&)D|IOdxu+zOCXCdZ zX{O>vRLaTaKr|5PHVt{3b)Kh`p*$w?G6{F2@-%sv|NUP3IIB0Ujd>mxVcl9#wZ>z3 ze}uIFy3eq3-H_G({kDb~r=I!e8@~V?Zcu)MTEd|K0007FOGiWi0IH26G5`Po32;bR za{vGf6951U69E94oEQKA00(qQO+^Ri2onxE0GfWmSpWb54M{{nR7l6QRok)yAqYzx z|NocMhxG!kpgm{m!_E|JjF2FOd~t3d0ATzU0ic>q#0E|C-vS{yvy(2Iy(IbOORrBRc94gSComMO*-gyelg=k$|o2si~eJ0ahr!bKDQt1%(99 zl>iDr5dC|{z;>!U66;}n!GREV$%2*gBemFFR?*tf+a73 znlk8K0>8@s6gy;M1& literal 4952 zcmeHKX;c$g7LK%ofTFe_D(D!)qKK7LDwU9w1jPV?8qJAOux-#vRV4(;ViHIMS8Q#t z1r-IA&81P4r3ZAx)*eIz1zf-dmv&T|abIvpWNf5g0xHh*AJ1w3nR6e7#lQaDK!eMT~wL^9c&_#9J zeKLJn^PtUs?eo3w3?0GTwj?7lSpQ~L+34{V!nTK(YSzVJSZ}YO;tLa|cV^`bSW!MU zYSs81GG)#4D;qi*XUv#nppW?4-c{{z+dFTc>8bOWH~;+hblv0plA;7*Q&WECoyJC9 zi|AJSGHq>SU$~&Qps4?hi^GH9wD`bej~zy1DAaFU>+ts zfB3-b139^>MO&Hw-E_;`$ZDx>=B7ifCige!+~-l+g_{{|n>rS@-H_H+? zp3OPfi(4m+efr`@-H;1Kj%d)s)z=G$mpSA6u* z`3*kRo=92>Y)5v})VQYQE>}@!e zsa5?v5`(!Vb>GlVy;N3apZ0dGTW?7ymYnQxTHcymtF}mPT zhL_l_ew|C!fkwTL&p*Pa6wa%14V!x*^YZ!9#>3J!;ma$<`MC*#J>sHyC+(yC_SOYQ z^REUt&fcHZd)-ZsehQk`tzp$_`q9LU%F~{&B5e;{LZxxAnm8b7xzr zrmf$oS~?0&xY$NC@{esd+n7a>lKlzh(FgB&^ayJfBlX#KP*kF-ImljDmwrCo2Z>_7v9_xhplhQx>x@4 zutb^b4ICNjrWr;ZHR z`u1;O3HNH`m$pRFXuaH3B9SCiBzkxHz?sX=SzkJ(O5(h_LRK2&-1~UIaO7u~;poPx zv+O3V8tN0CbKc{)e2^$jy7;T6z>&LG(qB6~cBp^ri}AM{ckAC-)12K|;d^%9Mi?4m z8g-`NSZhMnspj9QiyKWV<=i4OF zc#ZNH7-AhNFs#DG(=bA-X5yq)PBG1D9T;OYn%@Mo4ks2+M!K9*sx(5zlV2(rbQLLN zgmJ~NSSO;QR3Y(tYG(X&84AZLEM!=5F>r5LW-;hi z6XOCQBU~(@i?n)*jxtdu3!aK(JJxb~ zCIZ~w<9=lQu6C<2uo8>0KrIn#NiQ@|$gsr6NG+ivG3%{>=ZmtrBm&7Pm;<3)QV#J^ zln-$cfr2FDz9h=??Ew|4F&J?TL0O;xI8z01D2|+iayfhm;UX}E%H;|GL2x0qf~W9B z5d}e^+#V1!^eUiAJf>$>7AO)xp$dY{ms2Ff<*-o*C145?pg00ia+Hno@Hl;TJC0a1qFq6}TYiSDxiUGvp7M%hBs|TnB6X_}3sMX7~ z+880jk`mqGX_YtKud68`Dg&@sWKn##=4Vn1yPmp^K#a<|MW7a@5H6yn2j5-_X)ooB-&LaQu0Cu8$5HU~rgr$j%NWpKS~svqnB z+TLZ*W6}X?y4Ju11p}G&ej;~s2J-!!pKiH*&Jc9^mmr_S?-#nh(Dg|Se3J1Ob$y}h zlNk6U<1gy^%jk0W@J>f*z#lymcw^iDYU~8?wr3-sIysO=D@buiz>~c$WR8JG>+58> zdeJhohl0gE#!zukpSyMg2RaTW_T~)&OPtWa0GZuo^%-{mqwqkR%F518j`yRD*<)_+ yvytXa6pa;*%Z#EDs`b6RlJ*uK>~!n6;a@V#xsPX+Qw(sYg$7Lz{Atqs#6JMqeL%wi diff --git a/assets-cg/demo_player.png b/assets-cg/demo_player.png index 7c1da00eb6988b570c732a4e62908d67d942a06f..b212897512dabc832cb8c1ff0835f3f78430dd15 100644 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6!aZFaLo_BXo#4pVV8FqW?puFl z` literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^93afW0wnX;%77$;k*AAe2*=FWGY2^t3WZsdx7C_t?e@=pi_AHXoj`D0lJ%;LPUJj3Z49X_4w44t$N^fGR zy2Jg<%Kt%kbsFz+&Ws)DSB(4_m=wThUguwPog;CAqDkw!xHp!&wThM>7dVi9b^C(4 zWuce#ZT*w48Tdcwdp2)E;O$7J`d#^73Z@+3_&znxPe|hBze|^G7&$zqtbBgYrTvWp qBS!-R$BoVxf6YRgk8M9@)5yI0p_{m>p71@8e>`3NT-G@yGywp$_FcyS literal 5972 zcmeHLYj6|S6<$4TJ^TPacsT~IWgfPZm3CKaOWImc=)`BUWX$e z(?TD3D%6+)`9M>QvXu%Irh>k9XsKW$AJj4waq@i=*!RWkZD8lde3W2Q3MG~V_YP<@ z*y(V89h$g4I@bZPPeRkmf0bY%G$ zDGZo0MWISj3?9X@AkR33d_}1sqAGP!(TRXKm3%d_Zsp-2u+w2at>GV^lO`nl5XYRb*ynLph&|d*<2awm<*EE3fX{ zwY%%JU%bAz=ePUbeCzFZ-aUNe=w=^~#c_Fpj@CN{$BJeH_Zz~ZS=um#xddmD3K zR!+1D4JK;f|FQ-q4W7fYf3li}O*uy_DXDgpl;FWoz$-Qi7#8W+v88*_k?QpJgRVZq z`CXUsrA`Rd~AWBT$gM(o~xbj!~4PkJqV>#yP318wiM^$c!KPWJX6zBFj< zxH8t=k6&9=U7%rRCR~TW3w>E<9Mh?-(ChyKW!$?uUCq z7q)zKZ{W@L8C@^kzIxw5EYn~8SZ?Z^DtH}=h^{)R&RNCs0iTic1l)o#;tR?@6GaOm zL5^P~NVr?57yWj_-`+cDz(tSUu)M%YI)f!bgIKvHB-E~1?Bds~;%y$og8BNQ2nzr{ zLE`X;uhAc7BX)y~%Yu!%O$J>$bDr*LiSVG?#5q7l( z1yhX>4m5>$p{!Z(OF5$~6%J0jMY+|YwrTN>b-P@}C<2b9z`~iy0y9BdZ4|*! zBu&^XHjdy(3(31lvyG$qQ4l{2iBOeXFWGM68s+5R92AB;1^rBN(0{ zy%v)8czL%B<>A@#K*-0za*95#UN8my_3{7`oGq?)*bTIi9OjON`W*Bg_J-GgdmVS!MNQ#Ve@+21W$S_<^qbRErN9{dN|;fTDXueR#2Yu zVF}Nb7bm8@3r)kD zVN5f$?Rl5y!fA=iXl<5FN;&J)!&A=kJR7?<-zb^Xue(vKXc1V6k5 zwZLJiEYatHqn6VBgNjo4SMcT>IKX1MVC9N1h9#t-rodk4m=2v9$>A*1T-BycO3s~< zbDf8-m5$P4SLOR(xE|8?l8Gx%{B^Bx_o2G1?i2C+Kov9jRpQDQ(@rO!`XK#LSLdf^ zw3*T=yx|t1{Kv+nUmjY}`&juCTN9TRuG_G&XFz{TPpOYK2cJy6(0B6ey4~sN-JhrR luh_fbdgsFx`O^Hx4{y!6eYSlG3$tR5vc;uuEc|iXKLO>My$ApR From 09839a707dca988176639e8e9616d5b6fff56fc0 Mon Sep 17 00:00:00 2001 From: mibi88 <76903855+mibi88@users.noreply.github.com> Date: Sat, 27 Jul 2024 16:51:47 +0200 Subject: [PATCH 6/9] Better characters --- CMakeLists.txt | 5 +++-- assets-cg/INFO_Icon.png | Bin 671 -> 920 bytes assets-cg/SGN_Icon.png | Bin 496 -> 637 bytes assets-cg/SignAction.png | Bin 143 -> 187 bytes assets-cg/demo_player.png | Bin 144 -> 0 bytes assets-cg/fxconv-metadata.txt | 3 +++ assets-cg/npc/char/fxconv-metadata.txt | 4 ++++ assets-cg/npc/char/npc_female.png | Bin 0 -> 221 bytes assets-cg/npc/char/npc_male.png | Bin 167 -> 203 bytes assets-cg/npc/char/npc_milkman.png | Bin 0 -> 217 bytes assets-cg/npc/char/npc_police.png | Bin 0 -> 216 bytes assets-cg/npc/face/npc_female.png | Bin 792 -> 808 bytes assets-cg/npc/face/npc_police.png | Bin 969 -> 992 bytes assets-cg/player_female.png | Bin 0 -> 229 bytes assets-cg/player_male.png | Bin 0 -> 207 bytes assets-fx/fxconv-metadata.txt | 5 ++++- assets-fx/player_female.png | Bin 0 -> 110 bytes assets-fx/{demo_player.png => player_male.png} | Bin 18 files changed, 14 insertions(+), 3 deletions(-) delete mode 100644 assets-cg/demo_player.png create mode 100644 assets-cg/npc/char/npc_female.png create mode 100644 assets-cg/npc/char/npc_milkman.png create mode 100644 assets-cg/npc/char/npc_police.png create mode 100644 assets-cg/player_female.png create mode 100644 assets-cg/player_male.png create mode 100644 assets-fx/player_female.png rename assets-fx/{demo_player.png => player_male.png} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index eaca920..1d8cc9b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,8 @@ set(ASSETS ) set(ASSETS_cg - assets-cg/demo_player.png + assets-cg/player_male.png + assets-cg/player_female.png assets-cg/npc/char/npc_male.png assets-cg/SignAction.png assets-cg/npc/face/npc_male.png @@ -63,7 +64,7 @@ set(ASSETS_cg_EGA64 ) set(ASSETS_fx - assets-fx/demo_player.png + assets-fx/player_male.png assets-fx/npc/char/npc_male.png assets-fx/SignAction.png assets-fx/npc/face/npc_male.png diff --git a/assets-cg/INFO_Icon.png b/assets-cg/INFO_Icon.png index e6e1ae1a60dcb7c2a341fe5e211d4ae350973e69..ba8e2865f6310ff0d6242ac1847303ca75ae3793 100644 GIT binary patch delta 909 zcmV;819JSI1(*kr8Gi-<0063Kaozv`17Ar*K~#90?V7)D8Zi{dKSrqeu_RFjSQ;{g zR%&3&R)$LH(xnSoQ2&Wao%$zqt<|awHjQYFBE`MifQnDAAf*mvk5@2*8`x_>5TQ9 zOeO)lfT?(SX#@T^q?pj1kyBV+k; z`B&d^^?JWxd9vr#5Blu`#cJ|ZEM-)Uks}qe@Cul2U?<@4@DPApE(gHN-se$ESQZR0 z3bD)e{ks0Go`0N-*0=cm;*$c{+}s4j2ZWfJ0*u#hG#UU@ypPE&ABRgBu|&^iqJX#x z#*(d83xIC73&6$21pr%HTaoQ9FE4?i`Pwl?CsslnmQv2opD2Lc-Cbay1W|ywFqXFQ zJP&|eu93`=R(Z%<+e|#B9nZ1)4PH<8-|6frfI^`Fh<^f5M@L7%U@TWEUbGZ!%g0!J zP|e<3IG&r5FQ^|JjP`4z?>Cz}3Pb^@cDoHg;q+a!!?-m6(OU51hX~*_bju9F*HZ}lR2Lvb+4L0ZWL3|*oC0u89 zKq}LuLwHON;37F`3AGj6fx+2OrF5PD`4uVa8h4kDK~!jg?U=i66G0S)zhfdHXab^0DojB{ zMe+veXedYnRqU6`ZkIH?LU;i-yZ{Rnaf6@)35H^3yk}=G*;uyr1o@Y2d2Sk?|J+A# z@CJAX%m4(0emI~2egb93o(XX3s`0hJzFHTxZ&d8O5dSYGz<(8RIN(qL9688(_WT7- zfVW{hk8Div6sqB#nw;l1Gp@CA6P*1qC>TkEt-%0IxpWG=GuN#JF;+y(>6Em;724sta&qZ*&%EjyxD z*J=-VuOOT+1%IYkU?9Wm`B>2qrA;LVl`{f{FaY(aNH|l71qMC?A6#=`)|^@^GT_(( z13Odatud#PI;Y)_*M(>|*H~ZxnwGq2{YUIOD-4W*3^+951!G(~$1`w+1qLn!aFr(v zjqU4zjcoW4_y&9*Q0J`!IaN(zBO5wc+5l{xffIa9A%6m=7+|0l2fCym;u$)d_U(yy zjFC7X4&UQXUAv^Z$Lm7gv!-#5*MGze3k-no3p5KF7x-#6Wky%ax>D}yCsO-}^EMcO zItvjxHl%vieFCgjMdesx0O~zr89uwfBPwQ6CRVK<&DcOK61F{;IJK}4-$(ueUb*4^ zpCaZ1JAZMY4{6&N3aI5f!fh)k9T!Ry^}wnJ(>fxeEtkZ(DE)JRhxk|7yU#!&KCf$I zX=6dpmjchi?>o*wK!(?6*9-cAz=N>Pec-p{m(o??mS0Vs7Xn8e7yoArP-Ri@z2EeP si$-T)i!HX;LK;Qi=5A`m=#lUrcOae#)WL<>01E&B07*qoM6N<$f}aZ_=l}o! diff --git a/assets-cg/SGN_Icon.png b/assets-cg/SGN_Icon.png index bb2b60487a456adb5a4d3dfef264f0daeb337600..d3b15f5b0fc43263786c777387baf50d57885570 100644 GIT binary patch delta 623 zcmV-#0+9Xi1N{V$8Gi-<0063Kaozv`0z^qfK~#90?VHhY!Y~YmfA!cX126>)2~#it zGo=r$(x6z8W$c)%^}RGlW23XaB(h@&zzhJl3jhF@%W?n!Ai5G7a6X>_0FTFG&TR4$ z2giB8-(BtJ`StX#%*Ou~;t?TQ1~@sQ(=-tPJfF|p5zm6n(|@?$_v3K14+B!D2Jpzr z3|J%H8W|6x#T5n^oU9Wx6PVV9l=iR1D;eH^<-(WG<LN49mwH8c}ET>xQ#T?a^dXP)8jmnL}U7GVIy z?CiDY8z3SaSMJ!6b5)3ShKDQ>woph?`uUEV4a}NvU=?xvDW^) z@eFUk=G~w~+Z}fF`oX)VX?umj0B?hW9iF??-ihMfEfxmIJu_wl+DNl|Z#ZBUNr1h_ zDGX3>8?ZFYG@+pZ$@^EvF7hy7O|bz>2gWXQ$t*5T`c;HKCtI19%**%_W~So^1AeG! z0F&%cW@vuXk8Q$k=1U0!YK^33f|dDAKL=%=8Qy^E?*>;DnXBE-J%Cf*d5^9>0`7gCLQCpG{8002ov JPDHLkV1n{%BFz8* delta 481 zcmV<70UrMS1n>ip8Gi%-0001Bxm5rF0k=s+K~!jg-I!69!ypJnA3d|9EFi1sDrXg4 zK-QFgR5FBu8cmL5-dC$060d*(S^*H+Gy{08#zZps1n}$3^YEkb*{6v%0^&_40v7Ad z4e4b}lWmyuVF^fos082}7Qa_L9*Mw@9?(&7lt^y96>Y-_5P$F&&$(T;<_dlO69EeX z`M_smnccTWMJWncu?Z0R@K>4GSQh2s1l+seOvTTHSKb39 z4JTlJ5uH^XNq<|Oh7-s}K~F9yR!C_6&6x1K06fX|so?~Qj;=fDEa?+wO-bMDELs~kApqV2TlM<6x$|9rqxZ)ffP1l+rzQuiltdmnfM X%!PU}zI(0-00000NkvXXu0mjf!y(xV diff --git a/assets-cg/SignAction.png b/assets-cg/SignAction.png index bef67481dd1db09327af4b5023b4bcb5e4e0d12c..965ea6e490465d940567e1f7298e12d815f1c959 100644 GIT binary patch delta 170 zcmV;b09F5w0lNW^8Gi-<001BJ|6u?C0D?(GK~y-6ol-#(01*revtLXfsgJY=Ylc;n z%(zsOrXk=1NdSOq%2g Y0&fXr@V6;Ec>n+a07*qoM6N<$f~inQEdT%j delta 125 zcmV-@0D}L!0gnNY8FmB!006c6H|hWY09HvvK~yM_rIEo6z%U2{&sA4s$_z<9q=NK8 zs`AA6WElY%Fq|?b7{Em{T5jKkp!5X7t+ez diff --git a/assets-cg/fxconv-metadata.txt b/assets-cg/fxconv-metadata.txt index 86e8216..406fdaf 100644 --- a/assets-cg/fxconv-metadata.txt +++ b/assets-cg/fxconv-metadata.txt @@ -4,6 +4,9 @@ profile: p8 scale: 1 +player_male.png: + name: demo_player_img + font.png: name: fontRPG custom-type: font diff --git a/assets-cg/npc/char/fxconv-metadata.txt b/assets-cg/npc/char/fxconv-metadata.txt index b7658e5..caf3ddb 100644 --- a/assets-cg/npc/char/fxconv-metadata.txt +++ b/assets-cg/npc/char/fxconv-metadata.txt @@ -1,3 +1,7 @@ npc_male.png: type: bopti-image name: demo_PNJ_img + +npc_female.png: + type: bopti-image + name: demo_PNJ_img diff --git a/assets-cg/npc/char/npc_female.png b/assets-cg/npc/char/npc_female.png new file mode 100644 index 0000000000000000000000000000000000000000..be8c41f5be6b6047224c5e2987d37c1c124ce46c GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`OFUg1Lo9ly1_kmtD{?S@UdPdX z#JNmfEBHX_dd^O#+^rK|uzV8|JaSLRoxAq%d~hP!zWm}Ep5ci%F~&U)+r;V|pO z8Cym2SAG^+>hQFrI%;wJ%WU~lb_=dOJQIUDPOh)FX7gs#6JW0mi*e7BeB}2|N%ZK) z3qO43HE-JFcq(D4_4)fd51fy>Ao%R;SC5YCyw7rY-j-M-7`$0HjY06+rVagn_@54lI;IAO`p{SN;mz%}#q6k8H{td$mh za|^h92J3}?X5M}IPT53LqN6!4jl*QpMzMw6*_T3sx|gLspEvWE=gi)^^hX@Ytj4e9 zc{d%*_R`s-#Gu-By??9e(#ZSkHn>V@E>SaV+R@2k7CUi{+Nnd)iNcMK`FJX}urYpG zd86{LGTR|lq2C^|&bxWu&G+dLJToik_m!L0JY<*gTe~DWM4fgxgTe literal 0 HcmV?d00001 diff --git a/assets-cg/npc/face/npc_female.png b/assets-cg/npc/face/npc_female.png index c0edcfd6d429ec3bc9e41fbd4adbb693e13fd640..77f10cc2a2ce9f186b6bc72501b0cdd116c7cba1 100644 GIT binary patch delta 785 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 delta 947 zcmV;k15Etj2gwJJB!7@eL_t(|ob8)IlAACPMW0f01E;be2bj&&T!CByE|JS*lgbIQ zu`ZFhLJr|Ys(b=3$im<-Ac=0NF&=0BhB8L#{=b`+1i}FwK+`k;H2D5_{yiLs{BBzZ z(6<6SjyHr4TRX5d9v&Yb9l+^y0^rpA1mO4669CW8&j2|0rhft}#>3JD_e%U7J+i~Q z+wA~29*>=wHwD=3b`IcpJgVBM1gNTt!{IReJQHuCmtPl`Vd%_h;%gL(H6Vc7B0ga7 z$1`N4D7e~Npu0KZF`P4Ek>7tm56}p36UELNnp+?&KbR z<>%Lh;C;By#eX&edtMj-bq0i-of^}S*R;{J^}-^Ubqi>moj4>$j*W<|B*&~#KuZR6 zgbc|qqPz(9kUG8O;0oE5#O!dQyuM&7!=DNN=81DtE4j-~!vvA^p+5J@?d6EW-l zLb%%+;9M&j;qF!dDc%K;URc-lntqr8kOzYd*koSdJzu{6 zaZtWWwVeqXE|iis423qE%v|b#v4gKL>f7oTuwM%dB3NT3Vb@s zTMC0=FgYO_i=ZX3&~C6>Itr{m4;TnoZ4ohs#Rn7Yp=+d%w_*gf#9fO6H})e3#RB{o zeSa|`76Hn(in^9z$Lz<esZt>X#DjMG*1L;4foG VP2%fXLo9lGg97jN<(A^B4u6{1-oD!M<*0fXr literal 0 HcmV?d00001 diff --git a/assets-cg/player_male.png b/assets-cg/player_male.png new file mode 100644 index 0000000000000000000000000000000000000000..503aa03e29a6601589f250442f32f1e7c8616df9 GIT binary patch literal 207 zcmV;=05JcFP) zQ4Yf}2t%K%ToDc#4#_^ctZC9}Y5frikTEfcFVaXJK!Je$c}nh^=qdR;|}V}ReB)3B{y7} z_yngz^0n_%J44Il_5d>@Mq|6MSl@1Ogr4(TU(40xC>q~G|v z{*9g2^-vc9U!GSAi(PfEehi)V%<4d~QIq4Qw~zKd`o8`H)68Rh?4?gx=Yve}boFyt I=akR{07rZzlK=n! literal 0 HcmV?d00001 diff --git a/assets-fx/demo_player.png b/assets-fx/player_male.png similarity index 100% rename from assets-fx/demo_player.png rename to assets-fx/player_male.png From 8ef79972c8e0bdb96db0ad2020699416e4282051 Mon Sep 17 00:00:00 2001 From: mibi88 <76903855+mibi88@users.noreply.github.com> Date: Sat, 27 Jul 2024 17:20:06 +0200 Subject: [PATCH 7/9] Use the right tiny npc --- CMakeLists.txt | 6 ++++++ assets-cg/npc/char/fxconv-metadata.txt | 12 ++++++++++-- assets-fx/npc/char/fxconv-metadata.txt | 11 ++++++++++- assets-fx/npc/char/npc_female.png | Bin 0 -> 115 bytes assets-fx/npc/char/npc_milkman.png | Bin 0 -> 118 bytes assets-fx/npc/char/npc_police.png | Bin 0 -> 118 bytes src/npc.c | 22 +++++++++++++++++++--- src/player.c | 13 +++---------- src/player.h | 6 ++++++ 9 files changed, 54 insertions(+), 16 deletions(-) create mode 100644 assets-fx/npc/char/npc_female.png create mode 100644 assets-fx/npc/char/npc_milkman.png create mode 100644 assets-fx/npc/char/npc_police.png diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d8cc9b..be3b00f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,6 +40,9 @@ set(ASSETS_cg assets-cg/player_male.png assets-cg/player_female.png assets-cg/npc/char/npc_male.png + assets-cg/npc/char/npc_female.png + assets-cg/npc/char/npc_milkman.png + assets-cg/npc/char/npc_police.png assets-cg/SignAction.png assets-cg/npc/face/npc_male.png assets-cg/npc/face/npc_female.png @@ -66,6 +69,9 @@ set(ASSETS_cg_EGA64 set(ASSETS_fx assets-fx/player_male.png assets-fx/npc/char/npc_male.png + assets-fx/npc/char/npc_female.png + assets-fx/npc/char/npc_milkman.png + assets-fx/npc/char/npc_police.png assets-fx/SignAction.png assets-fx/npc/face/npc_male.png assets-fx/npc/face/npc_female.png diff --git a/assets-cg/npc/char/fxconv-metadata.txt b/assets-cg/npc/char/fxconv-metadata.txt index caf3ddb..33fca10 100644 --- a/assets-cg/npc/char/fxconv-metadata.txt +++ b/assets-cg/npc/char/fxconv-metadata.txt @@ -1,7 +1,15 @@ npc_male.png: type: bopti-image - name: demo_PNJ_img + name: tiny_npc_male npc_female.png: type: bopti-image - name: demo_PNJ_img + name: tiny_npc_female + +npc_milkman.png: + type: bopti-image + name: tiny_npc_milkman + +npc_police.png: + type: bopti-image + name: tiny_npc_police diff --git a/assets-fx/npc/char/fxconv-metadata.txt b/assets-fx/npc/char/fxconv-metadata.txt index b7658e5..be0fd73 100644 --- a/assets-fx/npc/char/fxconv-metadata.txt +++ b/assets-fx/npc/char/fxconv-metadata.txt @@ -1,3 +1,12 @@ npc_male.png: type: bopti-image - name: demo_PNJ_img + name: tiny_npc_male +npc_female.png: + type: bopti-image + name: tiny_npc_female +npc_milkman.png: + type: bopti-image + name: tiny_npc_milkman +npc_police.png: + type: bopti-image + name: tiny_npc_police diff --git a/assets-fx/npc/char/npc_female.png b/assets-fx/npc/char/npc_female.png new file mode 100644 index 0000000000000000000000000000000000000000..08d2bcdcf00f67c0981be6882b3f0f46999d7543 GIT binary patch literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^93afW0wnX;%77$;m8Xki2**s{vl|5)3>Xd{C>J}! zWDtAfvdEo@D+1CjSNOIWh5BYpsVd<7#M{-tc)F}a_H6XEpC2#36*rX-Y`^Dx(iCKj Mr>mdKI;Vst0I#zoYXATM literal 0 HcmV?d00001 diff --git a/assets-fx/npc/char/npc_milkman.png b/assets-fx/npc/char/npc_milkman.png new file mode 100644 index 0000000000000000000000000000000000000000..639504e9570e3a5665dffcd87298f86dcfd5ce8b GIT binary patch literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^93afW0wnX;%77$;t*47)2*=FSGY5Ga90Z&$nqPik zw&3c^i*g?~xb^;HZe-Co;=J{UK=4wP8ygo~DGxeSwp7&iZDDv-h4DXm_5Nu7H)};? Qeu7N$boFyt=akR{0IRbn!2kdN literal 0 HcmV?d00001 diff --git a/assets-fx/npc/char/npc_police.png b/assets-fx/npc/char/npc_police.png new file mode 100644 index 0000000000000000000000000000000000000000..639504e9570e3a5665dffcd87298f86dcfd5ce8b GIT binary patch literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^93afW0wnX;%77$;t*47)2*=FSGY5Ga90Z&$nqPik zw&3c^i*g?~xb^;HZe-Co;=J{UK=4wP8ygo~DGxeSwp7&iZDDv-h4DXm_5Nu7H)};? Qeu7N$boFyt=akR{0IRbn!2kdN literal 0 HcmV?d00001 diff --git a/src/npc.c b/src/npc.c index f7c776c..dbdcf04 100644 --- a/src/npc.c +++ b/src/npc.c @@ -11,7 +11,10 @@ #include -extern bopti_image_t demo_PNJ_img; +extern bopti_image_t tiny_npc_male; +extern bopti_image_t tiny_npc_female; +extern bopti_image_t tiny_npc_milkman; +extern bopti_image_t tiny_npc_police; NPC *npcRPG; @@ -309,6 +312,13 @@ void reload_npc(Game *game) void npc_draw(Game *game) { Player *pl = &game->player; + size_t i; + const Face npc_sprites[FACES] = { + {"MALE", &tiny_npc_male}, + {"FEMALE", &tiny_npc_female}, + {"MILKMAN", &tiny_npc_milkman}, + {"POLICE", &tiny_npc_police} + }; for (uint32_t u=0; ucurx * PXSIZE))-(int16_t) pl->wx; int16_t delY=((int16_t) (Data->cury * PXSIZE))-(int16_t) pl->wy; - dimage( pl->px-P_WIDTH/2+delX, pl->py-P_HEIGHT/2+delY, &demo_PNJ_img); + bopti_image_t *face = &tiny_npc_male; + for(i=0;iface)){ + face = npc_sprites[i].face; + } + } + dimage( pl->px-P_WIDTH/2+delX, pl->py-P_HEIGHT/2+delY, face); } } @@ -392,7 +408,7 @@ void OLD_npc_draw(Game *game) { int16_t deltaY=((int16_t) (Data->y * PXSIZE))-(int16_t) player->wy; dimage( player->px-P_WIDTH/2+deltaX, player->py-P_HEIGHT/2+deltaY, - &demo_PNJ_img); + &tiny_npc_male); } diff --git a/src/player.c b/src/player.c index 58d8e37..9578c66 100644 --- a/src/player.c +++ b/src/player.c @@ -6,13 +6,6 @@ #include "npc.h" #include -#define FACES 4 - -struct Face { - const char *name; - bopti_image_t *face; -}; - extern bopti_image_t demo_player_img; extern bopti_image_t npc_male; extern bopti_image_t npc_female; @@ -21,7 +14,7 @@ extern bopti_image_t npc_police; extern bopti_image_t SGN_Icon_img; extern bopti_image_t INFO_Icon_img; -const struct Face faces[FACES] = { +const Face faces[FACES] = { {"MALE", &npc_male}, {"FEMALE", &npc_female}, {"MILKMAN", &npc_milkman}, @@ -133,7 +126,7 @@ void player_action(Game *game) { * fast string comparison. */ face = NULL; for(i=0;iface)){ face = current_face.face; } @@ -164,7 +157,7 @@ void player_action(Game *game) { * fast string comparison. */ face = NULL; for(i=0;iface)){ face = current_face.face; } diff --git a/src/player.h b/src/player.h index a36d988..5e246c9 100644 --- a/src/player.h +++ b/src/player.h @@ -6,6 +6,12 @@ #include "game.h" #include "memory.h" +typedef struct { + const char *name; + bopti_image_t *face; +} Face; + +#define FACES 4 /* Structure 'Player' has been moved to game.h */ /* to avoid circular references between map.h, game.h and player.h */ From 587e8e872d10819eb2754e8646faa61d5fa9fa83 Mon Sep 17 00:00:00 2001 From: mibi88 <76903855+mibi88@users.noreply.github.com> Date: Sat, 27 Jul 2024 17:28:19 +0200 Subject: [PATCH 8/9] Small improvements --- assets-cg/npc/char/npc_female.png | Bin 221 -> 221 bytes assets-cg/npc/char/npc_male.png | Bin 203 -> 206 bytes assets-cg/npc/char/npc_milkman.png | Bin 217 -> 222 bytes assets-cg/npc/char/npc_police.png | Bin 216 -> 220 bytes assets-cg/player_female.png | Bin 229 -> 238 bytes assets-cg/player_male.png | Bin 207 -> 208 bytes 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/assets-cg/npc/char/npc_female.png b/assets-cg/npc/char/npc_female.png index be8c41f5be6b6047224c5e2987d37c1c124ce46c..041e95114c67db24143bfa3abdf8333e3e02c965 100644 GIT binary patch delta 184 zcmV;p07w7b0o?(REq_}M1R)43ler=u5)R3H=(5UVv(tn`v9{6(oUpx^*%;|iDm zMafN0X41XD1t=<-Noz|qQfnWzQ^R5Vo#6xx;DpSB^uL+4lZMBi;1ojdU#NI4N3y1$j z$xTjx-EQCl92Eh(+A?cu?N9K-1(BGw6mO~X5~V=pbbDH(U+HTfbq6>KybO_2h{>;i zI|fSzE)WNOR$NDJ8RAavA{E8)(D+QAgR-(g%3zf{&)>Pg&oNri5$4VHNQl=B=4=e@ mbU0uz?4gzb5%#jMkNgkjVQSySdwbsR%A!<16HIem>w2idHWuJnG6z?Xo!qL zRl%%mW2{Lwz^uaub~s7`!UP9I~D gmuAiaYAvnY8%v`#4g~DPmH+?%07*qoM6N<$g6FJ9)c^nh delta 175 zcmV;g08szV0m}i9B!7}gL_t(Ijir)N62K4)M0Y!`$RXvB>4zdEovQAKLA=CdLv$&= ziEY_{TN3_&0RX`sRP$ol)b>XOEo>inclQ0UTGf;0Sbi`CoTN{Mcm?N1%5aWjT)-r( zHufYklD?Rv&w*}QNr2pitK24j(QS~3HA@wJCc=Bm1fvC(2`Dj};5>k?EYobv@u8XX d2TCm|>ai{da#@@PpdLd%JsLF1&%Mt=txGPGZCcU>OHiczx!F)9Y2xSo0d(l@b#(p4OC zhHPclQb-{&g4n|htaeA@D#v9;u^NGX2M&B?z90bkt9j`0k2@I%mq_UDyG4$A1G0Nx wWrz{Xo+9%hReYq`bH%8#S?22ityjOHC%B0~xFE;#761SM07*qoM6N<$f~w_I^8f$< delta 189 zcmV;u07C!X0oehNB!8euL_t(Ijir*&7Q-M2Lz5kUQ9sgrBzv&54w>EQ?jtlQ7>I*z zW(YKru@<3=YtmFwi>77go|(o;nT>vD;s|2}GwUA>vcYRgEW9EBC5qRNwKb(#->$Gl z8Y!eEF@m^>1U6lfoF>Y`TVWG{;|>gXv<3n4sn~h_BL>1H5;prt9Yebe?w?GE5zLxW r`_ydsiCJ^T*z1?aTn8BcI&SC>H3TiO?qp+j7H#x|w^0000$4#Xe`YnT0^d?b8i?_oD5%6V&IGLg0nkr*I{ z#ytW+!vY$3e;+@|8;rTfE)nj3#kjb)4Jj;>4a^mM$z)FKu|jjLAo zBv@Rlz|HBz-pChCEa!j*qB&xooOmjTrp4gw70A;d-9inqh)YT?(wHi!$d~JWn9ez1 zB;8exwHY~A`Upe-?dx1Tpj_h9mt#I~)$RbUv#77NLx9HR(|*qX0I7;tvYi<1ga7~l M07*qoM6N<$f=aStLI3~& delta 201 zcmV;)05<>b0p$UZB!8?)L_t(Ijg3-K4uvoXYmHYNhlE4&KGZn|?yboZhqP2IF~Ai* z-eCY55-8yFe0-7@7<-RZBUJy2F->m^l1U^B7#-YXGB);FA-?{E4U_`zc~VvD0^@H9 z5W7x+htr9DksC`ab3g&n6gDTvUI*4Z4LG|4*AS#fsKJt`yFxlC3=S&tHFX`Pb1n!; zRWD;LLe5T;!0me*ufV-5^?G`LXE~(-4)}OZweD|j7}=HLdfCeYHQoh?8T?&(ug7PjLiEwr3_ ijl(b<{S91N0stp$!8vDi%afb{0000Oyu*_KtWV8(WppOkKL(6*3uHZn%F zu^z}n>J+jSRv?e#4(iKQdLX?eH(Z+d1gAstweM3qL(Am$04y^jMq|6MSl@1Ogr4(T h Date: Sat, 27 Jul 2024 17:38:58 +0200 Subject: [PATCH 9/9] Very simple player selection --- CMakeLists.txt | 1 + assets-cg/fxconv-metadata.txt | 3 --- assets-fx/fxconv-metadata.txt | 4 ++-- src/game.c | 8 ++++++++ src/game.h | 1 + src/main.c | 2 +- src/player.c | 6 ++++-- 7 files changed, 17 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index be3b00f..94eeb0c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,6 +68,7 @@ set(ASSETS_cg_EGA64 set(ASSETS_fx assets-fx/player_male.png + assets-fx/player_female.png assets-fx/npc/char/npc_male.png assets-fx/npc/char/npc_female.png assets-fx/npc/char/npc_milkman.png diff --git a/assets-cg/fxconv-metadata.txt b/assets-cg/fxconv-metadata.txt index 406fdaf..86e8216 100644 --- a/assets-cg/fxconv-metadata.txt +++ b/assets-cg/fxconv-metadata.txt @@ -4,9 +4,6 @@ profile: p8 scale: 1 -player_male.png: - name: demo_player_img - font.png: name: fontRPG custom-type: font diff --git a/assets-fx/fxconv-metadata.txt b/assets-fx/fxconv-metadata.txt index 25201a7..1020805 100644 --- a/assets-fx/fxconv-metadata.txt +++ b/assets-fx/fxconv-metadata.txt @@ -1,9 +1,9 @@ player_male.png: type: bopti-image - name: demo_player_img + name: player_male_img player_female.png: type: bopti-image - name: player_female + name: player_female_img player_face.png: type: bopti-image diff --git a/src/game.c b/src/game.c index 2f7cb7a..dd2bb1c 100644 --- a/src/game.c +++ b/src/game.c @@ -114,6 +114,14 @@ void game_get_inputs(Game *game) { if(keydown(KEY_UP)) player_move(game, D_UP); if(keydown(KEY_DOWN)) player_move(game, D_DOWN); if(keydown(KEY_SHIFT)) player_action(game); + if(keydown(KEY_OPTN)){ + game->player.is_male = !game->player.is_male; + /* TODO: Make something cleaner */ + while(keydown(KEY_OPTN)){ + clearevents(); + sleep(); + } + } /* Display Debug Information on screen */ #if DEBUGMODE diff --git a/src/game.h b/src/game.h index 07df01a..77fb3a7 100644 --- a/src/game.h +++ b/src/game.h @@ -43,6 +43,7 @@ typedef struct { bool isDoingAction; /* the player is interacting with a NPC */ bool isInteractingWithNPC; + bool is_male; } Player; diff --git a/src/main.c b/src/main.c index 8055976..76655fd 100644 --- a/src/main.c +++ b/src/main.c @@ -36,7 +36,7 @@ extern Map *worldRPG[]; /* Game data (defined in "game.h")*/ Game game = { NULL, - {12*PXSIZE, 36*PXSIZE, 0, 0, 12*PXSIZE, 36*PXSIZE, 100, SPEED, false, 0, false, false}, + {12*PXSIZE, 36*PXSIZE, 0, 0, 12*PXSIZE, 36*PXSIZE, 100, SPEED, false, 0, false, false, true}, {{}, {}, 0}, false, false, false, 0 diff --git a/src/player.c b/src/player.c index 9578c66..dbb443a 100644 --- a/src/player.c +++ b/src/player.c @@ -6,7 +6,8 @@ #include "npc.h" #include -extern bopti_image_t demo_player_img; +extern bopti_image_t player_male_img; +extern bopti_image_t player_female_img; extern bopti_image_t npc_male; extern bopti_image_t npc_female; extern bopti_image_t npc_milkman; @@ -50,7 +51,8 @@ extern uint32_t nbNPC; void player_draw(Game *game) { Player *player = &game->player; - dimage(player->px-P_WIDTH/2, player->py-P_HEIGHT/2, &demo_player_img); + dimage(player->px-P_WIDTH/2, player->py-P_HEIGHT/2, + player->is_male ? &player_male_img : &player_female_img); } void player_move(Game *game, Direction direction) {