Changeset 356 for trunk

Timestamp:

10/31/09 15:11:33 (10 years ago)

Author:

Kaydeth_parpg

Message:

Ticket #73. Patch by Kaydeth. Most of the changes were made to the map loading logic in the Engine, World, and Map classes to make sure it could handle loading maps after the game state has been restored by a load game. Also added a floating door back to both maps so map changing can still be tested in game. fixes[s:trac, t:73]

Location:

trunk/game

Files:

• maps/map.xml (modified) (2 diffs)
• maps/map2.xml (modified) (2 diffs)
• scripts/engine.py (modified) (3 diffs)
• scripts/filebrowser.py (modified) (1 diff)
• scripts/gamestate.py (modified) (2 diffs)
• scripts/map.py (modified) (3 diffs)
• scripts/objects/actors.py (modified) (2 diffs)
• scripts/world.py (modified) (3 diffs)

trunk/game/maps/map.xml

@@ -14 +14 @@
         <import file="../objects/agents/player/player.xml" />
         <import file="../objects/buildings/container_house/container_house.xml" />
+    <import file="../objects/buildings/shanty/shanty-door.xml" />
         <layer grid_type="square" id="GroundLayer" pathing="cell_edges_only" rotation="0.0" transparency="0" x_offset="0.0" x_scale="1.0" y_offset="0.0" y_scale="1.0">
                 <instances>
@@ -1869 +1870 @@
                         <i o="block" r="0" x="-1.0" y="-3.0" z="0.0" />
                         <i o="container_house" r="0" x="0.0" y="0.0" z="0.0" />
+            <i gfx="shanty-door" id="shanty-door01" is_open="False" name="Shanty Door" o="shanty-door" object_type="ShantyDoor" r="0" target_map="maps/map2.xml" target_map_name="map2" target_x="10.0" target_y="10.0" text="Looks like the entrance to the building." x="-2.0" xpos="-2.0" y="6.0" ypos="6.0" z="0.0" />
                         </instances>
         </layer>

trunk/game/maps/map2.xml

@@ -11 +11 @@
         <import file="../objects/buildings/windmill/windmilld.xml"></import>
         <import file="../objects/buildings/windmill/windmille.xml"></import>
-
+        
+        <import file="../objects/buildings/shanty/shanty-door.xml" />
+        
         <layer grid_type="square" id="GroundLayer" x_scale="1.0" pathing="cell_edges_only" y_scale="1.0" rotation="0.0" x_offset="0.0" y_offset="0.0">
                 <instances>
@@ -1023 +1025 @@
             <i x="8" o="windmille" z="0.0" y="-2" r="0"></i>
 
-            <i x="-4" o="shantya" z="0.0" y="3" r="0"></i>
-            <i x="-4" o="shantyb" z="0.0" y="4" r="0"></i>
-            <i x="-4" o="shantyc" z="0.0" y="5" r="0"></i>
-            <i x="-4" o="shantyd" z="0.0" y="6" r="0"></i>
-            <i x="-3" o="shantye" z="0.0" y="6" r="0"></i>
-            <i x="-2" o="shantyf" z="0.0" y="6" r="0"></i>
-            <i x="-1" o="shantyg" z="0.0" y="6" r="0"></i>
-            <i x="-0" o="shantyh" z="0.0" y="6" r="0"></i>
-            <i x="1" o="shantyi" z="0.0" y="6" r="0"></i>
-
             <!-- A sample door -->
             <i x="-2.0" o="shanty-door" z="0.0" y="6.0" r="0" id="shanty-door01" object_type="ShantyDoor" is_open="False"
                 name="Shanty Door" text="Looks like the entrance to the building." target_map_name="main-map" target_map="maps/map.xml"
-                target_x="0.0" target_y="0.0"></i>
+                target_x="5.0" target_y="5.0"></i>
 
         </instances>

trunk/game/scripts/engine.py

@@ -54 +54 @@
         fname = '/'.join([path, filename])
         try:
-            f = open(fname, 'w')
+            f = open(fname, 'wb')
         except(IOError):
             sys.stderr.write("Error: Can't find save game: " + fname + "\n")
             return
+        
+        # save the PC coordinates before we destroy the behaviour
+        coords = self.game_state.PC.behaviour.agent.getLocation().\
+                    getMapCoordinates()
+        self.game_state.saved_pc_coordinates = (coords.x, coords.y)
         
         # can't pickle SwigPyObjects
@@ -84 +89 @@
         self.game_state.PC.behaviour = behaviour_player
 
-    def load(self, filename):
+    def load(self, path, filename):
         """Loads a saver from a file.
            @type filename: string
            @param filename: the name of the file (including path) to load from
            @return: None"""
-        
-        # TODO
-        # Remove what we are currently working with 
-        print "TODO: load"
-        self.view.active_map.view.clearCameras()
-        self.view.active_map.model.deleteMaps()
-        
+            
+        fname = '/'.join([path, filename])
+
         try:
-            f = open(filename, 'r')
+            f = open(fname, 'rb')
         except(IOError):
             sys.stderr.write("Error: Can't find save game file\n")
             return
+        
+        #Remove all currently loaded maps so we can start fresh
+        self.view.deleteMaps();
+        
         self.game_state = pickle.load(f)
         f.close()
         
-        # Make sure we're on the right map
+        # Recreate all the behaviours. These can't be saved because FIFE
+        # objects cannot be pickled
+        for map_id in self.game_state.objects:
+            for (object_id, npc) in self.game_state.objects[map_id].items():
+                if npc.trueAttr("NPC"):
+                    npc.createBehaviour(self.view.active_map.agent_layer)
+
+        # Fix the player behaviour
+        self.game_state.PC.createBehaviour(self.view.active_map.agent_layer)
+        
+        #In most maps we'll create the PC Instance internally. In these
+        #cases we need a target position
+        self.target_position = self.game_state.saved_pc_coordinates
+        
+        #Load the current map
         if self.game_state.current_map_file:
             self.loadMap(self.game_state.current_map_name, \
                          self.game_state.current_map_file) 
-
+            
     def createObject (self, layer, attributes, instance):
         """Create an object and add it to the current map.
@@ -258 +277 @@
         self.view.loadMap(map_name, str(map_file))
 
-        # If the map has been loaded, we might need to add some
-        # agents to the PC and NPS
-        for map_id in self.game_state.objects:
-            for (object_id, npc) in self.game_state.objects[map_id].items():
-                if npc.trueAttr("NPC") and npc.behaviour == None:
-                    npc.createBehaviour(self.view.active_map.agent_layer)
-
-        # Fix the player behaviour
-        if self.game_state.PC.behaviour == None:
-            self.game_state.PC.createBehaviour(self.view.active_map.agent_layer)
-
         # create the PC agent
         self.view.active_map.addPC()

trunk/game/scripts/filebrowser.py

@@ -113 +113 @@
         self._widget.hide()
         selection = self._widget.collectData('fileList')
-        data = self._widget.collectData('saveField')
 
         if self.save_file:
+            data = self._widget.collectData('saveField')
             if data:
                 if (data.split('.')[1] == 'dat'):

trunk/game/scripts/gamestate.py

@@ -26 +26 @@
         self.current_map_file = None
         self.current_map_name = None
+        #these coordinates are only used for saving and loading the game.
+        #They do not represent the pc's active location
+        self.saved_pc_coordinates = (0,0)
         
     def getObjectsFromMap(self, map_id):
@@ -45 +48 @@
         if obj_id in self.objects[map_id]:
             return self.objects[map_id][obj_id]
-
+        

trunk/game/scripts/map.py

@@ -80 +80 @@
         self.map = loadMapFile(filename, self.engine, self.data)
         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:
+        
+        #find out if a PC instance was created when the map was loaded
+        found = False
+        for inst in self.agent_layer.getInstances():
+            if inst.getId() == "PC":
+                found = True
+                break
+                
+        #If there is not a PC instance created yet than we construct the PC
+        #instance from what we have saved in the PC Game Object
+        if not found:
             x = float(self.data.target_position[0])
             y = float(self.data.target_position[1])
@@ -90 +98 @@
                                             fife.ExactModelCoordinate(x,y,z),\
                                             "PC")
-            inst.setRotation(self.data.game_state.PC.behaviour.agent.getRotation())
             fife.InstanceVisual.create(inst)
-
+        #If the PC instance exists already then make sure it's set to correct
+        #location for this new map
+        elif self.data.target_position is not None:
+            pos = self.data.target_position
+            coord = fife.DoublePoint3D(float(pos[0]), float(pos[1]), 0)
+            location = fife.Location(self.agent_layer)
+            location.setMapCoordinates(coord)
+            inst.setLocation(location)
+        #else we are loading the first map and the PC position were set by
+        #the coordinates in the Map file
+            
         # it's possible there's no transition layer
         size = len('TransitionLayer')
@@ -120 +137 @@
                                                        strip=False)))
         rend.changeDefaultFont(text)
-
+        
         # Make World aware that this is now the active map.
         self.data.view.active_map = self

trunk/game/scripts/objects/actors.py

@@ -68 +68 @@
         self.speed = float(TDS.readSetting("PCSpeed")) # TODO: rework/improve
         self.nextAction = None
+        self.agent = None
         
     def onInstanceActionFinished(self, instance, action):
@@ -90 +91 @@
         """Sets the agent onto the new layer.
         """
-        self.agent.removeActionListener(self)
+        if self.agent is not None:
+            self.agent.removeActionListener(self)
+            
         self.agent = layer.getInstance(self.parent.ID)
         self.agent.addActionListener(self)

trunk/game/scripts/world.py

@@ -235 +235 @@
            @return: None"""
         click = fife.ScreenPoint(evt.getX(), evt.getY())
-        i=self.active_map.cameras[self.active_map.my_cam_id].getMatchingInstances(click, \
-                                                self.active_map.agent_layer)
+        i=self.active_map.cameras[self.active_map.my_cam_id].\
+                getMatchingInstances(click, self.active_map.agent_layer)
         # no object returns an empty tuple
         if(i != ()):
@@ -248 +248 @@
                     obj_map_coords = \
                                       obj.getLocation().getMapCoordinates()
-                    obj_screen_coords = self.active_map.cameras["main"]\
-                                    .toScreenCoordinates(obj_map_coords)
+                    obj_screen_coords = self.active_map.\
+                        cameras[self.active_map.my_cam_id]\
+                        .toScreenCoordinates(obj_map_coords)
                     
                     if obj_screen_coords.y > front_y:
@@ -274 +275 @@
            @rtype: fife.Location
            @return: The map coordinates"""
-        coord = self.active_map.cameras[self.active_map.my_cam_id].toMapCoordinates(click, False)
+        coord = self.active_map.cameras[self.active_map.my_cam_id].\
+                    toMapCoordinates(click, False)
         coord.z = 0
         location = fife.Location(self.active_map.agent_layer)
         location.setMapCoordinates(coord)
         return location
+    
+    def deleteMaps(self):
+        """Clear all currently loaded maps from FIFE as well as clear our
+            local map cache
+            @return: nothing"""
+        self.engine.getView().clearCameras()
+        self.engine.getModel().deleteMaps()
+        self.engine.getModel().deleteObjects()
+
+        self.maps = {}
 
     def pump(self):