From 28515f6b77a816aaf43a7299a5188f6596cb4dcf Mon Sep 17 00:00:00 2001
From: "theo@manjaro" <ayte@tutanota.com>
Date: Thu, 25 Nov 2021 09:21:42 +0100
Subject: [PATCH] More animation on result screen

---
 gamedata/assets/particles/sparkles/0.png | Bin 0 -> 647 bytes
 gamedata/assets/particles/sparkles/1.png | Bin 0 -> 626 bytes
 gamedata/assets/particles/sparkles/2.png | Bin 0 -> 588 bytes
 gamedata/assets/particles/sparkles/3.png | Bin 0 -> 576 bytes
 gamedata/assets/particles/sparkles/4.png | Bin 0 -> 570 bytes
 gamedata/game.py                         |   3 +-
 gamedata/objects/results.py              |  43 +++++++++++++++++++----
 7 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 gamedata/assets/particles/sparkles/0.png
 create mode 100644 gamedata/assets/particles/sparkles/1.png
 create mode 100644 gamedata/assets/particles/sparkles/2.png
 create mode 100644 gamedata/assets/particles/sparkles/3.png
 create mode 100644 gamedata/assets/particles/sparkles/4.png

diff --git a/gamedata/assets/particles/sparkles/0.png b/gamedata/assets/particles/sparkles/0.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6796bcf2fdfe8e9443a290898ca738f05ff17fd
GIT binary patch
literal 647
zcmV;20(kw2P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iTcx5E2RryRWT;LSM5Q=t6^c+H)C#RSm|Xe=O&XFE
z7e~Rh;NZt%)xpJCR|i)?5c~jfb8}L3krMxx6k5c1aNLh~_a1le0DryARI_6OP&La)
zCE`LRyD9`<(Stz*5yP;=Onpuilkgm0_we!cF3PjK&;2=im7K`{pFljzbi*RvAdYQX
zI_G`jFe^$5@j3ChK^G)`<htzg8|Q+<ex4aN(y4jkFtJc*W4Vo4(NKw}i6e@tQNBOp
zvch?bvs$jQ<~{ifLpg0_nd>x1kia6AAVPqQDoQBBLX=jG6cZ`hk9+us9KT2|nOr3>
zax9<%6_Voz|AXJ%n)#_oHz^bcI$v!2V-yJP0*#t&e;?a+;{*si16NwhU#SB#pQP7X
zTI2}m+XgPKTbjHFT<!n^Pr77CjufEj&*y>nGy0}1(0>bbuerT7_i_3Fq^Yaq4RCM>
zj1?$*-Q(R|?Y;ebrrF;QqNsAZEn~$900006VoOIv06qXA05@h}G(Z3V010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru<qH`HI0_<}O7#E$02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{003V}L_t(I%VS^|K47ka^?!2IFu^3;Q~nb)#69Id`7U@e
z#p?gpx4Zs7nPT;yWUs+A!|;<SR{x3dGId;lZV1*uBo^$P!$`d-#p?pR(M4>ClNHkV
h0*fRs5FJ?5001UeOob+(PtpJY002ovPDHLkV1h(-3m^ah

literal 0
HcmV?d00001

diff --git a/gamedata/assets/particles/sparkles/1.png b/gamedata/assets/particles/sparkles/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3be9fd5af3ec3ebfaef9b08f2954e0d230b1833
GIT binary patch
literal 626
zcmV-&0*(ENP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iTcx5E2RryRWT;LSM5Q=t6^c+H)C#RSm|Xe=O&XFE
z7e~Rh;NZt%)xpJCR|i)?5c~jfb8}L3krMxx6k5c1aNLh~_a1le0DryARI_6OP&La)
zCE`LRyD9`<(Stz*5yP;=Onpuilkgm0_we!cF3PjK&;2=im7K`{pFljzbi*RvAdYQX
zI_G`jFe^$5@j3ChK^G)`<htzg8|Q+<ex4aN(y4jkFtJc*W4Vo4(NKw}i6e@tQNBOp
zvch?bvs$jQ<~{ifLpg0_nd>x1kia6AAVPqQDoQBBLX=jG6cZ`hk9+us9KT2|nOr3>
zax9<%6_Voz|AXJ%n)#_oHz^bcI$v!2V-yJP0*#t&e;?a+;{*si16NwhU#SB#pQP7X
zTI2}m+XgPKTbjHFT<!n^Pr77CjufEj&*y>nGy0}1(0>bbuerT7_i_3Fq^Yaq4RCM>
zj1?$*-Q(R|?Y;ebrrF;QqNsAZEn~$900006VoOIv06qXA05@h}G(Z3V010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru<qH`HI2JaT7P<fc02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{002r!L_t(I%VS^|K47ka^?z!p!3&;DvHDN8>z+)p`v3Lq
zuK!P_Sp6s4CD>fRM2Z1B=P(YZD8(5Da}BKjyQlo8EY2xTFhdIf0CbTdoDzrC8vp<R
M07*qoM6N<$f-Fh^3jhEB

literal 0
HcmV?d00001

diff --git a/gamedata/assets/particles/sparkles/2.png b/gamedata/assets/particles/sparkles/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a8b2505d559a6d416822aec82c553201b193ec4
GIT binary patch
literal 588
zcmV-S0<-;zP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iTcx5E2RryRWT;LSM5Q=t6^c+H)C#RSm|Xe=O&XFE
z7e~Rh;NZt%)xpJCR|i)?5c~jfb8}L3krMxx6k5c1aNLh~_a1le0DryARI_6OP&La)
zCE`LRyD9`<(Stz*5yP;=Onpuilkgm0_we!cF3PjK&;2=im7K`{pFljzbi*RvAdYQX
zI_G`jFe^$5@j3ChK^G)`<htzg8|Q+<ex4aN(y4jkFtJc*W4Vo4(NKw}i6e@tQNBOp
zvch?bvs$jQ<~{ifLpg0_nd>x1kia6AAVPqQDoQBBLX=jG6cZ`hk9+us9KT2|nOr3>
zax9<%6_Voz|AXJ%n)#_oHz^bcI$v!2V-yJP0*#t&e;?a+;{*si16NwhU#SB#pQP7X
zTI2}m+XgPKTbjHFT<!n^Pr77CjufEj&*y>nGy0}1(0>bbuerT7_i_3Fq^Yaq4RCM>
zj1?$*-Q(R|?Y;ebrrF;QqNsAZEn~$900006VoOIv06qXA05@h}G(Z3V010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru<qH`HI45UD7JvW%02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{001OOL_t(I%VS^|SzxY#^?!6RCQ>xJr~Joi2t_U!1*3sA
aH~;|h>I=|>N@3>!0000<MNUMnLSTX*ZR$n<

literal 0
HcmV?d00001

diff --git a/gamedata/assets/particles/sparkles/3.png b/gamedata/assets/particles/sparkles/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7daf05ae76bacf52293d814aaea456af278b6f8
GIT binary patch
literal 576
zcmV-G0>Ax<P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iTcx5E2RryRWT;LSM5Q=t6^c+H)C#RSm|Xe=O&XFE
z7e~Rh;NZt%)xpJCR|i)?5c~jfb8}L3krMxx6k5c1aNLh~_a1le0DryARI_6OP&La)
zCE`LRyD9`<(Stz*5yP;=Onpuilkgm0_we!cF3PjK&;2=im7K`{pFljzbi*RvAdYQX
zI_G`jFe^$5@j3ChK^G)`<htzg8|Q+<ex4aN(y4jkFtJc*W4Vo4(NKw}i6e@tQNBOp
zvch?bvs$jQ<~{ifLpg0_nd>x1kia6AAVPqQDoQBBLX=jG6cZ`hk9+us9KT2|nOr3>
zax9<%6_Voz|AXJ%n)#_oHz^bcI$v!2V-yJP0*#t&e;?a+;{*si16NwhU#SB#pQP7X
zTI2}m+XgPKTbjHFT<!n^Pr77CjufEj&*y>nGy0}1(0>bbuerT7_i_3Fq^Yaq4RCM>
zj1?$*-Q(R|?Y;ebrrF;QqNsAZEn~$900006VoOIv06qXA05@h}G(Z3V010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru<qH`HI5m|2XUG5m02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{000<CL_t(I%VS^|SzxY#^?!y@FbYNiRsaB2rveCP;X5<{
O0000<MNUMnLSTY_ZRA}5

literal 0
HcmV?d00001

diff --git a/gamedata/assets/particles/sparkles/4.png b/gamedata/assets/particles/sparkles/4.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe9b7055eb6a1a99fb9a3e9c0fb87fc8e9a6495e
GIT binary patch
literal 570
zcmV-A0>%A_P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iTcx5E2RryRWT;LSM5Q=t6^c+H)C#RSm|Xe=O&XFE
z7e~Rh;NZt%)xpJCR|i)?5c~jfb8}L3krMxx6k5c1aNLh~_a1le0DryARI_6OP&La)
zCE`LRyD9`<(Stz*5yP;=Onpuilkgm0_we!cF3PjK&;2=im7K`{pFljzbi*RvAdYQX
zI_G`jFe^$5@j3ChK^G)`<htzg8|Q+<ex4aN(y4jkFtJc*W4Vo4(NKw}i6e@tQNBOp
zvch?bvs$jQ<~{ifLpg0_nd>x1kia6AAVPqQDoQBBLX=jG6cZ`hk9+us9KT2|nOr3>
zax9<%6_Voz|AXJ%n)#_oHz^bcI$v!2V-yJP0*#t&e;?a+;{*si16NwhU#SB#pQP7X
zTI2}m+XgPKTbjHFT<!n^Pr77CjufEj&*y>nGy0}1(0>bbuerT7_i_3Fq^Yaq4RCM>
zj1?$*-Q(R|?Y;ebrrF;QqNsAZEn~$900006VoOIv06qXA05@h}G(Z3V010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru<qH`HIRM*NlBxgz02y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{000t6L_t(I%VS^|1*2dTi~<M%00a;K0fj%RasU7T07*qo
IM6N<$g1m3vt^fc4

literal 0
HcmV?d00001

diff --git a/gamedata/game.py b/gamedata/game.py
index 9747358..2b04d55 100644
--- a/gamedata/game.py
+++ b/gamedata/game.py
@@ -278,8 +278,9 @@ class Game():
 
             return sprite_list
 
-    def addParticle(self,sprites,posx,posy,velx=0,vely=0,modvelx=0,modvely=0,flipx=False,flipy=False,fps=15):
+    def addParticle(self,sprites,posx,posy,velx=0,vely=0,modvelx=0,modvely=0,flipx=False,flipy=False,fps=15,depth=0):
         p = Particle(self,sprites,posx,posy,velx,vely,modvelx,modvely,flipx,flipy,fps)
+        p.depth = depth
         self.gameloop.summon(p)
 
     def scaleCamera(self,neww=None,newh=None):
diff --git a/gamedata/objects/results.py b/gamedata/objects/results.py
index 907a92d..557f0ab 100644
--- a/gamedata/objects/results.py
+++ b/gamedata/objects/results.py
@@ -10,10 +10,17 @@ class Results(BaseObject):
         self.maxcount = self.game.globals["totaltrashes"]
         self.currentcount = 0
         self.count = self.game.globals["trashes"]
+        
+        self.maxtime = self.game.globals["timetobeat"]
+        self.currenttime = 99
+        self.time = min(99,self.game.globals["timer"])
+
+        self.sparkles = game.getSpriteDir("particles/dust/")
+
         self.text = self.game.getchars("Cleared : 0 / "+str(self.maxcount))
         self.levelname = self.game.getchars("Level "+str(self.game.globals["levelname"]+1))
         self.levellore = None
-        txt = "Time : "+str(int(self.game.globals["timer"]))
+        txt = "Time : 0"
         txt += " ( "+str(self.game.globals["timetobeat"])+" for medal )"
         self.seconds = self.game.getchars(txt)
         if self.game.globals["levellore"]:
@@ -29,10 +36,15 @@ class Results(BaseObject):
 
         self.medalwave = self.game.sprite_lib["medals/wave.png"]
         self.medalclock= self.game.sprite_lib["medals/clock.png"]
+        self.medalwaveoff = self.game.sprite_lib["medals/waveoff.png"]
+        self.medalclockoff = self.game.sprite_lib["medals/clockoff.png"]
 
         self.transition = False
 
         self.depth = 3
+        
+        self.centerx = self.game.globals["cameraw"]/2
+        self.centery = self.game.globals["camerah"]/2
 
     def step(self):
 
@@ -44,6 +56,21 @@ class Results(BaseObject):
         if int(self.currentcount)>past:
             # Make a noise
             self.text = self.game.getchars("Cleared : "+str(int(self.currentcount))+" / "+str(self.maxcount))
+            if self.currentcount == self.maxcount: # Spawn sparkles
+                self.game.addParticle(self.sparkles,self.centerx+150+self.game.globals["camerax"],self.centery+self.game.globals["cameray"],fps=6,depth=4)
+        
+        past = int(self.currenttime)
+        self.currenttime-=self.game.dt
+        self.currenttime+= (self.time- self.currenttime)*self.game.dt
+        self.currenttime= max(self.currenttime,self.time)
+
+        if int(self.currenttime)<past:
+            # Make a noise
+            txt = "Time : "+str(int(self.currenttime))
+            txt += " ( "+str(self.game.globals["timetobeat"])+" for medal )"
+            self.seconds = self.game.getchars(txt)
+            if int(self.time)==int(self.currenttime) and int(self.game.globals["timetobeat"]) >= int(self.currenttime): # Spawn sparkles
+                self.game.addParticle(self.sparkles,self.centerx+150+self.game.globals["camerax"],self.centery+20+self.game.globals["cameray"],fps=6,depth = 4)
 
         if not self.transition:
             keys = ["up","down","left","right"]
@@ -63,8 +90,8 @@ class Results(BaseObject):
     def draw(self):
         self.fill.set_alpha(self.alpha)
         self.game.window.blit(self.fill,[0,0])
-        cx = self.game.globals["cameraw"]/2
-        cy = self.game.globals["camerah"]/2
+
+        cx,cy = self.centerx,self.centery
 
         self.game.lib.drawcenter(self.game,self.levelname,cx,cy-50) # Level names
         if self.levellore:
@@ -72,7 +99,11 @@ class Results(BaseObject):
 
         self.game.lib.drawcenter(self.game,self.text,cx,cy) # Clean
         self.game.lib.drawcenter(self.game,self.seconds,cx,cy+20)
+        medal = self.medalwaveoff
         if self.currentcount == self.maxcount: # Medals
-            self.game.lib.drawcenter(self.game,self.medalwave,cx+150,cy)
-        if int(self.game.globals["timetobeat"]) >= int(self.game.globals["timer"]):
-            self.game.lib.drawcenter(self.game,self.medalclock,cx+150,cy+20)
+            medal = self.medalwave
+        self.game.lib.drawcenter(self.game,medal,cx+150,cy)
+        medal = self.medalclockoff
+        if int(self.time)==int(self.currenttime) and int(self.game.globals["timetobeat"]) >= int(self.currenttime):
+            medal = self.medalclock
+        self.game.lib.drawcenter(self.game,medal,cx+150,cy+20)