From d7b8668d9a37113bf7f5a165b0a886b99c1e79f8 Mon Sep 17 00:00:00 2001
From: LOIRELAB <66545056+LoireLab@users.noreply.github.com>
Date: Sat, 19 Jul 2025 21:53:53 +0200
Subject: [PATCH] Improve holy-war output

---
 docs/holy-war.rst |  3 +++
 holy-war.lua      | 19 +++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/docs/holy-war.rst b/docs/holy-war.rst
index c24f45266..3c9ceecf2 100644
--- a/docs/holy-war.rst
+++ b/docs/holy-war.rst
@@ -13,6 +13,9 @@ two peoples, the civilization is set to war. Both your stance toward
 the other civilization and their stance toward you are set to war,
 ensuring a mutual declaration.
 
+Civilizations without proper names are ignored, and the reported sphere
+lists contain only the spheres unique to each civilization.
+
 Usage
 -----
 
diff --git a/holy-war.lua b/holy-war.lua
index 2326682bf..71227dafe 100644
--- a/holy-war.lua
+++ b/holy-war.lua
@@ -37,6 +37,14 @@ local function spheres_to_str(spheres)
     return table.concat(names, ', ')
 end
 
+local function diff(a, b)
+    local d = {}
+    for k in pairs(a) do
+        if not b[k] then d[k] = true end
+    end
+    return d
+end
+
 local function get_deity_spheres(hfid)
     local spheres = {}
     local hf = df.historical_figure.find(hfid)
@@ -154,16 +162,19 @@ local function main(...)
             if p_status ~= 1 or c_status ~= 1 then -- not already mutually at war
                 local civ_spheres = get_civ_spheres(civ)
                 local civ_hfs = get_civ_hists(civ)
-                local divine_conflict = not share(player_spheres, civ_spheres)
+                local divine_conflict = next(player_spheres) and next(civ_spheres)
+                    and not share(player_spheres, civ_spheres)
                 local persecution = has_religious_grudge(player_hfs, civ_hfs)
-                if divine_conflict or persecution then
+                if (divine_conflict or persecution) and civ.name.has_name then
                     local name = dfhack.translation.translateName(civ.name, true)
                     local reason_parts = {}
                     if divine_conflict then
+                        local p_diff = diff(player_spheres, civ_spheres)
+                        local c_diff = diff(civ_spheres, player_spheres)
                         table.insert(reason_parts,
                             ('conflicting spheres (%s vs %s)'):format(
-                                spheres_to_str(player_spheres),
-                                spheres_to_str(civ_spheres)))
+                                spheres_to_str(p_diff),
+                                spheres_to_str(c_diff)))
                     end
                     if persecution then
                         table.insert(reason_parts, 'religious persecution')