From 84b6e517462b21970f0f0ca58e80eb9ca55845c1 Mon Sep 17 00:00:00 2001
From: tekki mariani <tekki.mariani@googlemail.com>
Date: Mon, 23 Mar 2026 20:02:40 +0000
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20improve=20occlusion=20detection?=
 =?UTF-8?q?=20with=20wider=20tile=20check?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Expands isOccluded() from same-column-only to a 3x4 tile window
(tileX+-1, tileY+1..4) to catch trees whose canopy extends sideways
and well above the trunk tile. Outline scale bumped to 1.15.
---
 src/systems/VillagerSystem.ts | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/systems/VillagerSystem.ts b/src/systems/VillagerSystem.ts
index b008257..da53fa9 100644
--- a/src/systems/VillagerSystem.ts
+++ b/src/systems/VillagerSystem.ts
@@ -589,7 +589,7 @@ export class VillagerSystem {
     // Silhouette: same texture, white fill, fixed high depth so it shows through
     // trees and buildings. Visibility is toggled per frame by isOccluded().
     const outlineSprite = this.scene.add.image(v.x, v.y, 'villager')
-      .setScale(1.1)
+      .setScale(1.15)
       .setTintFill(0xaaddff)
       .setAlpha(0.85)
       .setDepth(900)
@@ -648,19 +648,22 @@ export class VillagerSystem {
 
   /**
    * Returns true if a world object (tree, rock, or building) with a higher tileY
-   * than the Nisse exists on the same column, meaning the Nisse is visually
-   * behind that object. Checks 1–3 tiles below to account for tall tree canopies.
+   * exists in the vicinity of the Nisse and would visually occlude them.
+   * Checks a 3-column × 4-row window below the Nisse's tile to account for
+   * wide tree canopies that extend above and to the sides of the trunk tile.
    * @param tileX - Nisse's current tile column
    * @param tileY - Nisse's current tile row
    */
   private isOccluded(tileX: number, tileY: number): boolean {
     const state = stateManager.getState()
-    for (let dy = 1; dy <= 3; dy++) {
-      const checkY = tileY + dy
-      if (this.worldSystem.hasResourceAt(tileX, checkY)) return true
-      if (Object.values(state.world.buildings).some(
-        b => b.tileX === tileX && b.tileY === checkY && b.kind !== 'stockpile_zone'
-      )) return true
+    const buildings = Object.values(state.world.buildings)
+    for (let dx = -1; dx <= 1; dx++) {
+      for (let dy = 1; dy <= 4; dy++) {
+        const cx = tileX + dx
+        const cy = tileY + dy
+        if (this.worldSystem.hasResourceAt(cx, cy)) return true
+        if (buildings.some(b => b.tileX === cx && b.tileY === cy && b.kind !== 'stockpile_zone')) return true
+      }
     }
     return false
   }