@almadar/ui 5.72.0 → 5.74.0

package/dist/avl/index.js

@@ -10692,7 +10692,7 @@ function ScoreDisplay({
         assetUrl ? /* @__PURE__ */ jsx(
           "img",
           {
-            src: assetUrl,
+            src: assetUrl.url,
             alt: "",
             width: 20,
             height: 20,
@@ -10717,7 +10717,11 @@ var init_ScoreDisplay = __esm({
       lg: "text-2xl",
       xl: "text-4xl"
     };
-    DEFAULT_ASSET_URL = "https://almadar-kflow-assets.web.app/shared/effects/particles/star_01.png";
+    DEFAULT_ASSET_URL = {
+      url: "https://almadar-kflow-assets.web.app/shared/effects/particles/star_01.png",
+      role: "effect",
+      category: "effect"
+    };
     ScoreDisplay.displayName = "ScoreDisplay";
   }
 });
@@ -10793,7 +10797,7 @@ function ControlButton({
       children: assetUrl ? /* @__PURE__ */ jsx(
         "img",
         {
-          src: assetUrl,
+          src: assetUrl.url,
           alt: "",
           width: 24,
           height: 24,
@@ -10833,7 +10837,11 @@ var init_ControlButton = __esm({
       secondary: "bg-secondary text-secondary-foreground border-border hover:bg-secondary-hover",
       ghost: "bg-transparent text-foreground border-border hover:bg-muted"
     };
-    DEFAULT_ASSET_URL2 = "https://almadar-kflow-assets.web.app/shared/effects/particles/circle_01.png";
+    DEFAULT_ASSET_URL2 = {
+      url: "https://almadar-kflow-assets.web.app/shared/effects/particles/circle_01.png",
+      role: "effect",
+      category: "effect"
+    };
     ControlButton.displayName = "ControlButton";
   }
 });
@@ -10872,7 +10880,7 @@ var init_spriteAnimation = __esm({
   }
 });
 function Sprite({
-  spritesheet = "https://almadar-kflow-assets.web.app/shared/isometric-blocks/Spritesheet/allTiles_sheet.png",
+  spritesheet = DEFAULT_SPRITESHEET,
   frameWidth = 64,
   frameHeight = 64,
   frame = 0,
@@ -10925,7 +10933,7 @@ function Sprite({
         position: "absolute",
         width: frameWidth,
         height: frameHeight,
-        backgroundImage: `url(${spritesheet})`,
+        backgroundImage: `url(${spritesheet.url})`,
         backgroundPosition,
         backgroundRepeat: "no-repeat",
         imageRendering: "pixelated",
@@ -10938,11 +10946,17 @@ function Sprite({
     }
   );
 }
+var DEFAULT_SPRITESHEET;
 var init_Sprite = __esm({
   "components/game/atoms/Sprite.tsx"() {
     "use client";
     init_useEventBus();
     init_spriteAnimation();
+    DEFAULT_SPRITESHEET = {
+      url: "https://almadar-kflow-assets.web.app/shared/isometric-blocks/Spritesheet/allTiles_sheet.png",
+      role: "tile",
+      category: "tile"
+    };
   }
 });
 function StateIndicator({
@@ -10972,7 +10986,7 @@ function StateIndicator({
         /* @__PURE__ */ jsx(Box, { as: "span", children: assetUrl ? /* @__PURE__ */ jsx(
           "img",
           {
-            src: assetUrl,
+            src: assetUrl.url,
             alt: displayLabel,
             width: 16,
             height: 16,
@@ -10991,7 +11005,11 @@ var init_StateIndicator = __esm({
     init_Box();
     init_Icon();
     init_cn();
-    DEFAULT_ASSET_URL3 = "https://almadar-kflow-assets.web.app/shared/isometric-dungeon/Isometric/chestClosed_E.png";
+    DEFAULT_ASSET_URL3 = {
+      url: "https://almadar-kflow-assets.web.app/shared/isometric-dungeon/Isometric/chestClosed_E.png",
+      role: "effect",
+      category: "item"
+    };
     DEFAULT_STATE_STYLES = {
       idle: { icon: "\u23F8", bgClass: "bg-muted" },
       active: { icon: "\u25B6", bgClass: "bg-success" },
@@ -11089,7 +11107,7 @@ function ResourceCounter({
         assetUrl ? /* @__PURE__ */ jsx(
           "img",
           {
-            src: assetUrl,
+            src: assetUrl.url,
             alt: label,
             width: sizes.img,
             height: sizes.img,
@@ -11122,7 +11140,11 @@ var init_ResourceCounter = __esm({
       error: "text-error",
       muted: "text-muted-foreground"
     };
-    DEFAULT_ASSET_URL4 = "https://almadar-kflow-assets.web.app/shared/world-map/gold_mine.png";
+    DEFAULT_ASSET_URL4 = {
+      url: "https://almadar-kflow-assets.web.app/shared/world-map/gold_mine.png",
+      role: "effect",
+      category: "world"
+    };
     sizeMap5 = {
       sm: { wrapper: "text-xs gap-1 px-1.5 py-0.5", icon: "text-sm", img: 16 },
       md: { wrapper: "text-sm gap-1.5 px-2 py-1", icon: "text-base", img: 20 },
@@ -11168,7 +11190,7 @@ function ItemSlot({
         assetUrl ? /* @__PURE__ */ jsx(
           "img",
           {
-            src: assetUrl,
+            src: assetUrl?.url,
             alt: label,
             width: px,
             height: px,
@@ -11216,7 +11238,11 @@ var init_ItemSlot = __esm({
       epic: "shadow-lg",
       legendary: "shadow-lg"
     };
-    DEFAULT_ASSET_URL5 = "https://almadar-kflow-assets.web.app/shared/isometric-dungeon/Isometric/chestClosed_E.png";
+    DEFAULT_ASSET_URL5 = {
+      url: "https://almadar-kflow-assets.web.app/shared/isometric-dungeon/Isometric/chestClosed_E.png",
+      role: "effect",
+      category: "item"
+    };
     assetSizeMap = {
       sm: 28,
       md: 40,
@@ -11262,7 +11288,7 @@ function TurnIndicator({
           assetUrl ? /* @__PURE__ */ jsx(
             "img",
             {
-              src: assetUrl,
+              src: assetUrl.url,
               alt: "",
               width: 12,
               height: 12,
@@ -11285,7 +11311,11 @@ var init_TurnIndicator = __esm({
       md: { wrapper: "text-sm gap-2 px-3 py-1", dot: "w-2 h-2" },
       lg: { wrapper: "text-base gap-2.5 px-4 py-1.5", dot: "w-2.5 h-2.5" }
     };
-    DEFAULT_ASSET_URL6 = "https://almadar-kflow-assets.web.app/shared/effects/particles/symbol_01.png";
+    DEFAULT_ASSET_URL6 = {
+      url: "https://almadar-kflow-assets.web.app/shared/effects/particles/symbol_01.png",
+      role: "effect",
+      category: "effect"
+    };
     TurnIndicator.displayName = "TurnIndicator";
   }
 });
@@ -11324,7 +11354,7 @@ function ComboCounter({
         assetUrl && /* @__PURE__ */ jsx(
           "img",
           {
-            src: assetUrl,
+            src: assetUrl.url,
             alt: "combo",
             width: 24,
             height: 24,
@@ -11350,7 +11380,11 @@ var DEFAULT_ASSET_URL7, sizeMap8;
 var init_ComboCounter = __esm({
   "components/game/atoms/ComboCounter.tsx"() {
     init_cn();
-    DEFAULT_ASSET_URL7 = "https://almadar-kflow-assets.web.app/shared/effects/flash/flash00.png";
+    DEFAULT_ASSET_URL7 = {
+      url: "https://almadar-kflow-assets.web.app/shared/effects/flash/flash00.png",
+      role: "effect",
+      category: "effect"
+    };
     sizeMap8 = {
       sm: { combo: "text-lg", label: "text-xs", multiplier: "text-xs" },
       md: { combo: "text-2xl", label: "text-xs", multiplier: "text-sm" },
@@ -11470,7 +11504,7 @@ function WaypointMarker({
           children: completed ? checkIcon : assetUrl ? /* @__PURE__ */ jsx(
             "img",
             {
-              src: assetUrl,
+              src: assetUrl.url,
               alt: label,
               width: sizes.img,
               height: sizes.img,
@@ -11499,7 +11533,11 @@ var init_WaypointMarker = __esm({
   "components/game/atoms/WaypointMarker.tsx"() {
     init_cn();
     init_Icon();
-    DEFAULT_ASSET_URL8 = "https://almadar-kflow-assets.web.app/shared/world-map/battle_marker.png";
+    DEFAULT_ASSET_URL8 = {
+      url: "https://almadar-kflow-assets.web.app/shared/world-map/battle_marker.png",
+      role: "effect",
+      category: "world"
+    };
     sizeMap10 = {
       sm: { dot: "w-4 h-4", ring: "w-6 h-6", label: "text-xs mt-1", img: 12 },
       md: { dot: "w-6 h-6", ring: "w-8 h-8", label: "text-sm mt-1.5", img: 18 },
@@ -11540,7 +11578,7 @@ function StatusEffect({
           /* @__PURE__ */ jsx("span", { className: cn("flex items-center justify-center", sizes.icon), children: assetUrl ? /* @__PURE__ */ jsx(
             "img",
             {
-              src: assetUrl,
+              src: assetUrl.url,
               alt: label,
               width: sizes.img,
               height: sizes.img,
@@ -11579,7 +11617,11 @@ var init_StatusEffect = __esm({
   "components/game/atoms/StatusEffect.tsx"() {
     init_cn();
     init_Icon();
-    DEFAULT_ASSET_URL9 = "https://almadar-kflow-assets.web.app/shared/effects/particles/flame_01.png";
+    DEFAULT_ASSET_URL9 = {
+      url: "https://almadar-kflow-assets.web.app/shared/effects/particles/flame_01.png",
+      role: "effect",
+      category: "effect"
+    };
     sizeMap11 = {
       sm: { container: "w-8 h-8", icon: "text-sm", badge: "text-xs -top-1 -right-1 w-4 h-4", timer: "text-[9px]", img: 20 },
       md: { container: "w-10 h-10", icon: "text-base", badge: "text-xs -top-1 -right-1 w-5 h-5", timer: "text-xs", img: 28 },
@@ -11617,7 +11659,7 @@ function DamageNumber({
           assetUrl && /* @__PURE__ */ jsx(
             "img",
             {
-              src: assetUrl,
+              src: assetUrl.url,
               alt: "",
               width: 14,
               height: 14,
@@ -11653,14 +11695,18 @@ var init_DamageNumber = __esm({
   100% { opacity: 0; transform: translateY(-32px) scale(0.8); }
 }
 `;
-    DEFAULT_ASSET_URL10 = "https://almadar-kflow-assets.web.app/shared/effects/particles/spark_01.png";
+    DEFAULT_ASSET_URL10 = {
+      url: "https://almadar-kflow-assets.web.app/shared/effects/particles/spark_01.png",
+      role: "effect",
+      category: "effect"
+    };
     DamageNumber.displayName = "DamageNumber";
   }
 });
 function DialogueBubble({
   speaker = "Hero",
   text = "The dungeon awaits. Choose your path wisely.",
-  portrait = "https://almadar-kflow-assets.web.app/shared/characters/archetypes/04_hero.png",
+  portrait = DEFAULT_PORTRAIT,
   position = "bottom",
   className
 }) {
@@ -11676,7 +11722,7 @@ function DialogueBubble({
         portrait && /* @__PURE__ */ jsx("div", { className: "flex-shrink-0 w-12 h-12 rounded-full overflow-hidden border-2 border-warning/60", children: /* @__PURE__ */ jsx(
           "img",
           {
-            src: portrait,
+            src: portrait?.url,
             alt: speaker ?? "speaker",
             className: "w-full h-full object-cover"
           }
@@ -11689,9 +11735,15 @@ function DialogueBubble({
     }
   );
 }
+var DEFAULT_PORTRAIT;
 var init_DialogueBubble = __esm({
   "components/game/atoms/DialogueBubble.tsx"() {
     init_cn();
+    DEFAULT_PORTRAIT = {
+      url: "https://almadar-kflow-assets.web.app/shared/characters/archetypes/04_hero.png",
+      role: "effect",
+      category: "character"
+    };
     DialogueBubble.displayName = "DialogueBubble";
   }
 });
@@ -11735,7 +11787,7 @@ function ChoiceButton({
         assetUrl ? /* @__PURE__ */ jsx(
           "img",
           {
-            src: assetUrl,
+            src: assetUrl.url,
             alt: "",
             width: 16,
             height: 16,
@@ -11805,7 +11857,7 @@ function ActionButton({
         assetUrl ? /* @__PURE__ */ jsx(
           "img",
           {
-            src: assetUrl,
+            src: assetUrl.url,
             alt: "",
             width: 16,
             height: 16,
@@ -11849,7 +11901,11 @@ var init_ActionButton = __esm({
       secondary: "bg-secondary text-secondary-foreground hover:bg-secondary-hover border-border",
       danger: "bg-error text-error-foreground hover:bg-error/90 border-error"
     };
-    DEFAULT_ASSET_URL11 = "https://almadar-kflow-assets.web.app/shared/effects/particles/slash_01.png";
+    DEFAULT_ASSET_URL11 = {
+      url: "https://almadar-kflow-assets.web.app/shared/effects/particles/slash_01.png",
+      role: "effect",
+      category: "effect"
+    };
     ActionButton.displayName = "ActionButton";
   }
 });
@@ -14436,12 +14492,7 @@ var init_useCanvasGestures = __esm({
   }
 });
 function unitAtlasUrl(unit) {
-  if (unit.spriteSheet) return unit.spriteSheet;
-  const sprite = unit.sprite;
-  if (!sprite) return null;
-  const match = /^(.*-sprite-sheet)(?:-(?:se|sw))?(?:-v\d+)?\.png$/.exec(sprite);
-  if (!match) return null;
-  return `${match[1]}.json`;
+  return unit.spriteSheet?.url ?? null;
 }
 function resolveSheetUrl(atlasUrl, relativeSheetPath) {
   try {
@@ -14637,7 +14688,6 @@ function IsometricCanvas({
   // Tuning
   diamondTopY: diamondTopYProp,
   // Remote asset loading
-  assetBaseUrl,
   assetManifest
 }) {
   const tilesProp = Array.isArray(_tilesPropRaw) ? _tilesPropRaw : [];
@@ -14719,54 +14769,48 @@ function IsometricCanvas({
   const attackTargetSet = useMemo(() => {
     return new Set(attackTargets.map((p2) => `${p2.x},${p2.y}`));
   }, [attackTargets]);
-  const resolveManifestUrl7 = useCallback((relativePath) => {
-    if (!relativePath) return void 0;
-    if (assetBaseUrl) return `${assetBaseUrl.replace(/\/$/, "")}${relativePath.startsWith("/") ? "" : "/"}${relativePath}`;
-    return relativePath;
-  }, [assetBaseUrl]);
   const spriteUrls = useMemo(() => {
     const urls = [];
     for (const tile of sortedTiles) {
-      if (tile.terrainSprite) urls.push(tile.terrainSprite);
+      if (tile.terrainSprite) urls.push(tile.terrainSprite.url);
       else if (getTerrainSprite) {
         const url = getTerrainSprite(tile.terrain ?? "");
         if (url) urls.push(url);
       } else {
-        const url = resolveManifestUrl7(assetManifest?.terrains?.[tile.terrain ?? ""]);
+        const url = assetManifest?.terrains?.[tile.terrain ?? ""]?.url;
         if (url) urls.push(url);
       }
     }
     for (const feature of features) {
-      if (feature.sprite) urls.push(feature.sprite);
+      if (feature.sprite) urls.push(feature.sprite.url);
       else if (getFeatureSprite) {
         const url = getFeatureSprite(feature.type);
         if (url) urls.push(url);
       } else {
-        const url = resolveManifestUrl7(assetManifest?.features?.[feature.type]);
+        const url = assetManifest?.features?.[feature.type]?.url;
         if (url) urls.push(url);
       }
     }
     for (const unit of units) {
-      if (unit.sprite) urls.push(unit.sprite);
+      if (unit.sprite) urls.push(unit.sprite.url);
       else if (getUnitSprite) {
         const url = getUnitSprite(unit);
         if (url) urls.push(url);
       } else if (unit.unitType) {
-        const url = resolveManifestUrl7(assetManifest?.units?.[unit.unitType]);
+        const url = assetManifest?.units?.[unit.unitType]?.url;
         if (url) urls.push(url);
       }
     }
     if (assetManifest?.effects) {
-      for (const path of Object.values(assetManifest.effects)) {
-        const url = resolveManifestUrl7(path);
-        if (url) urls.push(url);
+      for (const asset of Object.values(assetManifest.effects)) {
+        if (asset.url) urls.push(asset.url);
       }
     }
     if (effectSpriteUrls) urls.push(...effectSpriteUrls);
     if (atlasSheetUrls.length) urls.push(...atlasSheetUrls);
     if (backgroundImage) urls.push(backgroundImage);
     return [...new Set(urls.filter(Boolean))];
-  }, [sortedTiles, features, units, getTerrainSprite, getFeatureSprite, getUnitSprite, effectSpriteUrls, atlasSheetUrls, backgroundImage, assetManifest, resolveManifestUrl7]);
+  }, [sortedTiles, features, units, getTerrainSprite, getFeatureSprite, getUnitSprite, effectSpriteUrls, atlasSheetUrls, backgroundImage, assetManifest]);
   const { getImage, pendingCount: _imagePendingCount } = useImageCache(spriteUrls);
   useEffect(() => {
     if (typeof window === "undefined") return;
@@ -14791,14 +14835,14 @@ function IsometricCanvas({
     lerpToTarget
   } = useCamera();
   const resolveTerrainSpriteUrl = useCallback((tile) => {
-    return tile.terrainSprite || getTerrainSprite?.(tile.terrain ?? "") || resolveManifestUrl7(assetManifest?.terrains?.[tile.terrain ?? ""]);
-  }, [getTerrainSprite, assetManifest, resolveManifestUrl7]);
+    return tile.terrainSprite?.url || getTerrainSprite?.(tile.terrain ?? "") || assetManifest?.terrains?.[tile.terrain ?? ""]?.url;
+  }, [getTerrainSprite, assetManifest]);
   const resolveFeatureSpriteUrl = useCallback((featureType) => {
-    return getFeatureSprite?.(featureType) || resolveManifestUrl7(assetManifest?.features?.[featureType]);
-  }, [getFeatureSprite, assetManifest, resolveManifestUrl7]);
+    return getFeatureSprite?.(featureType) || assetManifest?.features?.[featureType]?.url;
+  }, [getFeatureSprite, assetManifest]);
   const resolveUnitSpriteUrl = useCallback((unit) => {
-    return unit.sprite || getUnitSprite?.(unit) || (unit.unitType ? resolveManifestUrl7(assetManifest?.units?.[unit.unitType]) : void 0);
-  }, [getUnitSprite, assetManifest, resolveManifestUrl7]);
+    return unit.sprite?.url || getUnitSprite?.(unit) || (unit.unitType ? assetManifest?.units?.[unit.unitType]?.url : void 0);
+  }, [getUnitSprite, assetManifest]);
   const miniMapTiles = useMemo(() => {
     if (!showMinimap) return [];
     return sortedTiles.map((t2) => ({
@@ -14945,7 +14989,7 @@ function IsometricCanvas({
       if (pos.x + scaledTileWidth < visLeft || pos.x > visRight || pos.y + scaledTileHeight < visTop || pos.y > visBottom) {
         continue;
       }
-      const spriteUrl = feature.sprite || resolveFeatureSpriteUrl(feature.type);
+      const spriteUrl = feature.sprite?.url || resolveFeatureSpriteUrl(feature.type);
       const img = spriteUrl ? getImage(spriteUrl) : null;
       const centerX = pos.x + scaledTileWidth / 2;
       const featureGroundY = pos.y + scaledDiamondTopY + scaledFloorHeight * 0.5;
@@ -14994,12 +15038,12 @@ function IsometricCanvas({
       const img = unitSpriteUrl ? getImage(unitSpriteUrl) : null;
       const unitDrawH = scaledFloorHeight * spriteHeightRatio * unitScale;
       const maxUnitW = scaledTileWidth * spriteMaxWidthRatio * unitScale;
+      const unitIsSheet = unit.sprite?.dimension === "2d" && (unit.sprite?.animations?.length ?? 0) > 0;
       const SHEET_ROWS = 5;
       const sheetFrameW = img ? img.naturalWidth / SHEET_COLUMNS : 0;
       const sheetFrameH = img ? img.naturalHeight / SHEET_ROWS : 0;
-      const imgIsSheet = img ? img.naturalWidth % SHEET_COLUMNS === 0 && img.naturalHeight % SHEET_ROWS === 0 && Math.abs(sheetFrameW - sheetFrameH) < 2 : false;
-      const frameW = imgIsSheet ? sheetFrameW : img?.naturalWidth ?? 1;
-      const frameH = imgIsSheet ? sheetFrameH : img?.naturalHeight ?? 1;
+      const frameW = unitIsSheet ? sheetFrameW : img?.naturalWidth ?? 1;
+      const frameH = unitIsSheet ? sheetFrameH : img?.naturalHeight ?? 1;
       const ar = frameW / (frameH || 1);
       let drawH = unitDrawH;
       let drawW = unitDrawH * ar;
@@ -15014,7 +15058,7 @@ function IsometricCanvas({
         ctx.save();
         ctx.globalAlpha = 0.25;
         if (img) {
-          if (imgIsSheet) {
+          if (unitIsSheet) {
             ctx.drawImage(img, 0, 0, sheetFrameW, sheetFrameH, ghostCenterX - drawW / 2, ghostGroundY - drawH, drawW, drawH);
           } else {
             ctx.drawImage(img, ghostCenterX - drawW / 2, ghostGroundY - drawH, drawW, drawH);
@@ -15062,7 +15106,7 @@ function IsometricCanvas({
       } else if (img) {
         const spriteY = groundY - drawH - breatheOffset;
         const drawUnit = (x) => {
-          if (imgIsSheet) {
+          if (unitIsSheet) {
             ctx.drawImage(img, 0, 0, sheetFrameW, sheetFrameH, x, spriteY, drawW, drawH);
           } else {
             ctx.drawImage(img, x, spriteY, drawW, drawH);
@@ -15089,7 +15133,7 @@ function IsometricCanvas({
       }
     }
     for (const fx of effects) {
-      const spriteUrl = resolveManifestUrl7(assetManifest?.effects?.[fx.key]);
+      const spriteUrl = assetManifest?.effects?.[fx.key]?.url;
       if (!spriteUrl) continue;
       const img = getImage(spriteUrl);
       if (!img) continue;
@@ -15133,7 +15177,6 @@ function IsometricCanvas({
     backgroundImage,
     cameraRef,
     unitScale,
-    resolveManifestUrl7,
     assetManifest
   ]);
   useEffect(() => {
@@ -15411,6 +15454,42 @@ var init_boardEntity = __esm({
   "components/game/organisms/boardEntity.ts"() {
   }
 });
+
+// components/game/organisms/utils/makeAsset.ts
+function makeAsset(url, role, overrides = {}) {
+  const defaults = ROLE_DEFAULTS[role] ?? { dimension: "2d", animations: ["static"], aspect: "1:1" };
+  return {
+    url,
+    role,
+    category: url.split("/").pop()?.replace(/\.[^.]+$/, "") ?? role,
+    ...defaults,
+    ...overrides
+  };
+}
+function makeAssetMap(record, role, overrides = {}) {
+  const result = {};
+  for (const [key, url] of Object.entries(record)) {
+    result[key] = makeAsset(url, role, overrides);
+  }
+  return result;
+}
+var ROLE_DEFAULTS;
+var init_makeAsset = __esm({
+  "components/game/organisms/utils/makeAsset.ts"() {
+    ROLE_DEFAULTS = {
+      tile: { dimension: "2d", animations: ["static"], aspect: "1:1" },
+      decoration: { dimension: "2d", animations: ["static"], aspect: "1:1" },
+      effect: { dimension: "2d", animations: ["static"], aspect: "1:1" },
+      item: { dimension: "2d", animations: ["static"], aspect: "5:7" },
+      player: { dimension: "2d", animations: ["idle", "walk", "attack", "hit", "death"], aspect: "1:1" },
+      enemy: { dimension: "2d", animations: ["idle", "walk", "attack", "hit", "death"], aspect: "1:1" },
+      npc: { dimension: "2d", animations: ["idle", "walk", "attack", "hit", "death"], aspect: "1:1" },
+      projectile: { dimension: "2d", animations: ["static"], aspect: "1:1" },
+      vehicle: { dimension: "2d", animations: ["idle", "walk"], aspect: "1:1" },
+      ui: { dimension: "2d", animations: ["static"], aspect: "1:1" }
+    };
+  }
+});
 function buildDefaultBattleTiles() {
   const tiles = [];
   for (let y = 0; y < BATTLE_GRID_H; y++) {
@@ -15469,14 +15548,14 @@ function BattleBoard({
     if (o === null || typeof o.x !== "number" || typeof o.y !== "number") return [];
     const tile = { x: o.x, y: o.y };
     if (typeof o.terrain === "string") tile.terrain = o.terrain;
-    if (typeof o.terrainSprite === "string") tile.terrainSprite = o.terrainSprite;
+    if (typeof o.terrainSprite === "string") tile.terrainSprite = makeAsset(o.terrainSprite, "tile");
     if (typeof o.passable === "boolean") tile.passable = o.passable;
     if (typeof o.movementCost === "number") tile.movementCost = o.movementCost;
     if (typeof o.elevation === "number") tile.elevation = o.elevation;
     if (typeof o.type === "string") tile.type = o.type;
     if (typeof o.tileType === "string") tile.tileType = o.tileType;
     if (typeof o.id === "string") tile.id = o.id;
-    if (typeof o.modelUrl === "string") tile.modelUrl = o.modelUrl;
+    if (typeof o.modelUrl === "string") tile.modelUrl = makeAsset(o.modelUrl, "decoration", { dimension: "3d" });
     return [tile];
   }) : []);
   const tiles = rawTiles.length === 0 ? DEFAULT_BATTLE_TILES : rawTiles;
@@ -15485,10 +15564,10 @@ function BattleBoard({
     if (o === null || typeof o.type !== "string" || typeof o.x !== "number" || typeof o.y !== "number") return [];
     const feat = { type: o.type, x: o.x, y: o.y };
     if (typeof o.id === "string") feat.id = o.id;
-    if (typeof o.sprite === "string") feat.sprite = o.sprite;
+    if (typeof o.sprite === "string") feat.sprite = makeAsset(o.sprite, "decoration");
     if (typeof o.color === "string") feat.color = o.color;
     if (typeof o.elevation === "number") feat.elevation = o.elevation;
-    if (typeof o.assetUrl === "string") feat.assetUrl = o.assetUrl;
+    if (typeof o.assetUrl === "string") feat.assetUrl = makeAsset(o.assetUrl, "decoration", { dimension: "3d" });
     return [feat];
   }) : []);
   const boardWidth = num(board.gridWidth ?? board.boardWidth, BATTLE_GRID_W);
@@ -15604,7 +15683,7 @@ function BattleBoard({
         maxHealth: num(unit.maxHealth),
         unitType: unit.unitType == null ? void 0 : str(unit.unitType),
         heroId: unit.heroId == null ? void 0 : str(unit.heroId),
-        sprite: unit.sprite == null ? void 0 : str(unit.sprite),
+        sprite: unit.sprite == null ? void 0 : makeAsset(str(unit.sprite), "npc"),
         traits: unitTraits?.map((tr) => ({
           name: tr.name,
           currentState: tr.currentState,
@@ -15754,7 +15833,6 @@ function BattleBoard({
             onTileHover: (x, y) => setHoveredTile({ x, y }),
             onTileLeave: () => setHoveredTile(null),
             scale,
-            assetBaseUrl: assetManifest?.baseUrl,
             assetManifest,
             backgroundImage,
             onDrawEffects,
@@ -15832,15 +15910,16 @@ var init_BattleBoard = __esm({
     init_IsometricCanvas();
     init_boardEntity();
     init_isometric();
+    init_makeAsset();
     BATTLE_CDN = "https://almadar-kflow-assets.web.app/shared";
     BATTLE_GRID_W = 16;
     BATTLE_GRID_H = 16;
     BATTLE_TERRAIN_SPRITES = [
-      `${BATTLE_CDN}/isometric-dungeon/Isometric/dirt_E.png`,
-      `${BATTLE_CDN}/isometric-dungeon/Isometric/dirtTiles_E.png`,
-      `${BATTLE_CDN}/isometric-dungeon/Isometric/planks_E.png`,
-      `${BATTLE_CDN}/isometric-dungeon/Isometric/stoneTile_E.png`,
-      `${BATTLE_CDN}/isometric-dungeon/Isometric/stoneInset_E.png`
+      makeAsset(`${BATTLE_CDN}/isometric-dungeon/Isometric/dirt_E.png`, "tile"),
+      makeAsset(`${BATTLE_CDN}/isometric-dungeon/Isometric/dirtTiles_E.png`, "tile"),
+      makeAsset(`${BATTLE_CDN}/isometric-dungeon/Isometric/planks_E.png`, "tile"),
+      makeAsset(`${BATTLE_CDN}/isometric-dungeon/Isometric/stoneTile_E.png`, "tile"),
+      makeAsset(`${BATTLE_CDN}/isometric-dungeon/Isometric/stoneInset_E.png`, "tile")
     ];
     DEFAULT_BATTLE_TILES = buildDefaultBattleTiles();
     BattleBoard.displayName = "BattleBoard";
@@ -15879,61 +15958,64 @@ function BattleTemplate({
     }
   );
 }
-var CDN, DEFAULT_BATTLE_TILES2, DEFAULT_BATTLE_UNITS, DEFAULT_BATTLE_FEATURES, DEFAULT_BATTLE_MANIFEST;
+var CDN, STONE, DIRT, GRASS, DEFAULT_BATTLE_TILES2, DEFAULT_BATTLE_UNITS, DEFAULT_BATTLE_FEATURES, DEFAULT_BATTLE_MANIFEST;
 var init_BattleTemplate = __esm({
   "components/game/templates/BattleTemplate.tsx"() {
     init_BattleBoard();
+    init_makeAsset();
     CDN = "https://almadar-kflow-assets.web.app/shared";
+    STONE = makeAsset(`${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_07.png`, "tile");
+    DIRT = makeAsset(`${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_01.png`, "tile");
+    GRASS = makeAsset(`${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_13.png`, "tile");
     DEFAULT_BATTLE_TILES2 = [
-      { x: 0, y: 0, terrain: "stone", passable: false, terrainSprite: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_07.png` },
-      { x: 1, y: 0, terrain: "stone", passable: false, terrainSprite: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_07.png` },
-      { x: 2, y: 0, terrain: "stone", passable: false, terrainSprite: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_07.png` },
-      { x: 3, y: 0, terrain: "stone", passable: false, terrainSprite: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_07.png` },
-      { x: 4, y: 0, terrain: "stone", passable: false, terrainSprite: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_07.png` },
-      { x: 0, y: 1, terrain: "stone", passable: false, terrainSprite: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_07.png` },
-      { x: 1, y: 1, terrain: "dirt", passable: true, terrainSprite: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_01.png` },
-      { x: 2, y: 1, terrain: "grass", passable: true, terrainSprite: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_13.png` },
-      { x: 3, y: 1, terrain: "grass", passable: true, terrainSprite: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_13.png` },
-      { x: 4, y: 1, terrain: "stone", passable: false, terrainSprite: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_07.png` },
-      { x: 0, y: 2, terrain: "stone", passable: false, terrainSprite: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_07.png` },
-      { x: 1, y: 2, terrain: "grass", passable: true, terrainSprite: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_13.png` },
-      { x: 2, y: 2, terrain: "dirt", passable: true, terrainSprite: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_01.png` },
-      { x: 3, y: 2, terrain: "grass", passable: true, terrainSprite: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_13.png` },
-      { x: 4, y: 2, terrain: "stone", passable: false, terrainSprite: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_07.png` },
-      { x: 0, y: 3, terrain: "stone", passable: false, terrainSprite: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_07.png` },
-      { x: 1, y: 3, terrain: "grass", passable: true, terrainSprite: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_13.png` },
-      { x: 2, y: 3, terrain: "grass", passable: true, terrainSprite: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_13.png` },
-      { x: 3, y: 3, terrain: "dirt", passable: true, terrainSprite: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_01.png` },
-      { x: 4, y: 3, terrain: "stone", passable: false, terrainSprite: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_07.png` },
-      { x: 0, y: 4, terrain: "stone", passable: false, terrainSprite: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_07.png` },
-      { x: 1, y: 4, terrain: "stone", passable: false, terrainSprite: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_07.png` },
-      { x: 2, y: 4, terrain: "stone", passable: false, terrainSprite: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_07.png` },
-      { x: 3, y: 4, terrain: "stone", passable: false, terrainSprite: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_07.png` },
-      { x: 4, y: 4, terrain: "stone", passable: false, terrainSprite: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_07.png` }
+      { x: 0, y: 0, terrain: "stone", passable: false, terrainSprite: STONE },
+      { x: 1, y: 0, terrain: "stone", passable: false, terrainSprite: STONE },
+      { x: 2, y: 0, terrain: "stone", passable: false, terrainSprite: STONE },
+      { x: 3, y: 0, terrain: "stone", passable: false, terrainSprite: STONE },
+      { x: 4, y: 0, terrain: "stone", passable: false, terrainSprite: STONE },
+      { x: 0, y: 1, terrain: "stone", passable: false, terrainSprite: STONE },
+      { x: 1, y: 1, terrain: "dirt", passable: true, terrainSprite: DIRT },
+      { x: 2, y: 1, terrain: "grass", passable: true, terrainSprite: GRASS },
+      { x: 3, y: 1, terrain: "grass", passable: true, terrainSprite: GRASS },
+      { x: 4, y: 1, terrain: "stone", passable: false, terrainSprite: STONE },
+      { x: 0, y: 2, terrain: "stone", passable: false, terrainSprite: STONE },
+      { x: 1, y: 2, terrain: "grass", passable: true, terrainSprite: GRASS },
+      { x: 2, y: 2, terrain: "dirt", passable: true, terrainSprite: DIRT },
+      { x: 3, y: 2, terrain: "grass", passable: true, terrainSprite: GRASS },
+      { x: 4, y: 2, terrain: "stone", passable: false, terrainSprite: STONE },
+      { x: 0, y: 3, terrain: "stone", passable: false, terrainSprite: STONE },
+      { x: 1, y: 3, terrain: "grass", passable: true, terrainSprite: GRASS },
+      { x: 2, y: 3, terrain: "grass", passable: true, terrainSprite: GRASS },
+      { x: 3, y: 3, terrain: "dirt", passable: true, terrainSprite: DIRT },
+      { x: 4, y: 3, terrain: "stone", passable: false, terrainSprite: STONE },
+      { x: 0, y: 4, terrain: "stone", passable: false, terrainSprite: STONE },
+      { x: 1, y: 4, terrain: "stone", passable: false, terrainSprite: STONE },
+      { x: 2, y: 4, terrain: "stone", passable: false, terrainSprite: STONE },
+      { x: 3, y: 4, terrain: "stone", passable: false, terrainSprite: STONE },
+      { x: 4, y: 4, terrain: "stone", passable: false, terrainSprite: STONE }
     ];
     DEFAULT_BATTLE_UNITS = [
-      { id: "u1", position: { x: 1, y: 1 }, unitType: "worker", name: "Worker", team: "player", health: 10, maxHealth: 10, sprite: `${CDN}/sprite-sheets/amir-sprite-sheet-se.png` },
-      { id: "u2", position: { x: 3, y: 3 }, unitType: "guardian", name: "Guardian", team: "enemy", health: 8, maxHealth: 10, sprite: `${CDN}/sprite-sheets/destroyer-sprite-sheet-sw.png` }
+      { id: "u1", position: { x: 1, y: 1 }, unitType: "worker", name: "Worker", team: "player", health: 10, maxHealth: 10, sprite: makeAsset(`${CDN}/sprite-sheets/amir-sprite-sheet-se.png`, "player") },
+      { id: "u2", position: { x: 3, y: 3 }, unitType: "guardian", name: "Guardian", team: "enemy", health: 8, maxHealth: 10, sprite: makeAsset(`${CDN}/sprite-sheets/destroyer-sprite-sheet-sw.png`, "enemy") }
     ];
     DEFAULT_BATTLE_FEATURES = [
-      { id: "f1", x: 2, y: 2, type: "gold_mine", sprite: `${CDN}/world-map/gold_mine.png` },
-      { id: "f2", x: 3, y: 1, type: "portal", sprite: `${CDN}/world-map/portal_open.png` }
+      { id: "f1", x: 2, y: 2, type: "gold_mine", sprite: makeAsset(`${CDN}/world-map/gold_mine.png`, "decoration") },
+      { id: "f2", x: 3, y: 1, type: "portal", sprite: makeAsset(`${CDN}/world-map/portal_open.png`, "decoration") }
     ];
     DEFAULT_BATTLE_MANIFEST = {
-      baseUrl: CDN,
-      terrains: {
-        stone: "/isometric-blocks/PNG/Abstract tiles/abstractTile_07.png",
-        dirt: "/isometric-blocks/PNG/Abstract tiles/abstractTile_01.png",
-        grass: "/isometric-blocks/PNG/Abstract tiles/abstractTile_13.png"
-      },
-      units: {
-        worker: "/sprite-sheets/amir-sprite-sheet-se.png",
-        guardian: "/sprite-sheets/destroyer-sprite-sheet-sw.png"
-      },
-      features: {
-        gold_mine: "/world-map/gold_mine.png",
-        portal: "/world-map/portal_open.png"
-      }
+      terrains: makeAssetMap({
+        stone: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_07.png`,
+        dirt: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_01.png`,
+        grass: `${CDN}/isometric-blocks/PNG/Abstract tiles/abstractTile_13.png`
+      }, "tile"),
+      units: makeAssetMap({
+        worker: `${CDN}/sprite-sheets/amir-sprite-sheet-se.png`,
+        guardian: `${CDN}/sprite-sheets/destroyer-sprite-sheet-sw.png`
+      }, "npc"),
+      features: makeAssetMap({
+        gold_mine: `${CDN}/world-map/gold_mine.png`,
+        portal: `${CDN}/world-map/portal_open.png`
+      }, "decoration")
     };
     BattleTemplate.displayName = "BattleTemplate";
   }
@@ -17321,7 +17403,6 @@ function BoardgameBoard({
       units,
       features,
       assetManifest,
-      assetBaseUrl,
       scale,
       showMinimap,
       enableCamera,
@@ -22391,7 +22472,7 @@ function CardHand({
           /* @__PURE__ */ jsx(Box, { className: "flex-1 flex items-center justify-center w-full", children: card.iconUrl ? /* @__PURE__ */ jsx(
             "img",
             {
-              src: card.iconUrl,
+              src: card.iconUrl.url,
               alt: card.title ?? card.id,
               width: art,
               height: art,
@@ -22449,15 +22530,6 @@ var init_CardHand = __esm({
     CardHand.displayName = "CardHand";
   }
 });
-function resolveManifestUrl(manifest, relative) {
-  if (relative == null) return void 0;
-  if (/^https?:\/\//.test(relative)) return relative;
-  const base = manifest?.baseUrl;
-  if (base == null) return relative;
-  const cleanBase = base.replace(/\/$/, "");
-  const cleanRel = relative.replace(/^\//, "");
-  return `${cleanBase}/${cleanRel}`;
-}
 function rowToCard(r2) {
   return {
     id: str(r2.id),
@@ -22471,7 +22543,7 @@ function rowToCard(r2) {
 function toHandCards(cards, manifest, mana) {
   return cards.map((c) => {
     const key = c.iconKey ?? c.id;
-    const iconUrl = resolveManifestUrl(manifest, manifest?.cards?.[key]);
+    const iconUrl = manifest?.cards?.[key];
     return {
       id: c.id,
       iconUrl,
@@ -23585,7 +23657,6 @@ function CastleBoard({
             onTileHover: (x, y) => setHoveredTile({ x, y }),
             onTileLeave: () => setHoveredTile(null),
             scale,
-            assetBaseUrl: assetManifest?.baseUrl,
             assetManifest,
             backgroundImage
           }
@@ -23661,60 +23732,63 @@ function CastleTemplate({
     }
   );
 }
-var CDN2, DEFAULT_CASTLE_TILES, DEFAULT_CASTLE_UNITS, DEFAULT_CASTLE_FEATURES, DEFAULT_CASTLE_MANIFEST;
+var CDN2, WALL, FLOOR, FLOOR_CENTER, DEFAULT_CASTLE_TILES, DEFAULT_CASTLE_UNITS, DEFAULT_CASTLE_FEATURES, DEFAULT_CASTLE_MANIFEST;
 var init_CastleTemplate = __esm({
   "components/game/templates/CastleTemplate.tsx"() {
     init_CastleBoard();
+    init_makeAsset();
     CDN2 = "https://almadar-kflow-assets.web.app/shared";
+    WALL = makeAsset(`${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_05.png`, "tile");
+    FLOOR = makeAsset(`${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_01.png`, "tile");
+    FLOOR_CENTER = makeAsset(`${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_09.png`, "tile");
     DEFAULT_CASTLE_TILES = [
-      { x: 0, y: 0, terrain: "wall", passable: false, terrainSprite: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_05.png` },
-      { x: 1, y: 0, terrain: "wall", passable: false, terrainSprite: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_05.png` },
-      { x: 2, y: 0, terrain: "wall", passable: false, terrainSprite: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_05.png` },
-      { x: 3, y: 0, terrain: "wall", passable: false, terrainSprite: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_05.png` },
-      { x: 4, y: 0, terrain: "wall", passable: false, terrainSprite: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_05.png` },
-      { x: 0, y: 1, terrain: "wall", passable: false, terrainSprite: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_05.png` },
-      { x: 1, y: 1, terrain: "floor", passable: true, terrainSprite: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_01.png` },
-      { x: 2, y: 1, terrain: "floor", passable: true, terrainSprite: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_01.png` },
-      { x: 3, y: 1, terrain: "floor", passable: true, terrainSprite: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_01.png` },
-      { x: 4, y: 1, terrain: "wall", passable: false, terrainSprite: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_05.png` },
-      { x: 0, y: 2, terrain: "wall", passable: false, terrainSprite: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_05.png` },
-      { x: 1, y: 2, terrain: "floor", passable: true, terrainSprite: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_01.png` },
-      { x: 2, y: 2, terrain: "floor", passable: true, terrainSprite: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_09.png` },
-      { x: 3, y: 2, terrain: "floor", passable: true, terrainSprite: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_01.png` },
-      { x: 4, y: 2, terrain: "wall", passable: false, terrainSprite: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_05.png` },
-      { x: 0, y: 3, terrain: "wall", passable: false, terrainSprite: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_05.png` },
-      { x: 1, y: 3, terrain: "floor", passable: true, terrainSprite: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_01.png` },
-      { x: 2, y: 3, terrain: "floor", passable: true, terrainSprite: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_01.png` },
-      { x: 3, y: 3, terrain: "floor", passable: true, terrainSprite: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_01.png` },
-      { x: 4, y: 3, terrain: "wall", passable: false, terrainSprite: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_05.png` },
-      { x: 0, y: 4, terrain: "wall", passable: false, terrainSprite: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_05.png` },
-      { x: 1, y: 4, terrain: "wall", passable: false, terrainSprite: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_05.png` },
-      { x: 2, y: 4, terrain: "wall", passable: false, terrainSprite: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_05.png` },
-      { x: 3, y: 4, terrain: "wall", passable: false, terrainSprite: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_05.png` },
-      { x: 4, y: 4, terrain: "wall", passable: false, terrainSprite: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_05.png` }
+      { x: 0, y: 0, terrain: "wall", passable: false, terrainSprite: WALL },
+      { x: 1, y: 0, terrain: "wall", passable: false, terrainSprite: WALL },
+      { x: 2, y: 0, terrain: "wall", passable: false, terrainSprite: WALL },
+      { x: 3, y: 0, terrain: "wall", passable: false, terrainSprite: WALL },
+      { x: 4, y: 0, terrain: "wall", passable: false, terrainSprite: WALL },
+      { x: 0, y: 1, terrain: "wall", passable: false, terrainSprite: WALL },
+      { x: 1, y: 1, terrain: "floor", passable: true, terrainSprite: FLOOR },
+      { x: 2, y: 1, terrain: "floor", passable: true, terrainSprite: FLOOR },
+      { x: 3, y: 1, terrain: "floor", passable: true, terrainSprite: FLOOR },
+      { x: 4, y: 1, terrain: "wall", passable: false, terrainSprite: WALL },
+      { x: 0, y: 2, terrain: "wall", passable: false, terrainSprite: WALL },
+      { x: 1, y: 2, terrain: "floor", passable: true, terrainSprite: FLOOR },
+      { x: 2, y: 2, terrain: "floor", passable: true, terrainSprite: FLOOR_CENTER },
+      { x: 3, y: 2, terrain: "floor", passable: true, terrainSprite: FLOOR },
+      { x: 4, y: 2, terrain: "wall", passable: false, terrainSprite: WALL },
+      { x: 0, y: 3, terrain: "wall", passable: false, terrainSprite: WALL },
+      { x: 1, y: 3, terrain: "floor", passable: true, terrainSprite: FLOOR },
+      { x: 2, y: 3, terrain: "floor", passable: true, terrainSprite: FLOOR },
+      { x: 3, y: 3, terrain: "floor", passable: true, terrainSprite: FLOOR },
+      { x: 4, y: 3, terrain: "wall", passable: false, terrainSprite: WALL },
+      { x: 0, y: 4, terrain: "wall", passable: false, terrainSprite: WALL },
+      { x: 1, y: 4, terrain: "wall", passable: false, terrainSprite: WALL },
+      { x: 2, y: 4, terrain: "wall", passable: false, terrainSprite: WALL },
+      { x: 3, y: 4, terrain: "wall", passable: false, terrainSprite: WALL },
+      { x: 4, y: 4, terrain: "wall", passable: false, terrainSprite: WALL }
     ];
     DEFAULT_CASTLE_UNITS = [
-      { id: "u1", position: { x: 1, y: 1 }, unitType: "worker", name: "Worker", team: "player", health: 10, maxHealth: 10, sprite: `${CDN2}/sprite-sheets/coordinator-sprite-sheet-se.png` },
-      { id: "u2", position: { x: 3, y: 3 }, unitType: "guardian", name: "Guardian", team: "player", health: 10, maxHealth: 10, sprite: `${CDN2}/sprite-sheets/forger-sprite-sheet-se.png` }
+      { id: "u1", position: { x: 1, y: 1 }, unitType: "worker", name: "Worker", team: "player", health: 10, maxHealth: 10, sprite: makeAsset(`${CDN2}/sprite-sheets/coordinator-sprite-sheet-se.png`, "player") },
+      { id: "u2", position: { x: 3, y: 3 }, unitType: "guardian", name: "Guardian", team: "player", health: 10, maxHealth: 10, sprite: makeAsset(`${CDN2}/sprite-sheets/forger-sprite-sheet-se.png`, "player") }
     ];
     DEFAULT_CASTLE_FEATURES = [
-      { id: "f1", x: 2, y: 2, type: "chest", sprite: `${CDN2}/world-map/treasure_chest_closed.png` },
-      { id: "f2", x: 3, y: 1, type: "crystal", sprite: `${CDN2}/world-map/resonance_crystal.png` }
+      { id: "f1", x: 2, y: 2, type: "chest", sprite: makeAsset(`${CDN2}/world-map/treasure_chest_closed.png`, "decoration") },
+      { id: "f2", x: 3, y: 1, type: "crystal", sprite: makeAsset(`${CDN2}/world-map/resonance_crystal.png`, "decoration") }
     ];
     DEFAULT_CASTLE_MANIFEST = {
-      baseUrl: CDN2,
-      terrains: {
-        wall: "/isometric-blocks/PNG/Platformer tiles/platformerTile_05.png",
-        floor: "/isometric-blocks/PNG/Platformer tiles/platformerTile_01.png"
-      },
-      units: {
-        worker: "/sprite-sheets/coordinator-sprite-sheet-se.png",
-        guardian: "/sprite-sheets/forger-sprite-sheet-se.png"
-      },
-      features: {
-        chest: "/world-map/treasure_chest_closed.png",
-        crystal: "/world-map/resonance_crystal.png"
-      }
+      terrains: makeAssetMap({
+        wall: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_05.png`,
+        floor: `${CDN2}/isometric-blocks/PNG/Platformer tiles/platformerTile_01.png`
+      }, "tile"),
+      units: makeAssetMap({
+        worker: `${CDN2}/sprite-sheets/coordinator-sprite-sheet-se.png`,
+        guardian: `${CDN2}/sprite-sheets/forger-sprite-sheet-se.png`
+      }, "player"),
+      features: makeAssetMap({
+        chest: `${CDN2}/world-map/treasure_chest_closed.png`,
+        crystal: `${CDN2}/world-map/resonance_crystal.png`
+      }, "decoration")
     };
     CastleTemplate.displayName = "CastleTemplate";
   }
@@ -24702,15 +24776,6 @@ var init_ChatBar = __esm({
     ChatBar.displayName = "ChatBar";
   }
 });
-function resolveManifestUrl2(manifest, relative) {
-  if (relative == null) return void 0;
-  if (/^https?:\/\//.test(relative)) return relative;
-  const base = manifest?.baseUrl;
-  if (base == null) return relative;
-  const cleanBase = base.replace(/\/$/, "");
-  const cleanRel = relative.replace(/^\//, "");
-  return `${cleanBase}/${cleanRel}`;
-}
 function buildDefaultCBTiles() {
   const tiles = [];
   for (let y = 0; y < CB_GRID_H; y++) {
@@ -24725,12 +24790,12 @@ function buildDefaultCBTiles() {
 function tilesToIso(tiles, manifest) {
   return tiles.map((t) => {
     const key = t.terrain ?? "grass";
-    const sprite = t.terrainSprite ?? resolveManifestUrl2(manifest, manifest?.terrains?.[key]) ?? resolveManifestUrl2(manifest, manifest?.terrains?.grass);
+    const terrainSprite = t.terrainSprite ?? manifest?.terrains?.[key] ?? manifest?.terrains?.grass;
     return {
       x: t.x,
       y: t.y,
       terrain: t.terrain,
-      terrainSprite: sprite,
+      terrainSprite,
       passable: t.passable
     };
   });
@@ -24741,7 +24806,7 @@ function buildingsToFeatures(buildings, manifest) {
     x: b.x,
     y: b.y,
     type: b.type,
-    sprite: resolveManifestUrl2(manifest, manifest?.features?.[b.type])
+    sprite: manifest?.features?.[b.type]
   }));
 }
 function CityBuilderBoard({
@@ -24773,7 +24838,7 @@ function CityBuilderBoard({
       x: num(r2.x),
       y: num(r2.y),
       terrain: r2.terrain == null ? void 0 : str(r2.terrain),
-      terrainSprite: r2.terrainSprite == null ? void 0 : str(r2.terrainSprite),
+      terrainSprite: r2.terrainSprite == null ? void 0 : makeAsset(str(r2.terrainSprite), "tile"),
       passable: r2.passable !== false
     })),
     [board.tiles]
@@ -24882,7 +24947,6 @@ function CityBuilderBoard({
         {
           tiles: isoTiles,
           features: buildingFeatures,
-          assetBaseUrl: assetManifest?.baseUrl,
           assetManifest,
           validMoves,
           hoveredTile,
@@ -24917,6 +24981,7 @@ var CB_GRID_W, CB_GRID_H, DEFAULT_BUILD_TYPES, DEFAULT_CB_TILES;
 var init_CityBuilderBoard = __esm({
   "components/game/organisms/CityBuilderBoard.tsx"() {
     "use client";
+    init_makeAsset();
     init_cn();
     init_useEventBus();
     init_Box();
@@ -30911,7 +30976,7 @@ function StatBadge({
         resolvedAsset ? /* @__PURE__ */ jsx(
           "img",
           {
-            src: resolvedAsset,
+            src: resolvedAsset.url,
             alt: "",
             width: 16,
             height: 16,
@@ -31218,7 +31283,7 @@ function GameCanvas2D({
   tickEvent,
   drawEvent,
   fps = 60,
-  backgroundImage = "",
+  backgroundImage,
   assetBaseUrl,
   className
 }) {
@@ -31282,7 +31347,7 @@ function GameCanvas2D({
           emitRef.current(tickEventRef.current, { dt, frame });
         }
         if (backgroundImageRef.current) {
-          const bgImg = loadImage(backgroundImageRef.current);
+          const bgImg = loadImage(backgroundImageRef.current.url);
           if (bgImg) {
             ctx.drawImage(bgImg, 0, 0, widthRef.current, heightRef.current);
           } else {
@@ -31653,7 +31718,7 @@ function EnemyPlate({
             assetUrl && /* @__PURE__ */ jsx(
               "img",
               {
-                src: assetUrl,
+                src: assetUrl.url,
                 alt: name,
                 width: 24,
                 height: 24,
@@ -31995,7 +32060,7 @@ function DialogueBox({
       "div",
       {
         className: "fixed inset-0 z-20 bg-center bg-cover bg-no-repeat",
-        style: { backgroundImage: `url(${backgroundImage})` },
+        style: { backgroundImage: `url(${backgroundImage?.url})` },
         "aria-hidden": "true"
       }
     ),
@@ -32010,7 +32075,7 @@ function DialogueBox({
         children: /* @__PURE__ */ jsx(
           "img",
           {
-            src: portraitUrl,
+            src: portraitUrl?.url,
             alt: dialogue.speaker,
             className: "h-full w-auto object-contain drop-shadow-2xl"
           }
@@ -43907,7 +43972,6 @@ var init_FeatureGridOrganism = __esm({
 });
 function FishingBoard({
   backgroundImage,
-  assetBaseUrl,
   scale = 1,
   showMinimap = false,
   enableCamera = true,
@@ -43925,8 +43989,7 @@ function FishingBoard({
       {
         width,
         height,
-        backgroundImage: backgroundImage ?? "",
-        assetBaseUrl,
+        backgroundImage,
         fps: 60,
         className: "w-full h-full"
       }
@@ -46145,7 +46208,7 @@ var init_GameCanvas3D2 = __esm({
                   children: /* @__PURE__ */ jsx(
                     ModelLoader,
                     {
-                      url: tile.modelUrl,
+                      url: tile.modelUrl.url,
                       scale: 0.95,
                       fallbackGeometry: "box",
                       castShadow: true,
@@ -46210,7 +46273,7 @@ var init_GameCanvas3D2 = __esm({
                     /* @__PURE__ */ jsx(
                       ModelLoader,
                       {
-                        url: unit.modelUrl,
+                        url: unit.modelUrl.url,
                         scale: modelScale,
                         fallbackGeometry: "box",
                         castShadow: true
@@ -46270,7 +46333,7 @@ var init_GameCanvas3D2 = __esm({
               return /* @__PURE__ */ jsx(
                 ModelLoader,
                 {
-                  url: feature.assetUrl,
+                  url: feature.assetUrl.url,
                   position,
                   scale: 0.5,
                   rotation: [0, feature.rotation ?? 0, 0],
@@ -46491,7 +46554,18 @@ function GameBoard3D({
   const row = boardEntity(entity);
   const eventBus = useEventBus();
   const entityUnits = row ? rows(row.units) : [];
-  const units = entityUnits;
+  const units = entityUnits.map((r2) => ({
+    id: str(r2.id),
+    x: num(r2.x),
+    y: num(r2.y),
+    z: num(r2.z),
+    faction: str(r2.faction) || "neutral",
+    team: str(r2.team) || str(r2.faction) || "neutral",
+    unitType: r2.unitType == null ? void 0 : str(r2.unitType),
+    name: r2.name == null ? void 0 : str(r2.name),
+    health: r2.health == null ? void 0 : num(r2.health),
+    maxHealth: r2.maxHealth == null ? void 0 : num(r2.maxHealth)
+  }));
   const selectedUnitId = row ? str(row.selectedUnitId) || null : null;
   const phase = row ? str(row.phase) : "observation";
   const result = row ? str(row.result) : "none";
@@ -46670,22 +46744,27 @@ function resolveDescriptor(value, idPrefix) {
   }
   if (typeof value === "object" && value !== null) {
     const desc = asDescriptor(value);
-    if (desc !== null && getComponentForPattern(desc.type) !== null) {
+    const hasComp = desc !== null && getComponentForPattern(desc.type) !== null;
+    shellLog.debug("resolve", { idPrefix, type: desc?.type ?? null, hasDesc: desc !== null, render: hasComp });
+    if (hasComp) {
       const resolvedProps = desc.props ?? {};
       const content = { id: desc._id ?? idPrefix, pattern: desc.type, props: resolvedProps, priority: 0 };
       const SCR = getSlotContentRenderer2();
-      return /* @__PURE__ */ jsx(SCR, { content, onDismiss: () => void 0 });
+      return /* @__PURE__ */ jsx(SCR, { content, onDismiss: () => void 0 }, content.id);
     }
+  } else {
+    shellLog.debug("resolve", { idPrefix, type: null, hasDesc: false, render: false, branch: typeof value });
   }
   return null;
 }
-var _scr, GameShell;
+var shellLog, _scr, GameShell;
 var init_GameShell = __esm({
   "components/game/templates/GameShell.tsx"() {
     init_cn();
     init_Box();
     init_Stack();
     init_Typography();
+    shellLog = createLogger("almadar:ui:game:game-shell");
     _scr = null;
     GameShell = ({
       appName = "Game",
@@ -47086,7 +47165,6 @@ function HexStrategyBoard({
       units,
       features,
       assetManifest,
-      assetBaseUrl,
       scale,
       showMinimap,
       enableCamera,
@@ -47128,7 +47206,6 @@ function HolidayRunnerBoard({
       units,
       features,
       assetManifest,
-      assetBaseUrl,
       scale,
       showMinimap,
       enableCamera,
@@ -47923,7 +48000,6 @@ function MatchPuzzleBoard({
       units,
       features,
       assetManifest,
-      assetBaseUrl,
       scale,
       showMinimap,
       enableCamera,
@@ -48184,7 +48260,6 @@ function MinigolfBoard({
       units,
       features,
       assetManifest,
-      assetBaseUrl,
       scale,
       showMinimap,
       enableCamera,
@@ -48490,7 +48565,6 @@ function PirateBoard({
       units,
       features,
       assetManifest,
-      assetBaseUrl,
       scale,
       showMinimap,
       enableCamera,
@@ -48611,8 +48685,8 @@ function PlatformerBoard({
             canvasHeight,
             followCamera: true,
             bgColor,
-            playerSprite,
-            tileSprites,
+            playerSprite: playerSprite?.url,
+            tileSprites: tileSprites ? Object.fromEntries(Object.entries(tileSprites).map(([k, a]) => [k, a.url])) : void 0,
             leftEvent,
             rightEvent,
             jumpEvent,
@@ -48677,7 +48751,7 @@ function PlatformerTemplate({
   worldHeight = 400,
   canvasWidth = 800,
   canvasHeight = 400,
-  playerSprite = `${CDN3}/characters/platformChar_idle.png`,
+  playerSprite = makeAsset(`${CDN3}/characters/platformChar_idle.png`, "player"),
   tileSprites = DEFAULT_TILE_SPRITES,
   bgColor = "#5c94fc",
   gameEndEvent = "GAME_END",
@@ -48730,13 +48804,14 @@ var init_PlatformerTemplate = __esm({
     init_PlatformerBoard();
     init_GameHud();
     init_ScoreBoard();
+    init_makeAsset();
     CDN3 = "https://almadar-kflow-assets.web.app/shared/platformer";
-    DEFAULT_TILE_SPRITES = {
+    DEFAULT_TILE_SPRITES = makeAssetMap({
       ground: `${CDN3}/tiles/platformPack_tile001.png`,
       platform: `${CDN3}/tiles/platformPack_tile004.png`,
       hazard: `${CDN3}/tiles/platformPack_tile017.png`,
       goal: `${CDN3}/tiles/platformPack_tile007.png`
-    };
+    }, "tile");
     DEFAULT_PLATFORMS = [
       { x: 0, y: 368, width: 800, height: 32, type: "ground" },
       { x: 150, y: 280, width: 160, height: 16, type: "platform" },
@@ -48892,7 +48967,6 @@ function RacingBoard({
       units,
       features,
       assetManifest,
-      assetBaseUrl,
       scale,
       showMinimap,
       enableCamera,
@@ -48911,27 +48985,18 @@ var init_RacingBoard = __esm({
     RacingBoard.displayName = "RacingBoard";
   }
 });
-function resolveManifestUrl3(manifest, relative) {
-  if (relative == null) return void 0;
-  if (/^https?:\/\//.test(relative)) return relative;
-  const base = manifest?.baseUrl;
-  if (base == null) return relative;
-  const cleanBase = base.replace(/\/$/, "");
-  const cleanRel = relative.replace(/^\//, "");
-  return `${cleanBase}/${cleanRel}`;
-}
 function dungeonTerrain(x, y, stairsX, stairsY, manifest) {
   const isBorder = x === 0 || y === 0 || x === DUNGEON_GRID_W - 1 || y === DUNGEON_GRID_H - 1;
   const isPillar = x % 4 === 0 && y % 4 === 0 && !isBorder;
   const isWall = isBorder || isPillar;
   const terrains = manifest?.terrains;
   if (x === stairsX && y === stairsY) {
-    return { terrain: "stairs", passable: true, terrainSprite: resolveManifestUrl3(manifest, terrains?.stairs) };
+    return { terrain: "stairs", passable: true, terrainSprite: terrains?.stairs };
   }
   if (isWall) {
-    return { terrain: "wall", passable: false, terrainSprite: resolveManifestUrl3(manifest, terrains?.wall) };
+    return { terrain: "wall", passable: false, terrainSprite: terrains?.wall };
   }
-  return { terrain: "floor", passable: true, terrainSprite: resolveManifestUrl3(manifest, terrains?.floor) };
+  return { terrain: "floor", passable: true, terrainSprite: terrains?.floor };
 }
 function buildDefaultDungeonTiles(stairsX, stairsY, manifest) {
   const tiles = [];
@@ -48975,7 +49040,7 @@ function RoguelikeBoard({
       x: num(r2.x),
       y: num(r2.y),
       terrain: r2.terrain == null ? void 0 : str(r2.terrain),
-      terrainSprite: r2.terrainSprite == null ? void 0 : str(r2.terrainSprite),
+      terrainSprite: r2.terrainSprite == null ? void 0 : makeAsset(str(r2.terrainSprite), "tile"),
       passable: r2.passable !== false
     })),
     [board.tiles]
@@ -49055,7 +49120,7 @@ function RoguelikeBoard({
         health: playerHp,
         maxHealth: playerMaxHp,
         unitType: "player",
-        sprite: resolveManifestUrl3(assetManifest, assetManifest?.units?.player)
+        sprite: assetManifest?.units?.player
       },
       ...liveEnemies.map((e) => ({
         id: e.id,
@@ -49065,7 +49130,7 @@ function RoguelikeBoard({
         health: e.hp,
         maxHealth: 6,
         unitType: "enemy",
-        sprite: resolveManifestUrl3(assetManifest, assetManifest?.units?.enemy)
+        sprite: assetManifest?.units?.enemy
       }))
     ];
   }, [player, enemies, playerHp, playerMaxHp, assetManifest, t]);
@@ -49075,7 +49140,7 @@ function RoguelikeBoard({
       x: it.x,
       y: it.y,
       type: it.kind,
-      sprite: resolveManifestUrl3(assetManifest, assetManifest?.features?.[it.kind])
+      sprite: assetManifest?.features?.[it.kind]
     })),
     [items, assetManifest]
   );
@@ -49136,7 +49201,6 @@ function RoguelikeBoard({
         onTileHover: (x, y) => setHoveredTile({ x, y }),
         onTileLeave: () => setHoveredTile(null),
         scale,
-        assetBaseUrl: assetManifest?.baseUrl,
         assetManifest,
         unitScale,
         spriteHeightRatio,
@@ -49196,6 +49260,7 @@ var init_RoguelikeBoard = __esm({
     init_Stack();
     init_IsometricCanvas();
     init_boardEntity();
+    init_makeAsset();
     DUNGEON_GRID_W = 16;
     DUNGEON_GRID_H = 16;
     DEFAULT_ENEMIES = [
@@ -49246,55 +49311,59 @@ function RoguelikeTemplate({
     }
   );
 }
-var CDN4, DEFAULT_ROGUELIKE_TILES, DEFAULT_ROGUELIKE_MANIFEST;
+var CDN4, wall, floor, tiles2, stairs, DEFAULT_ROGUELIKE_TILES, DEFAULT_ROGUELIKE_MANIFEST;
 var init_RoguelikeTemplate = __esm({
   "components/game/templates/RoguelikeTemplate.tsx"() {
     init_RoguelikeBoard();
+    init_makeAsset();
     CDN4 = "https://almadar-kflow-assets.web.app/shared";
+    wall = makeAsset(`${CDN4}/isometric-dungeon/Isometric/stoneInset_E.png`, "tile");
+    floor = makeAsset(`${CDN4}/isometric-dungeon/Isometric/dirt_E.png`, "tile");
+    tiles2 = makeAsset(`${CDN4}/isometric-dungeon/Isometric/dirtTiles_E.png`, "tile");
+    stairs = makeAsset(`${CDN4}/isometric-dungeon/Isometric/stairs_E.png`, "tile");
     DEFAULT_ROGUELIKE_TILES = [
-      { x: 0, y: 0, terrain: "wall", passable: false, terrainSprite: `${CDN4}/isometric-dungeon/Isometric/stoneInset_E.png` },
-      { x: 1, y: 0, terrain: "wall", passable: false, terrainSprite: `${CDN4}/isometric-dungeon/Isometric/stoneInset_E.png` },
-      { x: 2, y: 0, terrain: "wall", passable: false, terrainSprite: `${CDN4}/isometric-dungeon/Isometric/stoneInset_E.png` },
-      { x: 3, y: 0, terrain: "wall", passable: false, terrainSprite: `${CDN4}/isometric-dungeon/Isometric/stoneInset_E.png` },
-      { x: 4, y: 0, terrain: "wall", passable: false, terrainSprite: `${CDN4}/isometric-dungeon/Isometric/stoneInset_E.png` },
-      { x: 0, y: 1, terrain: "wall", passable: false, terrainSprite: `${CDN4}/isometric-dungeon/Isometric/stoneInset_E.png` },
-      { x: 1, y: 1, terrain: "floor", passable: true, terrainSprite: `${CDN4}/isometric-dungeon/Isometric/dirt_E.png` },
-      { x: 2, y: 1, terrain: "floor", passable: true, terrainSprite: `${CDN4}/isometric-dungeon/Isometric/dirt_E.png` },
-      { x: 3, y: 1, terrain: "floor", passable: true, terrainSprite: `${CDN4}/isometric-dungeon/Isometric/dirt_E.png` },
-      { x: 4, y: 1, terrain: "wall", passable: false, terrainSprite: `${CDN4}/isometric-dungeon/Isometric/stoneInset_E.png` },
-      { x: 0, y: 2, terrain: "wall", passable: false, terrainSprite: `${CDN4}/isometric-dungeon/Isometric/stoneInset_E.png` },
-      { x: 1, y: 2, terrain: "floor", passable: true, terrainSprite: `${CDN4}/isometric-dungeon/Isometric/dirtTiles_E.png` },
-      { x: 2, y: 2, terrain: "floor", passable: true, terrainSprite: `${CDN4}/isometric-dungeon/Isometric/dirtTiles_E.png` },
-      { x: 3, y: 2, terrain: "floor", passable: true, terrainSprite: `${CDN4}/isometric-dungeon/Isometric/dirt_E.png` },
-      { x: 4, y: 2, terrain: "wall", passable: false, terrainSprite: `${CDN4}/isometric-dungeon/Isometric/stoneInset_E.png` },
-      { x: 0, y: 3, terrain: "wall", passable: false, terrainSprite: `${CDN4}/isometric-dungeon/Isometric/stoneInset_E.png` },
-      { x: 1, y: 3, terrain: "floor", passable: true, terrainSprite: `${CDN4}/isometric-dungeon/Isometric/dirt_E.png` },
-      { x: 2, y: 3, terrain: "floor", passable: true, terrainSprite: `${CDN4}/isometric-dungeon/Isometric/dirtTiles_E.png` },
-      { x: 3, y: 3, terrain: "stairs", passable: true, terrainSprite: `${CDN4}/isometric-dungeon/Isometric/stairs_E.png` },
-      { x: 4, y: 3, terrain: "wall", passable: false, terrainSprite: `${CDN4}/isometric-dungeon/Isometric/stoneInset_E.png` },
-      { x: 0, y: 4, terrain: "wall", passable: false, terrainSprite: `${CDN4}/isometric-dungeon/Isometric/stoneInset_E.png` },
-      { x: 1, y: 4, terrain: "wall", passable: false, terrainSprite: `${CDN4}/isometric-dungeon/Isometric/stoneInset_E.png` },
-      { x: 2, y: 4, terrain: "wall", passable: false, terrainSprite: `${CDN4}/isometric-dungeon/Isometric/stoneInset_E.png` },
-      { x: 3, y: 4, terrain: "wall", passable: false, terrainSprite: `${CDN4}/isometric-dungeon/Isometric/stoneInset_E.png` },
-      { x: 4, y: 4, terrain: "wall", passable: false, terrainSprite: `${CDN4}/isometric-dungeon/Isometric/stoneInset_E.png` }
+      { x: 0, y: 0, terrain: "wall", passable: false, terrainSprite: wall },
+      { x: 1, y: 0, terrain: "wall", passable: false, terrainSprite: wall },
+      { x: 2, y: 0, terrain: "wall", passable: false, terrainSprite: wall },
+      { x: 3, y: 0, terrain: "wall", passable: false, terrainSprite: wall },
+      { x: 4, y: 0, terrain: "wall", passable: false, terrainSprite: wall },
+      { x: 0, y: 1, terrain: "wall", passable: false, terrainSprite: wall },
+      { x: 1, y: 1, terrain: "floor", passable: true, terrainSprite: floor },
+      { x: 2, y: 1, terrain: "floor", passable: true, terrainSprite: floor },
+      { x: 3, y: 1, terrain: "floor", passable: true, terrainSprite: floor },
+      { x: 4, y: 1, terrain: "wall", passable: false, terrainSprite: wall },
+      { x: 0, y: 2, terrain: "wall", passable: false, terrainSprite: wall },
+      { x: 1, y: 2, terrain: "floor", passable: true, terrainSprite: tiles2 },
+      { x: 2, y: 2, terrain: "floor", passable: true, terrainSprite: tiles2 },
+      { x: 3, y: 2, terrain: "floor", passable: true, terrainSprite: floor },
+      { x: 4, y: 2, terrain: "wall", passable: false, terrainSprite: wall },
+      { x: 0, y: 3, terrain: "wall", passable: false, terrainSprite: wall },
+      { x: 1, y: 3, terrain: "floor", passable: true, terrainSprite: floor },
+      { x: 2, y: 3, terrain: "floor", passable: true, terrainSprite: tiles2 },
+      { x: 3, y: 3, terrain: "stairs", passable: true, terrainSprite: stairs },
+      { x: 4, y: 3, terrain: "wall", passable: false, terrainSprite: wall },
+      { x: 0, y: 4, terrain: "wall", passable: false, terrainSprite: wall },
+      { x: 1, y: 4, terrain: "wall", passable: false, terrainSprite: wall },
+      { x: 2, y: 4, terrain: "wall", passable: false, terrainSprite: wall },
+      { x: 3, y: 4, terrain: "wall", passable: false, terrainSprite: wall },
+      { x: 4, y: 4, terrain: "wall", passable: false, terrainSprite: wall }
     ];
     DEFAULT_ROGUELIKE_MANIFEST = {
-      baseUrl: CDN4,
-      terrains: {
-        floor: "/isometric-dungeon/Isometric/dirt_E.png",
-        wall: "/isometric-dungeon/Isometric/stoneInset_E.png",
-        stairs: "/isometric-dungeon/Isometric/stairs_E.png",
-        planks: "/isometric-dungeon/Isometric/planks_E.png"
-      },
+      terrains: makeAssetMap({
+        floor: `${CDN4}/isometric-dungeon/Isometric/dirt_E.png`,
+        wall: `${CDN4}/isometric-dungeon/Isometric/stoneInset_E.png`,
+        stairs: `${CDN4}/isometric-dungeon/Isometric/stairs_E.png`,
+        planks: `${CDN4}/isometric-dungeon/Isometric/planks_E.png`
+      }, "tile"),
       units: {
-        player: "/isometric-dungeon/Characters/Male/Male_0_Idle0.png",
-        enemy: "/sprite-sheets/shadow-legion-sprite-sheet-sw.png"
+        player: makeAsset(`${CDN4}/isometric-dungeon/Characters/Male/Male_0_Idle0.png`, "player"),
+        enemy: makeAsset(`${CDN4}/sprite-sheets/shadow-legion-sprite-sheet-sw.png`, "enemy")
       },
-      features: {
-        health_potion: "/isometric-dungeon/Isometric/chestClosed_E.png",
-        sword: "/isometric-dungeon/Isometric/barrel_E.png",
-        shield: "/isometric-dungeon/Isometric/barrel_E.png"
-      }
+      features: makeAssetMap({
+        health_potion: `${CDN4}/isometric-dungeon/Isometric/chestClosed_E.png`,
+        sword: `${CDN4}/isometric-dungeon/Isometric/barrel_E.png`,
+        shield: `${CDN4}/isometric-dungeon/Isometric/barrel_E.png`
+      }, "item")
     };
     RoguelikeTemplate.displayName = "RoguelikeTemplate";
   }
@@ -52168,7 +52237,6 @@ function SokobanBoard({
       units,
       features,
       assetManifest,
-      assetBaseUrl,
       scale,
       showMinimap,
       enableCamera,
@@ -52210,7 +52278,6 @@ function SpaceShmupBoard({
       units,
       features,
       assetManifest,
-      assetBaseUrl,
       scale,
       showMinimap,
       enableCamera,
@@ -52252,7 +52319,6 @@ function SpaceStationBoard({
       units,
       features,
       assetManifest,
-      assetBaseUrl,
       scale,
       showMinimap,
       enableCamera,
@@ -52387,7 +52453,6 @@ function SportsBoard({
       units,
       features,
       assetManifest,
-      assetBaseUrl,
       scale,
       showMinimap,
       enableCamera,
@@ -54231,7 +54296,6 @@ function TanksBoard({
       units,
       features,
       assetManifest,
-      assetBaseUrl,
       scale,
       showMinimap,
       enableCamera,
@@ -54509,15 +54573,6 @@ var init_ToastSlot = __esm({
     ToastSlot.displayName = "ToastSlot";
   }
 });
-function resolveManifestUrl4(manifest, relative) {
-  if (relative == null || relative === "") return void 0;
-  if (/^https?:\/\//.test(relative)) return relative;
-  const base = manifest?.baseUrl;
-  if (base == null) return relative;
-  const cleanBase = base.replace(/\/$/, "");
-  const cleanRel = relative.replace(/^\//, "");
-  return `${cleanBase}/${cleanRel}`;
-}
 function readPlayer(v) {
   if (v == null || typeof v !== "object") return void 0;
   const o = v;
@@ -54570,10 +54625,10 @@ function TopDownShooterBoard({
   const wave = propWave ?? num(board.wave, 1);
   const lives = propLives ?? num(board.lives, 3);
   const result = propResult ?? (str(board.result) || "none");
-  const playerSprite = resolveManifestUrl4(assetManifest, assetManifest?.units?.player);
-  const enemySprite = resolveManifestUrl4(assetManifest, assetManifest?.units?.enemy);
-  const projectileSprite = resolveManifestUrl4(assetManifest, assetManifest?.features?.projectile);
-  const backgroundSprite = resolveManifestUrl4(assetManifest, assetManifest?.background);
+  const playerSprite = assetManifest?.units?.player?.url;
+  const enemySprite = assetManifest?.units?.enemy?.url;
+  const projectileSprite = assetManifest?.features?.projectile?.url;
+  const backgroundSprite = assetManifest?.background;
   const spriteUrls = useMemo(
     () => [playerSprite, enemySprite, projectileSprite].filter((u) => u != null),
     [playerSprite, enemySprite, projectileSprite]
@@ -54740,7 +54795,6 @@ function TopDownShooterBoard({
           width,
           height,
           backgroundImage: backgroundSprite,
-          assetBaseUrl: assetManifest?.baseUrl,
           onDraw
         }
       ),
@@ -54865,15 +54919,6 @@ var init_TopDownShooterTemplate = __esm({
     TopDownShooterTemplate.displayName = "TopDownShooterTemplate";
   }
 });
-function resolveManifestUrl5(manifest, relative) {
-  if (relative == null) return void 0;
-  if (/^https?:\/\//.test(relative)) return relative;
-  const base = manifest?.baseUrl;
-  if (base == null) return relative;
-  const cleanBase = base.replace(/\/$/, "");
-  const cleanRel = relative.replace(/^\//, "");
-  return `${cleanBase}/${cleanRel}`;
-}
 function buildDefaultTDTiles() {
   const pathSet = new Set(DEFAULT_TD_PATH.map((p2) => `${p2.x},${p2.y}`));
   const tiles = [];
@@ -54893,18 +54938,18 @@ function buildDefaultTDTiles() {
 function tilesToIso2(tiles, manifest) {
   return tiles.map((t) => {
     const key = t.terrain ?? "ground";
-    const sprite = t.terrainSprite ?? resolveManifestUrl5(manifest, manifest?.terrains?.[key]) ?? resolveManifestUrl5(manifest, manifest?.terrains?.ground);
+    const terrainSprite = t.terrainSprite != null ? makeAsset(t.terrainSprite, "tile") : manifest?.terrains?.[key] ?? manifest?.terrains?.ground;
     return {
       x: t.x,
       y: t.y,
       terrain: t.terrain,
-      terrainSprite: sprite,
+      terrainSprite,
       passable: t.passable
     };
   });
 }
 function creepsToUnits(creeps, manifest) {
-  const sprite = resolveManifestUrl5(manifest, manifest?.units?.creep);
+  const sprite = manifest?.units?.creep;
   return creeps.map((c) => ({
     id: c.id,
     position: { x: c.x, y: c.y },
@@ -54922,14 +54967,14 @@ function heroToUnit(hero, manifest) {
     position: { x: hero.x, y: hero.y },
     name: "Hero",
     team: "player",
-    sprite: resolveManifestUrl5(manifest, manifest?.units?.hero),
+    sprite: manifest?.units?.hero,
     unitType: "hero",
     health: 1,
     maxHealth: 1
   };
 }
 function towersToFeatures(towers, manifest) {
-  const sprite = resolveManifestUrl5(manifest, manifest?.features?.tower);
+  const sprite = manifest?.features?.tower;
   return towers.map((t) => ({
     id: t.id,
     x: t.x,
@@ -55127,7 +55172,6 @@ function TowerDefenseBoard({
           tiles: isoTiles,
           units: isoUnits,
           features: towerFeatures,
-          assetBaseUrl: assetManifest?.baseUrl,
           assetManifest,
           validMoves,
           hoveredTile,
@@ -55171,6 +55215,7 @@ var TD_GRID_W, TD_GRID_H, DEFAULT_TD_PATH, DEFAULT_TD_TILES;
 var init_TowerDefenseBoard = __esm({
   "components/game/organisms/TowerDefenseBoard.tsx"() {
     "use client";
+    init_makeAsset();
     init_cn();
     init_useEventBus();
     init_Box();
@@ -55500,15 +55545,6 @@ var init_UncontrolledBattleBoard = __esm({
     UncontrolledBattleBoard.displayName = "UncontrolledBattleBoard";
   }
 });
-function resolveManifestUrl6(manifest, relative) {
-  if (relative == null) return void 0;
-  if (/^https?:\/\//.test(relative)) return relative;
-  const base = manifest?.baseUrl;
-  if (base == null) return relative;
-  const cleanBase = base.replace(/\/$/, "");
-  const cleanRel = relative.replace(/^\//, "");
-  return `${cleanBase}/${cleanRel}`;
-}
 function VisualNovelBoard({
   entity,
   nodes: propNodes,
@@ -55543,11 +55579,11 @@ function VisualNovelBoard({
   const currentNodeId = propCurrentNodeId ?? (str(board.currentNodeId) || nodes[0]?.id);
   const currentNode = nodes.find((n) => n.id === currentNodeId) ?? nodes[0];
   const backgroundImage = useMemo(
-    () => resolveManifestUrl6(assetManifest, assetManifest?.backgrounds?.[currentNode?.backgroundKey ?? ""]),
+    () => assetManifest?.backgrounds?.[currentNode?.backgroundKey ?? ""],
     [assetManifest, currentNode?.backgroundKey]
   );
   const portraitUrl = useMemo(
-    () => resolveManifestUrl6(assetManifest, assetManifest?.portraits?.[currentNode?.portraitKey ?? ""]),
+    () => assetManifest?.portraits?.[currentNode?.portraitKey ?? ""],
     [assetManifest, currentNode?.portraitKey]
   );
   const dialogueChoices = useMemo(
@@ -55721,7 +55757,7 @@ function buildDefaultWorldTiles() {
     for (let x = 0; x < WORLD_GRID_W; x++) {
       const isBorder = x === 0 || y === 0 || x === WORLD_GRID_W - 1 || y === WORLD_GRID_H - 1;
       const def = isBorder ? WORLD_TERRAIN_DEFS[3] : WORLD_TERRAIN_DEFS[(x * 5 + y * 3 + (x ^ y)) % (WORLD_TERRAIN_DEFS.length - 1)];
-      tiles.push({ x, y, terrain: def.terrain, terrainSprite: def.sprite, passable: def.passable });
+      tiles.push({ x, y, terrain: def.terrain, terrainSprite: makeAsset(def.sprite, "tile"), passable: def.passable });
     }
   }
   return tiles;
@@ -55765,7 +55801,12 @@ function WorldMapBoard({
   const resolved = boardEntity(entity);
   const entityUnits = rows(resolved?.units);
   const entityTiles = rows(resolved?.tiles);
-  const features = propFeatures ?? rows(resolved?.features);
+  const features = propFeatures ?? rows(resolved?.features).map((r2) => ({
+    id: r2.id == null ? void 0 : str(r2.id),
+    x: num(r2.x),
+    y: num(r2.y),
+    type: str(r2.type)
+  }));
   const selectedHeroId = resolved?.selectedHeroId ?? null;
   const assetManifest = propAssetManifest ?? resolved?.assetManifest;
   const backgroundImage = resolved?.backgroundImage;
@@ -55775,7 +55816,7 @@ function WorldMapBoard({
       x: num(t.x),
       y: num(t.y),
       terrain: str(t.terrain),
-      terrainSprite: t.terrainSprite == null ? void 0 : str(t.terrainSprite),
+      terrainSprite: t.terrainSprite == null ? void 0 : makeAsset(str(t.terrainSprite), "tile"),
       passable: t.passable !== false
     })),
     [entityTiles]
@@ -55791,7 +55832,7 @@ function WorldMapBoard({
       team: str(u.team) === "enemy" ? "enemy" : "player",
       health: num(u.health) || 100,
       maxHealth: num(u.maxHealth) || 100,
-      sprite: u.sprite == null ? void 0 : str(u.sprite)
+      sprite: u.sprite == null ? void 0 : makeAsset(str(u.sprite), "player")
     })),
     [entityUnits, propUnits]
   );
@@ -55973,7 +56014,6 @@ function WorldMapBoard({
             onTileHover: (x, y) => setHoveredTile({ x, y }),
             onTileLeave: () => setHoveredTile(null),
             scale,
-            assetBaseUrl: assetManifest?.baseUrl,
             assetManifest,
             backgroundImage,
             effectSpriteUrls,
@@ -55996,6 +56036,7 @@ var WORLD_CDN, WORLD_GRID_W, WORLD_GRID_H, WORLD_TERRAIN_DEFS, DEFAULT_WORLD_TIL
 var init_WorldMapBoard = __esm({
   "components/game/organisms/WorldMapBoard.tsx"() {
     "use client";
+    init_makeAsset();
     init_cn();
     init_useEventBus();
     init_Stack();
@@ -56049,62 +56090,66 @@ function WorldMapTemplate({
     }
   );
 }
-var CDN5, DEFAULT_WORLDMAP_TILES, DEFAULT_WORLDMAP_UNITS, DEFAULT_WORLDMAP_FEATURES, DEFAULT_WORLDMAP_MANIFEST;
+var CDN5, mountain, water, grass, road, DEFAULT_WORLDMAP_TILES, DEFAULT_WORLDMAP_UNITS, DEFAULT_WORLDMAP_FEATURES, DEFAULT_WORLDMAP_MANIFEST;
 var init_WorldMapTemplate = __esm({
   "components/game/templates/WorldMapTemplate.tsx"() {
     init_WorldMapBoard();
+    init_makeAsset();
     CDN5 = "https://almadar-kflow-assets.web.app/shared";
+    mountain = makeAsset(`${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_13.png`, "tile");
+    water = makeAsset(`${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_11.png`, "tile");
+    grass = makeAsset(`${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_01.png`, "tile");
+    road = makeAsset(`${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_03.png`, "tile");
     DEFAULT_WORLDMAP_TILES = [
-      { x: 0, y: 0, terrain: "mountain", passable: false, terrainSprite: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_13.png` },
-      { x: 1, y: 0, terrain: "mountain", passable: false, terrainSprite: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_13.png` },
-      { x: 2, y: 0, terrain: "water", passable: false, terrainSprite: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_11.png` },
-      { x: 3, y: 0, terrain: "mountain", passable: false, terrainSprite: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_13.png` },
-      { x: 4, y: 0, terrain: "mountain", passable: false, terrainSprite: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_13.png` },
-      { x: 0, y: 1, terrain: "mountain", passable: false, terrainSprite: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_13.png` },
-      { x: 1, y: 1, terrain: "grass", passable: true, terrainSprite: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_01.png` },
-      { x: 2, y: 1, terrain: "grass", passable: true, terrainSprite: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_01.png` },
-      { x: 3, y: 1, terrain: "grass", passable: true, terrainSprite: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_01.png` },
-      { x: 4, y: 1, terrain: "water", passable: false, terrainSprite: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_11.png` },
-      { x: 0, y: 2, terrain: "water", passable: false, terrainSprite: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_11.png` },
-      { x: 1, y: 2, terrain: "grass", passable: true, terrainSprite: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_01.png` },
-      { x: 2, y: 2, terrain: "grass", passable: true, terrainSprite: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_03.png` },
-      { x: 3, y: 2, terrain: "grass", passable: true, terrainSprite: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_01.png` },
-      { x: 4, y: 2, terrain: "mountain", passable: false, terrainSprite: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_13.png` },
-      { x: 0, y: 3, terrain: "mountain", passable: false, terrainSprite: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_13.png` },
-      { x: 1, y: 3, terrain: "grass", passable: true, terrainSprite: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_01.png` },
-      { x: 2, y: 3, terrain: "grass", passable: true, terrainSprite: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_01.png` },
-      { x: 3, y: 3, terrain: "grass", passable: true, terrainSprite: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_03.png` },
-      { x: 4, y: 3, terrain: "mountain", passable: false, terrainSprite: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_13.png` },
-      { x: 0, y: 4, terrain: "mountain", passable: false, terrainSprite: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_13.png` },
-      { x: 1, y: 4, terrain: "water", passable: false, terrainSprite: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_11.png` },
-      { x: 2, y: 4, terrain: "grass", passable: true, terrainSprite: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_01.png` },
-      { x: 3, y: 4, terrain: "mountain", passable: false, terrainSprite: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_13.png` },
-      { x: 4, y: 4, terrain: "mountain", passable: false, terrainSprite: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_13.png` }
+      { x: 0, y: 0, terrain: "mountain", passable: false, terrainSprite: mountain },
+      { x: 1, y: 0, terrain: "mountain", passable: false, terrainSprite: mountain },
+      { x: 2, y: 0, terrain: "water", passable: false, terrainSprite: water },
+      { x: 3, y: 0, terrain: "mountain", passable: false, terrainSprite: mountain },
+      { x: 4, y: 0, terrain: "mountain", passable: false, terrainSprite: mountain },
+      { x: 0, y: 1, terrain: "mountain", passable: false, terrainSprite: mountain },
+      { x: 1, y: 1, terrain: "grass", passable: true, terrainSprite: grass },
+      { x: 2, y: 1, terrain: "grass", passable: true, terrainSprite: grass },
+      { x: 3, y: 1, terrain: "grass", passable: true, terrainSprite: grass },
+      { x: 4, y: 1, terrain: "water", passable: false, terrainSprite: water },
+      { x: 0, y: 2, terrain: "water", passable: false, terrainSprite: water },
+      { x: 1, y: 2, terrain: "grass", passable: true, terrainSprite: grass },
+      { x: 2, y: 2, terrain: "grass", passable: true, terrainSprite: road },
+      { x: 3, y: 2, terrain: "grass", passable: true, terrainSprite: grass },
+      { x: 4, y: 2, terrain: "mountain", passable: false, terrainSprite: mountain },
+      { x: 0, y: 3, terrain: "mountain", passable: false, terrainSprite: mountain },
+      { x: 1, y: 3, terrain: "grass", passable: true, terrainSprite: grass },
+      { x: 2, y: 3, terrain: "grass", passable: true, terrainSprite: grass },
+      { x: 3, y: 3, terrain: "grass", passable: true, terrainSprite: road },
+      { x: 4, y: 3, terrain: "mountain", passable: false, terrainSprite: mountain },
+      { x: 0, y: 4, terrain: "mountain", passable: false, terrainSprite: mountain },
+      { x: 1, y: 4, terrain: "water", passable: false, terrainSprite: water },
+      { x: 2, y: 4, terrain: "grass", passable: true, terrainSprite: grass },
+      { x: 3, y: 4, terrain: "mountain", passable: false, terrainSprite: mountain },
+      { x: 4, y: 4, terrain: "mountain", passable: false, terrainSprite: mountain }
     ];
     DEFAULT_WORLDMAP_UNITS = [
-      { id: "h1", position: { x: 1, y: 1 }, unitType: "hero", name: "Amir", team: "player", health: 10, maxHealth: 10, sprite: `${CDN5}/sprite-sheets/amir-sprite-sheet-se.png` },
-      { id: "h2", position: { x: 3, y: 3 }, unitType: "scout", name: "Archivist", team: "player", health: 10, maxHealth: 10, sprite: `${CDN5}/sprite-sheets/archivist-sprite-sheet-se.png` }
+      { id: "h1", position: { x: 1, y: 1 }, unitType: "hero", name: "Amir", team: "player", health: 10, maxHealth: 10, sprite: makeAsset(`${CDN5}/sprite-sheets/amir-sprite-sheet-se.png`, "player") },
+      { id: "h2", position: { x: 3, y: 3 }, unitType: "scout", name: "Archivist", team: "player", health: 10, maxHealth: 10, sprite: makeAsset(`${CDN5}/sprite-sheets/archivist-sprite-sheet-se.png`, "npc") }
     ];
     DEFAULT_WORLDMAP_FEATURES = [
-      { id: "f1", x: 2, y: 2, type: "capital", sprite: `${CDN5}/scenes/world/capital.png` },
-      { id: "f2", x: 4, y: 2, type: "power_node", sprite: `${CDN5}/world-map/power_node.png` }
+      { id: "f1", x: 2, y: 2, type: "capital", sprite: makeAsset(`${CDN5}/scenes/world/capital.png`, "decoration") },
+      { id: "f2", x: 4, y: 2, type: "power_node", sprite: makeAsset(`${CDN5}/world-map/power_node.png`, "decoration") }
     ];
     DEFAULT_WORLDMAP_MANIFEST = {
-      baseUrl: CDN5,
-      terrains: {
-        grass: "/isometric-blocks/PNG/Platformer tiles/platformerTile_01.png",
-        water: "/isometric-blocks/PNG/Platformer tiles/platformerTile_11.png",
-        mountain: "/isometric-blocks/PNG/Platformer tiles/platformerTile_13.png",
-        road: "/isometric-blocks/PNG/Platformer tiles/platformerTile_03.png"
-      },
+      terrains: makeAssetMap({
+        grass: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_01.png`,
+        water: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_11.png`,
+        mountain: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_13.png`,
+        road: `${CDN5}/isometric-blocks/PNG/Platformer tiles/platformerTile_03.png`
+      }, "tile"),
       units: {
-        hero: "/sprite-sheets/amir-sprite-sheet-se.png",
-        scout: "/sprite-sheets/archivist-sprite-sheet-se.png"
+        hero: makeAsset(`${CDN5}/sprite-sheets/amir-sprite-sheet-se.png`, "player"),
+        scout: makeAsset(`${CDN5}/sprite-sheets/archivist-sprite-sheet-se.png`, "npc")
       },
-      features: {
-        capital: "/scenes/world/capital.png",
-        power_node: "/world-map/power_node.png"
-      }
+      features: makeAssetMap({
+        capital: `${CDN5}/scenes/world/capital.png`,
+        power_node: `${CDN5}/world-map/power_node.png`
+      }, "decoration")
     };
     WorldMapTemplate.displayName = "WorldMapTemplate";
   }