From 50f7a79ea75e2b7eb0ff4c3881408485b4e9ec4e Mon Sep 17 00:00:00 2001
From: Doug Hoskisson <beauxq@users.noreply.github.com>
Date: Tue, 2 Jul 2024 19:32:01 -0700
Subject: [PATCH] Zillion: new map generation feature (#3604)

---
 worlds/zillion/__init__.py      |  6 +++---
 worlds/zillion/options.py       | 34 +++++++++++++++++++++++++--------
 worlds/zillion/requirements.txt |  2 +-
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/worlds/zillion/__init__.py b/worlds/zillion/__init__.py
index 205cc9ad6ba1..cf61d93ca4ce 100644
--- a/worlds/zillion/__init__.py
+++ b/worlds/zillion/__init__.py
@@ -145,10 +145,10 @@ def generate_early(self) -> None:
         self._item_counts = item_counts
 
         with redirect_stdout(self.lsi):  # type: ignore
-            self.zz_system.make_randomizer(zz_op)
-
-            self.zz_system.seed(self.multiworld.seed)
+            self.zz_system.set_options(zz_op)
+            self.zz_system.seed(self.random.randrange(1999999999))
             self.zz_system.make_map()
+            self.zz_system.make_randomizer()
 
         # just in case the options changed anything (I don't think they do)
         assert self.zz_system.randomizer, "init failed"
diff --git a/worlds/zillion/options.py b/worlds/zillion/options.py
index d75dd1a1c22c..5de0b65c82f0 100644
--- a/worlds/zillion/options.py
+++ b/worlds/zillion/options.py
@@ -1,9 +1,9 @@
 from collections import Counter
 from dataclasses import dataclass
-from typing import ClassVar, Dict, Tuple
+from typing import ClassVar, Dict, Literal, Tuple
 from typing_extensions import TypeGuard  # remove when Python >= 3.10
 
-from Options import Choice, DefaultOnToggle, NamedRange, OptionGroup, PerGameCommonOptions, Range, Toggle
+from Options import Choice, DefaultOnToggle, NamedRange, OptionGroup, PerGameCommonOptions, Range, Removed, Toggle
 
 from zilliandomizer.options import (
     Options as ZzOptions, char_to_gun, char_to_jump, ID,
@@ -251,9 +251,25 @@ class ZillionStartingCards(NamedRange):
     }
 
 
-class ZillionRoomGen(Toggle):
-    """ whether to generate rooms with random terrain """
-    display_name = "room generation"
+class ZillionMapGen(Choice):
+    """
+    - none: vanilla map
+    - rooms: random terrain inside rooms, but path through base is vanilla
+    - full: random path through base
+    """
+    display_name = "map generation"
+    option_none = 0
+    option_rooms = 1
+    option_full = 2
+    default = 0
+
+    def zz_value(self) -> Literal['none', 'rooms', 'full']:
+        if self.value == ZillionMapGen.option_none:
+            return "none"
+        if self.value == ZillionMapGen.option_rooms:
+            return "rooms"
+        assert self.value == ZillionMapGen.option_full
+        return "full"
 
 
 @dataclass
@@ -276,7 +292,9 @@ class ZillionOptions(PerGameCommonOptions):
     early_scope: ZillionEarlyScope
     skill: ZillionSkill
     starting_cards: ZillionStartingCards
-    room_gen: ZillionRoomGen
+    map_gen: ZillionMapGen
+
+    room_gen: Removed
 
 
 z_option_groups = [
@@ -375,7 +393,7 @@ def validate(options: ZillionOptions) -> "Tuple[ZzOptions, Counter[str]]":
 
     starting_cards = options.starting_cards
 
-    room_gen = options.room_gen
+    map_gen = options.map_gen.zz_value()
 
     zz_item_counts = convert_item_counts(item_counts)
     zz_op = ZzOptions(
@@ -393,7 +411,7 @@ def validate(options: ZillionOptions) -> "Tuple[ZzOptions, Counter[str]]":
         bool(options.early_scope.value),
         True,  # balance defense
         starting_cards.value,
-        bool(room_gen.value)
+        map_gen
     )
     zz_validate(zz_op)
     return zz_op, item_counts
diff --git a/worlds/zillion/requirements.txt b/worlds/zillion/requirements.txt
index ae7d9b173308..b4f554902f48 100644
--- a/worlds/zillion/requirements.txt
+++ b/worlds/zillion/requirements.txt
@@ -1,2 +1,2 @@
-zilliandomizer @ git+https://github.com/beauxq/zilliandomizer@1dd2ce01c9d818caba5844529699b3ad026d6a07#0.7.1
+zilliandomizer @ git+https://github.com/beauxq/zilliandomizer@4a2fec0aa1c529df866e510cdfcf6dca4d53679b#0.8.0
 typing-extensions>=4.7, <5