Skip to content

Fix all mq setting #56

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

Merged
flee135 merged 1 commit into from
Jul 7, 2026
Merged

Fix all mq setting #56

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
9 changes: 5 additions & 4 deletions src/hooks/useLogicInitialization.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,12 @@ const useLogicInitialization = (options = {}) => {
settings = response.settings;
}

// Set settings on SettingsHelper
SettingsHelper.setSettings(settings);
// LogicHelper post-processes settings (e.g. mq_dungeons_mode "mq" expands
// mq_dungeons_specific to all dungeons), so set SettingsHelper from its result.
const finalSettings = LogicHelper.initialize(logicHelpersFile, settings);

LogicHelper.initialize(logicHelpersFile, settings);
updateItemsFromLogic(settings); // Starting items.
SettingsHelper.setSettings(finalSettings);
updateItemsFromLogic(finalSettings); // Starting items.
setIsInitialized(true);
} catch (err) {
setError(err);
Expand Down
4 changes: 2 additions & 2 deletions src/utils/logic-helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ class LogicHelper {
},
};

static async initialize(logicHelpersFile, settings) {
static initialize(logicHelpersFile, settings) {
this.settings = settings;

this.ruleAliases = {};
Expand Down Expand Up @@ -438,7 +438,7 @@ class LogicHelper {
const disableTradeRevert =
shuffleInteriorEntrances || this.settings.shuffle_overworld_entrances || this.settings.adult_trade_shuffle;
const skipChildZelda =
!SettingsHelper.hasShuffleChildTrade("Zeldas Letter") &&
!_.includes(this.settings.shuffle_child_trade, "Zeldas Letter") &&
_.includes(this.settings.starting_inventory, "zeldas_letter");

const triforceGoal = this.settings.triforce_goal_per_world * this.settings.world_count;
Expand Down
Loading