From 4dec9677ff0732a78773299d2fc9224cda3c89e4 Mon Sep 17 00:00:00 2001 From: SlyVTT Date: Sun, 20 Aug 2023 11:02:00 +0200 Subject: [PATCH] adjusted some images to get correct upscaling on CG versions --- assets-cg/SignAction.png | Bin 6785 -> 4952 bytes assets-cg/demo_PNJ.png | Bin 4759 -> 4701 bytes assets/fxconv-metadata.txt | 8 -------- src/dialogs.c | 2 +- 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/assets-cg/SignAction.png b/assets-cg/SignAction.png index 82260bb56ae569f2f575aa4e47ccc6c1de0f62eb..ced6850a6fcd9b3086c6cf4db8b44cbc8d98eb5a 100644 GIT binary patch delta 1642 zcmV-w29^1NHP|M9iBL{Q4GJ0x0000DNk~Le00008000082m}BC0B#0$00003a(Yx) zbW&k=AaHVTW@&6?Aar?fWgumEX=VTbc-p;|VV3JA42Az|6 zxJf4O%{b1h85>5(7oiVuX#MB!PJiJNmpu7kDdrd*E}wmWmV!od`&G6lJHI{m>(?Iz7_5wfME2o@sfRF8Y+@c+@ZL#NjoSE%kRJ`!rkfXm4?sBKMU2 zarfR*-{y>26d#f5I45xSK{9I@~=Y<88l(Go^(3|C=@ zFS^&%Yfc0ZOVGWg_!G{oHu#iFyC2I6B#277(L$R2e zCkqzMELpaaH2D-#OqNp0sbtBDLo?)97 z`BYy+jn!(Zxt1nP8_tgwo3+$(D=V*9N~>Rg!x~px)0)@PvDCU!_dWF3t*4%QIjBvn zU&;w;JgLb>YB<_K4OX+81drn+3}yf(T)uUDP=@Ze6CS8tZdeQem|4f`dkfF_sev-(ai2osKr_%dqqW9DL=uKCU-<#;Y z^tv~u_UEX5;>`X{2I&)tcF%k5$_IcZuAS6(`2Xk6(f6zEBWL!v$v*Srf-Wq?jvqmp z{smWi=*ME#m}rxA2qAy5MHB?ZK^!u;792E_OH~L$g%~SXozf)5ViH4=QhWp7L?5Pu zAovRI3eNsFIyjic8xH@+;hg`!H_)<^FfA8%A<~`5r z(|A5#v5dZSjaT#BpJyqG%TPL3Wno@aU>%5^S(O`Bv2i=_kHmiuVmnH+Nc<$;iPFfh z+4a+88vb~i+pNUd#kuLLwsAS(6c3vbQzj%-bfuX($2jauT?zv3DG8+sv3fJjRNRP4 zIk_B)1|r?2A#bbB^OQ1@$3$Kx;f_?ECJ*y}zt=v_>P>5No(Dxxw-!{b@fhA8VRZ=W z&#-*mkk$G9wuTfLr=I!e8@~YZpHOOH$7jL-01f@Ks0l{`e>pZcG%+<~GA&|dFf%PQ zHDqEfI5adkEj2PZW@KYxH)J$6HzEokARu^ca7|4*Np5p=VQyn(Nkly&cx`YlX=!9S zWiw(kG&M6gEiyGSFfBAV>lA~G&9FfKDNlOzo|le!IqBr-TP zGGsPpG%YwVVq`5eV`effVlgmeEoC`jHf1$tW;ZZ3Hj`lvQ3E(SFq3-_Ya}!{I5II~ zWHT*eWjQk~G-F~oEjVE`G%aB=VlpyeWI1CtVKI|o4oj1d4+aD?Ix;b{UlDEy1he)k zKajQ?4HaXlq!IuC05eHMK~xCWZOt(bz%UR3!NLFkGb!wooG9h80#c+vLn=Ki onrLNv#Bu>9h^ei&{~P_@KCo332PMN3YybcN07*qoM6N<$f=%1Xi~s-t literal 6785 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 diff --git a/assets-cg/demo_PNJ.png b/assets-cg/demo_PNJ.png index f776fdc951995e380a53bd405b4897a315157d67..8198c5931a59c0c185c422ed67b214b778ce33f0 100644 GIT binary patch delta 1200 zcmV;h1W)^yCEX-{iBL{Q4GJ0x0000DNk~Le00008000082m}BC0B#0$00003TzXVk zbW&k=AaHVTW@&6?Aar?fWgumEX=VTbc-rlkZ*trq48^~5iXOp|5E941U}k!Q9={LU z>tz3=iL=`eovA%*2*?lde!yaeZ#r zrH`)L!_mQL5|pyXr#=4CPKUr&6x8&ckk`FqzV66z*Y_JC-U=BRje6UK@-8I2b?YqAX?lr|Y!n_E{gr~@!fQ*j>DX2J}B#J-;q0Vc| zNPiQ9A&-22I9!PIGTHswfg?*@u}9$}7g~qSQw{5A zj*%N7lnG*lS5DvI># zFm~P~W~H~2KvvL#Kt;LjL9(_Bz#3WzL@?3;s33Kg$TJ9#DmNs_ zQ6zzXjq?~9uNbYNtc>P>b{u9Pp_0VFCQAXV7!~WsqGJse6^*Kz)YLU=Ns?mHl#-=! zC>9fo!PJtOxn(OZ9$h`TxqJ4KISUR=%_&>NVHWxJkqL(NeSKEw{4Jf~B;7#6_31*y2lGO2<;`5_;^~Q@8Ft_i|9% zvEJP$sL@W1S5hO;4r*vMyGYPDPINE>Fb%H#9Ld zWHK#cWiT@>G&N*mEjTnZI4w0YIc8*IVmD+oHaC+x2OlIjVmCE8HZ(acFk)n4Ei_^{ zG%YwWHZ?6|IW#w7H)3LDVKOz7eFrBbG-hKlIAUdFEj2SSG%Yk^Fl8+{G+{C=Wnwfj zG&o{rVqrEjlgI~O3OF!0F*h+eH8(PoF$mQpGB`CdWHx3rEjTb@WGysfW-={eF)(B; zWjSFsWi@7IH!w9elPU>O1UNb{F|&UOZU_W&^3<@C@ewdj904%p=6(PG05M5KK~xCW zRf|Cq03ZkgSEm1e*$!j{2L~4@nvnQN8`utBev4@epmHq)(Z+cW% zbW&k=AaHVTW@&6?Aar?fWgumEX=VTbc-qaEQFiMn42IuX#Vo;+5E9G5V9uEx%<}J# z?Rc6rZR5rd*Bk=|SrYm{PQvovzdihei>DkzRP&TmnsCK`95WYmeA=$E)-=Vn-XEr0 z=WaY46O182E8C-|UH&#s)14+N=;;SVUiXRlej>+RzdtDAt&!o;=(k-_-W3UN6SONR z+p?yV-99d1UbeQ~R^rWKvvKKK}EZrL9(_hK!{*k;S31~fEvyQC7O)ch!98zpaR!fBF`W|s@&it zN09`7HqOH|UNKrlSsB9t<49&8p_0VFCQAXV7!~`+qGJyg6^*Kz)YLU=Ns?mHl#->9 z6pM+)U~0+C+_DuHkFK8F+&z2AoCQf!bIO)I=UfVG7HBSbyFj3nnP-{ftYJ>G%|7S3 zRBWFbtJYMldd;;oZqkrHT58t3DX#rLXTa0>ejvIUJhzI z)=%XGHQK51N@@t&K@Fp3Hx)F}i4JA}#vu}j+dzN~&4bzG6eACEgV~gk{*d$Fqz-0{ z1~Cwf3$b>(u?xHr9pv8P7A)Rz8tL-SD4S z!dKFlQ+wN|zkG&YlJ2PY&qVl_52F=R0< zVl*%}Ei^SYGA&^@G-NF`IbvmGVmD!7IbmXxwFh4cH#synG%-0cFgcSR2-PGvG-G5p zFk>(+Wn?&EEi_>`HZ5T|Gh!_^Ibk?qH8eOeWHe@z7YR`WH99mmvup`&2m}sC)gqJL z5ioWcFOfta^Z)<=SV=@dR4C7tkxLE$AqYcT;{C5&7vrLQGDbEUDU>IK@EZ%J;5q#z z(9(W`3%=Uw7&)B{h7LW#>v<+nrl=BC%sO|5jZUD+qQYsWV6%I}y#D083*Oef0Zl9w UA9Ff>-2eap07*qoM6N<$f`FGOVE_OC diff --git a/assets/fxconv-metadata.txt b/assets/fxconv-metadata.txt index d38d6f6..3122176 100644 --- a/assets/fxconv-metadata.txt +++ b/assets/fxconv-metadata.txt @@ -1,11 +1,3 @@ -# *.json: -# custom-type: map -# name_regex: (.*)\.json map_\1 - - WorldRPG.world: custom-type: world - #name: xxx #unused but mandatory (Do not touch) - #varMapData: worldRPG - #varExtraData: extraRPG name: worldRPG diff --git a/src/dialogs.c b/src/dialogs.c index 4a44fac..69bf657 100644 --- a/src/dialogs.c +++ b/src/dialogs.c @@ -26,7 +26,7 @@ extern font_t fontRPG; /* the color of the text to go to the next dialog phase */ /* it improves readability to have somathing lighter */ #if GRAYMODEOK || (defined(FXCG50) && !defined(COLOR1BIT)) - #define NEXT_COLOR C_LIGHT + #define NEXT_COLOR C_DARK #else #define NEXT_COLOR C_BLACK #endif