obstacle-race: ジャンプ力アップ、小さいジャンプ追加、背の高い花を追加

Author: shimizukawa

11-obstacle-race/assets/11-obstacle-race.pyxres

@@ -107,13 +107,17 @@ def update(self):
                 # 地面にいるか、空中で1回目のジャンプができるか
                 if self.dy == 10 and not self.is_falling:
                     # 地面からのジャンプ
-                    self.dy = -6
+                    self.dy = -8
                     self.jump_count = 1
                 elif self.jump_count < 2 and self.dy > 0:
                     # 空中での二段飛び
-                    self.dy = -6
+                    self.dy = -4
                     self.jump_count += 1
         else:
+            # スペースを離した
+            if self.space_pressed and self.dy < 0:
+                # 上昇中に離されたら上昇を止める
+                self.dy = 0
             self.space_pressed = False
 
         self.x, self.y = push_back(self.x, self.y, self.dx, self.dy)
@@ -185,6 +189,32 @@ def __init__(self, x, y, img):
         self.character = 32
 
 
+class Flower2(Obstacle):
+    def __init__(self, x, y, img):
+        super().__init__(x, y, img)
+        self.character = 32
+
+    def draw(self):
+        if self.is_show:
+            u = (self.frame_count // 10 % 2) * 8
+            w = 8 if self.direction > 0 else -8
+            self.img.blt(self.x - player.x, self.y, 0, u + 16, self.character, w, 8, TRANSPARENT_COLOR)
+            self.img.blt(self.x - player.x, self.y - 8, 0, u, self.character, w, 8, TRANSPARENT_COLOR)
+
+    def is_colliding(self, x, y):
+        if not self.is_show:
+            return False
+        # もしobsとplayerが4ピクセル以上重なっていたら衝突
+        if abs(self.x - x) <= 4 and abs(self.y - y) <= 4:
+            return True
+        # もしobsとplayerが4ピクセル以上重なっていたら衝突
+        if abs(self.x - x) <= 4 and abs(self.y - 8 - y) <= 4:
+            return True
+
+        return False
+
+
+
 class Bird(Obstacle):
     def __init__(self, x, y, img, speed=1):
         super().__init__(x, y, img)
@@ -219,22 +249,34 @@ def reset(self):
         for i in range(100):
             if x < 500:
                 x += random.randint(4, 12) * 8
-                self.obstacles.append(Flower1(x, 72, self.img))
+                if random.randint(0, 10) == 0:
+                    self.obstacles.append(Flower2(x+8, 72, self.img))
+                else:
+                    self.obstacles.append(Flower1(x, 72, self.img))
                 if i % 6 == 7:
                     self.obstacles.append(Bird(x, random.randint(24, 72), self.img, speed=1))
             elif x < 1000:
                 x += random.randint(3, 10) * 8
-                self.obstacles.append(Flower1(x, 72, self.img))
+                if random.randint(0, 7) == 0:
+                    self.obstacles.append(Flower2(x+8, 72, self.img))
+                else:
+                    self.obstacles.append(Flower1(x, 72, self.img))
                 if i % 6 == 0:
                     self.obstacles.append(Bird(x, random.randint(24, 72), self.img, speed=i % 2 + 1))
             elif x < 1500:
                 x += random.randint(2, 7) * 8
-                self.obstacles.append(Flower1(x, 72, self.img))
+                if random.randint(0, 4) == 0:
+                    self.obstacles.append(Flower2(x+8, 72, self.img))
+                else:
+                    self.obstacles.append(Flower1(x, 72, self.img))
                 if i % 3 == 0:
                     self.obstacles.append(Bird(x, random.randint(36, 72), self.img, speed=2))
             else:
                 x += random.randint(1, 4) * 8
-                self.obstacles.append(Flower1(x, 72, self.img))
+                if random.randint(0, 2) == 0:
+                    self.obstacles.append(Flower2(x+8, 72, self.img))
+                else:
+                    self.obstacles.append(Flower1(x, 72, self.img))
                 self.obstacles.append(Bird(x, random.randint(48, 72), self.img, speed=3))
 
         reset()