From 6856e5698b10f7e37dfc5dcc78adb9600a4af4f6 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 16 Oct 2025 02:45:39 +0000
Subject: [PATCH 1/2] Initial plan


From 1055670c17cb4e56f6e11ff5de1e987c92839539 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 16 Oct 2025 02:53:33 +0000
Subject: [PATCH 2/2] Fix idle conversation combat condition logic

Co-authored-by: Mirrowel <28632877+Mirrowel@users.noreply.github.com>
---
 gamedata/scripts/talker_trigger_idle_conversation.script | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gamedata/scripts/talker_trigger_idle_conversation.script b/gamedata/scripts/talker_trigger_idle_conversation.script
index b19140e..d32c88b 100644
--- a/gamedata/scripts/talker_trigger_idle_conversation.script
+++ b/gamedata/scripts/talker_trigger_idle_conversation.script
@@ -18,7 +18,7 @@ local function cooldown_ready()
 end
 
 local function someone_should_make_idle_conversation()
-    local result = cooldown_ready() and queries.is_player_in_combat()
+    local result = cooldown_ready() and not queries.is_in_combat(queries.get_player())
     -- reset cooldown
     if result then last_idle_conversation_time_ms = queries.get_game_time_ms() end
     return result