From: Peter Gerwinski <peter.gerwinski@hs-bochum.de>
Date: Tue, 3 Apr 2018 18:51:45 +0000 (+0200)
Subject: fixed mustard with key modifiers, made initial platform generation consistent with... 
X-Git-Url: http://bicyclesonthemoon.info/git-projects/?a=commitdiff_plain;h=f612a35cc9942edf75a51597ff04ee76a00d98bf;p=ott%2Fmolpy-up

fixed mustard with key modifiers, made initial platform generation consistent with later one
---

diff --git a/molpyup.py b/molpyup.py
index fe20240..69da631 100644
--- a/molpyup.py
+++ b/molpyup.py
@@ -253,13 +253,13 @@ class MolpyUp:
                 self.xmovement -= 1
             self.direction = 1
         elif key[K_PLUS] or key[K_KP_PLUS]:
-            if pygame.key.get_mods() and KMOD_CTRL:
+            if pygame.key.get_mods() & KMOD_CTRL:
                 self.score += 10
             else:
                 self.speed += 1
                 self.screen.blit(self.font.render("Speed: " + str(self.speed), -1, (0, 0, 0)), (self.sx // 32, self.sy - self.sy // 12))
         elif key[K_MINUS] or key[K_KP_MINUS]:
-            if pygame.key.get_mods() and KMOD_CTRL:
+            if pygame.key.get_mods() & KMOD_CTRL:
                 self.score -= 10
             else:
                 self.speed -= 1
@@ -364,7 +364,7 @@ class MolpyUp:
             elif platformType == self.platformTypeGrass and self.score > self.scorePrickly and not self.hadPrickly:
                 self.items.append([x + self.imgPlatformSand[0].get_width() // 3, y + 8, self.itemTypePrickly, False])
                 self.hadPrickly = True
-            else:
+            elif self.score > 0:
                 check = random.randint(0, 999)
                 if check > 800:
                     xx = x + random.randint(0, self.imgPlatformSand[0].get_width() - 40)
@@ -554,11 +554,8 @@ class MolpyUp:
                         item[-1] = True
 
     def generateInitialPlatforms(self):
-        on = self.sy
-        while on > -self.sy // 6:
-            x = random.randint(0, self.sx * 8 // 7)
-            self.platforms.append([x, on, self.choosePlatformType(), 0])
-            on -= self.sy // 12
+        while self.platforms[-1][1] > - self.sy // 6:
+            self.generateNewPlatform()
 
     def drawGrid(self):
         for x in range(80):
@@ -609,13 +606,13 @@ class MolpyUp:
                     if key[K_ESCAPE]:
                         sys.exit()
                     elif key[K_e]:
-                        if pygame.key.get_mods() and KMOD_CTRL:
+                        if pygame.key.get_mods() & KMOD_CTRL:
                             self.eternal = not self.eternal
                     elif key[K_f]:
-                        if pygame.key.get_mods() and KMOD_CTRL:
+                        if pygame.key.get_mods() & KMOD_CTRL:
                             self.playerCarriesFlag = not self.playerCarriesFlag
                     elif key[K_b]:
-                        if pygame.key.get_mods() and KMOD_CTRL:
+                        if pygame.key.get_mods() & KMOD_CTRL:
                             self.playerWearsBeanie = not self.playerWearsBeanie
                     elif key[K_SPACE]:
                         while self.waitForIt([K_SPACE, K_s]) == K_s: