Changeset 609

Timestamp:

07/31/10 08:10:20 (9 years ago)

Author:

beliar

Message:

Patch by Beliar.

• Removed item_id from CarryableItem?.
• item_type of CarryableItem? now store store the actual type of the item instead of the python class
• Changed functions that find items by item_id to find items by item_type instead.

Location:

trunk/game

Files:

• run.py (modified) (1 diff)
• scripts/gamemodel.py (modified) (2 diffs)
• scripts/gui/dialoguegui.py (modified) (4 diffs)
• scripts/inventory.py (modified) (1 diff)
• scripts/objects/actors.py (modified) (1 diff)
• scripts/objects/base.py (modified) (4 diffs)
• scripts/objects/composed.py (modified) (2 diffs)
• scripts/objects/items.py (modified) (1 diff)

trunk/game/run.py

@@ -27 +27 @@
 utils.addPaths ('./lib', './lib/extensions')
 
-#from settings import Setting
 
 TDS = Setting(app_name="PARPG",

trunk/game/scripts/gamemodel.py

@@ -134 +134 @@
         info.update(extra)
         ID = info.pop("id") if info.has_key("id") else info.pop("ID")
-        if not info.has_key("item_id"):
-            info['item_id'] = ID
+        if not info.has_key("item_type"):
+            info["item_type"] = info["type"]
         ID = self.createUniqueID(ID)
         new_item = CarryableItem(ID = ID, **info) 
@@ -504 +504 @@
                 item_data = agent["item"]
             inst_dict["item"] = item_data
-            inst_dict["item_id"] = agent["ItemType"]
+            inst_dict["item_type"] = agent["ItemType"]
 
         self.createMapObject(self.active_map.agent_layer, inst_dict, inst)

trunk/game/scripts/gui/dialoguegui.py

@@ -99 +99 @@
         def getStuff(state, thing):
             """Moves an item from the npc inventory to the players
-            @param thing: item_id of the item
+            @param thing: item_type of the item
             @type thing: str """
-            item = state['npc'].inventory.findItem(item_id = thing)
+            item = state['npc'].inventory.findItem(item_type = thing)
             if item:
                 state['npc'].give(item, state['pc'])
@@ -110 +110 @@
         def giveStuff(state, thing):
             """Moves an item from the pc inventory to the npcs
-            @param thing: item_id of the item
+            @param thing: item_type of the item
             @type thing: str """
             """Moves an item from the npc inventory to the players
-            @param thing: item_id of the item
+            @param thing: item_type of the item
             @type thing: str """
-            item = state['pc'].inventory.findItem(item_id = thing)
+            item = state['pc'].inventory.findItem(item_type = thing)
             if item:
                 state['pc'].give(item, state['npc'])
@@ -127 +127 @@
             @param who: Sets whose item to replace. Should be either pc or npc
             @type who: str
-            @param old_items: item_ids of the items to replace
+            @param old_items: item_types of the items to replace
             @type old_item: list of str
             @param new_item: Types of the items that replace the old items
             @type new_item: list of str """
             old_item_instances = []
-            for item_id in old_items:
+            for item_type in old_items:
                 old_item_instances.append(state[who].inventory.\
-                                                findItem(item_id = item_id))
+                                                findItem(item_type = item_type))
             if old_item_instances:
                 for old_item in old_item_instances:
@@ -154 +154 @@
             @param who: Sets whose item to replace. Should be either pc or npc
             @type who: str
-            @param old_item: item_id of the item to replace
+            @param old_item: item_type of the item to replace
             @type old_item: str
             @param new_item: Type of the item that replaces the old item
             @type new_item: str """
-            old_item = state[who].inventory.findItem(item_id = old_item)
+            old_item = state[who].inventory.findItem(item_type = old_item)
             if old_item:
                 inst_dict = {}

trunk/game/scripts/inventory.py

@@ -84 +84 @@
 
 
-    def count(self, item_id):
-        return sum(item.count(item_id) for item in self.items.values())
+    def count(self, item_type = ""):
+        return sum(item.count(item_type) for item in self.items.values())
     
     def takeOff(self, item):

trunk/game/scripts/objects/actors.py

@@ -230 +230 @@
         actor.inventory.placeItem(item)           
         
-    def hasItem(self, item_id):
+    def hasItem(self, item_type):
         """Returns wether an item is present in the players inventory or not
-        @param item_id: ID of the item
-        @type item_id: str
+        @param item_type: ID of the item
+        @type item_type: str
         @return: True when the item is present, False when not"""
-        return self.inventory.findItem(item_id = item_id)
-
-    def itemCount(self, item_id = ""):
-        """Returns number of all items or items specified by item_id 
+        return self.inventory.findItem(item_type = item_type)
+
+    def itemCount(self, item_type = ""):
+        """Returns number of all items or items specified by item_type 
         the player has.
-        @param item_id: ID of the item, can be empty
-        @type item_id: str
+        @param item_type: ID of the item, can be empty
+        @type item_type: str
         @return: Number of items"""
-        return self.inventory.count(item_id)
+        return self.inventory.count(item_type)
 
     def getLocation(self):

trunk/game/scripts/objects/base.py

@@ -362 +362 @@
             pass
 
-    def count (self, item_id = ""):
+    def count (self, item_type = ""):
         """Returns the number of items"""
-        if item_id:
+        if item_type:
             ret_count = 0
             for index in self.items :
-                if self.items[index].item_id == item_id:
+                if self.items[index].item_type == item_type:
                     ret_count += 1
             return ret_count
@@ -393 +393 @@
         return None
 
-    def findItemByItemID(self, item_id):
-        """Returns the item with the passed item_id"""
+    def findItemByItemType(self, item_type):
+        """Returns the item with the passed item_type"""
         for index in self.items :
-            if self.items[index].item_id == item_id:
+            if self.items[index].item_type == item_type:
                 return self.items[index]
         return None
@@ -414 +414 @@
             if "kind" in kwargs and not self.items[index].trueAttr(kwargs["kind"]):
                 continue
-            if "item_id" in kwargs and self.items[index].item_id != kwargs["item_id"]:
+            if "item_type" in kwargs and self.items[index].item_type != kwargs["item_type"]:
                 continue
             return self.items[index]
@@ -425 +425 @@
             item_dict = item.getStateForSaving()
             item_dict["index"] = index
-            item_dict["type"] = type(item).__name__ 
+            item_dict["type"] = item.item_type
             items.append(item_dict)
         return items

trunk/game/scripts/objects/composed.py

@@ -81 +81 @@
 class CarryableItem (GameObject, Carryable, Usable):
     """Composite class that will be used for all carryable items"""
-    def __init__(self, item_id, type = "CarryableItem", **kwargs):
+    def __init__(self, item_type, **kwargs):
         GameObject.__init__(self, **kwargs)
         Carryable.__init__(self, **kwargs)
         Usable.__init__(self, **kwargs)
-        self.item_id = item_id
-        self.item_type = type
+        self.item_type = item_type
 
     def prepareStateForSaving(self, state):
@@ -94 +93 @@
         """
         super(CarryableItem, self).prepareStateForSaving(state)
-        del state["in_container"]
+        if state.has_key("in_container"):
+            del state["in_container"]
         del state["on_map"]
         del state["agent"]

trunk/game/scripts/objects/items.py

@@ -22 +22 @@
 class MapItem(CarryableItem):
     """Item that is lying on a map"""
-    def __init__(self, ID, item_id, item, name = 'Item', text = 'An item',
+    def __init__(self, ID, item_type, item, name = 'Item', text = 'An item',
                    gfx = 'item', **kwargs):
-        CarryableItem.__init__(self, ID = ID, item_id = item_id, name = name, 
+        CarryableItem.__init__(self, ID = ID, item_type = item_type, name = name, 
                                text = text, gfx = gfx, **kwargs)
         self.item = item