From 09fe607aab229ac4023a88762fcda72e868f074a Mon Sep 17 00:00:00 2001
From: Sebastian Bularca <sebastian.bularca@gmail.com>
Date: Wed, 6 May 2026 11:29:50 +0200
Subject: [PATCH] should trigger encounters now

---
 Assets/Code/GameState/PlayModes/AdventurePlayMode.cs  |  2 +-
 .../PlayModes/Encounters/EncounterHandler.cs          | 11 +++--------
 .../Code/GameState/PlayModes/PartyMovementHandler.cs  |  1 -
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Assets/Code/GameState/PlayModes/AdventurePlayMode.cs b/Assets/Code/GameState/PlayModes/AdventurePlayMode.cs
index da571b0..52a5b5b 100644
--- a/Assets/Code/GameState/PlayModes/AdventurePlayMode.cs
+++ b/Assets/Code/GameState/PlayModes/AdventurePlayMode.cs
@@ -137,7 +137,7 @@ namespace Nox.Game {
             timeHandler ??= new TimeHandler(adventureSettings, adventureData, worldClock);
 
             zoneSystem ??= new ZoneSystem(mapRef.zonesObjectHolder);
-            encounterHandler = new EncounterHandler(zoneSystem, encounterRegistry, encounterPrefabs, adventureData);
+            encounterHandler = new EncounterHandler(zoneSystem, encounterRegistry, encounterPrefabs);
             partyMovementHandler ??= new PartyMovementHandler(
                 partyRef,
                 cameraController,
diff --git a/Assets/Code/GameState/PlayModes/Encounters/EncounterHandler.cs b/Assets/Code/GameState/PlayModes/Encounters/EncounterHandler.cs
index b120959..72d2000 100644
--- a/Assets/Code/GameState/PlayModes/Encounters/EncounterHandler.cs
+++ b/Assets/Code/GameState/PlayModes/Encounters/EncounterHandler.cs
@@ -6,15 +6,12 @@ namespace Nox.Game {
     public class EncounterHandler {
         private readonly ZoneSystem zoneSystem;
         private readonly EncounterRegistry encounterRegistry;
-        private readonly AdventureData adventureData;
         private readonly EncounterView encounterView;
         private string previousZoneId;
-        private int previousDay;
 
-        public EncounterHandler(ZoneSystem zoneSystem, EncounterRegistry encounterRegistry, EncounterPrefabs encounterPrefabs, AdventureData adventureData) {
+        public EncounterHandler(ZoneSystem zoneSystem, EncounterRegistry encounterRegistry, EncounterPrefabs encounterPrefabs) {
             this.zoneSystem = zoneSystem;
             this.encounterRegistry = encounterRegistry;
-            this.adventureData = adventureData;
             encounterView = new EncounterView(encounterPrefabs);
         }
 
@@ -62,7 +59,7 @@ namespace Nox.Game {
             if(currentZoneId != previousZoneId) {
                 if(!string.IsNullOrEmpty(currentZoneId)) {
                     Debug.Log($"Entered zone: {currentZoneId} (encounter: {zoneContext.encounterTableId}, safe: {zoneContext.isSafe})");
-                    if(ResolveEncounter(zoneContext, currentZoneId, out var encounter)) {
+                    if(ResolveEncounter(zoneContext, zoneContext.encounterTableId, out var encounter)) {
                         TriggerEncounter(encounter);
                     }
 
@@ -86,9 +83,7 @@ namespace Nox.Game {
         }
 
         public void CheckForEncounters(Vector3 position) {
-            if (adventureData.currentDay != previousDay) {
-                VerifyZones(position);
-            }
+            VerifyZones(position);
         }
 
         public void Tick() { }
diff --git a/Assets/Code/GameState/PlayModes/PartyMovementHandler.cs b/Assets/Code/GameState/PlayModes/PartyMovementHandler.cs
index 57737e8..37250fa 100644
--- a/Assets/Code/GameState/PlayModes/PartyMovementHandler.cs
+++ b/Assets/Code/GameState/PlayModes/PartyMovementHandler.cs
@@ -17,7 +17,6 @@ namespace Nox.Game {
         private Vector3 targetPosition;
         private bool shouldHover;
         private MapLocation currentSelectedPoi;
-        private string previousZoneId;
         private bool hasClicked;
         private bool skipNextClick;