Skip to content

changes required for DFHack/df-structures#872 #1564

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
ab9rf merged 3 commits into from
Feb 20, 2026
Merged

changes required for DFHack/df-structures#872 #1564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
323a951
changes required for DFHack/df-structures#872
ab9rf Feb 20, 2026
fbd92ca
remove pointless typo corrections
ab9rf Feb 20, 2026
21281bb
choose an element of `circumstance_id` at "random"
ab9rf Feb 20, 2026
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
4 changes: 2 additions & 2 deletions armoks-blessing.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function brainwash_unit(unit)
unit.status.current_soul.personality.traits.GREED = 25
unit.status.current_soul.personality.traits.IMMODERATION = 25
unit.status.current_soul.personality.traits.VIOLENT = 50
unit.status.current_soul.personality.traits.PERSEVERENCE = 75
unit.status.current_soul.personality.traits.PERSEVERANCE = 75
unit.status.current_soul.personality.traits.WASTEFULNESS = 50
unit.status.current_soul.personality.traits.DISCORD = 25
unit.status.current_soul.personality.traits.FRIENDLINESS = 75
Expand Down Expand Up @@ -80,7 +80,7 @@ function brainwash_unit(unit)
[df.value_type.HARD_WORK]=41,
[df.value_type.SACRIFICE]=41,
[df.value_type.COMPETITION]=-41,
[df.value_type.PERSEVERENCE]=41,
[df.value_type.PERSEVERANCE]=41,
[df.value_type.LEISURE_TIME]=-11,
[df.value_type.COMMERCE]=41,
[df.value_type.ROMANCE]=41,
Expand Down
4 changes: 0 additions & 4 deletions assign-beliefs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,6 @@ function assign(beliefs, unit, reset)
for belief, level in pairs(beliefs) do
assert(type(level) == "number")
belief = belief:upper()
-- there's a typo in the game data
if belief == "PERSEVERANCE" then
belief = "PERSEVERENCE"
end
if df.value_type[belief] then
if level >= -3 and level <= 3 then
local belief_value = calculate_random_belief_value(level)
Expand Down
4 changes: 0 additions & 4 deletions assign-facets.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,6 @@ function assign(facets, unit, reset)
for facet, level in pairs(facets) do
assert(type(level) == "number")
facet = facet:upper()
-- there's a typo in the game data
if facet == "PERSEVERANCE" then
facet = "PERSEVERENCE"
end
if df.personality_facet_type[facet] then
if level >= -3 and level <= 3 then
local facet_strength = calculate_random_facet_strength(level)
Expand Down
2 changes: 1 addition & 1 deletion devel/print-event.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ end
local function print_event(event)
local str = df.new("string")
local ctx = df.history_event_context:new()
event:getSentence(str, ctx)
event:getSentence(str, ctx, true, false)
ctx:delete()
print(str.value)
str:delete()
Expand Down
4 changes: 2 additions & 2 deletions exportlegends.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,8 +912,8 @@ local function export_more_legends_xml()
for ID, event in progress_ipairs(vector, 'historical event relationship supplements') do
file:write("\t<historical_event_relationship_supplement>\n")
file:write("\t\t<event>"..event.event.."</event>\n")
file:write("\t\t<occasion_type>"..event.occasion_type.."</occasion_type>\n")
file:write("\t\t<site>"..event.site.."</site>\n")
file:write("\t\t<occasion_type>"..event.circumstance.."</occasion_type>\n")
file:write("\t\t<site>"..event.circumstance_id.Death.."</site>\n") -- FIXME: Death has been chosen arbitrarily here
file:write("\t\t<reason>"..event.reason.."</reason>\n")
file:write("\t</historical_event_relationship_supplement>\n")
end
Expand Down