diff --git a/ALttPRandomizer/Model/SeedSettings.cs b/ALttPRandomizer/Model/SeedSettings.cs index 4e2f645..5e04a53 100644 --- a/ALttPRandomizer/Model/SeedSettings.cs +++ b/ALttPRandomizer/Model/SeedSettings.cs @@ -73,7 +73,6 @@ [SettingName("shuffleenemies")] [IgnoreSetting(Apr2025)] - [RequiredSetting([Pikit], EnemyShuffle.Vanilla)] public EnemyShuffle EnemyShuffle { get; set; } = EnemyShuffle.Vanilla; [SettingName("shuffle_damage_table")] diff --git a/ALttPRandomizer/appsettings.Docker.json b/ALttPRandomizer/appsettings.Docker.json index 897b29f..af795ac 100644 --- a/ALttPRandomizer/appsettings.Docker.json +++ b/ALttPRandomizer/appsettings.Docker.json @@ -24,6 +24,10 @@ "workingDirectory": "/beta_randomizer", "randomizerCommand": [ "uv", "run", "DungeonRandomizer.py" ], }, + "pikit": { + "workingDirectory": "/pikit_randomizer", + "randomizerCommand": [ "uv", "run", "DungeonRandomizer.py" ], + }, } }, "Serilog": { diff --git a/Dockerfile b/Dockerfile index 82c427a..4edf995 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,6 +52,14 @@ RUN uv sync COPY BetaRandomizer/ . +# pikit generator +WORKDIR /pikit_randomizer + +COPY PikitRandomizer/pyproject.toml . +RUN uv sync + +COPY PikitRandomizer/ . + # web server WORKDIR /app COPY --from=build /app/publish . diff --git a/PikitRandomizer b/PikitRandomizer index 2738f61..be35ed4 160000 --- a/PikitRandomizer +++ b/PikitRandomizer @@ -1 +1 @@ -Subproject commit 2738f61c0d2db0e7b10efee311eaa024d982d9e4 +Subproject commit be35ed44515df441c70bddca80bb87ac1a06fd67