From 59741aa3711e41a595f2f06a262633c2ad561879 Mon Sep 17 00:00:00 2001 From: lepelog <25211966+lepelog@users.noreply.github.com> Date: Sat, 1 Aug 2026 12:55:57 +0200 Subject: [PATCH] fix sky keep with dungeon ER it is now selectable and can be assigned --- src/logic/Entrances.ts | 14 +++++--------- src/permalink/GeneratedOptions.ts | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/logic/Entrances.ts b/src/logic/Entrances.ts index 6377b41d..22e8e81e 100644 --- a/src/logic/Entrances.ts +++ b/src/logic/Entrances.ts @@ -102,10 +102,8 @@ export function getEntrancePools( const relevantDerSetting = randomDungeonEntranceSetting ?? randomEntranceSetting; const requiredDungeonsSeparately = - relevantDerSetting === 'Required Dungeons Separately'; - const skyKeepVanilla = - relevantDerSetting !== 'All Surface Dungeons + Sky Keep' && - relevantDerSetting !== 'Required Dungeons Separately'; + relevantDerSetting === 'Required Dungeons Only'; + const skyKeepVanilla = false; // not disabled by a setting const requiredDungeons_: string[] = requiredDungeons; const result: Record = {}; @@ -202,15 +200,13 @@ export function getExitRules( logic.areaGraph.autoExits, ); - const everythingRandomized = randomEntranceSetting === 'All'; + const everythingRandomized = randomEntranceSetting === 'All Entrances'; const relevantDerSetting = randomDungeonEntranceSetting ?? randomEntranceSetting; const dungeonEntrancesRandomized = relevantDerSetting !== 'None'; const requiredDungeonsSeparately = - relevantDerSetting === 'Required Dungeons Separately'; - const skyKeepVanilla = - relevantDerSetting !== 'All Surface Dungeons + Sky Keep' && - relevantDerSetting !== 'Required Dungeons Separately'; + relevantDerSetting === 'Required Dungeons Only'; + const skyKeepVanilla = false; // not disabled by a setting for (const exitId of Object.keys(logic.areaGraph.exits)) { if ( diff --git a/src/permalink/GeneratedOptions.ts b/src/permalink/GeneratedOptions.ts index 56cc8d61..7f95a286 100644 --- a/src/permalink/GeneratedOptions.ts +++ b/src/permalink/GeneratedOptions.ts @@ -21,7 +21,7 @@ export interface GeneratedOptions { /** Triforce Shuffle */ 'triforce-shuffle': 'Vanilla' | 'Sky Keep' | 'Anywhere'; /** Randomize Entrances */ - 'randomize-entrances': 'None' | 'Required Dungeons Separately' | 'All Surface Dungeons' | 'All Surface Dungeons + Sky Keep'; + 'randomize-entrances': 'None' | 'Required Dungeons Only' | 'Required Dungeons' | 'All Entrances'; /** Randomize Silent Realms */ 'randomize-trials': boolean; /** No Spoiler Log */