X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=resources%2Fjs%2Fcomponents%2Ftracker%2FDungeons.js;h=b997e754fb8c3b31b62c36b7c8e1ad40d5b33863;hb=cce28e8619fe87d4be33f82df9a5ec16b2ad9cf6;hp=07b66389dd0b7f7e5830c09edcca060af7dd8c53;hpb=b5a50d74cf042fa7fc874d8184dc37ae20bb74dd;p=alttp.git

diff --git a/resources/js/components/tracker/Dungeons.js b/resources/js/components/tracker/Dungeons.js
index 07b6638..b997e75 100644
--- a/resources/js/components/tracker/Dungeons.js
+++ b/resources/js/components/tracker/Dungeons.js
@@ -2,40 +2,56 @@ import React from 'react';
 
 import CountDisplay from './CountDisplay';
 import ToggleIcon from './ToggleIcon';
+import {
+	getDungeonAcquiredSKs,
+	getDungeonRemainingItems,
+	shouldShowDungeonItem,
+} from '../../helpers/tracker';
 import { useTracker } from '../../hooks/tracker';
 
 const Dungeons = () => {
-	const { dungeons, state } = useTracker();
+	const { config, dungeons, state } = useTracker();
 
 	return <div className="dungeons">
 		{dungeons.map(dungeon =>
 			<div className={`dungeon dungeon-${dungeon.id}`} key={dungeon.id}>
 				<span className="dungeon-tag">{dungeon.id.toUpperCase()}</span>
-				<ToggleIcon
-					controller={ToggleIcon.dungeonController(dungeon)}
-					icons={['map']}
-				/>
-				<ToggleIcon
-					controller={ToggleIcon.dungeonController(dungeon)}
-					icons={['compass']}
-				/>
-				<span className="dungeon-smalls">
+				{shouldShowDungeonItem(config, 'Map') ?
 					<ToggleIcon
-						controller={ToggleIcon.dungeonCountController(dungeon, dungeon.sk)}
-						icons={['small-key']}
+						controller={ToggleIcon.dungeonController(dungeon)}
+						icons={['map']}
 					/>
-					<CountDisplay count={state[`${dungeon.id}-small-key`] || 0} />
-				</span>
-				<ToggleIcon
-					controller={ToggleIcon.dungeonController(dungeon)}
-					icons={['big-key']}
-				/>
+				: null}
+				{shouldShowDungeonItem(config, 'Compass') ?
+					<ToggleIcon
+						controller={ToggleIcon.dungeonController(dungeon)}
+						icons={['compass']}
+					/>
+				: null}
+				{shouldShowDungeonItem(config, 'Small') ?
+					<span className="dungeon-smalls">
+						<ToggleIcon
+							controller={ToggleIcon.dungeonCountController(dungeon, dungeon.sk)}
+							icons={['small-key']}
+						/>
+						<CountDisplay
+							count={getDungeonAcquiredSKs(state, dungeon)}
+							full={dungeon.sk}
+						/>
+					</span>
+				: null}
+				{shouldShowDungeonItem(config, 'Big') ?
+					<ToggleIcon
+						controller={ToggleIcon.dungeonController(dungeon)}
+						icons={['big-key']}
+					/>
+				: null}
 				<span className="dungeon-checks">
 					<ToggleIcon
-						controller={ToggleIcon.dungeonCheckController(dungeon, dungeon.items)}
+						controller={ToggleIcon.dungeonCheckController(dungeon)}
 						icons={['open-chest', 'chest']}
 					/>
-					<CountDisplay count={dungeon.items - (state[`${dungeon.id}-checks`] || 0)} />
+					<CountDisplay count={getDungeonRemainingItems(state, dungeon)} />
 				</span>
 				{dungeon.boss ?
 					<ToggleIcon