X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=resources%2Fjs%2Fhelpers%2Ftracker.js;h=33338692bd155bf8a4e3be35d553b44774001725;hb=816690cc4fadff954f4407999550f7feec2884da;hp=20894332d669271b2b7508abe74145544b20664f;hpb=07c9bbbb2c6ddde460f48245699f27eaf66b8ac3;p=alttp.git

diff --git a/resources/js/helpers/tracker.js b/resources/js/helpers/tracker.js
index 2089433..3333869 100644
--- a/resources/js/helpers/tracker.js
+++ b/resources/js/helpers/tracker.js
@@ -66,7 +66,7 @@ export const BOTTLE_CONTENTS = [
 	'blue-potion',
 	'fairy',
 	'bottle-bee',
-	'bottle-bee',
+	'bottle-good-bee',
 ];
 
 export const BOSSES = [
@@ -1576,6 +1576,26 @@ export const UNDERWORLD_LOCATIONS = [
 export const getConfigValue = (config, name, fallback) =>
 	Object.prototype.hasOwnProperty.call(config, name) ? config[name] : fallback;
 
+export const configureDungeons = config => DUNGEONS.map(dungeon => {
+	const newDungeon = JSON.parse(JSON.stringify(dungeon));
+	if (config.wildMap && dungeon.map) {
+		++newDungeon.items;
+	}
+	if (config.wildCompass && dungeon.compass) {
+		++newDungeon.items;
+	}
+	if (config.wildSmall) {
+		newDungeon.items += dungeon.sk;
+	}
+	if (config.wildBig && dungeon.bk && !dungeon.dropBk) {
+		++newDungeon.items;
+	}
+	if (dungeon.boss) {
+		newDungeon.bosses = config.bossShuffle ? BOSSES : [dungeon.boss];
+	}
+	return newDungeon;
+});
+
 export const applyLogic = (config, dungeons, state) => {
 	const logic = Logic[config.worldState];
 	const map = {};
@@ -1859,18 +1879,6 @@ const collectUnderworld = (state, data) => {
 	});
 };
 
-export const computeState = (config, data, prizeMap) => {
-	const state = {};
-	collectInventory(state, data.slice(SRAM_ADDR.INV_START), prizeMap);
-	collectOverworld(state, data);
-	collectUnderworld(state, data.slice(SRAM_ADDR.ROOM_DATA_START));
-	const amounts = getDungeonAmounts(config, state);
-	DUNGEONS.forEach(dungeon => {
-		state[`${dungeon.id}-checks`] = amounts[dungeon.id];
-	});
-	return state;
-};
-
 const getDungeonAmounts = (config, state) => {
 	const amounts = {};
 	DUNGEONS.forEach(dungeon => {
@@ -1902,6 +1910,18 @@ const getDungeonAmounts = (config, state) => {
 	return amounts;
 };
 
+export const computeState = (config, data, prizeMap) => {
+	const state = {};
+	collectInventory(state, data.slice(SRAM_ADDR.INV_START), prizeMap);
+	collectOverworld(state, data);
+	collectUnderworld(state, data.slice(SRAM_ADDR.ROOM_DATA_START));
+	const amounts = getDungeonAmounts(config, state);
+	DUNGEONS.forEach(dungeon => {
+		state[`${dungeon.id}-checks`] = amounts[dungeon.id];
+	});
+	return state;
+};
+
 export const mergeStates = (autoState, manualState) => {
 	const next = { ...autoState };
 	BOOLEAN_STATES.forEach(name => {