Rename generators

This commit is contained in:
2026-01-25 13:31:15 -06:00
parent 96cebd2289
commit 720cc469d4
7 changed files with 11 additions and 10 deletions

4
.gitmodules vendored
View File

@@ -1,7 +1,7 @@
[submodule "BaseRandomizer"] [submodule "BaseRandomizer"]
path = BaseRandomizer path = BaseRandomizer
url = https://git.gwaa.kiwi/alttpr-gwaa-kiwi/alttpr-python url = https://git.gwaa.kiwi/alttpr-gwaa-kiwi/alttpr-python
branch = GwaaKiwi branch = main
[submodule "Apr2025Randomizer"] [submodule "Apr2025Randomizer"]
path = Apr2025Randomizer path = Apr2025Randomizer
url = https://git.gwaa.kiwi/alttpr-gwaa-kiwi/alttpr-python url = https://git.gwaa.kiwi/alttpr-gwaa-kiwi/alttpr-python
@@ -9,4 +9,4 @@
[submodule "BetaRandomizer"] [submodule "BetaRandomizer"]
path = BetaRandomizer path = BetaRandomizer
url = https://git.gwaa.kiwi/alttpr-gwaa-kiwi/alttpr-python url = https://git.gwaa.kiwi/alttpr-gwaa-kiwi/alttpr-python
branch = DungeonMap branch = beta

View File

@@ -175,7 +175,7 @@
public enum RandomizerInstance { public enum RandomizerInstance {
[GeneratorSettings("base", "OR_", "--bps", "--spoiler=json")] Base, [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, [GeneratorSettings("apr2025", "ER_", requireFlips: true, "--json_spoiler")] Apr2025,
} }

View File

@@ -9,7 +9,6 @@
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text.Json; using System.Text.Json;
@@ -120,7 +119,8 @@
var args = this.GetArgs(settings); var args = this.GetArgs(settings);
if (settings.Randomizer != RandomizerInstance.Apr2025) { 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); 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)))) 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("--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)); .Append(string.Format("--tries={0}", MULTI_TRIES))
.Append(string.Format("--rom_header={0}", id));
await StartProcess(generatorSettings, id, args, async exitcode => { await StartProcess(generatorSettings, id, args, async exitcode => {
if (exitcode != 0) { if (exitcode != 0) {

View File

@@ -29,7 +29,7 @@
}; };
process.ErrorDataReceived += (_, args) => { process.ErrorDataReceived += (_, args) => {
if (args.Data != null) { if (args.Data != null) {
Logger.LogInformation("{prefix} STDERR: {output}", logPrefix, args.Data); Logger.LogInformation("{prefix} - STDERR: {output}", logPrefix, args.Data);
} }
}; };