From 1e3a4b6db5acff8e82bdecdc79773f2923de919a Mon Sep 17 00:00:00 2001
From: Doug Hoskisson <beauxq@users.noreply.github.com>
Date: Wed, 10 Jul 2024 23:11:47 -0700
Subject: [PATCH] Zillion: more rooms added to map_gen option (#3634)

---
 worlds/zillion/client.py        | 5 +++++
 worlds/zillion/gen_data.py      | 7 +++++++
 worlds/zillion/requirements.txt | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/worlds/zillion/client.py b/worlds/zillion/client.py
index be320284..09d0565e 100644
--- a/worlds/zillion/client.py
+++ b/worlds/zillion/client.py
@@ -347,6 +347,11 @@ class ZillionContext(CommonContext):
                         "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
index aa24ff89..13cbee9c 100644
--- a/worlds/zillion/gen_data.py
+++ b/worlds/zillion/gen_data.py
@@ -28,6 +28,13 @@ class GenData:
     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
index b4f55490..d6b01ac1 100644
--- 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