Release Healer Man 0.1.15

src/scene/PartyPopulation.tsx

@@ -19,7 +19,7 @@ import { classById, raceById, type GenderId, type RaceId } from "../app/characte
 import { CharacterModel } from "../avatar/CharacterModel";
 import { ProceduralAvatar } from "../avatar/ProceduralAvatar";
 import { useCombatStore } from "../game/combatStore";
-import { equipmentItemsForOwner } from "../game/equipment";
+import { resolvedEquipmentItems } from "../game/heirloomEquipment";
 import type { CharacterCombatAnimationEvent } from "../game/combatAnimation";
 import { resolveDungeonAssets, resolveManastormStageAssets } from "../game/dungeonAssets";
 import { activeManastormStageAssetPackage } from "../game/manastormStageLoader";
@@ -298,12 +298,19 @@ function PartyActors({
   const equipment = useCombatStore((state) => state.equipment);
   const equipmentItemsByOwner = useMemo(
     () => new Map(
-      Object.keys(equipment).map((ownerId) => [
-        ownerId,
-        equipmentItemsForOwner(equipment, inventory, ownerId),
+      members.map((member) => [
+        member.id,
+        resolvedEquipmentItems(equipment, inventory, {
+          ownerId: member.id,
+          ownerKind: "party",
+          classId: member.classId,
+          specializationId: member.specializationId,
+          role: member.role,
+          level: member.level,
+        }),
       ]),
     ),
-    [equipment, inventory],
+    [equipment, inventory, members],
   );
   const resetRevision = useGameStore((state) => state.resetRevision);
   const { rapier, world } = useRapier();

src/scene/PlayerRig.tsx

@@ -22,9 +22,9 @@ import {
 import { PLAYER_AURA_ENTITY_ID, useCombatStore } from "../game/combatStore";
 import type { CharacterCombatAnimationEvent } from "../game/combatAnimation";
 import {
-  equipmentItemsForOwner,
   PLAYER_EQUIPMENT_OWNER_ID,
 } from "../game/equipment";
+import { resolvedEquipmentItems } from "../game/heirloomEquipment";
 import type { InventoryItem } from "../game/lootTypes";
 import {
   cameraRelativeMovement,
@@ -460,13 +460,23 @@ export function PlayerRig() {
   const animationEvent = useCombatStore((state) => state.playerAnimationEvent);
   const inventory = useCombatStore((state) => state.inventory);
   const equipment = useCombatStore((state) => state.equipment);
+  const level = useCombatStore((state) => state.level);
+  const specializationId = useCombatStore((state) => state.specializationId);
+  const gearRole = useCombatStore((state) => state.gearRole);
   const equipmentItems = useMemo(
-    () => equipmentItemsForOwner(
+    () => activeCharacter ? resolvedEquipmentItems(
       equipment,
       inventory,
-      PLAYER_EQUIPMENT_OWNER_ID,
-    ),
-    [equipment, inventory],
+      {
+        ownerId: PLAYER_EQUIPMENT_OWNER_ID,
+        ownerKind: "player",
+        classId: activeCharacter.classId,
+        specializationId,
+        role: gearRole,
+        level,
+      },
+    ) : [],
+    [activeCharacter, equipment, gearRole, inventory, level, specializationId],
   );
   const bodyRef = useRef<RapierRigidBody>(null);
   const avatarRef = useRef<Object3D>(null);