From 1853fd9e28f5e5bd5c90203f819f89800167977e Mon Sep 17 00:00:00 2001
From: dnviti <dnviti@gmail.com>
Date: Fri, 19 Dec 2025 03:05:19 +0100
Subject: [PATCH] feat: improve card image URL resolution by prioritizing
 `image_uris.normal` and falling back to constructed paths.

---
 src/client/dev-dist/sw.js                        | 2 +-
 src/client/src/modules/draft/DeckBuilderView.tsx | 9 ---------
 src/client/src/modules/game/CardComponent.tsx    | 2 --
 src/client/src/modules/game/GameView.tsx         | 6 +++++-
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/client/dev-dist/sw.js b/src/client/dev-dist/sw.js
index 8961311..cfd81ce 100644
--- a/src/client/dev-dist/sw.js
+++ b/src/client/dev-dist/sw.js
@@ -82,7 +82,7 @@ define(['./workbox-5a5d9309'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
-    "revision": "0.l4u3i9b5p1c"
+    "revision": "0.m2b6ukjs8r"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {
diff --git a/src/client/src/modules/draft/DeckBuilderView.tsx b/src/client/src/modules/draft/DeckBuilderView.tsx
index ef7dc22..6607c30 100644
--- a/src/client/src/modules/draft/DeckBuilderView.tsx
+++ b/src/client/src/modules/draft/DeckBuilderView.tsx
@@ -438,15 +438,6 @@ export const DeckBuilderView: React.FC<DeckBuilderViewProps> = ({ initialPool, a
         }
       };
 
-      if (targetId && setCode) {
-        return {
-          ...cardWithDefinition,
-          image_uris: {
-            normal: `/cards/images/${setCode}/full/${targetId}.jpg`,
-            crop: `/cards/images/${setCode}/crop/${targetId}.jpg`
-          }
-        };
-      }
       return cardWithDefinition;
     });
 
diff --git a/src/client/src/modules/game/CardComponent.tsx b/src/client/src/modules/game/CardComponent.tsx
index 3b87305..8a66f16 100644
--- a/src/client/src/modules/game/CardComponent.tsx
+++ b/src/client/src/modules/game/CardComponent.tsx
@@ -29,8 +29,6 @@ export const CardComponent: React.FC<CardComponentProps> = ({ card, onDragStart,
     return () => unregisterCard(card.instanceId);
   }, [card.instanceId]);
 
-  // Robustly resolve Art Crop
-  // Robustly resolve Art Crop
   // Robustly resolve Art Crop
   let imageSrc = card.imageUrl;
 
diff --git a/src/client/src/modules/game/GameView.tsx b/src/client/src/modules/game/GameView.tsx
index aea5bd1..9cd1a18 100644
--- a/src/client/src/modules/game/GameView.tsx
+++ b/src/client/src/modules/game/GameView.tsx
@@ -947,7 +947,11 @@ export const GameView: React.FC<GameViewProps> = ({ gameState, currentPlayerId }
           {activeDragId ? (
             <div className="w-32 h-48 pointer-events-none opacity-80 z-[1000]">
               <img
-                src={gameState.cards[activeDragId]?.imageUrl}
+                src={(() => {
+                  const c = gameState.cards[activeDragId];
+                  return c?.image_uris?.normal ||
+                    (c?.definition?.set && c?.definition?.id ? `/cards/images/${c.definition.set}/full/${c.definition.id}.jpg` : c?.imageUrl);
+                })()}
                 alt="Drag Preview"
                 className="w-full h-full object-cover rounded-xl shadow-2xl"
               />