obstacle-race: 難易度調整、ゲームオーバー追加

Author: shimizukawa

11-obstacle-race/main.py

@@ -12,7 +12,6 @@
 # ]
 # ///
 
-import time
 import random
 import pyxel
 
@@ -92,7 +91,8 @@ def update(self):
         self.frame_count = pyxel.frame_count
         last_y = self.y
         if pyxel.btn(pyxel.KEY_LEFT):
-            self.dx = -1 * (2 if pyxel.btn(pyxel.KEY_SHIFT) else 1)
+            # 戻れないよ
+            # self.dx = -1 * (2 if pyxel.btn(pyxel.KEY_SHIFT) else 1)
             self.direction = -1
         if pyxel.btn(pyxel.KEY_RIGHT):
             self.dx = 2 * (2 if pyxel.btn(pyxel.KEY_SHIFT) else 1)
@@ -126,7 +126,7 @@ def update(self):
         self.is_falling = self.y > last_y
 
         if self.y >= _height:
-            game_over()
+            reset()
 
     def draw(self):
         u = (2 if self.is_falling else self.frame_count // 3 % 2) * 8
@@ -181,10 +181,23 @@ def __init__(self, width, height):
             Obstacle(x, 72, self.img)
         ]
         for i in range(100):
-            x += random.randint(3, 15) * 8
+            if x < 500:
+                x += random.randint(4, 12) * 8
+            elif x < 1000:
+                x += random.randint(3, 10) * 8
+            elif x < 1500:
+                x += random.randint(2, 7) * 8
+            else:
+                x += random.randint(1, 4) * 8
             self.obstacles.append(Obstacle(x, 72, self.img))
 
     def update(self):
+        global is_gameover
+        if is_gameover:
+            if pyxel.btnp(pyxel.KEY_SPACE):
+                reset()
+            return
+
         # global is_loose, show_bb, is_pback
         # if pyxel.btnp(pyxel.KEY_1):
         #     show_bb = not show_bb
@@ -193,7 +206,7 @@ def update(self):
         # elif pyxel.btnp(pyxel.KEY_3):
         #     is_pback = not is_pback
         if pyxel.btnp(pyxel.KEY_4):
-            game_over()
+            reset()
         player.update()
         for obs in self.obstacles:
             obs.update()
@@ -202,7 +215,7 @@ def update(self):
         for obs in self.obstacles:
             # もしobsとplayerが4ピクセル以上重なっていたら衝突
             if abs(obs.x - x) <= 4 and abs(obs.y - y) <= 4:
-                game_over()
+                is_gameover = True
 
 
     def render(self):
@@ -221,17 +234,23 @@ def render(self):
         for obs in self.obstacles:
             obs.draw()
         player.draw()
+        
+        # Draw game over
+        global is_gameover
+        if is_gameover:
+            g.rectb(20, 30, 88, 20, 8)
+            g.text(48, 32, "GAME OVER", 8)
+            g.text(30, 40, f"DISTANCE: {player.x/10:4.1f} m", 7)
         return g
 
 
-def game_over():
-    time.sleep(5)
+def reset():
+    global is_gameover
     player.x = 0
     player.y = 30
     player.dx = 0
     player.dy = 0
-    global is_gameover
-    is_gameover = True
+    is_gameover = False
 
 
 class ParentApp: