From 77820dc05adcab0ef03253381fca556930ef29da Mon Sep 17 00:00:00 2001
From: Peter Gerwinski <peter.gerwinski@hs-bochum.de>
Date: Sat, 31 Mar 2018 22:06:53 +0200
Subject: [PATCH] implemented Lucky

---
 assets/platformLuckyAttacking.png | Bin 0 -> 1306 bytes
 assets/platformLuckySleeping.png  | Bin 0 -> 1160 bytes
 molpyup.py                        |  30 ++++++++++++++++++++++++++----
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 assets/platformLuckyAttacking.png
 create mode 100644 assets/platformLuckySleeping.png

diff --git a/assets/platformLuckyAttacking.png b/assets/platformLuckyAttacking.png
new file mode 100644
index 0000000000000000000000000000000000000000..52d41667b482110fc5c53a600baa1d3ed34ba0af
GIT binary patch
literal 1306
zcmV+#1?BpQP)<h;3K|Lk000e1NJLTq001)p000{Z1ONa4dslz@0008!X+uL$X=7sm
z04R}TU|^o$=;GwcB*4H>P*hUn9^@Dq5gDbxex8Aiftdje5|fJy90LM;K<vEyyi^8M
zz{tSx?HY(=V7ROcGK+yUz?uxS7)T!gVxyGQ;$$HG1&GtjOA3JEj4?pANK!VKT>xTd
zhXgqT*)0qVOgts26(GF~&iMtEMVaXtB?^X?mX->RDfvmM3c;1dC8@c^3Z8k%`9%f!
zMTsS;DL}PQJ3xTfCBH<$Jux#+!N@?BM0XPepm2n+5aELmLxAMcqA~~ztVn=Cfx&>m
zfgyk)k)fVp0mD&-H;m$pE{vs&D;V!Fi7^E+O<=mfEX*9qypZ_~izQ13%Pm$t)>hVg
zY?f@(*uJrcv+w3m;^^Y|!kNf<fy<F=3%4fs0v;)zsk}nGllX-Brt!=0FBZ@d*dgdD
zctt2x=!bBxh>FNw(Qwf(Vw1#;#IHzHNXkhblggKtmOdd<CaW%cORi7eMgEV%R>eXk
zJ*BtGYgGzVO;mrX9aQhq2-Q^5{GfF}dy-D7u9cpk-Yfkh1`7;pjbe;#P2^3PO<$T_
zFyCph#BzdFopr8FoNb_;tG%^@v7?TYnzNFNf~&lng1fSZx~Hy}iMNf9yKk^xf`5KM
zec;5PrNO&GE{47gXNr)Ew2F#|u85f#yC?2J0$ZYPQdn|B%9_-h=^PmrnVDI0voGed
z=h^316l^MdSFBx<Rl2I|O@)4CN!6|z##*nssr3&V^_ps$&$i076}BJkl<q3(KHaO@
z*Vun|qRph)lmAYQpLTeL#?1a%-{&OEJw4xi!O}${i(8j`Tb8-}-pY_wr`Ncw-M8Ly
z!?sN(o40H=*|vR$)z1C9UH6>b7q<Vw!JI=skF*~XKfdCm^{I1blF$A+Kk1_OrK498
zul~C}=cdiAyLamEDc?WwFz>P0ll{*!Ux>Us_&Wcs{JRSunm(C+e)V<1_wb(rzfS#W
z{pa}qKL8B?4>W(M#f<;}00Lr5M??VshmXv^00009a7bBm006Nn006Nn0b!>s?*IS*
z2XskIMF-*o9}^uLv+I@V0005GNkl<ZNXNaDJuE{}6vuzwYiN`xB4Y3n!NMY9W2i|g
z2o{scWDzEVLBwWY76y$$#AqNUABjkarovz<f=E*a(vYX`8dURmuf6Y8>)h!k_nhB7
z|NB1|vJ)x;{6h>O7{iro%r*kS3q84nOd%5Ml9F6OW|9zrAV_mAAk#k}0>LeL*@ldo
zAOew1;Z#a#;?)9jZtg~I!4mrEq<}C%PPst<(99OKrgBdlalvfjj3Hzy)^JF*VIN_g
z2wuifO=n}Ya+QfN4cuC4Z?QbWeZa_fq9^aS!l}c{K6UBuVXUT=tL+6^<=MMCuDD!k
zef$m0PA^M#x=@U}C=qs;q|Lp?H6eU*NDXnjf*}xG6GKB!>@>nm(J05vI)VrS<kLkj
zi-fpil@=L5p_U3B9Act$B(lr!$OlDbkWC&PLcWBWr_i2-i`mNnVC-pwdEDs{3M&?=
zx?|W}YRE*IG&>+2J?YIrDu@p)O^FZ3uQY50DIzSnsZ-hB=r&^(q=Gm%!?SU66aYdJ
z|LGZgyIyvw`uYDIOS_3@WbYf}*Xy^D@R4+rGtfQ$FGwFJe;P=+(U)ob1pKsRKp;m5
QLjV8(07*qoM6N<$g5lC?4*&oF

literal 0
HcmV?d00001

diff --git a/assets/platformLuckySleeping.png b/assets/platformLuckySleeping.png
new file mode 100644
index 0000000000000000000000000000000000000000..17fb7240c678a38d392e3229ca7e1387b12cd45a
GIT binary patch
literal 1160
zcmV;31b6$1P)<h;3K|Lk000e1NJLTq001)p000vR1ONa4mjwNn0008!X+uL$X=7sm
z04R}TU|^o$=;GwcB*4H>P*hUn9^@Dq5gDbxex8Aiftdje5|fJy90LM;K<vEyyi^8M
zz{tSx?HY(=V7ROcGK+yUz?uxS7)T!gVxyGQ;$$HG1&GtjOA3JEj4?pANK!VKT>xTd
zhXgqT*)0qVOgts26(GF~&iMtEMVaXtB?^X?mX->RDfvmM3c;1dC8@c^3Z8k%`9%f!
zMTsS;DL}PQJ3xTfCBH<$Jux#+!N@?BM0XPepm2n+5aELmLxAMcqA~~ztVn=Cfx&>m
zfgyk)k)fVp0mD&-H;m$pE{vs&D;V!Fi7^E+O<=mfEX*9qypZ_~izQ13%Pm$t)>hVg
zY?f@(*uJrcv+w3m;^^Y|!kNf<fy<F=3%4fs0v;)zsk}nGllX-Brt!=0FBZ@d*dgdD
zctt2x=!bBxh>FNw(Qwf(Vw1#;#IHzHNXkhblggKtmOdd<CaW%cORi7eMgEV%R>eXk
zJ*BtGYgGzVO;mrX9aQhq2-Q^5{GfF}dy-D7u9cpk-Yfkh1`7;pjbe;#P2^3PO<$T_
zFyCph#BzdFopr8FoNb_;tG%^@v7?TYnzNFNf~&lng1fSZx~Hy}iMNf9yKk^xf`5KM
zec;5PrNO&GE{47gXNr)Ew2F#|u85f#yC?2J0$ZYPQdn|B%9_-h=^PmrnVDI0voGed
z=h^316l^MdSFBx<Rl2I|O@)4CN!6|z##*nssr3&V^_ps$&$i076}BJkl<q3(KHaO@
z*Vun|qRph)lmAYQpLTeL#?1a%-{&OEJw4xi!O}${i(8j`Tb8-}-pY_wr`Ncw-M8Ly
z!?sN(o40H=*|vR$)z1C9UH6>b7q<Vw!JI=skF*~XKfdCm^{I1blF$A+Kk1_OrK498
zul~C}=cdiAyLamEDc?WwFz>P0ll{*!Ux>Us_&Wcs{JRSunm(C+e)V<1_wb(rzfS#W
z{pa}qKL8B?4>W(M#f<;}00Lr5M??VshmXv^00009a7bBm006Nn006Nn0b!>s?*IS*
z2XskIMF-*o9}^WI$~pGM0003eNkl<ZILoz@Jxc>Y5Qd*y(g;SP1jB)XjZF~JSlYx!
z320#@Sf)z4_(Qa_5^F7NweS}N(wNRlNs)ty1|phIGZv?acR6>tkC|?neV=`IW-N4J
zbIcAl3WpvK+|Z%Vggkp}@yZn^d=N3V=^~oEXC)eBlQ%6y5FC!MzVD<c_=T*0AUT>W
z8$aohOP(1~B~O+Yb1!E`PW(Aw&K#1V7ZM{}c*Rs8rbaq+Pi^l(YDSS_l?7@MMn{>I
zm2pCUm>|5fq(c<A)yjNoD=NW&G>QX;k$kv0VllYof-untObwg}*FlgX;}~50<e0-*
zka?bBgt#lZ>&KkN3=xDb8{P?T5`Sd4`@5zV^#t4qLW{LuOerCVAhapDkbN2nVuUH@
atbYMrJqFI&DREo?0000<MNUMnLSTYhavk6R

literal 0
HcmV?d00001

diff --git a/molpyup.py b/molpyup.py
index bb98165..76a82d9 100644
--- a/molpyup.py
+++ b/molpyup.py
@@ -49,9 +49,10 @@ class MolpyUp:
     platformTypeWater = 5
     platformTypeRaftcastle = 6
     platformTypeFloating = platformTypeRaftcastle
-    platformTypeBreaking = 7
-    platformTypeTheEnd = 8
-    platformTypeWonTheGame = 9
+    platformTypeLucky = 7
+    platformTypeBreaking = 8
+    platformTypeTheEnd = 9
+    platformTypeWonTheGame = 10
 
     itemTypeAccelerator = 0
     itemTypeBeanie = 1
@@ -67,6 +68,7 @@ class MolpyUp:
     scoreGrass = 2193
     scoreAfterLucky = 2315
     scoreCastle = 2825
+    scoreLucky = 2976
     scoreRaftcastle = 3031
     scoreWater = 3043
     scoreTheEnd = 3089
@@ -97,6 +99,8 @@ class MolpyUp:
                                   pygame.image.load("assets/platformWater2f.png").convert_alpha() ]
         self.imgPlatformAfterLucky = pygame.image.load("assets/platformAfterLucky.png").convert_alpha()
         self.imgPlatformCastle = pygame.image.load("assets/platformCastle.png").convert_alpha()
+        self.imgPlatformLuckySleeping = pygame.image.load("assets/platformLuckySleeping.png").convert_alpha()
+        self.imgPlatformLuckyAttacking = pygame.image.load("assets/platformLuckyAttacking.png").convert_alpha()
         self.imgPlatformRaftcastle = pygame.image.load("assets/platformRaftcastle.png").convert_alpha()
         self.imgPlatformGrapevine = pygame.image.load("assets/platformGrapevine.png").convert_alpha()
         self.imgPlatformBreaking = pygame.image.load("assets/platformBreaking.png").convert_alpha()
@@ -159,6 +163,7 @@ class MolpyUp:
         self.hadPrickly = False
         self.hadAfterLucky = False
         self.hadCastle = False
+        self.hadLucky = False
         self.hadTheEnd = False
         self.raftcastleHasFlag = False
         self.platforms = [[self.playerx, self.playery + self.sy // 6, self.platformTypeSand, 0, 0]]
@@ -256,7 +261,12 @@ class MolpyUp:
                 else:
                     self.jump = self.sy // 20
                     self.gravity = 0
-                    if (p[2] == self.platformTypeAfterLucky or p[2] == self.platformTypeCastle) and self.playerCarriesFlag and not p[-2]:
+                    if p[2] == self.platformTypeLucky and not self.playerCarriesFlag and p[-2] <= 0:
+                        self.xmovement = self.sx // 20
+                        self.direction = 0
+                        self.cameray -= self.sy // 12
+                        p[-2] = -1
+                    elif (p[2] == self.platformTypeAfterLucky or p[2] == self.platformTypeCastle or p[2] == self.platformTypeLucky) and self.playerCarriesFlag and not p[-2]:
                         self.playerCarriesFlag = False
                         p[-2] = True
                         self.sandcastles += 1
@@ -297,6 +307,9 @@ class MolpyUp:
                 elif self.score > self.scoreCastle and not self.hadCastle:
                     self.hadCastle = True
                     return self.platformTypeCastle
+                elif self.score > self.scoreLucky and not self.hadLucky:
+                    self.hadLucky = True
+                    return self.platformTypeLucky
                 else:
                     return self.platformTypeGrass
             else:
@@ -318,6 +331,8 @@ class MolpyUp:
                         self.hadTheEnd = True
                 elif platformType == self.platformTypeWater or platformType == self.platformTypeRaftcastle:
                     self.platforms.append([random.randint(0, self.sx * 7 // 8), self.platforms[-1][1] - self.sy // 8, platformType, False, False])
+                elif platformType == self.platformTypeLucky:
+                    self.platforms.append([0, self.platforms[-1][1] - self.sy // 12, platformType, False, False])
                 else:
                     self.platforms.append([random.randint(0, self.sx * 7 // 8), self.platforms[-1][1] - self.sy // 12, platformType, False, False])
                 if platformType <= self.platformTypeNormal:
@@ -377,6 +392,13 @@ class MolpyUp:
                 if p[-2]:
                     self.screen.blit(self.imgFlagRight, (p[0] + self.imgPlatformCastle.get_width() - 16, p[1] - 4 - self.cameray))
                 self.screen.blit(self.imgPlatformCastle, (p[0], p[1] - self.cameray))
+            elif p[2] == self.platformTypeLucky:
+                if p[-2]:
+                    self.screen.blit(self.imgPlatformLuckyAttacking, (p[0], p[1] - self.imgPlatformLuckyAttacking.get_height() + self.imgPlatformLuckySleeping.get_height() - self.cameray))
+                    if p[-2] > 0:
+                        self.screen.blit(self.imgFlagRight, (p[0] + self.imgPlatformLuckyAttacking.get_width() - 8, p[1] - 11 - self.cameray))
+                else:
+                    self.screen.blit(self.imgPlatformLuckySleeping, (p[0], p[1] - self.cameray))
             elif p[2] == self.platformTypeRaftcastle:
                 if self.raftcastleHasFlag:
                     self.screen.blit(self.imgFlagRight, (p[0] + 50, p[1] - 13 - self.cameray))
-- 
2.30.2