From 2539559edccaeb1761ecf8508859393221d14a32 Mon Sep 17 00:00:00 2001 From: n8n-gitea Date: Mon, 1 Jun 2026 11:04:48 +0200 Subject: [PATCH] fix: pass activeIds to DisciplineCard in ElementalSubtab; add missing mana type names --- docs/circular-deps.txt | 2 +- docs/dependency-graph.json | 2 +- src/components/game/tabs/DisciplinesTab.tsx | 1 + src/components/game/tabs/ElementalSubtab.tsx | 9 ++++++--- src/lib/game/utils/discipline-math.ts | 8 ++++++++ 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/docs/circular-deps.txt b/docs/circular-deps.txt index dd2bdc0..ba4f025 100644 --- a/docs/circular-deps.txt +++ b/docs/circular-deps.txt @@ -1,4 +1,4 @@ # Circular Dependencies -Generated: 2026-05-31T18:23:54.984Z +Generated: 2026-06-01T07:54:15.106Z No circular dependencies found. ✅ diff --git a/docs/dependency-graph.json b/docs/dependency-graph.json index be0b28c..4faaa07 100644 --- a/docs/dependency-graph.json +++ b/docs/dependency-graph.json @@ -1,6 +1,6 @@ { "_meta": { - "generated": "2026-05-31T18:23:53.253Z", + "generated": "2026-06-01T07:54:13.158Z", "description": "Import dependency graph for src/lib/game. Keys are files, values are arrays of files they import.", "usage": "To find what a file affects, search for its path in the VALUES. To find what a file depends on, look at its KEY entry." }, diff --git a/src/components/game/tabs/DisciplinesTab.tsx b/src/components/game/tabs/DisciplinesTab.tsx index 5fb96b2..17e2353 100644 --- a/src/components/game/tabs/DisciplinesTab.tsx +++ b/src/components/game/tabs/DisciplinesTab.tsx @@ -120,6 +120,7 @@ export const DisciplinesTab: React.FC = () => { {activeAttunement === 'elemental' ? ( ; + activeIds: string[]; concurrentLimit: number; elements: DisciplineCardProps['missingSourceMana'] extends readonly string[] ? Record @@ -65,8 +66,8 @@ interface GroupProps extends SharedRenderProps { conversion?: DisciplineDefinition; } -const ElementalDisciplineGroup: React.FC = ({ - manaType, capacity, conversion, disciplines, concurrentLimit, elements, onToggle, +const ElementalDisciplineGroup: React.FC = ({ + manaType, capacity, conversion, disciplines, activeIds, concurrentLimit, elements, onToggle, }) => { const elementDef = ELEMENTS[manaType]; const manaColor = elementDef?.color ?? '#888888'; @@ -95,6 +96,7 @@ const ElementalDisciplineGroup: React.FC = ({ definition={def} xp={discState.xp} paused={discState.paused} + activeIds={activeIds} concurrentLimit={concurrentLimit} isLocked={!prereqCheck.canProceed} missingPrereqs={prereqCheck.missingPrereqs} @@ -117,7 +119,7 @@ const ElementalDisciplineGroup: React.FC = ({ interface ElementalSubtabProps extends SharedRenderProps {} export const ElementalSubtab: React.FC = ({ - disciplines, concurrentLimit, elements, onToggle, + disciplines, activeIds, concurrentLimit, elements, onToggle, }) => { const disciplineMap = useMemo( () => buildElementalDisciplineMap( @@ -151,6 +153,7 @@ export const ElementalSubtab: React.FC = ({ capacity={entry.capacity} conversion={entry.conversion} disciplines={disciplines} + activeIds={activeIds} concurrentLimit={concurrentLimit} elements={elements} onToggle={onToggle} diff --git a/src/lib/game/utils/discipline-math.ts b/src/lib/game/utils/discipline-math.ts index ef9de35..e5c481b 100644 --- a/src/lib/game/utils/discipline-math.ts +++ b/src/lib/game/utils/discipline-math.ts @@ -100,9 +100,17 @@ const MANA_TYPE_NAMES: Record = { metal: 'metal', sand: 'sand', lightning: 'lightning', + frost: 'frost', + blackflame: 'blackflame', + radiantflames: 'radiantflames', + miasma: 'miasma', + shadowglass: 'shadowglass', crystal: 'crystal', stellar: 'stellar', void: 'void', + soul: 'soul', + time: 'time', + plasma: 'plasma', }; /**