Merge pull request #287 from /issues/285-transition-bug

Issues/285 transition bug
Dallinger · May 21, 2024 · 259aadd · 259aadd
2 parents 9f605c6 + b091cb5
commit 259aadd
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 5 deletions.
diff --git a/dlgr/griduniverse/experiment.py b/dlgr/griduniverse/experiment.py
@@ -1613,11 +1613,15 @@ def handle_item_transition(self, msg):
 
         # The player's item type has changed
         if transition["actor_end"] != actor_key:
-            new_player_item = Item(
-                id=len(self.grid.item_locations) + len(self.grid.items_consumed),
-                item_config=self.item_config[transition["actor_end"]],
-            )
-            player.current_item = new_player_item
+            if transition["actor_end"] is not None:
+                replacement_item_config = self.item_config.get(transition["actor_end"])
+                replacement_item = Item(
+                    id=len(self.grid.item_locations) + len(self.grid.items_consumed),
+                    item_config=replacement_item_config,
+                )
+            else:
+                replacement_item = None
+            player.current_item = replacement_item
             self.grid.items_updated = True
 
         # The location's item type has changed

diff --git a/test/test_transitions.py b/test/test_transitions.py
@@ -83,6 +83,32 @@ def test_handle_item_transition_combine_items(self, mocked_exp, player):
         assert len(mocked_exp.grid.item_locations) == 1
         assert list(mocked_exp.grid.item_locations.values())[0].name == "Big Hard Rock"
 
+    def test_handle_item_transition_transforms_items(self, mocked_exp, player):
+        mocked_exp.transition_config[("stone", "big_hard_rock")] = {
+            "actor_start": "stone",
+            "actor_end": None,
+            "target_start": "big_hard_rock",
+            "target_end": "sharp_stone",
+            "last_use": False,
+            "modify_uses": [0, 0],
+            "visible": "always",
+        }
+        big_hard_rock = create_item(**mocked_exp.item_config["big_hard_rock"])
+        stone = create_item(**mocked_exp.item_config["stone"])
+        mocked_exp.grid.item_locations[(0, 0)] = big_hard_rock
+        player.current_item = stone
+
+        mocked_exp.handle_item_transition(
+            msg={"player_id": player.id, "position": (0, 0)}
+        )
+
+        # The Stone and the Big Hard Rock have been transformed into a
+        # Sharp Stone on the square where the Big Hard Rock was before
+        assert player.current_item is None
+        assert len(mocked_exp.grid.items_consumed) == 2
+        assert len(mocked_exp.grid.item_locations) == 1
+        assert list(mocked_exp.grid.item_locations.values())[0].name == "Sharp Stone"
+
     def test_handle_item_transition_reduces_items_remaining(self, mocked_exp, player):
         gooseberry_bush = create_item(**mocked_exp.item_config["gooseberry_bush"])
         assert gooseberry_bush.name == "Gooseberry Bush"