Changeset 340 for trunk/game/scripts/map.py

Timestamp:

10/23/09 18:13:26 (10 years ago)

Author:

eliedebrauwer

Message:

Ticket #66: Patch by Saritor, This patch implements Kaydeth's camera fix as well as a fix for letting us be able to remove the PC entry on individual map files. However the very first map a player starts the game on will need such an entry. fixes[s:trac, t:66]

File:

• trunk/game/scripts/map.py (modified) (7 diffs)

trunk/game/scripts/map.py

@@ -32 +32 @@
         self.engine = engine
         self.data = data
-        
+
         # init map attributes
+        self.my_cam_id = None
         self.cameras = {}
         self.agent_layer = None
@@ -49 +50 @@
            @return: None"""
         # We have to delete the map in Fife.
-        # TODO: We're killing the PC now, but later we will have to save the PC
         if self.map:
             self.model.deleteObjects()
@@ -55 +55 @@
         self.transitions = []
         self.map = None
-        self.agent_layer = None
+        self.agent_layer = None        
         # We have to clear the cameras in the view as well, or we can't reuse
         # camera names like 'main'
-        self.view.clearCameras()
-        self.cameras = {}
-        self.cur_cam2_x = 0
+        #self.view.clearCameras()
         self.initial_cam2_x = 0
         self.cam2_scrolling_right = True
+        #self.cameras = {}
+        self.cur_cam2_x = 0
         self.target_rotation = 0
         self.outline_renderer = None
@@ -69 +69 @@
         """Makes this map the active one.
         """
-        pass
+        self.cameras[self.my_cam_id].setEnabled(True)
+
         
     def load(self, filename):
         """Load a map given the filename.
-           @type filename: string
+           @type filename: String
            @param filename: Name of map to load
            @return: None"""
         self.reset()
         self.map = loadMapFile(filename, self.engine, self.data)
-         
-        # there must be a PC object on the objects layer!
         self.agent_layer = self.map.getLayer('ObjectLayer')
-        
+
+        # if this is not the very first map load in the game carry over the PC instance
+        if self.data.target_position:
+            x = float(self.data.target_position[0])
+            y = float(self.data.target_position[1])
+            z = 0
+            pc_obj = self.model.getObject("player", "PARPG")
+            inst = self.agent_layer.createInstance(pc_obj,\
+                                            fife.ExactModelCoordinate(x,y,z),\
+                                            "PC")
+            inst.setRotation(self.data.game_state.PC.behaviour.agent.getRotation())
+            fife.InstanceVisual.create(inst)
+
         # it's possible there's no transition layer
         size = len('TransitionLayer')
@@ -88 +99 @@
             if(layer.getId()[:size] == 'TransitionLayer'):
                 self.transitions.append(self.map.getLayer(layer.getId()))
-                
-        # init the camera
+
+        """ Initialize the camera.
+        Note that if we have more than one camera in a map file
+        we will have to rework how self.my_cam_id works. To make sure
+        the proper camera is set as the 'main' camera."""
         for cam in self.view.getCameras():
-            self.cameras[cam.getId()] = cam
+            self.my_cam_id = cam.getId()
+            self.cameras[self.my_cam_id] = cam
         self.view.resetRenderers()
-        self.target_rotation = self.cameras['main'].getRotation()
-        
+        self.target_rotation = self.cameras[self.my_cam_id].getRotation()
+
         self.outline_render = fife.InstanceRenderer.\
-                                        getInstance(self.cameras['main'])
-        
+                                        getInstance(self.cameras[self.my_cam_id])
+
         # set the render text
-        rend = fife.FloatingTextRenderer.getInstance(self.cameras['main'])
+        rend = fife.FloatingTextRenderer.getInstance(self.cameras[self.my_cam_id])
         text = self.engine.getGuiManager().\
                         createFont('fonts/rpgfont.png', 0, \
@@ -105 +120 @@
                                                        strip=False)))
         rend.changeDefaultFont(text)
+
+        # Make World aware that this is now the active map.
+        self.data.view.active_map = self
                 
-    def addPC(self, agent):
+    def addPC(self):
         """Add the player character to the map
-           @type agent: Fife.instance of PC
            @return: None"""
+
+        # Update gamestate.PC
+        self.data.game_state.PC.behaviour.onNewMap(self.agent_layer)
+
         # actually this is real easy, we just have to
         # attach the main camera to the PC, if a camera
         # was already used, we simply recycle it. 
-        if self.cameras['main'].getAttached() == None:
-            self.cameras['main'].attach(agent)
+        if self.cameras[self.my_cam_id].getAttached() == None:
+            self.cameras[self.my_cam_id].attach(self.data.game_state.PC.behaviour.agent)
 
         
@@ -120 +141 @@
         """Enable or disable a renderer.
            @return: None"""
-        renderer = self.cameras['main'].getRenderer(str(r_name))
+        renderer = self.cameras[self.my_cam_id].getRenderer(str(r_name))
         renderer.setEnabled(not renderer.isEnabled())