X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=koperkapel%2Fscenes%2Fmenu.py;h=a902d3ab3aa9be265a7c5f016ddf919132f0cc09;hb=208b0bfa93ce450a3d1e686d0bd0b2c93104f7b8;hp=9769ff602f65be54d5cf19eca52501765f3c6b58;hpb=22ae4326a187ae76c6904bc8fbf666d8aa147706;p=koperkapel.git

diff --git a/koperkapel/scenes/menu.py b/koperkapel/scenes/menu.py
index 9769ff6..a902d3a 100644
--- a/koperkapel/scenes/menu.py
+++ b/koperkapel/scenes/menu.py
@@ -3,9 +3,7 @@
 from pgzero.constants import keys
 from ..actors.buttons import TextButton
 from ..actors.navigator import ActorNavigator
-from .base import Scene, ChangeSceneEvent, QuitEvent
-
-
+from .base import Scene, ChangeSceneEvent, WorldEvent, QuitEvent
 
 
 class MenuScene(Scene):
@@ -14,18 +12,19 @@ class MenuScene(Scene):
     def __init__(self):
         super().__init__()
         self._title = self.actors.add(TextButton("Main Menu"))
-        self._title.pos = (300, 200)
+        self._title.pos = (300, 100)
         self._nav = ActorNavigator()
         self._menu = [
             TextButton("Play", action=self.change_to_level),
             TextButton("View Last Generated Level",
                        action=self.change_to_viewer),
-            TextButton("Manage Roaches", action=self.change_to_roaches),
+            TextButton("Manage Roaches",
+                       action=self.change_to_roach_management),
             TextButton("Credits", action=self.change_to_credits),
             TextButton("Quit", action=self.quit),
         ]
         for i, item in enumerate(self._menu):
-            item.pos = (300, 300 + (i * 100))
+            item.pos = (300, 200 + (i * 100))
             self.actors.add(item)
         self._nav.connect(
             self._menu, [keys.DOWN, keys.RIGHT], [keys.UP, keys.LEFT],
@@ -33,15 +32,18 @@ class MenuScene(Scene):
         self._nav.current.select()
 
     def change_to_level(self):
-        from .level import LevelScene
-        return [ChangeSceneEvent(LevelScene('level1'))]
+        from .level import GameLevelScene
+        return [ChangeSceneEvent(GameLevelScene())]
 
     def change_to_viewer(self):
         from .viewlevel import ViewLevelScene
-        return [ChangeSceneEvent(ViewLevelScene('map'))]
+        return [
+            WorldEvent("set", {"level.name": "map"}),
+            ChangeSceneEvent(ViewLevelScene())
+        ]
 
-    def change_to_roaches(self):
-        from .roaches import RoachesScene
+    def change_to_roach_management(self):
+        from .roach_management import RoachesScene
         return [ChangeSceneEvent(RoachesScene())]
 
     def change_to_credits(self):