diff --git a/.gitmodules b/.gitmodules index 40e293f..f9c3072 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,7 +9,7 @@ [submodule "BetaRandomizer"] path = BetaRandomizer url = https://git.gwaa.kiwi/alttpr-gwaa-kiwi/alttpr-python - branch = beta + branch = beta_2 [submodule "PikitRandomizer"] path = PikitRandomizer url = https://git.gwaa.kiwi/alttpr-gwaa-kiwi/alttpr-python.git diff --git a/ALttPRandomizer/Model/SeedSettings.cs b/ALttPRandomizer/Model/SeedSettings.cs index 5e04a53..12f45df 100644 --- a/ALttPRandomizer/Model/SeedSettings.cs +++ b/ALttPRandomizer/Model/SeedSettings.cs @@ -1,5 +1,4 @@ namespace ALttPRandomizer.Model { - using ALttPRandomizer.Randomizers; using ALttPRandomizer.Settings; using System.Text.Json.Serialization; @@ -159,6 +158,10 @@ [IgnoreSetting(Apr2025)] public TrapDoorMode TrapDoorMode { get; set; } = TrapDoorMode.Some; + [SettingName("extra_keys")] + [IgnoreSetting(Apr2025, Base)] + public ExtraKeysMode ExtraKeys { get; set; } = ExtraKeysMode.None; + [NoSettingName] [IgnoreSetting(Apr2025)] public FollowerShuffle FollowerShuffle { get; set; } = FollowerShuffle.Vanilla; @@ -475,6 +478,14 @@ [SettingName("oneway")] RemoveAll, } + public enum ExtraKeysMode { + [SettingName("0")] None, + [SettingName("1")] Extra1, + [SettingName("20")] Percent20, + [SettingName("30")] Percent30, + [SettingName("40")] Percent40, + } + public enum FluteShuffle { Vanilla, Random, diff --git a/BetaRandomizer b/BetaRandomizer index b1a71ef..24ebf30 160000 --- a/BetaRandomizer +++ b/BetaRandomizer @@ -1 +1 @@ -Subproject commit b1a71ef9b19bed782cc216ae939d7a912550c383 +Subproject commit 24ebf3037a22e41b1364e3b3cc07917ef9515f67