# HG changeset patch # User Neil Muller # Date 1282997454 -7200 # Node ID a1ffc919d0c11fea736a891b35d4d2c55690087c # Parent 8f85902f4cb6ec8ab1af59f6e9d2757a580f7da5 Add is_in_inventory helper diff -r 8f85902f4cb6 -r a1ffc919d0c1 gamelib/state.py --- 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 diff -r 8f85902f4cb6 -r a1ffc919d0c1 gamelib/tests/game_logic_utils.py --- 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)