Refines the difficulty curve.

More random, less level design needed.

Throot.py

@@ -11,9 +11,11 @@ from Games.Throot.artrepository import OBSTACLES
 from Games.Throot.player import Player
 from Games.Throot.map import ObstacleSlice, OBSTACLE_SLICES
 from Games.Throot.sprites import Obstacle, update_entities
-from Games.Throot.constants import *
+from Games.Throot.constants import CONST_FPS
 
 class GameManager:
+    EVENT_ROOM_CHANGE = {'start': 0, 'main': 1, 'end': 2, 'next': -1}
+    
     def __init__(self, *rooms):
          self.rooms = rooms
          self.room_index = 0
@@ -22,14 +24,13 @@ class GameManager:
         # Set the FPS (without this call, the default fps is 30)
         thumby.display.setFPS(CONST_FPS)
 
-    def room_goto(self, event):
+    def room_goto(self, index):
-        index = event['room']
         if index < 0:
             self.room_index = min(self.room_index + 1, len(self.rooms))
         else:
             self.room_index = index
             
-        self.rooms[self.room_index].start(event)
+        self.rooms[self.room_index].start()
 
     def restart(self):
         self.room_index = 0
@@ -40,11 +41,11 @@ class GameManager:
         thumby.display.update()
         
         if event:
-            self.room_goto(event)
+            self.room_goto(self.EVENT_ROOM_CHANGE[event])
         
 
 class Room:
-    def start(self, event):
+    def start(self):
         t0 = time.ticks_ms()   # Get time (ms)
         thumby.display.fill(0) # Fill canvas to black
     
@@ -57,9 +58,7 @@ class RoomTitle(Room):
         super().update(tpf)
         
         if thumby.inputPressed():
-            return {
+            return 'main'
-                'room': ROOM_MAIN
-            }
         
         # draw title sprite
         title_text = 'press a to start'
@@ -85,13 +84,6 @@ class GameLoop(Room):
         self.player = Player()
         
         self.score = 0
-    
-    def start(self, event):
-        self.current_depth = 0
-        self.entities.clear()
-        self.current_obstacle_slice = OBSTACLE_SLICES[0]
-        self.player = Player()
-        self.score = 0
 
     def get_obstacle_slice(self):
         return OBSTACLE_SLICES[randrange(0, len(OBSTACLE_SLICES))]
@@ -126,10 +118,7 @@ class GameLoop(Room):
                 to_remove.add(entity)
             elif entity.intersects_pixel(self.player.xsub, self.player.ysub):
                 if isinstance(entity, Obstacle):
-                    return {
+                    print("Hit!")
-                        'room': ROOM_END,
-                        'score': self.score
-                    }
         self.entities -= to_remove
         
         self.score = int(self.current_depth * 10)
@@ -141,29 +130,10 @@ class GameLoop(Room):
         self.player.update_draw(self.player.y)
 
         thumby.display.drawText(str(self.score), thumby.display.width - (len(str(self.score)) + 2) * 5, 1, 1)
-        
+        thumby.display.update()
-class EndRoom(Room):
-    def __init__(self):
-        self.score = 0
-    
-    def start(self, event):
-        self.score = event['score']
-        # Used to make sure that we aren't triggering from input mean't for the game.
-        self.still_pressed = thumby.inputPressed()
-    
-    def update(self, tpf):
-        if not thumby.inputPressed():
-            self.still_pressed = False
-        elif not self.still_pressed and thumby.inputPressed():
-            return {
-                'room': ROOM_START
-            }
-        thumby.display.fill(0)
-        thumby.display.drawText("Final Score:", (thumby.display.width - 60) // 2, 1, 1)
-        thumby.display.drawText(str(self.score), (thumby.display.width - (len(str(self.score)) * 5)) // 2, 9, 1)
 
 def main():    
-    game = GameManager(RoomTitle(), GameLoop(), EndRoom())
+    game = GameManager(RoomTitle(), GameLoop())
     game.start()
 
     prev_time = 0