Mercurial > pyntnclick

diff gamelib/tests/test_scene_interactions_cryo.py @ 816:eed75a1d50c4 pyntnclick

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Better Item handling.
author Jeremy Thurgood <firxen@gmail.com>
date Sun, 27 Jan 2013 22:19:39 +0200
parents bdaffaa8b6bf
children
line wrap: on
line diff
--- a/gamelib/tests/test_scene_interactions_cryo.py	Sun Jan 27 22:09:34 2013 +0200
+++ b/gamelib/tests/test_scene_interactions_cryo.py	Sun Jan 27 22:19:39 2013 +0200
@@ -23,10 +23,10 @@
         self.state.add_inventory_item('titanium_leg')
         self.assert_game_data('door', 'shut', 'cryo.door')
 
-        self.interact_thing('cryo.door', 'titanium_leg')
+        self.interact_thing('cryo.door', 'titanium_leg:')
 
         self.assert_game_data('door', 'shut', 'cryo.door')
-        self.assert_inventory_item('titanium_leg', True)
+        self.assert_inventory_item('titanium_leg:', True)
 
     def test_cryo_door_ajar_hand(self):
         "The door is ajar and we touch it with the hand. No change."
@@ -43,10 +43,10 @@
         self.state.add_inventory_item('titanium_leg')
         self.set_game_data('door', 'ajar', 'cryo.door')
 
-        self.interact_thing('cryo.door', 'titanium_leg')
+        self.interact_thing('cryo.door', 'titanium_leg:')
 
         self.assert_game_data('door', 'open', 'cryo.door')
-        self.assert_inventory_item('titanium_leg', True)
+        self.assert_inventory_item('titanium_leg:', True)
 
     def test_cryo_door_open_hand(self):
         "The door is open and we touch it with the hand. We go to the map."
@@ -64,7 +64,7 @@
         self.state.add_inventory_item('titanium_leg')
         self.set_game_data('door', 'open', 'cryo.door')
 
-        self.interact_thing('cryo.door', 'titanium_leg')
+        self.interact_thing('cryo.door', 'titanium_leg:')
 
         self.assert_game_data('door', 'open', 'cryo.door')
         self.assert_current_scene('cryo')
@@ -74,12 +74,12 @@
 
         self.interact_thing('cryo.unit.1')
         self.assert_game_data('contains_titanium_leg', True, 'cryo.unit.1')
-        self.assert_inventory_item('titanium_leg', False)
+        self.assert_inventory_item('titanium_leg:', False)
         self.assert_detail_thing('cryo.titanium_leg', True)
 
         self.interact_thing('cryo.titanium_leg', detail='cryo_detail')
 
-        self.assert_inventory_item('titanium_leg', True)
+        self.assert_inventory_item('titanium_leg:', True)
         self.assert_detail_thing('cryo.titanium_leg', False)
         self.assert_game_data('contains_titanium_leg', False, 'cryo.unit.1')
 
@@ -128,26 +128,26 @@
         self.assert_game_data('fixed', True, 'cryo.pipe.left')
         self.assert_game_data('fixed', True, 'cryo.pipe.right.top')
         self.assert_game_data('fixed', True, 'cryo.pipe.right.bottom')
-        self.assert_item_exists('cryo_pipe.0', False)
-        self.assert_item_exists('cryo_pipe.1', False)
-        self.assert_item_exists('cryo_pipe.2', False)
+        self.assert_item_exists('cryo_pipe:0', False)
+        self.assert_item_exists('cryo_pipe:1', False)
+        self.assert_item_exists('cryo_pipe:2', False)
 
         self.assertNotEquals(
-            None, self.interact_thing('cryo.pipe.left', 'machete'))
+            None, self.interact_thing('cryo.pipe.left', 'machete:'))
         self.assertNotEquals(
-            None, self.interact_thing('cryo.pipe.right.top', 'machete'))
+            None, self.interact_thing('cryo.pipe.right.top', 'machete:'))
         self.assertNotEquals(
-            None, self.interact_thing('cryo.pipe.right.bottom', 'machete'))
+            None, self.interact_thing('cryo.pipe.right.bottom', 'machete:'))
 
         self.assert_game_data('fixed', False, 'cryo.pipe.left')
         self.assert_game_data('fixed', False, 'cryo.pipe.right.top')
         self.assert_game_data('fixed', False, 'cryo.pipe.right.bottom')
-        self.assert_item_exists('tube_fragment.0')
-        self.assert_item_exists('tube_fragment.1')
-        self.assert_item_exists('tube_fragment.2')
-        self.assert_inventory_item('tube_fragment.0', True)
-        self.assert_inventory_item('tube_fragment.1', True)
-        self.assert_inventory_item('tube_fragment.2', True)
+        self.assert_item_exists('tube_fragment:0')
+        self.assert_item_exists('tube_fragment:1')
+        self.assert_item_exists('tube_fragment:2')
+        self.assert_inventory_item('tube_fragment:0', True)
+        self.assert_inventory_item('tube_fragment:1', True)
+        self.assert_inventory_item('tube_fragment:2', True)
 
     def test_pipes_chopped_machete(self):
         "Touch the chopped cryopipes with the machete. No change."
@@ -158,11 +158,11 @@
         self.set_game_data('fixed', False, 'cryo.pipe.right.bottom')
 
         self.assertEquals(
-            None, self.interact_thing('cryo.pipe.left', 'machete'))
+            None, self.interact_thing('cryo.pipe.left', 'machete:'))
         self.assertEquals(
-            None, self.interact_thing('cryo.pipe.right.top', 'machete'))
+            None, self.interact_thing('cryo.pipe.right.top', 'machete:'))
         self.assertEquals(
-            None, self.interact_thing('cryo.pipe.right.bottom', 'machete'))
+            None, self.interact_thing('cryo.pipe.right.bottom', 'machete:'))
 
         self.assert_game_data('fixed', False, 'cryo.pipe.left')
         self.assert_game_data('fixed', False, 'cryo.pipe.right.top')