Merge pull request #25 from MarcCote/bf_objects_disambiguation

BF: objects disambiguation for 2-arity actions.

Author: tavianator

textworld/generator/inform7/tests/test_world2inform7.py

@@ -165,6 +165,54 @@ def test_names_disambiguation():
         assert "tasty apple" in game_state.inventory
         assert "tasty apple" not in game_state.description
 
+    # With two-argument actions.
+    M = textworld.GameMaker()
+    roomA = M.new_room("roomA")
+    roomB = M.new_room("roomB")
+    roomC = M.new_room("roomC")
+    M.set_player(roomA)
+
+    path = M.connect(roomA.east, roomB.west)
+    gateway = M.new_door(path, name="gateway")
+    
+    path = M.connect(roomA.west, roomC.east)
+    rectangular_gateway = M.new_door(path, name="rectangular gateway")
+
+    keycard = M.new(type="k", name="keycard")
+    rectangular_keycard = M.new(type="k", name="rectangular keycard")
+    roomA.add(keycard, rectangular_keycard)
+
+    M.add_fact("match", keycard, gateway)
+    M.add_fact("match", rectangular_keycard, rectangular_gateway)
+    M.add_fact("locked", gateway)
+    M.add_fact("locked", rectangular_gateway)
+
+    game = M.build()
+    game_name = "test_names_disambiguation"
+    with make_temp_directory(prefix=game_name) as tmpdir:
+        game_file = compile_game(game, game_name, games_folder=tmpdir)
+        env = textworld.start(game_file)
+        env.reset()
+        game_state, _, done = env.step("take keycard")
+        assert "keycard" in game_state.inventory
+        game_state, _, done = env.step("take keycard")
+        assert "rectangular keycard" in game_state.inventory
+
+        game_state, _, done = env.step("unlock gateway with rectangular keycard")
+        assert "That doesn't seem to fit the lock." in game_state.command_feedback
+        game_state, _, done = env.step("unlock gateway with keycard")
+        game_state, _, done = env.step("open gateway")
+        game_state, _, done = env.step("go east")
+        assert "-= Roomb =-" in game_state.description
+
+        game_state, _, done = env.step("go west")
+        game_state, _, done = env.step("unlock rectangular gateway with keycard")
+        assert "That doesn't seem to fit the lock." in game_state.command_feedback
+        game_state, _, done = env.step("unlock rectangular gateway with rectangular keycard")
+        game_state, _, done = env.step("open rectangular gateway")
+        game_state, _, done = env.step("go west")
+        assert "-= Roomc =-" in game_state.description
+
 
 def test_take_all_and_variants():
     M = textworld.GameMaker()

textworld/generator/inform7/world2inform7.py

@@ -329,8 +329,10 @@ def generate_inform7_source(game, seed=1234, use_i7_description=False):
     # Refeering to an object by it whole name shouldn't be ambiguous.
     source += textwrap.dedent("""\
     Does the player mean doing something with something (called target):
-        if the player's command matches the text printed name of the target:
-            it is very likely.
+	if the player's command matches the text printed name of the target and the second noun is nothing:
+		it is very likely;
+	if the player's command matches the text printed name of the target and the player's command matches the text printed name of the second noun:
+		it is very likely.  [Handle action with two arguments.]
 
     """)
 
@@ -391,11 +393,8 @@ def generate_inform7_source(game, seed=1234, use_i7_description=False):
         remove the list of containers from L;
         remove the list of supporters from L;
         remove the list of doors from L;
-        if the number of entries in L is 1:
-            say "There is [L with indefinite articles] on the floor.";
-        else if the number of entries in L is greater than 1:
-            say "There's [L with indefinite articles] on the floor.";
-
+        say "There is [L with indefinite articles] on the floor.";
+        
     """)
 
     # Print properties of objects when listing the inventory contents and the room contents.