Merge branch 'main' into StardewValley/properly-support-universal-tra…

…cker
Jouramie · Jul 14, 2024 · 0420c9b · 0420c9b
2 parents 173a0bf + eaec41d
commit 0420c9b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/worlds/tunic/er_scripts.py b/worlds/tunic/er_scripts.py
@@ -67,7 +67,7 @@ def create_er_regions(world: "TunicWorld") -> Dict[Portal, Portal]:
     "Eastern Vault West Fuses": "Eastern Vault Fortress",
     "Eastern Vault East Fuse": "Eastern Vault Fortress",
     "Quarry Connector Fuse": "Quarry Connector",
-    "Quarry Fuse": "Quarry",
+    "Quarry Fuse": "Quarry Entry",
     "Ziggurat Fuse": "Rooted Ziggurat Lower Back",
     "West Garden Fuse": "West Garden",
     "Library Fuse": "Library Lab",

diff --git a/worlds/zillion/client.py b/worlds/zillion/client.py
@@ -347,6 +347,11 @@ def process_from_game_queue(self) -> None:
                         "operations": [{"operation": "replace", "value": doors_b64}]
                     }
                     async_start(self.send_msgs([payload]))
+            elif isinstance(event_from_game, events.MapEventFromGame):
+                row = event_from_game.map_index // 8
+                col = event_from_game.map_index % 8
+                room_name = f"({chr(row + 64)}-{col + 1})"
+                logger.info(f"You are at {room_name}")
             else:
                 logger.warning(f"WARNING: unhandled event from game {event_from_game}")
 

diff --git a/worlds/zillion/gen_data.py b/worlds/zillion/gen_data.py
@@ -28,6 +28,13 @@ def to_json(self) -> str:
     def from_json(gen_data_str: str) -> "GenData":
         """ the reverse of `to_json` """
         from_json = json.loads(gen_data_str)
+
+        # backwards compatibility for seeds generated before new map_gen options
+        room_gen = from_json["zz_game"]["options"].get("room_gen", None)
+        if room_gen is not None:
+            from_json["zz_game"]["options"]["map_gen"] = {False: "none", True: "rooms"}.get(room_gen, "none")
+            del from_json["zz_game"]["options"]["room_gen"]
+
         return GenData(
             from_json["multi_items"],
             ZzGame.from_jsonable(from_json["zz_game"]),

diff --git a/worlds/zillion/requirements.txt b/worlds/zillion/requirements.txt
@@ -1,2 +1,2 @@
-zilliandomizer @ git+https://github.com/beauxq/zilliandomizer@4a2fec0aa1c529df866e510cdfcf6dca4d53679b#0.8.0
+zilliandomizer @ git+https://github.com/beauxq/zilliandomizer@33045067f626266850f91c8045b9d3a9f52d02b0#0.9.0
 typing-extensions>=4.7, <5