Skip to content

fix sky keep with dungeon ER #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lepelog wants to merge 1 commit into
base: archipelago
Choose a base branch
from
Open

fix sky keep with dungeon ER #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions src/logic/Entrances.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<string, EntrancePool> = {};
Expand Down Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion src/permalink/GeneratedOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down