Release Healer Man 0.1.29

src/game/combatPresentation.ts

@@ -40,8 +40,8 @@ export interface CombatPresentationSettings {
 const ACTOR_GROUPS: readonly CombatActorGroup[] = ["player", "party", "enemy"];
 
 export const DEFAULT_COMBAT_PRESENTATION_SETTINGS: CombatPresentationSettings = Object.freeze({
-  originalMediaEnabled: false,
-  vfxMode: "generated",
+  originalMediaEnabled: true,
+  vfxMode: "original",
   vfxQuality: "high",
   vfxEnabled: Object.freeze({ player: true, party: true, enemy: true }),
   audioEnabled: Object.freeze({ player: true, party: true, enemy: true }),
@@ -90,12 +90,9 @@ export function normalizeCombatPresentationSettings(
   const originalMediaEnabled = typeof record.originalMediaEnabled === "boolean"
     ? record.originalMediaEnabled
     : fallback.originalMediaEnabled;
-  const requestedVfxMode = record.vfxMode === "generated" || record.vfxMode === "original"
+  const vfxMode = 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;
@@ -219,11 +216,11 @@ function installCombatEffectManifest(manifest: GeneratedCombatEffectManifest): v
 
 export function preloadCombatEffectManifest(): Promise<void> {
   if (manifestRequest) return manifestRequest;
-  if (typeof fetch === "undefined") return Promise.resolve();
+  if (typeof fetch === "undefined" || !combatMediaPackReady()) return Promise.resolve();
   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);
+    .catch(() => { manifestRequest = null; });
   return manifestRequest;
 }