Skip to content

gui/petition: fix deity display #1586

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

Open
chdoc wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −4
Open

gui/petition: fix deity display #1586

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
2 changes: 2 additions & 0 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ Template for new versions:

## Fixes

- `gui/petitions`: fix deity display

## Misc Improvements

## Removed
Expand Down
16 changes: 12 additions & 4 deletions list-agreements.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,19 @@ function get_agr_party_name(agr)
return party_name
end

---@param agr df.agreement
function get_deity_name(agr)
local religion_id = agr.details[0].data.Location.deity_data.Religion
local deities = df.global.world.entities.all[religion_id].relations.deities
if #deities == 0 then return 'An Unknown Deity' end
return dfhack.translation.translateName(df.global.world.history.figures[deities[0]].name,true)
local practice_type = agr.details[0].data.Location.deity_type
local practice_id = agr.details[0].data.Location.deity_data.practice_id -- could be either entity_id or hf_id
if practice_type == df.religious_practice_type.WORSHIP_HFID then
local hf = df.historical_figure.find(practice_id)
if not hf then return 'An Unknown Deity' end
return dfhack.translation.translateName(hf.name, true)
else
local deities = df.global.world.entities.all[practice_id].relations.deities
if #deities == 0 then return 'An Unknown Deity' end
return dfhack.translation.translateName(df.global.world.history.figures[deities[0]].name, true)
end
end

--get resolution status, and string
Expand Down
Loading