diff --git a/.gitmodules b/.gitmodules index 45e4398..62b1fad 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "BaseRandomizer"] path = BaseRandomizer url = https://git.gwaa.kiwi/alttpr-gwaa-kiwi/alttpr-python - branch = GwaaKiwi + branch = main [submodule "Apr2025Randomizer"] path = Apr2025Randomizer url = https://git.gwaa.kiwi/alttpr-gwaa-kiwi/alttpr-python @@ -9,4 +9,4 @@ [submodule "BetaRandomizer"] path = BetaRandomizer url = https://git.gwaa.kiwi/alttpr-gwaa-kiwi/alttpr-python - branch = DungeonMap + branch = beta diff --git a/ALttPRandomizer/Model/SeedSettings.cs b/ALttPRandomizer/Model/SeedSettings.cs index 60d8e08..7bc64e3 100644 --- a/ALttPRandomizer/Model/SeedSettings.cs +++ b/ALttPRandomizer/Model/SeedSettings.cs @@ -175,7 +175,7 @@ public enum RandomizerInstance { [GeneratorSettings("base", "OR_", "--bps", "--spoiler=json")] Base, - [GeneratorSettings("beta", "OR_","--bps", "--spoiler=json")] Beta, + [GeneratorSettings("beta", "GK_","--bps", "--spoiler=json")] Beta, [GeneratorSettings("apr2025", "ER_", requireFlips: true, "--json_spoiler")] Apr2025, } diff --git a/ALttPRandomizer/Randomizers/BaseRandomizer.cs b/ALttPRandomizer/Randomizers/BaseRandomizer.cs index 914db11..0f05f98 100644 --- a/ALttPRandomizer/Randomizers/BaseRandomizer.cs +++ b/ALttPRandomizer/Randomizers/BaseRandomizer.cs @@ -9,7 +9,6 @@ using Microsoft.Extensions.Options; using System; using System.Collections.Generic; - using System.Diagnostics; using System.IO; using System.Linq; using System.Text.Json; @@ -120,7 +119,8 @@ var args = this.GetArgs(settings); if (settings.Randomizer != RandomizerInstance.Apr2025) { - args.Append(string.Format("--tries={0}", SINGLE_TRIES)); + args.Add($"--tries={SINGLE_TRIES}"); + args.Add($"--rom_header={id}"); } var generatorSettings = this.SettingsProcessor.GetGeneratorSettings(settings.Randomizer); @@ -150,7 +150,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("--tries={0}", MULTI_TRIES)); + .Append(string.Format("--tries={0}", MULTI_TRIES)) + .Append(string.Format("--rom_header={0}", id)); await StartProcess(generatorSettings, id, args, async exitcode => { if (exitcode != 0) { diff --git a/ALttPRandomizer/Service/ProcessService.cs b/ALttPRandomizer/Service/ProcessService.cs index 0e51fe9..61231e6 100644 --- a/ALttPRandomizer/Service/ProcessService.cs +++ b/ALttPRandomizer/Service/ProcessService.cs @@ -29,7 +29,7 @@ }; process.ErrorDataReceived += (_, args) => { if (args.Data != null) { - Logger.LogInformation("{prefix} STDERR: {output}", logPrefix, args.Data); + Logger.LogInformation("{prefix} - STDERR: {output}", logPrefix, args.Data); } }; diff --git a/Apr2025Randomizer b/Apr2025Randomizer index ca9af42..029e8de 160000 --- a/Apr2025Randomizer +++ b/Apr2025Randomizer @@ -1 +1 @@ -Subproject commit ca9af423db90f6d606dd38d0bd3b4ab0571725e7 +Subproject commit 029e8de8527f1f58b39c89130306f96ee3622b03 diff --git a/BaseRandomizer b/BaseRandomizer index ea8498f..ec81a90 160000 --- a/BaseRandomizer +++ b/BaseRandomizer @@ -1 +1 @@ -Subproject commit ea8498f402163abf07f2cb6c02fa403f1ed20701 +Subproject commit ec81a900efcf56304537c16e5596e9eb9b57dc48 diff --git a/BetaRandomizer b/BetaRandomizer index 0f7253c..a019fa6 160000 --- a/BetaRandomizer +++ b/BetaRandomizer @@ -1 +1 @@ -Subproject commit 0f7253c94ed0d354331634a9ef16d78521ec0347 +Subproject commit a019fa6478fc48428d9f439213da0871761f3db6