Mercurial > pyntnclick
comparison gamelib/state.py @ 305:75783238f73d
Make replace_inventory_item use names for consisency
| author | Neil Muller <neil@dip.sun.ac.za> |
|---|---|
| date | Sat, 28 Aug 2010 01:28:25 +0200 |
| parents | fe899fb63866 |
| children | 00eb7ea2b7ea |
comparison
equal
deleted
inserted
replaced
| 304:3caf7c9bcafc | 305:75783238f73d |
|---|---|
| 131 self.inventory.remove(self.items[name]) | 131 self.inventory.remove(self.items[name]) |
| 132 # Unselect tool if it's removed | 132 # Unselect tool if it's removed |
| 133 if self.tool == self.items[name]: | 133 if self.tool == self.items[name]: |
| 134 self.set_tool(None) | 134 self.set_tool(None) |
| 135 | 135 |
| 136 def replace_inventory_item(self, old_item, new_item): | 136 def replace_inventory_item(self, old_item_name, new_item_name): |
| 137 """Try to replace an item in the inventory with a new one""" | 137 """Try to replace an item in the inventory with a new one""" |
| 138 try: | 138 try: |
| 139 index = self.inventory.index(old_item) | 139 index = self.inventory.index(self.items[old_item_name]) |
| 140 self.inventory[index] = new_item | 140 self.inventory[index] = self.items[new_item_name] |
| 141 if self.tool == old_item: | 141 if self.tool == self.items[old_item_name]: |
| 142 self.set_tool(new_item) | 142 self.set_tool(self.items[new_item_name]) |
| 143 except ValueError: | 143 except ValueError: |
| 144 return False | 144 return False |
| 145 return True | 145 return True |
| 146 | 146 |
| 147 def set_tool(self, item): | 147 def set_tool(self, item): |