1

src/components/game-canvas/GameCanvasEntityLayer.tsx

@@ -33,6 +33,7 @@ import {
   RoleCharacterSprite,
   SCENE_TRANSITION_LOWER_COMPANION_DELAY_S,
   SCENE_TRANSITION_UPPER_COMPANION_DELAY_S,
+  SceneEncounterNpcSprite,
   SceneEntityButton,
 } from './GameCanvasShared';
 
@@ -403,7 +404,9 @@ export function GameCanvasEntityLayer({
                         style={{imageRendering: 'pixelated'}}
                       />
                     </div>
-                  ) : peacefulResolvedCharacter ? (
+                  ) : peacefulResolvedCharacter &&
+                    !encounter.visual &&
+                    !encounter.imageSrc?.trim() ? (
                     <RoleCharacterSprite
                       state={AnimationState.IDLE}
                       character={peacefulResolvedCharacter}
@@ -417,11 +420,11 @@ export function GameCanvasEntityLayer({
                       className="scale-[1.82] origin-bottom"
                     />
                   ) : (
-                    <MedievalNpcAnimator
+                    <SceneEncounterNpcSprite
                       encounter={encounter}
-                      className="drop-shadow-[0_8px_14px_rgba(0,0,0,0.38)]"
+                      state={AnimationState.IDLE}
                       facing={peacefulNpcSpriteFacing}
-                      scale={GENERIC_NPC_SCENE_SCALE}
+                      className="drop-shadow-[0_8px_14px_rgba(0,0,0,0.38)]"
                     />
                   )}
                 </div>