]> bicyclesonthemoon.info Git - ott/molpy-up/commitdiff
adopted arrow by balthasar_s
authorPeter Gerwinski <peter.gerwinski@hs-bochum.de>
Sat, 7 Apr 2018 18:26:14 +0000 (20:26 +0200)
committerPeter Gerwinski <peter.gerwinski@hs-bochum.de>
Sat, 7 Apr 2018 18:26:14 +0000 (20:26 +0200)
assets/molpArrow.png [new file with mode: 0644]
molpyup.py

diff --git a/assets/molpArrow.png b/assets/molpArrow.png
new file mode 100644 (file)
index 0000000..8c42b04
Binary files /dev/null and b/assets/molpArrow.png differ
index 69da6314251cbf2250b391a97ff8d855ce1c2816..99584d962efb401fbfd0e0191debf1560724b3d6 100644 (file)
@@ -7,6 +7,8 @@
 # Copyright (C) 2018 by Peter Gerwinski <http://www.peter.gerwinski.de>,
 # OTTified in about 120 minutes.
 #
+# edited to add arrow - balthasar_s
+#
 # This program is Free Software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License (GNU GPL), version 3,
 # as published by the Free Software Foundation.
@@ -146,7 +148,8 @@ class MolpyUp:
                                pygame.image.load("assets/plantGrass9.png").convert_alpha(),
                                pygame.image.load("assets/plantGrass10.png").convert_alpha(),
                                pygame.image.load("assets/plantGrass11.png").convert_alpha() ]
-    
+        self.imgMolpArrow = pygame.image.load("assets/molpArrow.png").convert_alpha()
+
     def reset(self):
         self.cameray = 0
         self.score = 0
@@ -237,7 +240,7 @@ class MolpyUp:
             return False
 
     def updatePlayer(self):
-        if not self.jump:        
+        if not self.jump:
             self.playery += self.gravity
             self.gravity += 1
         else:
@@ -276,36 +279,41 @@ class MolpyUp:
         self.playerx += self.xmovement
         if self.playery - self.cameray <= self.sy // 3:
             self.cameray -= self.sy // 60
-        if not self.direction:
-            if self.jump:
-                if self.playerWearsBeanie:
-                    self.screen.blit(self.imgPlayerRightDownBeanie, (self.playerx, self.playery - self.cameray))
-                else:
-                    self.screen.blit(self.imgPlayerRightDown, (self.playerx, self.playery - self.cameray))
-                if self.playerCarriesFlag:
-                    self.screen.blit(self.imgFlagLeft, (self.playerx + 24, self.playery - 10 - self.cameray))
-            else:
-                if self.playerWearsBeanie:
-                    self.screen.blit(self.imgPlayerRightUpBeanie, (self.playerx, self.playery - self.cameray))
-                else:
-                    self.screen.blit(self.imgPlayerRightUp, (self.playerx, self.playery - self.cameray))
-                if self.playerCarriesFlag:
-                    self.screen.blit(self.imgFlagLeftDown, (self.playerx + 22, self.playery - 10 - self.cameray))
+
+        if (self.playery - self.cameray + self.imgPlayerRightUp.get_height()) < 0:
+            self.screen.blit(self.imgMolpArrow, (self.playerx, 2))
         else:
-            if self.jump:
-                if self.playerWearsBeanie:
-                    self.screen.blit(self.imgPlayerLeftDownBeanie, (self.playerx, self.playery - self.cameray))
+
+            if not self.direction:
+                if self.jump:
+                    if self.playerWearsBeanie:
+                        self.screen.blit(self.imgPlayerRightDownBeanie, (self.playerx, self.playery - self.cameray))
+                    else:
+                        self.screen.blit(self.imgPlayerRightDown, (self.playerx, self.playery - self.cameray))
+                    if self.playerCarriesFlag:
+                        self.screen.blit(self.imgFlagLeft, (self.playerx + 24, self.playery - 10 - self.cameray))
                 else:
-                    self.screen.blit(self.imgPlayerLeftDown, (self.playerx, self.playery - self.cameray))
-                if self.playerCarriesFlag:
-                    self.screen.blit(self.imgFlagRight, (self.playerx + 13, self.playery - 10 - self.cameray))
+                    if self.playerWearsBeanie:
+                        self.screen.blit(self.imgPlayerRightUpBeanie, (self.playerx, self.playery - self.cameray))
+                    else:
+                        self.screen.blit(self.imgPlayerRightUp, (self.playerx, self.playery - self.cameray))
+                    if self.playerCarriesFlag:
+                        self.screen.blit(self.imgFlagLeftDown, (self.playerx + 22, self.playery - 10 - self.cameray))
             else:
-                if self.playerWearsBeanie:
-                    self.screen.blit(self.imgPlayerLeftUpBeanie, (self.playerx, self.playery - self.cameray))
+                if self.jump:
+                    if self.playerWearsBeanie:
+                        self.screen.blit(self.imgPlayerLeftDownBeanie, (self.playerx, self.playery - self.cameray))
+                    else:
+                        self.screen.blit(self.imgPlayerLeftDown, (self.playerx, self.playery - self.cameray))
+                    if self.playerCarriesFlag:
+                        self.screen.blit(self.imgFlagRight, (self.playerx + 13, self.playery - 10 - self.cameray))
                 else:
-                    self.screen.blit(self.imgPlayerLeftUp, (self.playerx, self.playery - self.cameray))
-                if self.playerCarriesFlag:
-                    self.screen.blit(self.imgFlagRightDown, (self.playerx + 11, self.playery - 10 - self.cameray))
+                    if self.playerWearsBeanie:
+                        self.screen.blit(self.imgPlayerLeftUpBeanie, (self.playerx, self.playery - self.cameray))
+                    else:
+                        self.screen.blit(self.imgPlayerLeftUp, (self.playerx, self.playery - self.cameray))
+                    if self.playerCarriesFlag:
+                        self.screen.blit(self.imgFlagRightDown, (self.playerx + 11, self.playery - 10 - self.cameray))
 
     def choosePlatformType(self):
         if self.score >= self.scoreTheEnd:
@@ -586,7 +594,7 @@ class MolpyUp:
         pygame.draw.rect(self.screen, (0,0,0), ((self.sx - w) // 2 - dx, (self.sy - h) // 2 - dy, w + 2 * dx, h + 2 * dy), 3)
         self.screen.blit(line1, ((self.sx - line1.get_width()) // 2, self.sy // 2 - line1.get_height()))
         self.screen.blit(line2, ((self.sx - line2.get_width()) // 2, self.sy // 2))
-        pygame.display.flip() 
+        pygame.display.flip()
         self.waitForIt([K_RETURN])
 
     def run(self):
@@ -634,6 +642,6 @@ class MolpyUp:
                 else:
                     self.showScore()
                     self.reset()
-            pygame.display.flip() 
+            pygame.display.flip()
 
 MolpyUp().run()