From fe33bd83b06ef715001a0028788a7e978084276b Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Thu, 8 Jan 2026 08:27:26 -0600 Subject: [PATCH] showloot setting --- ALttPRandomizer/Model/SeedSettings.cs | 23 ++++++++++++++++++- ALttPRandomizer/Randomizers/BaseRandomizer.cs | 3 ++- DungeonMapRandomizer | 2 +- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/ALttPRandomizer/Model/SeedSettings.cs b/ALttPRandomizer/Model/SeedSettings.cs index 93722c8..4d62aa6 100644 --- a/ALttPRandomizer/Model/SeedSettings.cs +++ b/ALttPRandomizer/Model/SeedSettings.cs @@ -87,6 +87,11 @@ [NoSettingName([Apr2025])] public DungeonItemLocations Compasses { get; set; } = DungeonItemLocations.Dungeon; + [SettingName("showloot")] + [RequiredSetting([Apr2025, Base], ShowLoot.Never)] + [NoSettingName([Apr2025, Base])] + public ShowLoot ShowLoot { get; set; } = ShowLoot.Never; + [NoSettingName] [RequiredSetting([Apr2025], ShopShuffle.Vanilla)] public ShopShuffle ShopShuffle { get; set; } = ShopShuffle.Vanilla; @@ -124,8 +129,12 @@ [RequiredSetting([Apr2025], BookSettings.Normal)] public BookSettings Book { get; set; } = BookSettings.Normal; + [NoSettingName] + [RequiredSetting([Apr2025], MirrorSettings.Normal)] + public MirrorSettings Mirror { get; set; } = MirrorSettings.Normal; + [SettingName("door_shuffle")] - [RequiredSetting([Apr2025, DungeonMap], DoorShuffle.Vanilla)] + [RequiredSetting([Apr2025], DoorShuffle.Vanilla)] [NoSettingName([Apr2025])] public DoorShuffle DoorShuffle { get; set; } = DoorShuffle.Vanilla; @@ -311,12 +320,24 @@ Wild, } + public enum ShowLoot { + Never, + Compass, + Always, + } + public enum BootsSettings { Normal, [AdditionalSetting("--pseudoboots")] Pseudoboots, [AddStartingItems("Pegasus_Boots")] Starting, } + public enum MirrorSettings { + Normal, + [AdditionalSetting("--mirrorscroll")] Scroll, + [AddStartingItems("Magic_Mirror")] Starting, + } + public enum FluteSettings { Normal, [AdditionalSetting("--flute_mode=pseudo")] Pseudoflute, diff --git a/ALttPRandomizer/Randomizers/BaseRandomizer.cs b/ALttPRandomizer/Randomizers/BaseRandomizer.cs index fbdc540..33d4ab6 100644 --- a/ALttPRandomizer/Randomizers/BaseRandomizer.cs +++ b/ALttPRandomizer/Randomizers/BaseRandomizer.cs @@ -141,6 +141,7 @@ } public async Task RandomizeMultiworld(string id, IList settings) { + var randomizerName = this.SettingsProcessor.GetRandomizerName(settings[0].Randomizer); Logger.LogDebug("Recieved request for id {id} to randomize multiworld settings {@settings}", id, settings); var names = settings.Select(s => s.PlayerName.Replace(' ', '_')).ToList(); @@ -149,7 +150,7 @@ .Append(string.Format("--names={0}", string.Join(",", names))) .Append(string.Format("--multi={0}", settings.Count)); - await StartProcess(Name, id, args, async exitcode => { + await StartProcess(randomizerName, id, args, async exitcode => { if (exitcode != 0) { await GenerationFailed(id, exitcode); } else { diff --git a/DungeonMapRandomizer b/DungeonMapRandomizer index 507f417..8df39da 160000 --- a/DungeonMapRandomizer +++ b/DungeonMapRandomizer @@ -1 +1 @@ -Subproject commit 507f4170c85ae69f0f8b4a59a06dfb3fe83665d6 +Subproject commit 8df39da2bd70ea9121eaa2fb6c5d33a06c091a27