Release Healer Man 0.1.14

src/game/combatPresentation.ts

@@ -1,4 +1,9 @@
 import type { AbilityDefinition, AbilityEffect } from "./abilityCatalog";
+import {
+  COMBAT_MEDIA_MANIFEST_URL,
+  combatMediaPackReady,
+  fetchCombatMediaAsset,
+} from "./combatMediaPack";
 
 export type CombatActorGroup = "player" | "party" | "enemy";
 export type CombatVfxMode = "generated" | "original";
@@ -24,6 +29,7 @@ export type CombatPresentationSource = "wow335" | "ascension" | "runewaker" | "f
 export type CombatPresentationPosition = readonly [number, number, number];
 
 export interface CombatPresentationSettings {
+  readonly originalMediaEnabled: boolean;
   readonly vfxMode: CombatVfxMode;
   readonly vfxQuality: CombatVfxQuality;
   readonly vfxEnabled: Readonly<Record<CombatActorGroup, boolean>>;
@@ -34,6 +40,7 @@ export interface CombatPresentationSettings {
 const ACTOR_GROUPS: readonly CombatActorGroup[] = ["player", "party", "enemy"];
 
 export const DEFAULT_COMBAT_PRESENTATION_SETTINGS: CombatPresentationSettings = Object.freeze({
+  originalMediaEnabled: false,
   vfxMode: "generated",
   vfxQuality: "high",
   vfxEnabled: Object.freeze({ player: true, party: true, enemy: true }),
@@ -80,13 +87,20 @@ export function normalizeCombatPresentationSettings(
   const record = value && typeof value === "object" && !Array.isArray(value)
     ? value as Partial<Record<keyof CombatPresentationSettings, unknown>>
     : {};
-  const vfxMode = record.vfxMode === "generated" || record.vfxMode === "original"
+  const originalMediaEnabled = typeof record.originalMediaEnabled === "boolean"
+    ? record.originalMediaEnabled
+    : fallback.originalMediaEnabled;
+  const requestedVfxMode = record.vfxMode === "generated" || record.vfxMode === "original"
     ? record.vfxMode
     : fallback.vfxMode;
+  const vfxMode = requestedVfxMode === "original" && !originalMediaEnabled
+    ? "generated"
+    : requestedVfxMode;
   const vfxQuality = record.vfxQuality === "off" || record.vfxQuality === "low" || record.vfxQuality === "high"
     ? record.vfxQuality
     : fallback.vfxQuality;
   return Object.freeze({
+    originalMediaEnabled,
     vfxMode,
     vfxQuality,
     vfxEnabled: booleanGroups(record.vfxEnabled, fallback.vfxEnabled),
@@ -191,7 +205,6 @@ interface GeneratedCombatEffectManifest {
   readonly entries: readonly CombatEffectManifestEntry[];
 }
 
-const COMBAT_EFFECT_MANIFEST_URL = "/assets/game/combat-effects/manifest.json";
 const manifestByKey = new Map<string, CombatEffectManifestEntry>();
 const manifestBySpellId = new Map<number, CombatEffectManifestEntry>();
 let manifestRequest: Promise<void> | null = null;
@@ -207,13 +220,19 @@ function installCombatEffectManifest(manifest: GeneratedCombatEffectManifest): v
 export function preloadCombatEffectManifest(): Promise<void> {
   if (manifestRequest) return manifestRequest;
   if (typeof fetch === "undefined") return Promise.resolve();
-  manifestRequest = fetch(COMBAT_EFFECT_MANIFEST_URL)
+  manifestRequest = fetchCombatMediaAsset(COMBAT_MEDIA_MANIFEST_URL)
     .then((response) => response.ok ? response.json() : Promise.reject(new Error(String(response.status))))
     .then((manifest) => installCombatEffectManifest(manifest as GeneratedCombatEffectManifest))
     .catch(() => undefined);
   return manifestRequest;
 }
 
+export function effectiveCombatVfxMode(settings: CombatPresentationSettings): CombatVfxMode {
+  return settings.originalMediaEnabled && combatMediaPackReady()
+    ? settings.vfxMode
+    : "generated";
+}
+
 export function combatEffectManifestEntry(
   spellId: number | undefined,
   source?: CombatPresentationSource,