From 9a40c9dc0f6b83b176dfeffc66c73899e919bc8d Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Sat, 7 Feb 2026 17:01:23 -0600 Subject: [PATCH] More settings! --- .gitmodules | 4 ++++ ALttPRandomizer/Model/SeedSettings.cs | 6 +++++- PikitRandomizer | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) create mode 160000 PikitRandomizer diff --git a/.gitmodules b/.gitmodules index 62b1fad..40e293f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,7 @@ path = BetaRandomizer url = https://git.gwaa.kiwi/alttpr-gwaa-kiwi/alttpr-python branch = beta +[submodule "PikitRandomizer"] + path = PikitRandomizer + url = https://git.gwaa.kiwi/alttpr-gwaa-kiwi/alttpr-python.git + branch = pikit diff --git a/ALttPRandomizer/Model/SeedSettings.cs b/ALttPRandomizer/Model/SeedSettings.cs index d6ad5bb..4e2f645 100644 --- a/ALttPRandomizer/Model/SeedSettings.cs +++ b/ALttPRandomizer/Model/SeedSettings.cs @@ -16,6 +16,7 @@ public RaceMode Race { get; set; } = RaceMode.Normal; [ForbiddenSetting([Apr2025], Mode.Inverted)] + [RequiredSetting([Pikit], Mode.Open)] public Mode Mode { get; set; } = Mode.Open; [SettingName("swords")] @@ -72,6 +73,7 @@ [SettingName("shuffleenemies")] [IgnoreSetting(Apr2025)] + [RequiredSetting([Pikit], EnemyShuffle.Vanilla)] public EnemyShuffle EnemyShuffle { get; set; } = EnemyShuffle.Vanilla; [SettingName("shuffle_damage_table")] @@ -115,6 +117,7 @@ public PotShuffle PotShuffle { get; set; } = PotShuffle.Vanilla; [IgnoreSetting(Apr2025)] + [RequiredSetting([Pikit], PrizeShuffle.Vanilla)] public PrizeShuffle PrizeShuffle { get; set; } = PrizeShuffle.Vanilla; [NoSettingName] @@ -186,7 +189,7 @@ public OverworldMapFog OverworldMapFog { get; set; } = OverworldMapFog.Fog; [NoSettingName] - [IgnoreSetting(Apr2025)] + [IgnoreSetting(Apr2025, Pikit)] public TileSwap TileSwap { get; set; } = TileSwap.Vanilla; [SettingName("damage_challenge")] @@ -200,6 +203,7 @@ public enum RandomizerInstance { [GeneratorSettings("base", "GK_", "--bps", "--spoiler=json")] Base, [GeneratorSettings("beta", "GK_", "--bps", "--spoiler=json")] Beta, + [GeneratorSettings("pikit", "GK_", "--bps", "--spoiler=json")] Pikit, [GeneratorSettings("apr2025", "ER_", requireFlips: true, "--json_spoiler")] Apr2025, } diff --git a/PikitRandomizer b/PikitRandomizer new file mode 160000 index 0000000..2738f61 --- /dev/null +++ b/PikitRandomizer @@ -0,0 +1 @@ +Subproject commit 2738f61c0d2db0e7b10efee311eaa024d982d9e4