From 5b326bda818fa0438a12ab1ef34874c93a2cbb1e Mon Sep 17 00:00:00 2001 From: "theo@manjaro" Date: Thu, 18 Nov 2021 09:28:47 +0100 Subject: [PATCH] Better combo --- gamedata/assets/player/combo/2.png | Bin 635 -> 7027 bytes gamedata/assets/player/combo/3.png | Bin 638 -> 7854 bytes gamedata/assets/player/combo/4.png | Bin 639 -> 7604 bytes gamedata/assets/player/combo/5.png | Bin 0 -> 7728 bytes gamedata/assets/player/combo/6.png | Bin 0 -> 8007 bytes gamedata/objects/combat/player.py | 16 ++++++++++------ 6 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 gamedata/assets/player/combo/5.png create mode 100644 gamedata/assets/player/combo/6.png diff --git a/gamedata/assets/player/combo/2.png b/gamedata/assets/player/combo/2.png index ced6ddddedc7d0261caac22e4961f9ec490ba104..3c58ea41d4b7a734665e38ade2db6763c8164d23 100644 GIT binary patch literal 7027 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 delta 515 zcmV+e0{s2+Hv0sSBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iTct%Sf_4yb z2vVIah>AFB6^c+H)C#RSm|Xe=O&XFE7e~Rh;NZt%)xpJCR|i)?5c~jfb8}L3krMxx z6k5c1aNLh~_a1le0DryARI_6oP&La)CE`LRyD9`<(TzTY0DlZi%+%*ZF$vG{bq^n3 z?_xa5``n+SN6DEC@Cn4TOgAjz4dUrdOXs{#9AQOCAwDM_Gw6cEk6f2se&bwl*v~T~ zMmjZ593d78Z7jDjD;g^C6me8hHOlvATvj-5aaPM!*1RWwVK}F)EOVXa5E59#5=01) zQAG)5ScuW8k$++$Mf-6N|DfX+$t9Dk1V)YpRG>m~{NR7^yIV6qIpHRS<3Q(&ZGVga z!CjzHv+eI=+isiyfoI@KYxyg6VCIwbT1$%_0lnM6#dS-Q_khbCVBkrY49SrKH2wKJ z@P0<$lm+^4fvz>Tx8^=hAAmGA&Q0073X8>MW?IS&8;002ovPDHLk FV1id@--rMJ diff --git a/gamedata/assets/player/combo/3.png b/gamedata/assets/player/combo/3.png index 7315467825ae3bf24c0438387045caa33647da94..7b6758ef39af9780d09f6e09af762253f70c8703 100644 GIT binary patch literal 7854 zcmeHLc{r5q+a8oXTV$^>mJ&0}V3_T>#vXyKl`}z}# z6qO`fl#;c4L%r|Ydwjot-sAYb|K2&~nR%Z3KCkn-uJgX0`?&8r#>_Frm2{EFF0055ffhb#w1=SNfP@3${0Vpfz<=Unrk%IU zLvEejDponVFZV>^xu?R?R#G&pw96#V27WxIS37Q6SZ>Awj0z%Nshqv^qj~hv21_gU zy;g5kd+Fxq4*qkS*Vi@)+Yg?G?w-1|v6vfh$#GIyHcez@dB<+aC&WAFKeJnn4k_tf z8&UZ|#l0n;d~ZKr3=F!|?8xZx!)?w!Ou-eePGy2<4W5^2u%5ch*O5HZSeX#I^4+1A zxZ7k1k914^@ZbTm$aW*U@*B$~4!gO9`|etARlc@-+SrDUR!gbocxAqR{=Vky@!j}} z9o0uQE_uFJHI6DLzEjG_vfQb4IBXT7`sIZ(@zmDzhvP4YjjD^;Lt`ht{}3ZCo6g29 z+6cWe@B7^Fb}GuMYy11iqLdoDx@UdR(QP&I@_PRY^)CKZjm#*yeoQFfqj62#f_O{x zSn<(wFK!8pwa0Cjb<50`c2D#(1@N7>vzhEE%U8Yee8V9gw~T8NEY8HuhOQLXXcJ3} zo6f!DGf#`l0P?*wIQXuqslPg=RsfPBkR#&lP`7U1pL>64zM&`ZggU!cWo!D|B#qFr zTO1CC7kUJ8h)z`ynP)vGYsGd}JLN$x&)<*U6W#F-*-5HLf&}hoDG1+bD8m#S{BqO5 zlW77f|0%S5s?baDv5t|bExXTbLSpB^!*=G?aKUhK1-f$CNhDF2TV8Cu6;$a5;Snhh ze;6Q@p+3qO1PL!6l;L-v#EhHOAL!fG{2_6xCtt|nlURg+MR$ILkYj3Z98@RlL#D&3 zbYZ$h@5vjen!Zy}BII5~nnN6zV}s)=68tdLLMFvp)+U$AURw8JHj|j&ans&Yr*6XF z)^gBXRY`8pywCVs#)GG(^~JBj78FxZnW2$_u9*Qh?fA>?zgm^KQ=e=faKmb))Diu? zZ;{_z!De(RF_qoOZ?ryhxGjQPg@s1}gl`sm6I03!5@c1t&HXvAcl4d@#9G1)E6GRY~vK2{%cq)trssb9N^V60``?X7wZ za@|AL=Fm-Qi}0tB^-JvEorE$mJ_C(T1g$`>2l}d9x@AW&7pm*U;_} zfR*O8?Cnyj$6}8X@6zRp961K41OBep3n7<2q*f%tgdgogfkGlqq#SFjpzj-8h>Aj_ zgk6bZ1V3iWfNs+fJ=YnS@-%&Cov*Sfq!GM@54pb4lcccKyhO1^k63$i?;>`J9P##d zJu2=SA9^(}+joZpkrc#n{o%*fn1Ksc)DhLUq3x(esPRSJ>yA2xT!A^2V-5?6>(%15 zFyv<21he9$CFUAZolVOa_ zm1(qBa~uR(b@e|@vQheqPhAn`=3CypVGrXQ$acPFr`K-CI~2>EgiK$A68RifM@|>d~06-qZSx&$9(q3T zR0~uZi7J$rPSM65J?lNX9K~TtDv-wL$rwBkyx>TE+EIK*N4=9bTO#>*nHRU0RFcbQ z=1@~(zB~!53}E~zSCq$D|Lw9+fAys-aCLO-4=P*!)@1sW_GZ?7Y*9?0?hOVAx?e!K z_W&Yjb4QfIRuL9EgW@1O2B|Sj=$FU9Zw(yC*bRs;ToC*UKk%$Ys`+&Pl3xWk%W%)I zUV5V46UCIq@^J|7p>c}U=M!QkA?5Xj@gt%-SpyPc<)h%y{zM48`_PT zV5q66ZLz_+As;W){ingG0ezrvyot5kdY)))0zP3XD!$6|CT_*;ksJDQZ=!0-w-H?2 zW|GhhezNZT1?}fSP@t$w4sWG2;(&tzr<3G}Z-GU*kZ*bs-_7>{0t7f1U4=x>{-TmU}tNxdKPP6@fjBe?pfX3 z-T+}jY?n}7zN!@`o8h<%3b+A0FVDoDUNH1lKV*gnslMbbPsmT`8~GqvdvZ8!;3=1Q z!g|9Co=>-}IZxLjC$i$E^{vGd-Mf-Y`}oGB62un%iABTmdEG~sY>51?WPJ|>GJ_T*3+T@a$?|SY z>j+!me)wro>7Ibr1zfXI?FqTbaws0>)bdYsbV=H_UK;df;R$L(9x;hSN792!0cKL_ zA4oz|rv*Uc>~@Ii^DV2#Op1rw54#z#1SZ4Xyj9;^Ie`x=xf95K!~olH>rEolq`A>y zhm%~#zn9e!*Sg#WLf;oL7UqxqzC(u_qDVCVULmgzs$#$&Av)q55jbLl>M{ zJ8azYLs|ICbh#~E>sXf0k)Y9PsqoV04^uj#r^W2xD%T+<_iwY!)2B*2M>rByKq_T= z5|G3p%A$c$g<;;fhibG(J=^Z|tZzm!Mx*%R;gOlw*+krw;|KKZV)5;h=eQGqvZ^6E zjLY{rA@Q^7vC*JV^)tqZ;G&SsjQ%;91`%Iw<@CZ!eyLR_1Awk96(_>$FH&Uh+uHf@ z-PL`G{ic2f{-c9SGr;HC6UFe(6`zKltC14CED6@?L$GWA$y0;khtGpQL1$;**3Z%6%ow~o=1hg@^=_Pez0Bti&R8?IYcicd6vd=Y^(h7N z4mhIN2CU1%LSccOR(GA%&PoUs=LCRCrOKPfHIu_1%@m|)Sqr#Y>m8PQKcs-HJFCY4 z%g;NR^TA9>>&xlb*UDzMyZOah`}iY0qh(nQv@;{g$rao?hljKRf`k~`RaVykv0Dn< zHFT2dbiF83(5zA(bBAtIqxj-1k5`678H+==fk908WUAL~MA&_TjTZmF%gP7P2w)dA zK7LMkp_#%TW^ZkTJ2%0@dOU6US>8s+LtkLzsW+d31d6Fny_qaAmY1zdgs<5s;M1dS5*%(KvIGyLeJuk++%(^c83c>9|c2R{wp3E2!KYb0sB z;*4ioA32;SYW4=(qA}Imcq2uZi}>()x5{1dW`?J1t;gx1+Kon_ivox(!VhkOk%8_iXQnaR<+iC${7|H>5~zm3~({y8Jo;LfV9O>+oSOtjncm_)mjy6bI&k ziIqGS7FG7ZhTDAKkj_t~WqYrzhjo{p9Zv8RH9H!;%DB)qcmgH>t2JneE1WD}8+fhQ~7PxD=0s|ho7tD?|4UzP@>*eayt9S(I2hMq0yO3Ysl^TxHshjl9gm@y0xCwU=?+%1zKxu#Ux7 z*G-OZ%;sJdUlaqd29VZ@9AY+B&BPZJPN#C4BeDXU5*1$art!`^btp8^Hy&g=dFa$z z!3csb(VY_0ZLeoCuXe-K)4%>L!^x-9Mk?Di5k}Zgk1{>p+Tc0Gh zbwo_`+NrCB-9~9Gs%06}(RiB+vA){zEw8x3zheazA z6+W&r*^Yx#SKn%Z7lZqr9eGwszj08>t{|f^o2B*q4XC>>R}mrE*v>GwaX?c0hj#zc z8Yh-6JxmQEpLav*(Dc}_l5cN^Na;Cmc`FWcKja-zo8czIugx!FtNH!x%@w&my#-i_ z1&LYLIH+2m?v0u}UcoblSwmZzkofS|%mbFthq+(7nKsG{u_Q;Laza1u^6MV2?g^Yf z<7W1ynQ3iaN_(cSupn5@mrh-g2ppqIub&{S zqR&;!tkr_o!v#*WiV02MI+_^#urBSh-K_?T=Jod_FZ=Gk^Ajm=`7+n|ar5rGl9sQt zeU;ypt}K8foC3bA-LKaa7mQ6tp56@Dw3qZ(5lT`sYF86I&M2fVF3P;torvshp&z;` zjIvvOqFApQBp)u+wUxGb$IQuSr5TdBirW$0MJDc zw6x3&w6y-%2-CK|*&#{l`fZvb9Zr@-Ix+=#F0XF09NFktl?!~aW@4kPmB{pKp{G+K zB|19HNnn+YDqA0t*YjtsR$K=(G+({S=5;J=-<7<21bS3t{oQ19*QDy@iZs4~1py|- zNw{T9{q-IyYrYNT_A&IQxfI^M^urwz!ChnO^zO}ZRkFL}ONmF7T%|QNfw@-fBT`eq z+^O0_o!jkA7OALd@-#FBqQBEkdGSuU^I#g{W>41qs2bE%mUqI|6I0}Nq203G+-gMn zR-gYJ*p$ni8x?22X8U z4)CO){lT7O@jZ&49NIWC#+yK*5Qv_@Jx;U>(TAcA0@3<`f5hiOGB*B`-jn=G1)3gm z{%DdM6e2I@;UV|C1(~AbOC$Le(0{ccqiE+lauzr;(Z?Hu)A7Z5QpA6!z+(QiC;520 z@27*s$l=^^9yBPK<`w!kmwE=qW`A1jN#IKGAnjYx#QqzSLcsqe*56{=>)B7|_dsao zfAanf{YUQmU>eHU7^zLf`0Ryepsfzt^N++5F$64f{}zu{RDr3;D}u4gcq~{E55s|7 zl+idaUIl~3AQW7bm6YUvqcZR$Q_!9m+#VH;973S+VBrWn2J3b`yG3NBTt(dsDogTpMmeUn7N}V zc$$Ga$cW(SI2;47QBpUP62^sB+!|pqx+5POoxS>5=akTgQS3&*JPWUf_1w&xv zac~$Mj6kSB!HOzSC9nz{4+YCBpb;1s1sH7rFn?z!6Y&&3v^VawD=kx6HnalT&jxs6 zUrOn}qy5})dpgO(pkOHNtAdh8AYo7>6e=SRMas*AVKX5BYpps>tDJ4kplk+{BL#rE7w0# z;2(kit*-wwxmf?&@ZdaYs~|txcBY6L=0MvDF}fJ)X#=o;5P;&GJ5HO{!a~xwBLe^s z@x6=AzevNE*2qLLFxFvu&&I>d$5uA~<{qs{kfLKt(IR^6t(yV+%Q+kt=trQq0r!@3 zHenq6G?0yf_Gy$#AI4eWVB0bI0=D3g#zl>?ND^CP>j1j7s5`V16B#a8O@gzF^k46I zBhDb@5ShEs~&qAPIvC!ki<>B))PPm0Kny%X!uIs;1QY& OfPs#QHua42mHz>&cmopv delta 549 zcmV+=0^0qqJ^locBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iTct%Sf_4yb z2vVIah>AFB6^c+H)C#RSm|Xe=O&XFE7e~Rh;NZt%)xpJCR|i)?5c~jfb8}L3krMxx z6k5c1aNLh~_a1le0DryARI_6oP&La)CE`LRyD9`<(TzTY0DlZi%+%*ZF$vG{bq^n3 z?_xa5``n+SN6DEC@Cn4TOgAjz4dUrdOXs{#9AQOCAwDM_Gw6cEk6f2se&bwl*v~T~ zMmjZ593d78Z7jDjD;g^C6me8hHOlvATvj-5aaPM!*1RWwVK}F)EOVXa5E59#5=01) zQAG)5ScuW8k$++$Mf-6N|DfX+$t9Dk1V)YpRG>m~{NR7^yIV6qIpHRS<3Q(&ZGVga z!CjzHv+eI=+isiyfoI@KYxyg6VCIwbT1$%_0lnM6#dS-Q_khbCVBkrY49SrKH2wKJ z@P0<$lm+^4fvz>Tx8^=hAAmGH{*&?@A_fE<4&-+6lNufp!W6a0|P^&0)c%=>75r2EoV%I2#58BO5UI$bbo#Vdwx|BRU_ifw&YC1DL2CDR{k% n>~-{Dz!oetiRDo+3djHe){q`MsZNH~00000NkvXXu0mjf@k;F5 diff --git a/gamedata/assets/player/combo/4.png b/gamedata/assets/player/combo/4.png index 554f9fac06312a1ede5d772d4e1e28f1619b0722..58b4d9ddf00f961d739c235116a79736573a59fb 100644 GIT binary patch literal 7604 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 SYJzDl0LJ z@f2}XQ8mikJn()--;@RVZ-K5gx3}g# zP9K0Yb(OpU4i16Q0%fmzygSt1+rMX;{rvzQHFAY-)H^f)0F&q(G6n?+4JDJ!lOP>O zO(1_l6`Vb>pp76O88G3pbz(sqiehw)=zM|(=1-_XaS5@2i5SA&Q002w2A(%o@1||Ri002ovPDHLkV1oZY(>?$I diff --git a/gamedata/assets/player/combo/5.png b/gamedata/assets/player/combo/5.png new file mode 100644 index 0000000000000000000000000000000000000000..1b8b2bab11500d84f9e2c4ca288688512f0f6ffc GIT binary patch literal 7728 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 literal 0 HcmV?d00001 diff --git a/gamedata/assets/player/combo/6.png b/gamedata/assets/player/combo/6.png new file mode 100644 index 0000000000000000000000000000000000000000..64ee9b5ce9709d0b0645ec8735091eb835b6f447 GIT binary patch literal 8007 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 literal 0 HcmV?d00001 diff --git a/gamedata/objects/combat/player.py b/gamedata/objects/combat/player.py index 8f242a8..c2a7d86 100644 --- a/gamedata/objects/combat/player.py +++ b/gamedata/objects/combat/player.py @@ -71,6 +71,7 @@ class Player(Movable): self.combo = 0 self.combosprites = self.game.getSpriteDir("player/combo/") + self.combotimer = 1 def step(self): @@ -126,6 +127,8 @@ class Player(Movable): self.attackstate(self) # Si je suis sur le sol self.onground = False self.onceilling = False + if self.combotimer>=0: + self.combotimer-=self.game.dt*5 # Cancel fastfall if not enough speed if abs(self.verspd)<5: self.fastfall = 0 @@ -233,12 +236,13 @@ class Player(Movable): def upcombo(self): - # Up the combo and spawn particles - if self.combo>=1: - index = min(self.combo-1,len(self.combosprites)-1) - self.game.addParticle([self.combosprites[index]],self.rect.center[0],self.rect.top,fps=1) - - self.combo+=1 + if self.combotimer<=0: + # Up the combo and spawn particles + if self.combo>=1: + index = min(self.combo-1,len(self.combosprites)-1) + self.game.addParticle([self.combosprites[index]],self.rect.center[0],self.rect.top,fps=1) + self.combo+=1 + self.combotimer = 1 def draw(self): flipy = (self.gravityway<0 and not self.leaptimer<0)