Changeset 478

Timestamp:

02/03/10 14:54:21 (10 years ago)

Author:

maximinus_parpg

Message:

Added Beliars patch for loading / saving.

Location:

trunk/game/scripts

Files:

• engine.py (modified) (3 diffs)
• objects/actors.py (modified) (2 diffs)
• objects/containers.py (modified) (3 diffs)

trunk/game/scripts/engine.py

@@ -59 +59 @@
             return
         
-        # save the PC coordinates before we destroy the behaviour
+        # save the PC coordinates
         coords = self.game_state.PC.behaviour.agent.getLocation().\
                     getMapCoordinates()
         self.game_state.saved_pc_coordinates = (coords.x, coords.y)
         
-        # can't pickle SwigPyObjects
-        behaviours = {}
-        behaviour_player = self.game_state.PC.behaviour
-        self.game_state.PC.behaviour = None
-        
-        # Backup the behaviours 
-        for map_id in self.game_state.objects:
-            behaviours[map_id] = {}
-            for (object_id, npc) in self.game_state.objects[map_id].items():
-                if npc.trueAttr("NPC"):
-                    behaviours[map_id][object_id] = npc.behaviour
-                    npc.behaviour = None
-        
         # Pickle it 
         pickle.dump(self.game_state, f)
-        f.close()
-        
-        # Restore behaviours
-        for map_id in behaviours:
-            for (object_id, behaviour) in behaviours[map_id].items():
-                self.game_state.objects[map_id][object_id].behaviour = \
-                    behaviours[map_id][object_id]
-                
-        self.game_state.PC.behaviour = behaviour_player
+        f.close()       
 
     def load(self, path, filename):
@@ -112 +91 @@
         # 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)
+            for (object_id, obj) in self.game_state.objects[map_id].items():
+                if obj.trueAttr("NPC") or obj.trueAttr("AnimatedContainer"):
+                    obj.createBehaviour(self.view.active_map.agent_layer)
 
         # Fix the player behaviour
@@ -194 +173 @@
             # create the PC agent
             obj.start()
+        if obj.trueAttr("AnimatedContainer"):
+            # create the agent
+            obj.setup()
 
     def objectActive(self, ident):

trunk/game/scripts/objects/actors.py

@@ -126 +126 @@
         self.layer_id = agent_layer.getId()
         self.createBehaviour(agent_layer)
+    
+    def __getstate__(self):
+        odict = self.__dict__.copy()
+        del odict["behaviour"]
+        return odict;
+    
+    def __setstate__(self, state):
+        self.__dict__.update(state)
     
     def meet(self, npc):
@@ -281 +289 @@
         self.dialogue = kwargs.get('dialogue')
 
+    def __getstate__(self):
+        odict = self.__dict__.copy()
+        del odict["behaviour"]
+        return odict;
+    
+    def __setstate__(self, state):
+        self.__dict__.update(state)        
+
     def createBehaviour(self, layer):
         """Creates the behaviour for this actor.

trunk/game/scripts/objects/containers.py

@@ -35 +35 @@
         self.placeItem(CarryableItem(ID=987,name="Dagger456"))
         
-class Footlocker(ImmovableContainer, fife.InstanceActionListener):
-    def __init__ (self, ID, agent_layer=None, name = 'Footlocker',
-                  text = 'A Footlocker', gfx = 'lock_box_metal01', **kwargs):
-        ImmovableContainer.__init__(self, ID = ID, name = name, gfx = gfx,
-                                    text = text, **kwargs)
-        self.placeItem(CarryableItem(ID=987,name="Dagger456"))
+class ContainerBehaviour(fife.InstanceActionListener):
+    def __init__(self, parent = None, agent_layer = None):
+        fife.InstanceActionListener.__init__(self)
+        self.parent = parent
+        self.layer = agent_layer
+        self.state = _AGENT_STATE_CLOSED
+        self.agent = None
 
-        fife.InstanceActionListener.__init__(self)
-        self.layer = agent_layer
-        self.agent = self.layer.getInstance(self.ID)
+    def attachToLayer(self, agent_ID):
+        """ Attaches to a certain layer
+            @type agent_ID: String
+            @param agent_ID: ID of the layer to attach to.
+            @return: None"""
+        self.agent = self.layer.getInstance(agent_ID)
         self.agent.addActionListener(self)
         self.state = _AGENT_STATE_CLOSED
@@ -66 +70 @@
         
     def open (self):
-        super (Footlocker,self).open()
         if self.state != _AGENT_STATE_OPENED and self.state != _AGENT_STATE_OPENING:
             self.agent.act('open', self.agent.getLocation())
@@ -72 +75 @@
 
     def close(self):
-        super (Footlocker,self).close()
         if self.state != _AGENT_STATE_CLOSED and self.state != _AGENT_STATE_CLOSING:
             self.agent.act('close', self.agent.getLocation())
-            self.state = _AGENT_STATE_CLOSING
+            self.state = _AGENT_STATE_CLOSING  
+    
+class Footlocker(ImmovableContainer):
+    def __init__ (self, ID, agent_layer=None, name = 'Footlocker',
+                  text = 'A Footlocker', gfx = 'lock_box_metal01', **kwargs):
+        ImmovableContainer.__init__(self, ID = ID, name = name, gfx = gfx,
+                                    text = text, **kwargs)
+        self.placeItem(CarryableItem(ID=987,name="Dagger456"))
+
+        self.is_AnimatedContainer = True
+        self.createBehaviour(agent_layer)        
+        
+    def __getstate__(self):
+        odict = self.__dict__.copy()
+        del odict["behaviour"]
+        return odict;
+    
+    def __setstate__(self, state):
+        self.__dict__.update(state)
+    
+    def createBehaviour(self, layer):
+        self.behaviour = ContainerBehaviour(self, layer)
+
+    def setup(self):
+        """@return: None"""
+        self.behaviour.attachToLayer(self.ID)
+
+    def open (self):
+        super (Footlocker,self).open()
+        self.behaviour.open()
+
+    def close(self):
+        super (Footlocker,self).close()
+        self.behaviour.close()