From 24a8613ea05b7c76baa0a2fbc404a90a4e218001 Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Sat, 17 Jan 2026 13:08:15 -0600 Subject: [PATCH] show_map option and retries --- ALttPRandomizer/Model/SeedSettings.cs | 12 ++++++++++++ ALttPRandomizer/Randomizers/BaseRandomizer.cs | 8 +++++++- BaseRandomizer | 2 +- DungeonMapRandomizer | 2 +- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/ALttPRandomizer/Model/SeedSettings.cs b/ALttPRandomizer/Model/SeedSettings.cs index 4d62aa6..51508d5 100644 --- a/ALttPRandomizer/Model/SeedSettings.cs +++ b/ALttPRandomizer/Model/SeedSettings.cs @@ -92,6 +92,11 @@ [NoSettingName([Apr2025, Base])] public ShowLoot ShowLoot { get; set; } = ShowLoot.Never; + [SettingName("showmap")] + [RequiredSetting([Apr2025, Base], ShowMap.Map)] + [NoSettingName([Apr2025, Base])] + public ShowMap ShowMap { get; set; } = ShowMap.Map; + [NoSettingName] [RequiredSetting([Apr2025], ShopShuffle.Vanilla)] public ShopShuffle ShopShuffle { get; set; } = ShopShuffle.Vanilla; @@ -322,10 +327,17 @@ public enum ShowLoot { Never, + Presence, Compass, Always, } + public enum ShowMap { + Visited, + Map, + Always, + } + public enum BootsSettings { Normal, [AdditionalSetting("--pseudoboots")] Pseudoboots, diff --git a/ALttPRandomizer/Randomizers/BaseRandomizer.cs b/ALttPRandomizer/Randomizers/BaseRandomizer.cs index 33d4ab6..1f82d87 100644 --- a/ALttPRandomizer/Randomizers/BaseRandomizer.cs +++ b/ALttPRandomizer/Randomizers/BaseRandomizer.cs @@ -18,6 +18,9 @@ public const string Name = "base"; public const string DungeonMapName = "dungeon_map"; + public const int MULTI_TRIES = 20; + public const int SINGLE_TRIES = 20; + public BaseRandomizer( AzureStorage azureStorage, CommonSettingsProcessor settingsProcessor, @@ -97,6 +100,8 @@ args.Add("--spoiler=json"); + args.Add(string.Format("--tries={0}", SINGLE_TRIES)); + foreach (var arg in settings) { args.Add(arg); } @@ -148,7 +153,8 @@ var args = settings.Select((s, idx) => string.Format("--p{0}={1}", idx + 1, string.Join(" ", this.GetArgs(s)))) .Append(string.Format("--names={0}", string.Join(",", names))) - .Append(string.Format("--multi={0}", settings.Count)); + .Append(string.Format("--multi={0}", settings.Count)) + .Append(string.Format("--tries={0}", MULTI_TRIES)); await StartProcess(randomizerName, id, args, async exitcode => { if (exitcode != 0) { diff --git a/BaseRandomizer b/BaseRandomizer index 7bec1f8..ea8498f 160000 --- a/BaseRandomizer +++ b/BaseRandomizer @@ -1 +1 @@ -Subproject commit 7bec1f899c25fa051b6da4ea63e81e50c34e56aa +Subproject commit ea8498f402163abf07f2cb6c02fa403f1ed20701 diff --git a/DungeonMapRandomizer b/DungeonMapRandomizer index 8df39da..5e0dead 160000 --- a/DungeonMapRandomizer +++ b/DungeonMapRandomizer @@ -1 +1 @@ -Subproject commit 8df39da2bd70ea9121eaa2fb6c5d33a06c091a27 +Subproject commit 5e0deadf55c355e2df7b94d6c65373c7d72f54cc