Release Healer Man 0.1.14

src/scene/CombatEffects.tsx

@@ -13,6 +13,7 @@ import { useCombatStore } from "../game/combatStore";
 import {
   combatEffectStyle,
   preloadCombatEffectManifest,
+  effectiveCombatVfxMode,
   subscribeCombatPresentation,
   type CombatPresentationEvent,
   type CombatVfxQuality,
@@ -20,6 +21,7 @@ import {
 import {
   combatAudioOutputEnabled,
   configureCombatAudio,
+  combatMediaPreloadEnabled,
   playCombatAudio,
   resetCombatAudio,
   setCombatAudioListener,
@@ -254,17 +256,18 @@ export function CombatEffects({ active, safeGraphics = false }: CombatEffectsPro
   const camera = useThree((state) => state.camera);
   const forward = useMemo(() => new Vector3(), []);
   const audioOutputEnabled = combatAudioOutputEnabled(settings, masterVolume);
+  const vfxMode = effectiveCombatVfxMode(settings);
 
   useEffect(() => {
     if (!import.meta.env.DEV) return;
     document.documentElement.dataset[COMBAT_EFFECT_DATASET_KEY] = JSON.stringify({
-      mode: settings.vfxMode,
+      mode: vfxMode,
       quality: effectiveQuality,
       systems: effects.length,
       activeLights: 0,
       allocatedLights: 0,
     });
-  }, [effectiveQuality, effects.length, settings.vfxMode]);
+  }, [effectiveQuality, effects.length, vfxMode]);
 
   useEffect(() => () => {
     if (import.meta.env.DEV) delete document.documentElement.dataset[COMBAT_EFFECT_DATASET_KEY];
@@ -274,10 +277,7 @@ export function CombatEffects({ active, safeGraphics = false }: CombatEffectsPro
     settingsRef.current = settings;
     qualityRef.current = safeGraphics && settings.vfxQuality === "high" ? "low" : settings.vfxQuality;
     configureCombatAudio(settings, masterVolume);
-    if (
-      qualityRef.current !== "off"
-      || combatAudioOutputEnabled(settings, masterVolume)
-    ) void preloadCombatEffectManifest();
+    if (combatMediaPreloadEnabled(settings, masterVolume)) void preloadCombatEffectManifest();
     setEffects((current) => capCombatEffects(current.filter(({ event }) => (
       qualityRef.current !== "off" && settings.vfxEnabled[event.actorGroup]
     )), qualityRef.current));
@@ -333,7 +333,7 @@ export function CombatEffects({ active, safeGraphics = false }: CombatEffectsPro
   return (
     <group name="combat-effects">
       {effects.map((effect) => (
-        settings.vfxMode === "original" ? (
+        vfxMode === "original" ? (
           <OriginalCombatEffect
             key={`original:${effect.key}`}
             event={effect.event}