Changeset 180:026297a03963 for nagslang

Timestamp:

09/03/13 14:58:45 (8 years ago)

Author:

Neil Muller <drnlmuller@…>

Branch:

default

Phase:

public

Rebase:

36616364363066663031393763616436626334636264353230353363646637376262616364306264

Message:

Add DoorEvent and tweak ScreenChange to keep more state when the player goes through a door

Location:

nagslang

Files:

• engine.py (modified) (3 diffs)
• events.py (modified) (1 diff)
• game_object.py (modified) (2 diffs)
• screens/area.py (modified) (3 diffs)
• screens/base.py (modified) (1 diff)
• screens/menu.py (modified) (1 diff)

nagslang/engine.py

@@ -23 +23 @@
             'level2': AreaScreen,
         }
-        self.change_screen('menu')
+        self.change_screen('menu', None)
         # Dummy resize event, to force us to realise our real size
         # http://stackoverflow.com/q/16442573/8629
@@ -29 +29 @@
                                              size=(0, 0), w=0, h=0))
 
-    def change_screen(self, new_screen):
+    def change_screen(self, new_screen, player):
         if self._current_screen is not None:
             self._current_screen.teardown()
         screen_cls = self._screens[new_screen]
-        self._current_screen = screen_cls(new_screen, self._world)
+        self._current_screen = screen_cls(new_screen, player, self._world)
         self._current_screen.setup()
 
@@ -48 +48 @@
                 elif ScreenChange.matches(ev):
                     self._surface.fill(pygame.color.Color(0, 0, 0))
-                    self.change_screen(ev.screen)
+                    self.change_screen(ev.screen, ev.player)
                 else:
                     self._current_screen.handle_event(ev)

nagslang/events.py

@@ -36 +36 @@
 class ScreenChange(UserEvent):
     @classmethod
-    def post(cls, new_screen):
-        super(ScreenChange, cls).post(screen=new_screen)
+    def post(cls, new_screen, player=None):
+        super(ScreenChange, cls).post(screen=new_screen, player=player)
+
+
+class DoorEvent(UserEvent):
+    @classmethod
+    def post(cls, destination, dest_pos):
+        super(DoorEvent, cls).post(destination=destination, dest_pos=dest_pos)

nagslang/game_object.py

@@ -10 +10 @@
 from nagslang.options import options
 from nagslang.resources import resources
-from nagslang.events import ScreenChange
+from nagslang.events import DoorEvent
 
 
@@ -407 +407 @@
             if shape.collision_type == COLLISION_TYPE_PLAYER:
                 # Force to new position
-                shape.body.position = self.dest_pos
-                ScreenChange.post(self.destination)
+                DoorEvent.post(self.destination, self.dest_pos)

nagslang/screens/area.py

@@ -5 +5 @@
 import pymunk.pygame_util
 
-from nagslang.events import ScreenChange
+from nagslang.events import ScreenChange, DoorEvent
 from nagslang.level import Level
 from nagslang.protagonist import Protagonist
@@ -69 +69 @@
         self._drawables = Drawables()
         self.add_walls()
-        self.add_protagonist()
+        if self.protagonist is not None:
+            # We do things this way to avoid extra pymunk
+            # juggling to move objects between spaces
+            old_protagonist = self.protagonist
+            self.add_protagonist()
+            self.protagonist.copy_state(old_protagonist)
+        else:
+            self.add_protagonist()
         self.add_game_objects()
 
@@ -101 +108 @@
             if ev.key == pygame.locals.K_c:
                 self.protagonist.toggle_form()
+        elif DoorEvent.matches(ev):
+            self.protagonist.set_position(ev.dest_pos)
+            if ev.destination != self.name:
+                # Go to anther screen
+                ScreenChange.post(ev.destination, self.protagonist)
+            # else we're teleporting within the screen, and just the
+            # position change is enough
         self.keys.handle_event(ev)
 

nagslang/screens/base.py

@@ -7 +7 @@
 class Screen(object):
 
-    def __init__(self, name, world):
+    def __init__(self, name, player, world):
         self.name = name
         self.world = world
+        self.protagonist = player
         self.space = pymunk.Space()
 

nagslang/screens/menu.py

@@ -15 +15 @@
                 QuitEvent.post()
             elif ev.key == pygame.locals.K_1:
-                ScreenChange.post('level1')
+                ScreenChange.post('level1', None)
 
     def render(self, surface):