Skip to content

Fix holy-war output for unnamed civs #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 19, 2025
Merged

Fix holy-war output for unnamed civs #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/holy-war.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
-----

Expand Down
19 changes: 15 additions & 4 deletions holy-war.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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')
Expand Down