From 8e19f72a732dc556eb41bca21474511566a38b59 Mon Sep 17 00:00:00 2001 From: Lephenixnoir Date: Sun, 15 Aug 2021 11:49:04 +0200 Subject: [PATCH] add player damage animations --- CMakeLists.txt | 4 ++++ assets-cg/player/fxconv-metadata.txt | 16 ++++++++++++++++ assets-cg/player/player_damage_down.aseprite | Bin 0 -> 714 bytes assets-cg/player/player_damage_down.png | Bin 0 -> 309 bytes assets-cg/player/player_damage_left.aseprite | Bin 0 -> 691 bytes assets-cg/player/player_damage_left.png | Bin 0 -> 301 bytes assets-cg/player/player_damage_right.aseprite | Bin 0 -> 695 bytes assets-cg/player/player_damage_right.png | Bin 0 -> 298 bytes assets-cg/player/player_damage_up.aseprite | Bin 0 -> 702 bytes assets-cg/player/player_damage_up.png | Bin 0 -> 293 bytes src/anim.c | 1 + src/anim.h | 1 + src/entities.c | 3 +++ 13 files changed, 25 insertions(+) create mode 100644 assets-cg/player/player_damage_down.aseprite create mode 100644 assets-cg/player/player_damage_down.png create mode 100644 assets-cg/player/player_damage_left.aseprite create mode 100644 assets-cg/player/player_damage_left.png create mode 100644 assets-cg/player/player_damage_right.aseprite create mode 100644 assets-cg/player/player_damage_right.png create mode 100644 assets-cg/player/player_damage_up.aseprite create mode 100644 assets-cg/player/player_damage_up.png diff --git a/CMakeLists.txt b/CMakeLists.txt index 409a8bf..ba3aae2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,6 +44,10 @@ set(ASSETS assets-cg/player/player_attack_right.png assets-cg/player/player_attack_down.png assets-cg/player/player_attack_left.png + assets-cg/player/player_damage_up.png + assets-cg/player/player_damage_right.png + assets-cg/player/player_damage_down.png + assets-cg/player/player_damage_left.png # Skill animations assets-cg/skills/swing_up.png assets-cg/skills/swing_right.png diff --git a/assets-cg/player/fxconv-metadata.txt b/assets-cg/player/fxconv-metadata.txt index 60ba739..f1a8e82 100644 --- a/assets-cg/player/fxconv-metadata.txt +++ b/assets-cg/player/fxconv-metadata.txt @@ -34,3 +34,19 @@ player_attack_right.png: player_attack_left.png: next: anim_player_idle_left + +player_damage_*.png: + frame_duration: 90 + center: 12, 17 + +player_damage_down.png: + next: anim_player_idle_down + +player_damage_up.png: + next: anim_player_idle_up + +player_damage_right.png: + next: anim_player_idle_right + +player_damage_left.png: + next: anim_player_idle_left diff --git a/assets-cg/player/player_damage_down.aseprite b/assets-cg/player/player_damage_down.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..7203ad16e51862ea867142a4d3be39f28cf0e70b GIT binary patch literal 714 zcmb`ET}V@57{{NbYY2fFHq47WmBlJ(AIL--3=0XI7fYJ895FE>(uS1wL3VK< zMy^fL8-=2-q7{uKm);oXLL|%*YLH+z(iilJr{7UBy6-u>zw^G&#ryv~=S-{;c{^m1 zQXWN2BJ#z+O3_<77fI1d?|*LU$^Y@uyp(F@Vk^s{{G&kU6>GhsK%>f+Uw^5KY*H#= zoy`No)lR53?SgOGx5AmhFkE<+gg-yI;mtWejEp#7RXhrPt#;VxtAH*~HS~HyeB-+-Y#4$G(8nEdtWm}nSxnKy5kc%w!wV^l&@o(e9Sao5C!Azr$s~|8qRNdV zB@g~76vQG8$2v}&QkjaaE!VbfPY%vsxP9sB=8Wk`VT~pMReLhuIXRmjZgWqK&ov+ayl-sya;E3~P{E=t zmhiYAq&p{Ul?`_H*MXfrnJP@(_kVktEg8s6zQ|@b)*f27B^HdG%&8ly4rJFZbR{|- m&30F)xkZ0LT}j#APx#?@2^KR7i>KQ?U)gFc3VLf{@BUlp;VC(NRW}RERdT48Q_NY`_Riz!*%yBu9}L z*^Y@52Sk%^PVZ0d{_KCCkAKIY#kXYngMqaiLnmv&Ljss583^DqOH~oJXtGKk1ThIv zh?E4FBpDUa_qn%*O~gd_3aFia5>x8_4(_XkNmfB`a*5adh6H%aw_5J)z(&4aPBoNb zz78~z$0;WPKF>!jcR6q_8Ub3CtMRhcE*b$&M6pzdFaiOLgILSUdbcT(Xq*4eZy@L1 z6qBgbJuN6?yOGdP5$hBrz&wns2#3JWr>L0)d#7Kyo<8sbdrR`mes8}|00000NkvXX Hu0mjfMoxWd literal 0 HcmV?d00001 diff --git a/assets-cg/player/player_damage_left.aseprite b/assets-cg/player/player_damage_left.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..b5147a4f3f9aef8b2224eca277390091708dcf55 GIT binary patch literal 691 zcmcJM-%C?r7{{NLYyA>3B9ySbM5NG##}!S>nuH753S`AxdEu$$!sQGl#S}zD5YElK z2&GokA_GT7(M9QnRCZSmyAq2ir7r41Ob})T$In?w{sTQP?}z6+=i>W$&Uv~< zZJL4MgbC{=zQ8vhenXQINj!W8d%OBzLo^D{1Ou?`r~x0iTyVN345vCrVSLaBjmw%D zWq};)yDJ)&U<34VM;vRE@kJI>G;u@_JJj$(3L|tZ7t_Q71@Z|enOHIjB#kJim890f zl|n%ra^l?8`W981;=!)0L5`UGls~me@}&J{Sg-6h_1E*xTaik;-W-e7XdhGOd;Euu zgI@3H*5?`RY#>m$H}_OLT{Lhcc4_l{cjDXKNo{F(X0Cnl3yy`wW&W{h2YG!RqK_sF8G!K;MdB* literal 0 HcmV?d00001 diff --git a/assets-cg/player/player_damage_left.png b/assets-cg/player/player_damage_left.png new file mode 100644 index 0000000000000000000000000000000000000000..2a8b8625012300cc46b4d400a31fd079ad442849 GIT binary patch literal 301 zcmV+|0n+}7P)Px#=Sf6CR7i>Klrav1Fc^g&o&t2SiG~4nk(f9*5>KG4%FG0t{+L)4LcW8#Vzhk_-fJoux|1$J|5$Op=TQ zC`3xuz^}6#y#bLPMX}MnCTKuf-FX5XR_)d#!24#YxYq=?d~bZY4D*_xIu|6sN0}>O zuWYM_x=--Dl*SMnxJ}WhmrHZ+q6HE*j$%`j{Y8MM>B`uL&ez#yw5_R&VY4C-z%djG zT%P+939y*V6+eWcm#?VxS8cndU*uJ)K}Nj+Vo$}M>3?V}00000NkvXXu0mjf1vq@% literal 0 HcmV?d00001 diff --git a/assets-cg/player/player_damage_right.aseprite b/assets-cg/player/player_damage_right.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..6bc9e7b49f419201fec7531ede61bc0970b81d1a GIT binary patch literal 695 zcmcJM-Ahwp9DskT)<|J!WGpiFA|4rlE?Kw#)p47ZOvM(2)1(DR93l0H_3XNQmZ@8HE*&@EmEZR!9ykG zu&LAoN}==WcQ?#2#S z-;#nMQ^SVjEc`I_8)`;MshSiWo2?DUt0S@jcpOF+a0-G_Nv+Xn#wo*0|UE{6&m*w ziA}L94yRGk+0%VwG%)h%kr}ytb0L!UnG1=JPtJ6u7e{yb_fPM5`eSchaLdncMk?>Z z`^__{XtMCma5QPmr{1-VUmII|`PTMIdy4GAp&r+Ke!+O_SDU%r^{_KxzZI`J-qG*M TIXu>I^mL!}mRXjImjZtP_w&*+ literal 0 HcmV?d00001 diff --git a/assets-cg/player/player_damage_right.png b/assets-cg/player/player_damage_right.png new file mode 100644 index 0000000000000000000000000000000000000000..99e32701ed7b80e432add28a5019b61437d349a4 GIT binary patch literal 298 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|o_M-AhIn+o z4cW+h$UwkmhEgM&_W}_{DJ2!IQyrWNxv#!#U=Wfv;AC|+VCBu0aW(Mr=&>(Uky>YY zbJP18{r}AMf23>=N`5N+(5za1F<+@p%3Yx$Q=<8&n5x?SBP&B(bi-oW6MfW$nZEpO zC|%>r_3W+ijELEmsylSjbw1_pHJG{0KS9V=UHUsq)EmL|UW=~loIK0FGMMSg-iYq| z{WCQhw?=YoSa$MW&gBiJQLZHq*pmtcU;X=EXCi+6UaDB$|%^GUxKr*SD>OqGLsKra_BNl*fxx{Md7&?2Tp`SaG~9TuP!`mil)?f9@(CxISTYGDjVR4c($~Ph zg@X8{_4xUdeR?pi%TVsciW9d~Qo@qf@yn zH(&79`tSPl$JTZgQridSr;Ytbx1K7qYPG;4qayQdaC%$E%I%rhy=2w8k@2DQ8}He= WhLQ0@S4y>sL`5d|%p*-!Ao>e#9L>l8 literal 0 HcmV?d00001 diff --git a/assets-cg/player/player_damage_up.png b/assets-cg/player/player_damage_up.png new file mode 100644 index 0000000000000000000000000000000000000000..a3e396072fe4eca33915ced1561841eddf00eb8a GIT binary patch literal 293 zcmV+=0owkFP)Px#-$_J4R7i>Kl(7xMFcd^zn1Vn19JcFm>iy?_lq5T0J5CFSEwdy@pwqnU rWD-wN@T&HB(6!%d($VQC>-mExK>zNFDsqB!00000NkvXXu0mjfzOI8j literal 0 HcmV?d00001 diff --git a/src/anim.c b/src/anim.c index 4558f37..edc0533 100644 --- a/src/anim.c +++ b/src/anim.c @@ -14,6 +14,7 @@ DIRECTIONAL_ANIM(anim_player_idle); DIRECTIONAL_ANIM(anim_player_attack); +DIRECTIONAL_ANIM(anim_player_damage); DIRECTIONAL_ANIM(anim_swing); /* Animation functions. */ diff --git a/src/anim.h b/src/anim.h index 419d218..a612994 100644 --- a/src/anim.h +++ b/src/anim.h @@ -70,4 +70,5 @@ extern anim_frame_t anim_bat_damage_right[]; /* Quadri-directional animations. */ extern anim_frame_t *anim_player_idle[4]; extern anim_frame_t *anim_player_attack[4]; +extern anim_frame_t *anim_player_damage[4]; extern anim_frame_t *anim_swing[4]; diff --git a/src/entities.c b/src/entities.c index 93a5a53..68a11cd 100644 --- a/src/entities.c +++ b/src/entities.c @@ -154,6 +154,9 @@ int entity_damage(entity_t *e, int base_damage) else entity_set_anim(e, enemies[e->identity]->anim_damage[index]); } + else { + entity_set_anim(e, anim_player_damage[e->movement.facing]); + } return damage; }