Pull in follower shuffle update

This commit is contained in:
2025-05-04 15:28:28 -05:00
parent 901c94e340
commit 82bfff0677
3 changed files with 13 additions and 2 deletions

View File

@@ -19,6 +19,7 @@
public Mode Mode { get; set; } = Mode.Open; public Mode Mode { get; set; } = Mode.Open;
[SettingName("swords")] [SettingName("swords")]
[ForbiddenSetting([Apr2025], Weapons.Swordless, Weapons.AssuredMaster)]
public Weapons Weapons { get; set; } = Weapons.Random; public Weapons Weapons { get; set; } = Weapons.Random;
[RequiredSetting([Apr2025], Goal.Ganon)] [RequiredSetting([Apr2025], Goal.Ganon)]
@@ -130,6 +131,10 @@
[NoSettingName([Apr2025])] [NoSettingName([Apr2025])]
public TrapDoorMode TrapDoorMode { get; set; } = TrapDoorMode.Optional; public TrapDoorMode TrapDoorMode { get; set; } = TrapDoorMode.Optional;
[NoSettingName]
[RequiredSetting([Apr2025], FollowerShuffle.Vanilla)]
public FollowerShuffle FollowerShuffle { get; set; } = FollowerShuffle.Vanilla;
[NoSettingName] [NoSettingName]
public Hints Hints { get; set; } = Hints.Off; public Hints Hints { get; set; } = Hints.Off;
} }
@@ -155,6 +160,7 @@
Assured, Assured,
Vanilla, Vanilla,
Swordless, Swordless,
[SettingName("assured")] [AddStartingItems("Progressive_Sword")] AssuredMaster,
} }
public enum Goal { public enum Goal {
@@ -314,6 +320,11 @@
[SettingName("oneway")] RemoveAll, [SettingName("oneway")] RemoveAll,
} }
public enum FollowerShuffle {
Vanilla,
[AdditionalSetting("--shuffle_followers")] Shuffled,
}
public enum Hints { public enum Hints {
Off, Off,
[AdditionalSetting("--hints")] On, [AdditionalSetting("--hints")] On,