Release Healer Man 0.1.49

src/ui/GameplayPanels.tsx

@@ -5,6 +5,8 @@ import { useCombatStore } from "../game/combatStore";
 import {
   abilityAtLevel,
   abilityRankForLevel,
+  abilityTalentNodeId,
+  learnedAbilityRank,
 } from "../game/abilityCatalog";
 import { useGameStore } from "../game/store";
 import { OptionsPanel } from "./OptionsPanel";
@@ -61,9 +63,7 @@ export function GameplayPanels() {
   const spellbookAbilities = useMemo(() => [...abilities]
     .sort((left, right) => left.unlockLevel - right.unlockLevel)
     .map((catalogAbility) => {
-      const learnedTalentRank = catalogAbility.talentEntryId === undefined
-        ? undefined
-        : talentRanks[`coa-entry-${catalogAbility.talentEntryId}`] ?? 0;
+      const learnedTalentRank = learnedAbilityRank(catalogAbility, talentRanks);
       const ability = abilityAtLevel(catalogAbility, level, learnedTalentRank);
       const activeRank = abilityRankForLevel(catalogAbility, level, learnedTalentRank);
       return {
@@ -80,8 +80,8 @@ export function GameplayPanels() {
         cooldownSeconds: ability.cooldownMs / 1_000,
         castSeconds: ability.castTimeMs / 1_000,
         range: ability.range.max,
-        known: catalogAbility.talentEntryId === undefined || Boolean(learnedTalentRank),
-        talentLocked: catalogAbility.talentEntryId !== undefined,
+        known: !abilityTalentNodeId(catalogAbility) || Boolean(learnedTalentRank),
+        talentLocked: Boolean(abilityTalentNodeId(catalogAbility)),
         passive: ability.passive,
         rank: activeRank?.rank,
         rankCount: catalogAbility.ranks?.length,