Release Healer Man 0.1.49

src/ui/AbilityBindingsPanel.tsx

@@ -10,7 +10,13 @@ import {
   type ActionBindingLayer,
 } from "../game/actionBindings";
 import { useCombatStore } from "../game/combatStore";
-import { abilityAtLevel, defaultActionBarForCharacter, type AbilityDefinition } from "../game/abilityCatalog";
+import {
+  abilityAtLevel,
+  abilityTalentNodeId,
+  defaultActionBarForCharacter,
+  learnedAbilityRank,
+  type AbilityDefinition,
+} from "../game/abilityCatalog";
 import { useGameStore } from "../game/store";
 import { actionKeyLabel, assignedActionBarAbilityIds, assignDesktopAbility, resetDesktopAbilities, type UiLayout } from "../game/uiLayout";
 import { currentUiDevice, useUiLayoutStore } from "../game/uiLayoutStore";
@@ -110,14 +116,14 @@ function AbilityBindingsDialog({ onClose }: { onClose?: () => void }) {
   const talentRanks = useCombatStore((state) => state.talentRanks);
   const tooltipData = (definition: AbilityDefinition | null | undefined): AbilityTooltipData | null => {
     if (!definition) return null;
-    const talentRank = definition.talentEntryId === undefined ? undefined : talentRanks[`coa-entry-${definition.talentEntryId}`] ?? 0;
+    const talentRank = learnedAbilityRank(definition, talentRanks);
     const ability = abilityAtLevel(definition, level, talentRank);
     return {
       name: ability.name, description: ability.description, target: ability.target,
       resourceCost: ability.cost.amount, resourceLabel: ability.cost.resource.replace(/-/g, " "),
       cooldownSeconds: ability.cooldownMs / 1_000, castSeconds: ability.castTimeMs / 1_000,
       range: ability.range.max, lockedUntilLevel: ability.unlockLevel > level ? ability.unlockLevel : undefined,
-      talentLocked: ability.talentEntryId !== undefined && !talentRank,
+      talentLocked: Boolean(abilityTalentNodeId(ability)) && !talentRank,
     };
   };
   const bindings = useCombatStore((state) => state.actionBindings);
@@ -132,7 +138,7 @@ function AbilityBindingsDialog({ onClose }: { onClose?: () => void }) {
   const isWow = layout === "wow";
   const assignedIds = assignedActionBarAbilityIds(pcLayout, bindings, isWow);
   const isMissing = (ability: AbilityDefinition) => ability.unlockLevel <= level
-    && (ability.talentEntryId === undefined || Boolean(talentRanks[`coa-entry-${ability.talentEntryId}`]))
+    && (!abilityTalentNodeId(ability) || Boolean(learnedAbilityRank(ability, talentRanks)))
     && !assignedIds.has(ability.id);
   const assignment = (control: BindingControl) => typeof control === "number"
     ? pcLayout.bars[bar].slots[control].abilityId : bindings[actionBindingId(layer, control)];