From 82bfff067739be4768b45354b38afe4c6f55d502 Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Sun, 4 May 2025 15:28:28 -0500
Subject: [PATCH] Pull in follower shuffle update

---
 ALttPRandomizer/Model/SeedSettings.cs | 11 +++++++++++
 Apr2025Randomizer                     |  2 +-
 BaseRandomizer                        |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ALttPRandomizer/Model/SeedSettings.cs b/ALttPRandomizer/Model/SeedSettings.cs
index a3e1e54..ffe4ae4 100644
--- a/ALttPRandomizer/Model/SeedSettings.cs
+++ b/ALttPRandomizer/Model/SeedSettings.cs
@@ -19,6 +19,7 @@
         public Mode Mode { get; set; } = Mode.Open;
 
         [SettingName("swords")]
+        [ForbiddenSetting([Apr2025], Weapons.Swordless, Weapons.AssuredMaster)]
         public Weapons Weapons { get; set; } = Weapons.Random;
 
         [RequiredSetting([Apr2025], Goal.Ganon)]
@@ -130,6 +131,10 @@
         [NoSettingName([Apr2025])]
         public TrapDoorMode TrapDoorMode { get; set; } = TrapDoorMode.Optional;
 
+        [NoSettingName]
+        [RequiredSetting([Apr2025], FollowerShuffle.Vanilla)]
+        public FollowerShuffle FollowerShuffle { get; set; } = FollowerShuffle.Vanilla;
+
         [NoSettingName]
         public Hints Hints { get; set; } = Hints.Off;
     }
@@ -155,6 +160,7 @@
         Assured,
         Vanilla,
         Swordless,
+        [SettingName("assured")] [AddStartingItems("Progressive_Sword")] AssuredMaster,
     }
 
     public enum Goal {
@@ -314,6 +320,11 @@
         [SettingName("oneway")] RemoveAll,
     }
 
+    public enum FollowerShuffle {
+        Vanilla,
+        [AdditionalSetting("--shuffle_followers")] Shuffled,
+    }
+
     public enum Hints {
         Off,
         [AdditionalSetting("--hints")] On,
diff --git a/Apr2025Randomizer b/Apr2025Randomizer
index e6d24db..84adf1d 160000
--- a/Apr2025Randomizer
+++ b/Apr2025Randomizer
@@ -1 +1 @@
-Subproject commit e6d24db03e6a5c7cb3b299bde6ed3ef5f6688fa5
+Subproject commit 84adf1dd89db9b1f3e4fd61b70aa7223aafae5db
diff --git a/BaseRandomizer b/BaseRandomizer
index 9b77bb4..0427099 160000
--- a/BaseRandomizer
+++ b/BaseRandomizer
@@ -1 +1 @@
-Subproject commit 9b77bb4ac358473521ec31e1ff33ba996dacbcb7
+Subproject commit 04270990cbd9f51d8785e6a5d15f32bdeb173b55