Changeset 540 for trunk/game/scripts/engine.py

Timestamp:

05/07/10 20:14:52 (10 years ago)

Author:

beliar

Message:

Inventories can now be set in the map file
Items values read from the object database (objects/ObjectDatabase.yaml)
Again, values set in the map override those in the database.
Sample inventory for PC added to map.xml (same as that in init of PlayerCharacter?)

For now only the CarryableItem? type is supported. Once we decide how to implement items that do more than just sit in the inventory we need to change it.

File:

• trunk/game/scripts/engine.py (modified) (2 diffs)

trunk/game/scripts/engine.py

@@ -105 +105 @@
         # In most maps we'll create the PC Instance internally. In these
         # cases we need a target position
-            
-    def createObject (self, layer, attributes, instance):
+        
+
+    def checkAttributes(self, attributes):
+        """Checks for attributes that where not given in the map file
+        and fills them with values from the object database
+        @param attributes: attributes to check
+        @type attributes: Dictionary
+        @return: The modified attributes"""        
+        if attributes.has_key("object_type"):
+            class_name = attributes.pop("object_type")
+        else:
+            class_name = attributes["type"]
+        if self.object_db.has_key(class_name):
+            db_attributes = self.object_db[class_name].copy()
+            for key in db_attributes.keys():
+                if attributes.has_key(key):
+                    attributes[key] = attributes[key] or db_attributes[key]
+                else:
+                    attributes[key] = db_attributes[key]
+        return attributes
+    
+    def createInventoryObject(self, container, attributes):
+        """Create an inventory object and place it into a container
+           @type container: base.Container
+           @param container: Container where the item is on
+           @type attributes: Dictionary
+           @param attributes: Dictionary of all object attributes
+           @return: None"""
+        # create the extra data
+        extra = {}
+        extra['engine'] = self
+        attributes = self.checkAttributes(attributes)
+        
+        """TODO: Change when we use other and or more classes 
+        for inventory objects"""
+        from objects.composed import CarryableItem
+        info = {}
+        info.update(attributes)
+        info.update(extra)
+        ID = info.pop("id")
+        
+        obj = CarryableItem(ID = ID, **info)
+        #obj = createObject(attributes, extra)
+        container.placeItem(obj)
+        
+    def createMapObject (self, layer, attributes, instance):
         """Create an object and add it to the current map.
            @type layer: fife.Layer
@@ -117 +161 @@
         # create the extra data
         extra = {}
-        extra['agent_layer'] = layer
+        if layer is not None:
+            extra['agent_layer'] = layer
         extra['engine'] = self
-        class_name = attributes["type"]
-        if self.object_db.has_key(class_name):
-            db_attributes = self.object_db[class_name].copy()
-            for key in db_attributes.keys():
-                attributes[key] = attributes[key] or db_attributes[key]
+        attributes = self.checkAttributes(attributes)
         
         obj = createObject(attributes, extra)