From 7ea77e5001e445ccad5d72fcff9a5606571bc29f Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Tue, 23 Jul 2024 20:31:50 +0200 Subject: [PATCH] afegits els nous fitxers amb grafics i animacions --- data/gfx/player.ani | 51 +++++ data/gfx/{player_bal1.png => player.png} | Bin data/gfx/player_arounder_body.png | Bin 4859 -> 0 bytes data/gfx/player_arounder_death.png | Bin 1398 -> 0 bytes data/gfx/player_arounder_fire.png | Bin 887 -> 0 bytes data/gfx/player_arounder_head.png | Bin 1608 -> 0 bytes data/gfx/player_arounder_legs.png | Bin 443 -> 0 bytes data/gfx/player_body.ani | 176 ------------------ data/gfx/player_death.ani | 9 - data/gfx/player_head.ani | 114 ------------ data/gfx/player_legs.ani | 16 -- .../gfx/{player_fire.ani => player_power.ani} | 0 ...{player_bal1_fire.png => player_power.png} | Bin source/director.cpp | 23 +-- 14 files changed, 56 insertions(+), 333 deletions(-) create mode 100644 data/gfx/player.ani rename data/gfx/{player_bal1.png => player.png} (100%) delete mode 100644 data/gfx/player_arounder_body.png delete mode 100644 data/gfx/player_arounder_death.png delete mode 100644 data/gfx/player_arounder_fire.png delete mode 100644 data/gfx/player_arounder_head.png delete mode 100644 data/gfx/player_arounder_legs.png delete mode 100644 data/gfx/player_body.ani delete mode 100644 data/gfx/player_death.ani delete mode 100644 data/gfx/player_head.ani delete mode 100644 data/gfx/player_legs.ani rename data/gfx/{player_fire.ani => player_power.ani} (100%) rename data/gfx/{player_bal1_fire.png => player_power.png} (100%) diff --git a/data/gfx/player.ani b/data/gfx/player.ani new file mode 100644 index 0000000..1564e86 --- /dev/null +++ b/data/gfx/player.ani @@ -0,0 +1,51 @@ +frameWidth=30 +frameHeight=30 + +[animation] +name=walk +speed=5 +loop=0 +frames=0,1,2,3 +[/animation] + +[animation] +name=stand +speed=10 +loop=0 +frames=4,5,6,7 +[/animation] + +[animation] +name=walk-sideshoot +speed=5 +loop=0 +frames=8,9,10,11 +[/animation] + +[animation] +name=stand-sideshoot +speed=5 +loop=0 +frames=12,13,14,15 +[/animation] + +[animation] +name=walk-centershoot +speed=5 +loop=0 +frames=16,17,18,19 +[/animation] + +[animation] +name=stand-centershoot +speed=5 +loop=0 +frames=20,21,22,23 +[/animation] + +[animation] +name=death +speed=5 +loop=0 +frames=24,25,26,27 +[/animation] \ No newline at end of file diff --git a/data/gfx/player_bal1.png b/data/gfx/player.png similarity index 100% rename from data/gfx/player_bal1.png rename to data/gfx/player.png diff --git a/data/gfx/player_arounder_body.png b/data/gfx/player_arounder_body.png deleted file mode 100644 index ec8aa4c1f7c749dd020402ddb444694b744a1662..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4859 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 diff --git a/data/gfx/player_arounder_death.png b/data/gfx/player_arounder_death.png deleted file mode 100644 index a2ee38b773b1493ff281021326b5cdccd16718cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1398 zcmV-+1&R8JP)Px)FiAu~RA_u{B=kd z@xSqaD2iC4(ZKw{Ykn>3@%Ik^Ce{aB|jNA)UlP zh8E+G2~iZWAPD$*sZ>fmi*Ph4YRPgH!18`BCY=$&{iRp_ZZW{Y={29YOtyG#Q$Im; z`w*=ZF@)!@-lWcDFC=esAzy?@ynIbGgbJ!;LllH)pp&yMf*|01lM#T0fjIdBZUJA` zF*;^V$EdyB4^2P^6)`Sw$-HQ3vpu6!DxuM67=x#ZeEKenL>5sH1PFovGWo;{&w^AL z$HD0}|F~RN^+TJW`FOap_Nt(YJr7@`jcD@#Ij*?CWQ439Cqg9v;$d_-@K(}L-5^Y) zo9?3r#r?J?20NQFMMKC-pvePl*}h`8VONSMAZjXF8&8aoyZ z!E<;t;GZ7@(3cc+USL~`Md%bMlbVN zmqrCazz1*YTpT=L&*A+-MQMaA@j%XkzKE!Y`BFliP6w_cdj9GSo*dPAMs|3+hr?x` z-~KqtyxUKb#JKc`;8~EIMwLn>{Py!tP8}2E9A1W)irV@TvoJaBl|A6@qqiOz!9PFd zA`mkaTee2?KfK*b^-J}oEJo1H%P&-be)?J}1~i*ZuhZ#d?ietWUo6*{Dg{$PMO2m; z06;qq%35@5weCJ!46qqjTwcTd77O=VycDq#gl$Gp!A3p+<@P_zx-UW(15`0bN4m)v zazCo)sWzf6dm_J3;an8UHKr`akr8YJB}rmkc7SxjjU8Ps0xNB2Bem^jSs=Ix~j>Oi-R&jKPJNV$6|?mRiFuhfEMWw};jMRl9X zDYh&|i~(Y7Qr#nqh(xBVOBt2xQo^+rvM7k{-0W%F+6r>(pc>YhYe5lMkg2KwWGMz_ znFsZ2%vj`gTUE*xRjq>f+Rs$t5C>0t2_XAR83Ii(OG$l`H)89Es2bMw7iWC+_(K9CNc z|I|BeStMCwmo?~I&8Eh`b;#FrZU1fj7k{l;=PxyX1KM7scE7b5eEIP)Px&F-b&0RA_<4d0&rC#r0m` za@flW*2_s<3zH`EQ3J$4S%Kp3&>H8x;t3So zS;h87gv1~3*Up~TT2aX2Eac3W6QtXtdESj~wGA1NGoI+VAAh!~r!#7>vRcN=Yxv&? z_3+nz)3cwRRl>k)mBV~~l{INU8-bXqWB~O*D0+GcDCa1THHe@U^kwQPg;iazNg9uW*j@97D^UqLlxT3}SIc%z}QG+yb}8O(^RlDvU> zlxc}y6zk}a0QI?hI$#S*w@0~Wmmxw~ecd~(mANkGgSRp%v12M{B}d9wHGu1KKC~{6 z)}YbkT^^z+&zW(Mxi>LC>57nU50`Qg8GW0{kT;lCc=$bm&w3!^|O&3=s3OV*z@azwk`2-@5~qkyG@SQA_5 z$u+{#X*``!!UI5EXmrj7*k^Jdsc0{qay5Ln2n2|o$jA-xokk5;D zi9qp_3MV77pEo!fQIpT(^`n|Adx2q4t>#(RL+z7_y)sR%T^86>u5TZp&p+<#_;UaN N002ovPDHLkV1j}Vo-F_X diff --git a/data/gfx/player_arounder_head.png b/data/gfx/player_arounder_head.png deleted file mode 100644 index 211f28743394ab890179735421d4688ef803ff43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1608 zcmYk5dpy%?7{FKjh$YdokZ5&6#iHgCVKTQamdK@;(nYExm*~RAx;V8HQ=$%Ih3GO; zSW8TyP|4gT#T1*w8jan@`R(YB^L{?><$0g?d7k%q-tT)AyW2}g+ejM%f#~>nd-#KM z1lSuEX@H~r($QXUS`hE=lXvRPvtYkKzc@WrvI zUe<>M&xAkd^#Vw4XOcB~d^{7rsuV$=Jsq>fBsl)0?)0P54VW2Y%^@YpJd*wW+9jkO zV@9XikJ`(I=w;D4G{0OmdEXl`Ke$kK^t7q7Q;d>vTPxe0!}xheJbvl`E=+?E+*TqG zPUzo(l@-?u4b5yr-oE$le|x3R@1f(gtMtcc+Fu+{??Y6Vd#X*ZBjLmhbN^$hfXo#H@ldcr52M@D=}S`jwMg zF}Vfstk(O_1gOmXext}O;TfWVG2JnXmIpK|&tZrp;qfQRi7=I<@iFzaO(=bBN~oQC z(v!I86W3S{5YMyqAm7-VU)xISA-kG(fHTPGvvmvzuuN8T^2EMybS=r=MV(%Z1W+^K{C;CNa z_`>70q!8Em=n|2RG*_YG7XLU)Y>EixZU>M z&S@_nYxlRz@I^40(YlUKIl%B{pbYP2;;?Ha04fznHkSbBQgK+96a`V8Nu7{MfWTCq zmiq7NkQXV4+HV`IN=`3U5GSDzlM+RGjbreUr-!aqo^LIoS$Ym{ZlL4V6<4fNSvLqa zOsb1^@oGXTjy%3Wic;x8I6mPWb~Q~rk{MV8FhvR{DX{HqqBY3n&fz^9t?T+|js3!y z1H_4}Gam|8^s-IgNu@CeTT8OzpQN#iISQwc9PXr0uXVp!o{`Y+8yxl&&l3r4x(k@> z%|n?;*Fs0a^mw5Qv)32Sq=1~EMg=QVpLN}QwI*xo-7SK_Z0I$Uxs`xzcLCuE4%@bm z1QK;;A^%IU75VDHLiP;;3eJi%DATPP)t%3=Ll@&>Ek0;|^Jcab`O>K0D=j(9)7@?a z#l<@ahD=;2pEOnbbarHUI0Nw;fx=<%;K) z9~zzX4`*JmroYwPLkQfyU3COhCoVZwc;6{Kw=4X108VOu{=xagsu4ktvC%TB)`fj9 z@#18jjodkKzb{Q{Z;h^*L;qMvp%g5BZ!nnb_u<~EJn~0K=r80q_~B{3(C$$#HbqAY z7eZ}cN|ok}=MuC1oMfjuL9Qu*+|%RqYm!t^RD~K5OhDU0sF>J&L4ua%=Jb&l)jYv~ z@joxzj+&fVzPblR4HY7J@NUh1q2_!gf?Xz|`U+zH5ImrglOa+}LD%OqyO1qM#Qyy; zr8+v&B-`=ZbMjz>eh-FInc}#OhelO z&1%CU<4+OZxHY0qJ<8o9i2nllStDQo diff --git a/data/gfx/player_arounder_legs.png b/data/gfx/player_arounder_legs.png deleted file mode 100644 index cbc353b5fbc711e47e65c543ce2b2a632a393138..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 443 zcmeAS@N?(olHy`uVBq!ia0vp^2|#SX!3HGXiPfJ6QjEnx?oJHr&dIz4vP(T(978JR zyuD?c*K8nipiuZJljNc`b1fKRCs;5r8w-m+} z)X-dFmE-wLCro0=+&`~uytsCLId&_{;;V#NcIl(4eRp!ozwUf_IB~+M-R;uu9G@4h z-ZA~Td%BllV9<&8+m~xDbgQxjN`Ads`q!s-@w?VX7TXPdDsNw}tqfl_d-mIPcB^XD z_}Xv#Ei&q#Yt%1WtE6>oTch(Sn>-P#kQ(`~twCS+)ZOjQn%|i<-}KX~ue0kI{bK7M zFZ?H_F<<`uwfrq{YvitrCwIR${@QDF*1aRGcA4dz&Hv6dmt9(TG++PEg@&padd(prefix + "/data/gfx/title_dust.png", t_bitmap); asset->add(prefix + "/data/gfx/title_dust.ani", t_data); - asset->add(prefix + "/data/gfx/player_head.ani", t_data); - asset->add(prefix + "/data/gfx/player_body.ani", t_data); - asset->add(prefix + "/data/gfx/player_legs.ani", t_data); - asset->add(prefix + "/data/gfx/player_death.ani", t_data); - asset->add(prefix + "/data/gfx/player_fire.ani", t_data); + asset->add(prefix + "/data/gfx/player.png", t_bitmap); + asset->add(prefix + "/data/gfx/player.ani", t_data); + asset->add(prefix + "/data/gfx/player_power.png", t_bitmap); + asset->add(prefix + "/data/gfx/player_power.ani", t_data); - asset->add(prefix + "/data/gfx/player_bal1_head.png", t_bitmap); - asset->add(prefix + "/data/gfx/player_bal1_body.png", t_bitmap); - asset->add(prefix + "/data/gfx/player_bal1_legs.png", t_bitmap); - asset->add(prefix + "/data/gfx/player_bal1_death.png", t_bitmap); - asset->add(prefix + "/data/gfx/player_bal1_fire.png", t_bitmap); - - asset->add(prefix + "/data/gfx/player_arounder_head.png", t_bitmap); - asset->add(prefix + "/data/gfx/player_arounder_body.png", t_bitmap); - asset->add(prefix + "/data/gfx/player_arounder_legs.png", t_bitmap); - asset->add(prefix + "/data/gfx/player_arounder_death.png", t_bitmap); - asset->add(prefix + "/data/gfx/player_arounder_fire.png", t_bitmap); - - // Fuentes + // Fuentes de texto asset->add(prefix + "/data/font/8bithud.png", t_font); asset->add(prefix + "/data/font/8bithud.txt", t_font); asset->add(prefix + "/data/font/nokia.png", t_font);