X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=resources%2Fjs%2Fhelpers%2Ftracker.js;h=20894332d669271b2b7508abe74145544b20664f;hb=2703cfd41122e847511851d280124ed21102b897;hp=8b210d2632f266c94e629d204ec2715436badfe9;hpb=6a65eac02f94f00fdd2d56ad8feddf5d9476aa1e;p=alttp.git

diff --git a/resources/js/helpers/tracker.js b/resources/js/helpers/tracker.js
index 8b210d2..2089433 100644
--- a/resources/js/helpers/tracker.js
+++ b/resources/js/helpers/tracker.js
@@ -1573,11 +1573,18 @@ export const UNDERWORLD_LOCATIONS = [
 	},
 ];
 
+export const getConfigValue = (config, name, fallback) =>
+	Object.prototype.hasOwnProperty.call(config, name) ? config[name] : fallback;
+
 export const applyLogic = (config, dungeons, state) => {
 	const logic = Logic[config.worldState];
 	const map = {};
 	for (const name in logic) {
-		map[name] = logic[name](config, dungeons, state);
+		try {
+			map[name] = logic[name](config, dungeons, state);
+		} catch (e) {
+			console.error('error evaluating', name, e);
+		}
 	}
 	return map;
 };
@@ -1675,9 +1682,9 @@ export const aggregateLocationStatus = (names, logic, state) => {
 export const countRemainingLocations = (state, locations) =>
 	locations.reduce((acc, cur) => state[cur] ? acc : acc + 1, 0);
 
-export const getGanonCrystals = (state) => state['ganon-crystals'];
+export const getGanonCrystals = (config) => getConfigValue(config, 'ganon-crystals', 7);
 
-export const getGTCrystals = (state) => state['gt-crystals'];
+export const getGTCrystals = (config) => getConfigValue(config, 'gt-crystals', 7);
 
 export const getGTBoss = (state, which) => state[`gt-${which}-boss`];
 
@@ -1685,7 +1692,9 @@ export const hasDungeonBoss = (state, dungeon) =>
 	!dungeon.boss || !!state[`${dungeon.id}-boss-defeated`];
 
 export const getDungeonBoss = (state, dungeon) =>
-	state[`${dungeon.id}-boss`] || dungeon.boss || null;
+	dungeon.bosses.length > 1
+		? state[`${dungeon.id}-boss`] || dungeon.boss || null
+		: dungeon.bosses[0];
 
 export const hasDungeonPrize = (state, dungeon) =>
 	!dungeon.prize || !!state[`${dungeon.id}-prize-acquired`];
@@ -1776,8 +1785,6 @@ export const makeEmptyState = () => {
 	});
 	state['mm-medallion'] = null;
 	state['tr-medallion'] = null;
-	state['gt-crystals'] = 7;
-	state['ganon-crystals'] = 7;
 	return state;
 };
 
@@ -1917,6 +1924,9 @@ export const mergeStates = (autoState, manualState) => {
 		if (manualState[`${dungeon.id}-map`]) {
 			next[`${dungeon.id}-map`] = true;
 		}
+		if (manualState[`${dungeon.id}-boss`]) {
+			next[`${dungeon.id}-boss`] = manualState[`${dungeon.id}-boss`];
+		}
 		if (manualState[`${dungeon.id}-boss-defeated`]) {
 			next[`${dungeon.id}-boss-defeated`] = true;
 		}