From 5a5fe874909b9ad1a4628566313ee3e74df904fc Mon Sep 17 00:00:00 2001
From: mibi88 <76903855+mibi88@users.noreply.github.com>
Date: Thu, 25 Jul 2024 17:03:34 +0200
Subject: [PATCH] Better graphics :)

---
 CMakeLists.txt                         |  10 +++++-----
 assets-cg/NPC_Icon.png                 | Bin 7249 -> 0 bytes
 assets-cg/npc/char/fxconv-metadata.txt |   3 +++
 assets-cg/npc/char/npc_male.png        | Bin 0 -> 167 bytes
 assets-cg/npc/face/fxconv-metadata.txt |   3 +++
 assets-cg/npc/face/npc_female.png      | Bin 0 -> 512 bytes
 assets-cg/npc/face/npc_male.png        | Bin 0 -> 494 bytes
 assets-fx/2bpp_palette.png             | Bin 0 -> 77 bytes
 assets-fx/NPC_Icon.png                 | Bin 5942 -> 0 bytes
 assets-fx/demo_PNJ.png                 | Bin 4701 -> 0 bytes
 assets-fx/fxconv-metadata.txt          |  10 +---------
 assets-fx/npc/char/fxconv-metadata.txt |   3 +++
 assets-fx/npc/char/npc_male.png        | Bin 0 -> 118 bytes
 assets-fx/npc/face/fxconv-metadata.txt |   3 +++
 assets-fx/npc/face/npc_female.png      | Bin 0 -> 326 bytes
 assets-fx/npc/face/npc_male.png        | Bin 0 -> 306 bytes
 16 files changed, 18 insertions(+), 14 deletions(-)
 delete mode 100644 assets-cg/NPC_Icon.png
 create mode 100644 assets-cg/npc/char/fxconv-metadata.txt
 create mode 100644 assets-cg/npc/char/npc_male.png
 create mode 100644 assets-cg/npc/face/fxconv-metadata.txt
 create mode 100644 assets-cg/npc/face/npc_female.png
 create mode 100644 assets-cg/npc/face/npc_male.png
 create mode 100644 assets-fx/2bpp_palette.png
 delete mode 100644 assets-fx/NPC_Icon.png
 delete mode 100644 assets-fx/demo_PNJ.png
 create mode 100644 assets-fx/npc/char/fxconv-metadata.txt
 create mode 100644 assets-fx/npc/char/npc_male.png
 create mode 100644 assets-fx/npc/face/fxconv-metadata.txt
 create mode 100644 assets-fx/npc/face/npc_female.png
 create mode 100644 assets-fx/npc/face/npc_male.png

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d1d7c3..897d71d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ find_package(Gint 2.11 REQUIRED)
 find_package(LibProf 2.4 REQUIRED)
 
 #set the color mode either to 1b or 2b
-set(COLORMODE_fx 1b)
+set(COLORMODE_fx 2b)
 #set the color mode either to 1b, 2b or EGA64
 set(COLORMODE_cg EGA64)
 
@@ -38,9 +38,9 @@ set(ASSETS
 
 set(ASSETS_cg
   assets-cg/demo_player.png
-  assets-cg/demo_PNJ.png
+  assets-cg/npc/char/npc_male.png
   assets-cg/SignAction.png
-  assets-cg/NPC_Icon.png
+  assets-cg/npc/face/npc_male.png
   assets-cg/SGN_Icon.png
   assets-cg/INFO_Icon.png
   assets-cg/player_face.png
@@ -61,9 +61,9 @@ set(ASSETS_cg_EGA64
 
 set(ASSETS_fx
   assets-fx/demo_player.png
-  assets-fx/demo_PNJ.png
+  assets-fx/npc/char/npc_male.png
   assets-fx/SignAction.png
-  assets-fx/NPC_Icon.png
+  assets-fx/npc/face/npc_male.png
   assets-fx/SGN_Icon.png
   assets-fx/INFO_Icon.png
   assets-fx/player_face.png
diff --git a/assets-cg/NPC_Icon.png b/assets-cg/NPC_Icon.png
deleted file mode 100644
index e9cc81921b5f2657915dd33d759f9e273020b46a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7249
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

diff --git a/assets-cg/npc/char/fxconv-metadata.txt b/assets-cg/npc/char/fxconv-metadata.txt
new file mode 100644
index 0000000..b7658e5
--- /dev/null
+++ b/assets-cg/npc/char/fxconv-metadata.txt
@@ -0,0 +1,3 @@
+npc_male.png:
+  type: bopti-image
+  name: demo_PNJ_img
diff --git a/assets-cg/npc/char/npc_male.png b/assets-cg/npc/char/npc_male.png
new file mode 100644
index 0000000000000000000000000000000000000000..f4d654b78a21d9e7ef7fc130ef3eeb94c69d9e5a
GIT binary patch
literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6@;qG}Lo_B%y|9t@kb?;Gh3|sF
zDZM;Gvq}=JUU&$yos^1voS~<1K~^U3&)3|@P02@eHIsPwQeU=C@UTccdHyfof0YBK
zpTCGi3stR|Dpp&}y`zTX`5AlRdpw(e?q1mPxS`rrCQ4}0;jo(vvu{3R^x7hntR4F%
Q4rnujr>mdKI;Vst0PJKwUH||9

literal 0
HcmV?d00001

diff --git a/assets-cg/npc/face/fxconv-metadata.txt b/assets-cg/npc/face/fxconv-metadata.txt
new file mode 100644
index 0000000..1ac7f6f
--- /dev/null
+++ b/assets-cg/npc/face/fxconv-metadata.txt
@@ -0,0 +1,3 @@
+npc_male.png:
+  type: bopti-image
+  name: NPC_Icon_img
diff --git a/assets-cg/npc/face/npc_female.png b/assets-cg/npc/face/npc_female.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ae75fc147652c1475aba3535969e69abeb2771c
GIT binary patch
literal 512
zcmV+b0{{JqP)<h;3K|Lk000e1NJLTq002M$002M;1ONa40ARUQ0005UNkl<ZXo2mR
zO>)983`U<B?$TYazztx<j^nXoMQ^|rdLef~TpUNTl{6hWGkhByTk+4c9LWSC9Dy@%
z0SFKf6s5|B#E!<=E$DVt?LWeE7CYb@_>`<Ft3Lu?T4Q>zLc*OueU}XTUL{}{$(_Jn
zZCT>=HAO@U?gZWwkbPk7{jbQKz<UDn_vt@<pcv7efc_;El!KAbwb~`Q6EORL<Q8E@
zyH>dk0)IIalL2}o&^!fNT4&kwh?)lc%ALS;a&cM=L-{m3-?KW5Hi5G6lskc@59BLL
z+3!iQEp5{N*G`c;0h140m6tDBxn<L>510tFI<VSFBf1lKPheI?RLZ*lHEo-Kb@khg
zhQi}IgJc!%1ZMky773H?#dGU^;7*|F15(wMaU_H%nR4~=0QBVpiwM9g{@;dQ^XiL+
zZ4jtb&*)fg?2rJc>FnZfzjTQh)G2{d(U#+r*#xO~;iBnIpcxAez+))qH{FtiRG+^)
zGRovmpy~q$;1TWr1xPlBP*5n;AAvJ)n|V934sZ^y*pcK;U~~%7>RbQoEKvkPoKonA
zK)!mbq|B%$iGn+U*H%Y0V5wA6R-{qT`pDyiJAoh5jAcz50?6Y40000<MNUMnLSTZB
CZR!F5

literal 0
HcmV?d00001

diff --git a/assets-cg/npc/face/npc_male.png b/assets-cg/npc/face/npc_male.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4f48205acc5bf78985a0bdc2108476f922762cb
GIT binary patch
literal 494
zcmV<K0TKR*P)<h;3K|Lk000e1NJLTq002M$002M;1ONa40ARUQ0005CNkl<ZXo2mS
zy^+E&5JsOEIv}Hg%dQ1?U?Q?BkL;pz2efcSkhumfz&5hjmDfHol4txS9>nVBdy-aI
zIPOpbXW$FKfkV(;Dx8qm&{(?#%_i0U!#zf^1Ac)|DQby(zg~nyb^`HPTIzg8PX!Z5
z=|0k1b^_Y~_G0Nf=3h~E0^0!OJP=s}mgNymufdnu3CO!Z(4387I0OfkPvAc(!9t>3
z0x6SWj6`+<+W^dYz@NX^`mo0JS_c8g*iHC(Zk(^|1k}^;Z9j@vaT-<*oRNZMp8L4U
z!8It)P9XYbl$t=1Z${=!D9P$Rrgamry4Q996hJ`T1r=~jlo7QZ03{Ou#9VNiXz)kq
zK%0Lkoq)CuE_Ao5o=&{FA39j?Jt3%P!liqDcTdgz**#+<l}})4KA2kly~-y54EE>b
zerxO53Cy}7v7G<Ti?yhH0u|4d>^lodNacQAP1y-Vr|JN-N)8AsYB2`~ZKRLv1YXv_
z5x8}BS|0x?O7m;EBdCGK3p_fw1+m!)jHa@8Un{{)_tf0`&b9g>g>nc?x%bs5<<`1B
kg>ndBbe}?v*K>9Pe_?%HEo_NO=l}o!07*qoM6N<$g7zQWWB>pF

literal 0
HcmV?d00001

diff --git a/assets-fx/2bpp_palette.png b/assets-fx/2bpp_palette.png
new file mode 100644
index 0000000000000000000000000000000000000000..05dc19da38d7d0adb4bde11eacaf2b43cd4a6cde
GIT binary patch
literal 77
zcmeAS@N?(olHy`uVBq!ia0vp^j6lr7!2%?oUYxrTNQrp5IEHY{OiuW5{>k|RB8Luq
b_;1f3Xvw_P-D`3tP@cil)z4*}Q$iB}#ljW*

literal 0
HcmV?d00001

diff --git a/assets-fx/NPC_Icon.png b/assets-fx/NPC_Icon.png
deleted file mode 100644
index b353607ca16e021c204289bfe22ad0b705ac7309..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5942
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

diff --git a/assets-fx/demo_PNJ.png b/assets-fx/demo_PNJ.png
deleted file mode 100644
index 8198c5931a59c0c185c422ed67b214b778ce33f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4701
zcmeHKc~leU77vyRMYe~6h(693cqqjrlaT!p1OZLN00snW-6qLQ7|BK!5^+Hh@rh6r
ztX3W_=tEHv7YddtARypMg(8YjaYYX*3bvr7>iZH<;k^FiIj{ebb0(SjzTf@bdw=(S
z_hdFlgw3(DakC*12zCN~un7EGn=Wfh@U0x10KPw4oEWuGCqfL6TBE{nIST1ks!<3v
z;uwKoy!C9SO4AP6)>dlM+^e!2o$9NWV~HEwD;?UNNZ<Wub8(x)?!&w|>kAG&YtJdG
zd!NW0W~zInk^fq;M>BVP(RY&0<h1a%1ufHr@oSVf@-vItY8tCzowlE<Kg4_66t?MH
z^n~VLcW=E>E~)6g5Pze8^3>ZllO|;(wr%Vsd!E%_BS)0tLhm!>d#lgNAHIFdT+ngI
z<qh}QnM%8EMlHMgto6l|Ll^d}OV70QE@1ERObf8gYlyqdPa3~rYUXNgQF{9Ce1^a6
zj|cUK8}Ik2Lw$PPi7c-}2Ug#7=c~96TsL)OPFZujN585>_~krScV_tWs{>rwmHp=}
zkN)g`_;OT>+da&dn%YMwr`s*qm~zZe_iW*H=g>T%J|{lr(s`)STXbO7?j0qCQQO21
z{&6C&dhu5+vnSraqIb+@E4$=b`RhGGmz<n)*JI+MO;;oBp2U8$ZSvIZUx-s;!aD9g
z9ao-tEP(#{u5+*09rMTtRQmmGEV0=Tsb{>>bS&L)blpDto%Jpk;e^|sSpMnkfaq(<
z0U>420#B8WJ4duV#!t1h46s|Z!AV#r4~Cm83LyQC3%=G{zhrq{obS0l<E5+Hao1yc
zh3TE^5~g5KUe@_@UZEC+uFg;D_e<=YoimQ)G&eKi1X<#y?OFNp(_O}IscO#JRfhVI
z-Iwsn%2xGdamLvTuX=yom#g)5Ee<HV^DKFt2-|~xQ=H1V${fgjBs#fzMd6~zk}k%L
zrXK_~uNy_hout#Jt|jMxe?DaA_c!l_E}dI1dg7G$^j75QZeG78qV44EU#1l_hGoQv
zJg(WVh-IANUt@>q;Ll+DZ2|3L$IOUzzv6Ysb>-H{R}QA%caXVfHCGijLSvKTr?!Mm
zOjys_zo9*{J-OCL`Nt9svhSaQ?mcZDD-^5ku77*8blj%H*~|O$l6tC_*6sXd$t3?S
z_SbLYX053x&L6n{SS@a!c_}qU>U-%$n%uwdaa`--kc|#bFN*Ko_1<(F+zNXt`5DW6
z8EfrIemdyB)Z^ua1KB>mAN3iyeCn=q>*~^h@QbOBW>oY)7VO$GC;YP9y*vOj{+dzz
zX#S)MZC~zpw_fK~_czqMTh^*7y(4RQmGm3y`i=+P&5s4q1cHSJ9uyQI2nu?C&cNx)
z-MzJPZcW65x}?MVLnc_gv%Tk7RdPq{weyIhjSV&W1UFxhR_mGSng42R#b*C`R)H^^
z+nsaYD0OOh%S8W%%o<LI;rYfLyHjvZr4=6ST-5RR#r8!{YgxAn=T3fViR?1)o~P8k
ze4U1Nh1MGxKfPJ$vi}F$1u~IKXUOL*>u>IgE<-l|)>e_^xz@35eon}}X+6sAvs14Y
z?e)rjQU7y0#%Ulo2$$We%dhu#X9jtt3kn_=U|m!0pE%wna#V*43UVBevaZjo%_!KO
zeL1gy(xh<fE$#9P_YPW_{t$KQ=0C)H;dcY&eeuz%MgK1Lo1Xk5V_L~<4`Wiww-$xG
znkIcv^gw@`8<v~cxmWean3l?j#VnV$bzoe%;b1H+6wc#HR0=X8Rf$ouQK1F{i$L(3
zX;dSUI8+CTQ5mk}5ucx_Btp29M~q<zVWBz*jm7zi8Z<I7EJ~6XC*eqmGyQG+j9fsV
zKy?UYRLGTDu8~JH^K!wxX_-QV%n)51kGN160R^cvC`2dI$uKFzh$qm9{x*=GMv8Go
z!Lx@bz!Q%ctJA5u6pF!MARBziDvgXn<#0F@m`0(|NB}|7u2kv}BT1?CFi{M01fyDs
z23PBFl@c;>B4U+Z$0HKKKJ-35g<2^5K(EvesQ~n#7!fsvN`@&41!cH}Ru_^0NQMIX
zQwwbrnC=u2s#WPV5;P<MRq8y3Q%EHr?A3aW+?<Y7LP6!I0zkFED|Lj+IRatC2Mdz~
zGF+iHTLH00AaywQQLGWMnRd+S3=agDf8ZT~exJJ;3{XNLH&`Xno5B+W^N1$@T&YTe
zOS$G-4wFTvGNd$;7=?XFbcR$+V$<nt5`)IUq!KYpN@uc$Q3;e<9io(=CMrNq#sLpo
z%wlkubPfp?18cgNO((IbOa@8Hp|iv+u^2;WjA0bv8XR;bA|D==iAoBn=$M4c7Nb%U
z!<R}Y(IqfS;?NNq2^G_+bha21BTQd2l~lr=t<oqEP)=Nd$WV$}DKl@F1m^}u2zW#q
z8UDBuAxCr=FyImA;Yz*n<3<#&KqGaCNlhw~Lxb6Dm`!C-ISdx<BPbfxXhA2MIH@q%
zcaYaq7A{Bz2#c8d6cCs#KrY-M4T|Vgnkbb@&Lf&af=rg?_J;fhi^9jX0I|~4@k2cy
ziN+5;4ITkGZr*|*bK7ze$)FQ0l7LFhj)2|ZmLwKY%205=hZ^erI{qicqOln?DH8)F
z0@VTvW1#X>SV}@U2oq&s7z<`FN3v^Gn9hJ`&_Ef;6l4P$$eax{-7KZ|NVFjqHR%M?
zd`U2yL}f%#VJ?l$g{eL;jSIs>%22`-)2V)+u^;7sH1RV7hK&JWH@F7I3z$}v594Y`
zGn0&e;b*88f1w9JJ?i9>^c|IJRIX1_;FG|k-8CxLCn@kr;L+~-zsY6u@r4Iff`35<
z@H(UEZ9V~Bg~o_O=L8c7M>0HU;OPrB|0^wlFmAl*vLNK-x`IV3oj@33^~l=6dWr@7
zuyZX~q6&foqpWW%*b?YOfUL*F9DJA5YA^lV%4*{DoUO0;lW*EDUAqOh*=LMtpW(I!
b>&vr?X4u*!w6<0PV}c+gEVyXa^5p*l{ImZ0

diff --git a/assets-fx/fxconv-metadata.txt b/assets-fx/fxconv-metadata.txt
index 499f659..12e9d02 100644
--- a/assets-fx/fxconv-metadata.txt
+++ b/assets-fx/fxconv-metadata.txt
@@ -2,10 +2,6 @@ demo_player.png:
   type: bopti-image
   name: demo_player_img
 
-demo_PNJ.png:
-  type: bopti-image
-  name: demo_PNJ_img
-
 player_face.png:
   type: bopti-image
   name: player_face_img
@@ -18,10 +14,6 @@ INFO_Icon.png:
   type: bopti-image
   name: INFO_Icon_img
   
-NPC_Icon.png:
-  type: bopti-image
-  name: NPC_Icon_img
-  
 SGN_Icon.png:
   type: bopti-image
   name: SGN_Icon_img
@@ -34,4 +26,4 @@ font.png:
   grid.padding: 1
   grid.border: 0
   proportional: true
-  height: 5
\ No newline at end of file
+  height: 5
diff --git a/assets-fx/npc/char/fxconv-metadata.txt b/assets-fx/npc/char/fxconv-metadata.txt
new file mode 100644
index 0000000..b7658e5
--- /dev/null
+++ b/assets-fx/npc/char/fxconv-metadata.txt
@@ -0,0 +1,3 @@
+npc_male.png:
+  type: bopti-image
+  name: demo_PNJ_img
diff --git a/assets-fx/npc/char/npc_male.png b/assets-fx/npc/char/npc_male.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/face/fxconv-metadata.txt b/assets-fx/npc/face/fxconv-metadata.txt
new file mode 100644
index 0000000..1ac7f6f
--- /dev/null
+++ b/assets-fx/npc/face/fxconv-metadata.txt
@@ -0,0 +1,3 @@
+npc_male.png:
+  type: bopti-image
+  name: NPC_Icon_img
diff --git a/assets-fx/npc/face/npc_female.png b/assets-fx/npc/face/npc_female.png
new file mode 100644
index 0000000000000000000000000000000000000000..6727c29c5bec1074fa1d2265f4d5f8ce3de60ae5
GIT binary patch
literal 326
zcmV-M0lEH(P)<h;3K|Lk000e1NJLTq001BW001Be1ONa4*>kdg0003ENkl<ZNQtdf
zI~Id53{!YLUwVPw4z^A`p*j?Z;wS`o6+;upmOr%(Fmome1-suVR3>>qG8yBsgD%0z
z5LGWma2ZN))_<4a7SinqR?CNfWnho@0-FK{za|iUKh7kDLz4nUsZbROLn0*w7IPva
zi)t<DMMw}NL9YFu3I2dx!d0iRghCU*BCIdKNRn6@f*Q%nisfHt!NB>yL@;WdhQKxJ
zF?VMcfM>XWhA#G<w_)B-nFVn-#(~oV765PY9{i_TBK7K3KAG!OU7PN*=4}`Or1}5T
zZ<KUU6L7GRbneUy`fxV?@v)M)La5%Tbz_-ip`2gJ6h9k5$9%C;rI@05EJ{sLwG9E_
Y3lAo+r$7g~G5`Po07*qoM6N<$g2S_dvH$=8

literal 0
HcmV?d00001

diff --git a/assets-fx/npc/face/npc_male.png b/assets-fx/npc/face/npc_male.png
new file mode 100644
index 0000000000000000000000000000000000000000..994a16df6f127d82ead5cc051cd4b60c6a018a59
GIT binary patch
literal 306
zcmV-20nPr2P)<h;3K|Lk000e1NJLTq001BW001Be1ONa4*>kdg0002_Nkl<ZNQt$T
zK^B5A3`8eB&Q}kKJ6C$aaREq@PAKYg*g)F(Nka<&8)uU6VtIA4KBT7Ao(ve7J68mp
zvj^Yhw55;-oX=kXzLM`jsGu*$<m05MdM)fB3UJ(r9x~<Ou_EN>CdwX|s7J*LfUVQa
zO;<4wUc`@f^6K<GFm*JG*niG~%r#op0HEv^))fJ=3&)cC006G(`62Twant<1YuuGr
z)zjQ=xB<Ak>?*(fDp#FX<;%CA7pbEXKry-65ye|r5Szu{kLx14!4OG~_*o~|V9w}&
zhz3Ig(m!(Nu{qW=6>R|0xTPxn@DAA|M{NfP`&bL&1%8KWkKGex-v9sr07*qoM6N<$
Ef<UQ<_y7O^

literal 0
HcmV?d00001