1

src/components/game-canvas/GameCanvasRuntime.tsx

@@ -18,7 +18,6 @@ import {
   getMirroredStageEntityLeft,
   getMonsterWorldLeft,
   getPlayerWorldLeft,
-  HOSTILE_NPC_SCENE_INSET_PX,
   SCENE_TRANSITION_LOWER_COMPANION_DELAY_S,
   SCENE_TRANSITION_SPEED_PX_PER_S,
   SCENE_TRANSITION_SPRITE_CLEARANCE_PX,
@@ -119,7 +118,6 @@ export function GameCanvasRuntime({
   const playerMeleeLeft = `calc(100% - ${sideAnchor} - 13rem)`;
   const monsterMeleeLeft = `calc(100% - ${sideAnchor} - 20rem)`;
   const playerStageLeft = getMirroredStageEntityLeft(sideAnchor, 'player');
-  const opponentStageLeft = getMirroredStageEntityLeft(sideAnchor, 'opponent');
   const playerWorldLeft = getPlayerWorldLeft(sideAnchor, playerX, cameraAnchorX);
   const companionAnchorX = inBattle && !scrollWorld ? PLAYER_BASE_X_METERS : playerX;
   const companionAnchorLeft = getPlayerWorldLeft(sideAnchor, companionAnchorX, cameraAnchorX);
@@ -132,15 +130,16 @@ export function GameCanvasRuntime({
       : playerStageLeft;
   const monsterAnchorMeters = 3.2;
   const getHostileNpcOuterLeft = (hostileNpc: (typeof sceneHostileNpcs)[number]) => {
-    if (!scrollWorld && hostileNpc.animation !== 'attack') {
-      return opponentStageLeft;
+    if (hostileNpc.animation === 'attack' && hostileNpc.combatMode !== 'ranged' && !scrollWorld) {
+      return monsterMeleeLeft;
     }
 
-    const baseLeft =
-      hostileNpc.animation === 'attack' && hostileNpc.combatMode !== 'ranged' && !scrollWorld
-        ? monsterMeleeLeft
-        : getMonsterWorldLeft(sideAnchor, hostileNpc.xMeters, cameraAnchorX, monsterAnchorMeters);
-    return `calc(${baseLeft} - ${HOSTILE_NPC_SCENE_INSET_PX}px)`;
+    return getMonsterWorldLeft(
+      sideAnchor,
+      hostileNpc.xMeters,
+      cameraAnchorX,
+      monsterAnchorMeters,
+    );
   };
   const getPlayerEffectLeft = (effectX: number, offsetPx = 0) => {
     const base = playerActionMode === 'melee' && !scrollWorld