Changeset 310 for trunk/game/scripts/objects

Timestamp:

10/09/09 20:03:08 (10 years ago)

Author:

eliedebrauwer

Message:

Ticket #66: Patch by saritor (& eliedebrauwer), implements saritors rework of teleporting, at this point it implements the within-a-map teleport successfully, but cross map teleport still has in issue which probably has to do with the setup of the PC. comment[s:trac, t:66]

Location:

trunk/game/scripts/objects

Files:

• __init__.py (modified) (2 diffs)
• action.py (modified) (2 diffs)
• actors.py (modified) (1 diff)
• composed.py (modified) (1 diff)

trunk/game/scripts/objects/__init__.py

@@ -15 +15 @@
 #   You should have received a copy of the GNU General Public License
 #   along with PARPG.  If not, see <http://www.gnu.org/licenses/>.
-import containers
+import containers, doors
 import actors
 import sys
 
-object_modules = [containers, actors,]
+object_modules = [containers, actors, doors]
 
 def getAllObjects ():
@@ -50 +50 @@
             info[key] = val
 
+        # this is for testing purposes
         return getAllObjects()[obj_type](ID, **info)

trunk/game/scripts/objects/action.py

@@ -24 +24 @@
 class ChangeMapAction(Action):
     """A change map scheduled"""
-    def __init__(self, engine, targetmap, targetpos):
-        """@type engine: Engine reference
+    def __init__(self, engine, targetmapname, targetmapfile , targetpos):
+        """Initiates a change of the position of the character
+           possibly flagging a new map to be loaded.
+           @type engine: Engine reference
            @param engine: A reference to the engine.
-           @type targetmap: String
-           @param targetmap: Target mapname.
+           @type targetmapname: String
+           @param targetmapname: Target map id 
+           @type targetmapfile: String
+           @param targetmapfile: Target map filename
            @type targetpos: Tuple
            @param targetpos: (X, Y) coordinates on the target map.
@@ -34 +38 @@
         self.engine = engine
         self.targetpos = targetpos
-        self.targetmap = targetmap
-       
+        self.targetmapname = targetmapname
+        self.targetmapfile = targetmapfile
+
     def execute(self):
         """Executes the mapchange."""
-        self.engine.changeMap(self.targetmap, self.targetpos)
+        self.engine.changeMap(self.targetmapname, self.targetmapfile, self.targetpos)
        
 class OpenBoxAction(Action):

trunk/game/scripts/objects/actors.py

@@ -136 +136 @@
         self.state = _AGENT_STATE_RUN
         self.behaviour.agent.move('walk', location, self.behaviour.speed-1)
-      
+
+    def teleport(self, location):
+        """Teleports a PC instantly to the given location.
+           @type location: fife.Location
+           @param location: Target coordinates for PC.
+           @return: None"""
+        self.state = _AGENT_STATE_IDLE
+        self.behaviour.agent.setLocation(location)
+
     def approach(self, location, action = None):
         """Approaches an npc and then ???.

trunk/game/scripts/objects/composed.py

@@ -31 +31 @@
         Destructable .__init__(self, **kwargs)
         self.blocking = True
+
+class Door(GameObject, Lockable, Scriptable, Trappable):
+    """Composite class that can be used to create doors on a map."""
+    def __init__ (self, target_map_name = 'my-map', target_map = 'map/map.xml', target_pos = (0.0, 0.0), \
+                        **kwargs):
+        GameObject   .__init__(self, **kwargs)
+        Lockable     .__init__(self, **kwargs)
+        Scriptable   .__init__(self, **kwargs)
+        Trappable    .__init__(self, **kwargs)
+        self.is_door = True
+        self.target_map_name = target_map_name
+        self.target_map = target_map
+        self.target_pos = target_pos
+        self.blocking = True