From 3cd3bd136228abbfdc12f37855f6982d6c7dc84a Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Sat, 8 Mar 2025 19:34:26 -0600
Subject: [PATCH] Add door shuffle, flute, and lamp settings

---
 ALttPRandomizer/Model/SeedSettings.cs | 66 +++++++++++++++++++++++++++
 ALttPRandomizer/Program.cs            |  2 +-
 Apr2025Randomizer                     |  2 +-
 BaseRandomizer                        |  2 +-
 4 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/ALttPRandomizer/Model/SeedSettings.cs b/ALttPRandomizer/Model/SeedSettings.cs
index 762468e..e849b7d 100644
--- a/ALttPRandomizer/Model/SeedSettings.cs
+++ b/ALttPRandomizer/Model/SeedSettings.cs
@@ -91,6 +91,32 @@
         [NoSettingName]
         [ForbiddenSetting([Apr2025], BootsSettings.Starting)]
         public BootsSettings Boots { get; set; } = BootsSettings.Normal;
+
+        [NoSettingName]
+        [RequiredSetting([Apr2025], FluteSettings.Normal)]
+        public FluteSettings Flute { get; set; } = FluteSettings.Normal;
+
+        [SettingName("dark_rooms")]
+        [RequiredSetting([Apr2025], DarkRoomSettings.RequireLamp)]
+        [NoSettingName([Apr2025])]
+        public DarkRoomSettings DarkRooms { get; set; } = DarkRoomSettings.RequireLamp;
+
+        [SettingName("door_shuffle")]
+        [RequiredSetting([Apr2025], DoorShuffle.Vanilla)]
+        [NoSettingName([Apr2025])]
+        public DoorShuffle DoorShuffle { get; set; } = DoorShuffle.Vanilla;
+
+        [SettingName("intensity")]
+        [NoSettingName([Apr2025])]
+        public DoorLobbies Lobbies { get; set; } = DoorLobbies.Vanilla;
+
+        [SettingName("door_type_mode")]
+        [NoSettingName([Apr2025])]
+        public DoorTypeMode DoorTypeMode { get; set; } = DoorTypeMode.Big;
+
+        [SettingName("trap_door_mode")]
+        [NoSettingName([Apr2025])]
+        public TrapDoorMode TrapDoorMode { get; set; } = TrapDoorMode.Optional;
     }
 
     public enum RandomizerInstance {
@@ -221,4 +247,44 @@
         [AdditionalSetting("--pseudoboots")] Pseudoboots,
         [AddStartingItems("Pegasus_Boots")] Starting,
     }
+
+    public enum FluteSettings {
+        Normal,
+        [AdditionalSetting("--flute_mode=active")] Preactivated,
+        [AddStartingItems("Ocarina_(Activated)")] Starting,
+    }
+
+    public enum DarkRoomSettings {
+        [SettingName("require_lamp")] RequireLamp,
+        [SettingName("always_light_cone")] AlwaysLightCone,
+        [SettingName("no_dark_rooms")] NoDarkRooms,
+        [SettingName("require_lamp")] [AddStartingItems("Lamp")] StartingLamp,
+    }
+
+    public enum DoorShuffle {
+        Vanilla,
+        Basic,
+        Paired,
+        Partitioned,
+        Crossed,
+    }
+
+    public enum DoorLobbies {
+        [SettingName("2")] Vanilla,
+        [SettingName("3")] Shuffled,
+    }
+
+    public enum DoorTypeMode {
+        Original,
+        Big,
+        All,
+        Chaos,
+    }
+
+    public enum TrapDoorMode {
+        Vanilla,
+        Optional,
+        Boss,
+        [SettingName("oneway")] RemoveAll,
+    }
 }
diff --git a/ALttPRandomizer/Program.cs b/ALttPRandomizer/Program.cs
index 795269d..ebb7f82 100644
--- a/ALttPRandomizer/Program.cs
+++ b/ALttPRandomizer/Program.cs
@@ -44,7 +44,7 @@
             builder.Services.AddCors(options => {
                 options.AddPolicy("AllowDomains", policy => {
                     foreach (var domain in settings.AllowedCors) {
-                        policy.WithOrigins(domain);
+                        policy.WithOrigins(domain).AllowAnyHeader();
                     }
                 });
             });
diff --git a/Apr2025Randomizer b/Apr2025Randomizer
index 816ddb6..e6d24db 160000
--- a/Apr2025Randomizer
+++ b/Apr2025Randomizer
@@ -1 +1 @@
-Subproject commit 816ddb63e25bde258d4190b91b472db83e1cb370
+Subproject commit e6d24db03e6a5c7cb3b299bde6ed3ef5f6688fa5
diff --git a/BaseRandomizer b/BaseRandomizer
index 82815d2..8436b32 160000
--- a/BaseRandomizer
+++ b/BaseRandomizer
@@ -1 +1 @@
-Subproject commit 82815d256daa3d74fa3523dfc7b1dd6a95d67ee8
+Subproject commit 8436b32b29b18be637266bcf019b0e786c928fb0