From c1ab414aeb095aa04eee877aa996d51513796ce3 Mon Sep 17 00:00:00 2001
From: "theo@manjaro" <ayte@tutanota.com>
Date: Wed, 17 Nov 2021 15:16:07 +0100
Subject: [PATCH] Added dust particles

---
 gamedata/assets/particles/dust/0.png       | Bin 0 -> 664 bytes
 gamedata/assets/particles/dust/1.png       | Bin 0 -> 720 bytes
 gamedata/assets/particles/dust/2.png       | Bin 0 -> 725 bytes
 gamedata/assets/particles/dust/3.png       | Bin 0 -> 689 bytes
 gamedata/assets/particles/dust/4.png       | Bin 0 -> 644 bytes
 gamedata/objects/combat/ennemies/ennemy.py |   5 +++++
 gamedata/objects/combat/player.py          |   7 ++++++-
 7 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 gamedata/assets/particles/dust/0.png
 create mode 100644 gamedata/assets/particles/dust/1.png
 create mode 100644 gamedata/assets/particles/dust/2.png
 create mode 100644 gamedata/assets/particles/dust/3.png
 create mode 100644 gamedata/assets/particles/dust/4.png

diff --git a/gamedata/assets/particles/dust/0.png b/gamedata/assets/particles/dust/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d08d3f56e9d8c797da9ad05685b4a39abbc92a2
GIT binary patch
literal 664
zcmV;J0%!e+P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>CI65j%)DWT;LSq>4Cd6^c+H)C#RSm|XfHG-*gu
zTpR`0f`cE6RR<SmT^(EnLGS~_&CN;CMN0f%QfLw5!Ery{-Fw`<1B7~+X;#NLpy{@m
zPA0@`Zbb~eq6hs5BaV>FEMr!ZQt%yL_XzOyF2=L`&;2=i)x5=kfJi*U4AUlFC!X50
z4bJ<-5mu5_;&b9LlP*a7$aTfzH_k<u1)do(GwC_v2(egfW2KE*$<&A^iKD8fQ@)V(
zSmnIMSu0mr^Pc>L;k>@Q#C4j(NMZqtkRU=q6&onSMvPXS6botEPx$zUT)#vvg<Kn8
z<d{bV8f4cG{s+IiwF(n)FDaY=I$s>;V+0880*#vEd>=bb;{*sk16O*>U#SDrpQP7X
zTJ#9$+XgPKTbi;5T<!paPljyDt`wvx6bium8GTa@7`O$xSH0ev`#607GSpS-1~@nb
zMvIia=JW2Z_TK(I)9mjDUsZCSBgd0#00006VoOIv0M`JU0DT=~LZ$!!010qNS#tmY
z4#NNd4#NS*Z>VGd000McNliru<qHuG2m(1_=Tray02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{003}FL_t(I%VS^|1&p{P>=e!aBl8d4Kgme6sdkFy|F6%k
z{r~mtuK!=(?)raycI|(317Uy}o93BSZVYlkws0|iO?d`85mtuFSAI4;{P469Sv?ar
yQ;{{}6T@i$DFCYhkJcR~N{lLjNSkOJVE_Ov3ppgBct2kN0000<MNUMnLSTY$^bo25

literal 0
HcmV?d00001

diff --git a/gamedata/assets/particles/dust/1.png b/gamedata/assets/particles/dust/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4f6aa5b3e59f4d58073b904167df9495f69a625
GIT binary patch
literal 720
zcmV;>0x$iEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>CI65j%)DWT;LSq>4Cd6^c+H)C#RSm|XfHG-*gu
zTpR`0f`cE6RR<SmT^(EnLGS~_&CN;CMN0f%QfLw5!Ery{-Fw`<1B7~+X;#NLpy{@m
zPA0@`Zbb~eq6hs5BaV>FEMr!ZQt%yL_XzOyF2=L`&;2=i)x5=kfJi*U4AUlFC!X50
z4bJ<-5mu5_;&b9LlP*a7$aTfzH_k<u1)do(GwC_v2(egfW2KE*$<&A^iKD8fQ@)V(
zSmnIMSu0mr^Pc>L;k>@Q#C4j(NMZqtkRU=q6&onSMvPXS6botEPx$zUT)#vvg<Kn8
z<d{bV8f4cG{s+IiwF(n)FDaY=I$s>;V+0880*#vEd>=bb;{*sk16O*>U#SDrpQP7X
zTJ#9$+XgPKTbi;5T<!paPljyDt`wvx6bium8GTa@7`O$xSH0ev`#607GSpS-1~@nb
zMvIia=JW2Z_TK(I)9mjDUsZCSBgd0#00006VoOIv0M`JU0DT=~LZ$!!010qNS#tmY
z4#NNd4#NS*Z>VGd000McNliru<qHuG2ngA<4oUz302y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{005{-L_t(I%e9li4Z|P|MW0dUh}0>1N{<~NOJs)*kR7rF
z1LPP^Oo7BA^wfyB1c^lbH!S^U^JT+Di7q_vkCeaH;H3t*Y4iMk(G5KS(K^P7q)j<g
zj?7<0>i`sV*&w?Kw7FF4hMpN1C(;_cm@~oUP*WPWMW-gn8%Zs|BXb_2sRj6#FX%?*
zN`M<+4PM4+*+HUpMX0Vx?G6BbS9>Y1@{wAPt63l3kx;hKt@H)}0000<MNUMnLSTZZ
ClPtyn

literal 0
HcmV?d00001

diff --git a/gamedata/assets/particles/dust/2.png b/gamedata/assets/particles/dust/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f33d28c79e139b9813f239fd214ef0564b31c8d
GIT binary patch
literal 725
zcmV;`0xJE9P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>CI65j%)DWT;LSq>4Cd6^c+H)C#RSm|XfHG-*gu
zTpR`0f`cE6RR<SmT^(EnLGS~_&CN;CMN0f%QfLw5!Ery{-Fw`<1B7~+X;#NLpy{@m
zPA0@`Zbb~eq6hs5BaV>FEMr!ZQt%yL_XzOyF2=L`&;2=i)x5=kfJi*U4AUlFC!X50
z4bJ<-5mu5_;&b9LlP*a7$aTfzH_k<u1)do(GwC_v2(egfW2KE*$<&A^iKD8fQ@)V(
zSmnIMSu0mr^Pc>L;k>@Q#C4j(NMZqtkRU=q6&onSMvPXS6botEPx$zUT)#vvg<Kn8
z<d{bV8f4cG{s+IiwF(n)FDaY=I$s>;V+0880*#vEd>=bb;{*sk16O*>U#SDrpQP7X
zTJ#9$+XgPKTbi;5T<!paPljyDt`wvx6bium8GTa@7`O$xSH0ev`#607GSpS-1~@nb
zMvIia=JW2Z_TK(I)9mjDUsZCSBgd0#00006VoOIv0M`JU0DT=~LZ$!!010qNS#tmY
z4#NNd4#NS*Z>VGd000McNliru<qHuG2o0&;`o#bM02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{006B?L_t(I%cYac4TK;RMGu5JOsv9{E-k<&=)nT)!6qz#
zrLL^P#73CKL<0^V!`vO@-IMT65IE`T#=7VA*aev=w>*zM)zAWPE*pBnUXU1Eg~|Zc
z&@uyh!UDwL(k(o5-38%ePggfq@**kt4LFzWXDD>{jJy`2C*u{q?=)Gsh$(b89X4cG
zk6mO3a&T3q(D*wjRp?nLQFsGN6#~eA6ecykQRo3uNqzGVxWkmOu!xxk00000NkvXX
Hu0mjfLLe@=

literal 0
HcmV?d00001

diff --git a/gamedata/assets/particles/dust/3.png b/gamedata/assets/particles/dust/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..71b39e7ddf2c5c9a53f6a1857dada9893e07bfdd
GIT binary patch
literal 689
zcmV;i0#5yjP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>CI65j%)DWT;LSq>4Cd6^c+H)C#RSm|XfHG-*gu
zTpR`0f`cE6RR<SmT^(EnLGS~_&CN;CMN0f%QfLw5!Ery{-Fw`<1B7~+X;#NLpy{@m
zPA0@`Zbb~eq6hs5BaV>FEMr!ZQt%yL_XzOyF2=L`&;2=i)x5=kfJi*U4AUlFC!X50
z4bJ<-5mu5_;&b9LlP*a7$aTfzH_k<u1)do(GwC_v2(egfW2KE*$<&A^iKD8fQ@)V(
zSmnIMSu0mr^Pc>L;k>@Q#C4j(NMZqtkRU=q6&onSMvPXS6botEPx$zUT)#vvg<Kn8
z<d{bV8f4cG{s+IiwF(n)FDaY=I$s>;V+0880*#vEd>=bb;{*sk16O*>U#SDrpQP7X
zTJ#9$+XgPKTbi;5T<!paPljyDt`wvx6bium8GTa@7`O$xSH0ev`#607GSpS-1~@nb
zMvIia=JW2Z_TK(I)9mjDUsZCSBgd0#00006VoOIv0M`JU0DT=~LZ$!!010qNS#tmY
z4#NNd4#NS*Z>VGd000McNliru<qHuG2ofaL_b>ne02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{004<eL_t(I%hi&x34kyVMPGu8WQuetT_rmN(q;#76H7ZM
zuymBOkbnjeH6Zxg<KO$-eb~tvE6!NqfttO!3oQUXA>%TsGeZXCxhl<BJ`I#hj*xAx
z??x>lU1)K}iq3I-8ZPO#DOX2y#>(7Bnfv(o*j1nUNN=MxH6;R2H6;SjH6;Sj|1Z%B
XPmpt^Snka#00000NkvXXu0mjfC$=1B

literal 0
HcmV?d00001

diff --git a/gamedata/assets/particles/dust/4.png b/gamedata/assets/particles/dust/4.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fe0fe6e737b3542ab49e3fb098e1508bf6610b6
GIT binary patch
literal 644
zcmV-~0(<?5P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>CI65j%)DWT;LSq>4Cd6^c+H)C#RSm|XfHG-*gu
zTpR`0f`cE6RR<SmT^(EnLGS~_&CN;CMN0f%QfLw5!Ery{-Fw`<1B7~+X;#NLpy{@m
zPA0@`Zbb~eq6hs5BaV>FEMr!ZQt%yL_XzOyF2=L`&;2=i)x5=kfJi*U4AUlFC!X50
z4bJ<-5mu5_;&b9LlP*a7$aTfzH_k<u1)do(GwC_v2(egfW2KE*$<&A^iKD8fQ@)V(
zSmnIMSu0mr^Pc>L;k>@Q#C4j(NMZqtkRU=q6&onSMvPXS6botEPx$zUT)#vvg<Kn8
z<d{bV8f4cG{s+IiwF(n)FDaY=I$s>;V+0880*#vEd>=bb;{*sk16O*>U#SDrpQP7X
zTJ#9$+XgPKTbi;5T<!paPljyDt`wvx6bium8GTa@7`O$xSH0ev`#607GSpS-1~@nb
zMvIia=JW2Z_TK(I)9mjDUsZCSBgd0#00006VoOIv0M`JU0DT=~LZ$!!010qNS#tmY
z4#NNd4#NS*Z>VGd000McNliru<qHuG3kijuZ65#t02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{003M`L_t(I%VS`G0y{<X|8|Pz{~5>uc8cczcl2-hzoUN(
zQHCH}#zKx|Re7}#&ZOr5EDQ_`42SNYWMr7s{2$JyHJ~WGM!}$r7D|#a$w?VK86UcT
el96S=lQ96Pc|WAzzBOq80000<MNUMnLSTZ8$O;hv

literal 0
HcmV?d00001

diff --git a/gamedata/objects/combat/ennemies/ennemy.py b/gamedata/objects/combat/ennemies/ennemy.py
index c122e16..1065b91 100644
--- a/gamedata/objects/combat/ennemies/ennemy.py
+++ b/gamedata/objects/combat/ennemies/ennemy.py
@@ -8,6 +8,8 @@ class Ennemy(Movable):
 
         self.player = None
 
+        self.dustparticles = game.getSpriteDir("particles/dust/")
+
     def step(self):
 
         super().step()
@@ -19,6 +21,9 @@ class Ennemy(Movable):
                 if self.rect.colliderect(self.player.hitrect):
                     # Die
                     self.game.gameloop.delid(self.id)
+
+                    # Add particles
+                    self.game.addParticle(self.dustparticles,self.rect.center[0],self.rect.center[1])
                     # Boost the player vertically
                     if not self.player.fastfall:
                         if self.player.rect[1]>self.rect[1]:
diff --git a/gamedata/objects/combat/player.py b/gamedata/objects/combat/player.py
index 07aeb7d..f035a69 100644
--- a/gamedata/objects/combat/player.py
+++ b/gamedata/objects/combat/player.py
@@ -20,6 +20,8 @@ class Player(Movable):
         self.hitrect[3] = round(self.hitrect[3]*0.7)
         self.canhit = False
 
+        self.dustparticles = game.getSpriteDir("particles/dust/")
+
         self.speed = 200
         self.controlled = True
 
@@ -91,7 +93,10 @@ class Player(Movable):
                     self.onground = True
                     self.candash = True
                     self.canfastfall = True
-                    self.fastfall = False
+                    if self.fastfall:
+                        self.fastfall = False
+                        # Spawns dust
+                        self.game.addParticle(self.dustparticles,self.rect.center[0],self.rect.bottom,fps=25)
                     if self.gravityway > 0:
                         self.verspd=min(0,self.verspd)
                     else: