changeset 331:a1ffc919d0c1

Add is_in_inventory helper
author Neil Muller <neil@dip.sun.ac.za>
date Sat, 28 Aug 2010 14:10:54 +0200
parents 8f85902f4cb6
children 349c5bac4bb5
files gamelib/state.py gamelib/tests/game_logic_utils.py
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/gamelib/state.py	Sat Aug 28 14:01:17 2010 +0200
+++ b/gamelib/state.py	Sat Aug 28 14:10:54 2010 +0200
@@ -131,6 +131,9 @@
     def add_inventory_item(self, name):
         self.inventory.append(self.items[name])
 
+    def is_in_inventory(self, name):
+        return self.items[name] in self.inventory
+
     def remove_inventory_item(self, name):
         self.inventory.remove(self.items[name])
         # Unselect tool if it's removed
--- a/gamelib/tests/game_logic_utils.py	Sat Aug 28 14:01:17 2010 +0200
+++ b/gamelib/tests/game_logic_utils.py	Sat Aug 28 14:10:54 2010 +0200
@@ -40,7 +40,7 @@
         self.assertEquals(value, gizmo.get_data(key))
 
     def assert_inventory_item(self, item, in_inventory=True):
-        self.assertEquals(in_inventory, self.state.items[item] in self.state.inventory)
+        self.assertEquals(in_inventory, self.state.is_in_inventory(item))
 
     def assert_scene_thing(self, thing, in_scene=True):
         self.assertEquals(in_scene, thing in self.state.current_scene.things)