Release Healer Man 0.1.20

src/ui/PlayerStatusPanel.tsx

@@ -1,17 +1,15 @@
 import { useEffect, useState } from "react";
 import { abilityById } from "../game/abilityCatalog";
 import { PLAYER_AGGRO_ID } from "../game/aggro";
-import type { ActiveAura } from "../game/combatAuras";
 import { useCombatStore } from "../game/combatStore";
-import { usePartyStore } from "../game/partyStore";
 import { formatTimedEffectTimer, timedEffectRemainingMs } from "../game/timedEffectDisplay";
+import { AuraStrip } from "./AuraStrip";
 import {
-  AuraStrip,
-  auraDefinitionDisplaysInStrip,
-  auraDefinitionIsLongTerm,
+  auraDisplaysInPlayerStatusPanel,
   auraDescription,
   auraDisplayName,
-} from "./AuraStrip";
+  groupAurasForDisplay,
+} from "./auraDisplay";
 import { TimedEffectStrip } from "./TimedEffectStrip";
 import {
   timedEffectDescription,
@@ -25,34 +23,16 @@ function statusLabel(disposition: StatusEffectInspection["disposition"]): string
   return disposition === "buff" ? "Buff" : "Debuff";
 }
 
-export function auraDisplaysInPlayerStatusPanel(
-  aura: ActiveAura,
-  now: number,
-  partyTargetIds: ReadonlySet<string>,
-): boolean {
-  const belongsInPanel = aura.targetId === PLAYER_AGGRO_ID
-    || (partyTargetIds.has(aura.targetId) && auraDefinitionIsLongTerm(aura.definition));
-  return belongsInPanel
-    && auraDefinitionDisplaysInStrip(aura.definition)
-    && (aura.expiresAt === null || aura.expiresAt > now);
-}
-
 export function PlayerStatusPanel({ now }: { readonly now: number }) {
   const auras = useCombatStore((state) => state.auras);
   const effects = useCombatStore((state) => state.effects);
   const shield = useCombatStore((state) => state.shield);
   const shieldExpiresAt = useCombatStore((state) => state.shieldExpiresAt);
-  const partyMembers = usePartyStore((state) => state.members);
   const [inspected, setInspected] = useState<StatusEffectInspection | null>(null);
 
-  const partyAuraTargetIds = partyMembers.map((member) => member.id);
-  const partyAuraTargetIdSet = new Set(partyAuraTargetIds);
-  const partyAuraTargetLabels = Object.fromEntries(
-    partyMembers.map((member) => [member.id, member.name]),
-  );
-  const activeAuras = auras.filter((aura) => (
-    auraDisplaysInPlayerStatusPanel(aura, now, partyAuraTargetIdSet)
-  ));
+  const activeAuras = groupAurasForDisplay(auras.filter((aura) => (
+    auraDisplaysInPlayerStatusPanel(aura, now)
+  )));
   const activeEffects = effects.filter((effect) => (
     PLAYER_EFFECT_TARGETS.includes(effect.targetId)
     && timedEffectRemainingMs(effect, now) > 0
@@ -152,18 +132,6 @@ export function PlayerStatusPanel({ now }: { readonly now: number }) {
             onInspect={setInspected}
             tooltipId={TOOLTIP_ID}
           />
-          {partyAuraTargetIds.length ? (
-            <AuraStrip
-              targetId={partyAuraTargetIds[0]}
-              targetIds={partyAuraTargetIds}
-              dispositions={["buff"]}
-              className="player-status-panel__strip"
-              showOnlyLongTerm
-              targetLabels={partyAuraTargetLabels}
-              onInspect={setInspected}
-              tooltipId={TOOLTIP_ID}
-            />
-          ) : null}
           <TimedEffectStrip
             targetId={null}
             targetIds={PLAYER_EFFECT_TARGETS}
@@ -189,18 +157,6 @@ export function PlayerStatusPanel({ now }: { readonly now: number }) {
             onInspect={setInspected}
             tooltipId={TOOLTIP_ID}
           />
-          {partyAuraTargetIds.length ? (
-            <AuraStrip
-              targetId={partyAuraTargetIds[0]}
-              targetIds={partyAuraTargetIds}
-              dispositions={["debuff"]}
-              className="player-status-panel__strip"
-              showOnlyLongTerm
-              targetLabels={partyAuraTargetLabels}
-              onInspect={setInspected}
-              tooltipId={TOOLTIP_ID}
-            />
-          ) : null}
           <TimedEffectStrip
             targetId={null}
             targetIds={PLAYER_EFFECT_TARGETS}