From 323a95101c23a1479daf545d4936dc6908bf9443 Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Fri, 20 Feb 2026 13:19:07 -0600 Subject: [PATCH 1/3] changes required for DFHack/df-structures#872 --- armoks-blessing.lua | 4 ++-- assign-beliefs.lua | 2 +- assign-facets.lua | 2 +- devel/print-event.lua | 2 +- exportlegends.lua | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/armoks-blessing.lua b/armoks-blessing.lua index e34cc9992e..6d57ab34eb 100644 --- a/armoks-blessing.lua +++ b/armoks-blessing.lua @@ -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 @@ -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, diff --git a/assign-beliefs.lua b/assign-beliefs.lua index 2a0d92cdb4..722773604c 100644 --- a/assign-beliefs.lua +++ b/assign-beliefs.lua @@ -136,7 +136,7 @@ function assign(beliefs, unit, reset) belief = belief:upper() -- there's a typo in the game data if belief == "PERSEVERANCE" then - belief = "PERSEVERENCE" + belief = "PERSEVERANCE" end if df.value_type[belief] then if level >= -3 and level <= 3 then diff --git a/assign-facets.lua b/assign-facets.lua index 3e77b3e2e0..6b089d3aac 100644 --- a/assign-facets.lua +++ b/assign-facets.lua @@ -136,7 +136,7 @@ function assign(facets, unit, reset) facet = facet:upper() -- there's a typo in the game data if facet == "PERSEVERANCE" then - facet = "PERSEVERENCE" + facet = "PERSEVERANCE" end if df.personality_facet_type[facet] then if level >= -3 and level <= 3 then diff --git a/devel/print-event.lua b/devel/print-event.lua index f2d9a54aad..771ac55299 100644 --- a/devel/print-event.lua +++ b/devel/print-event.lua @@ -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() diff --git a/exportlegends.lua b/exportlegends.lua index 5ac72a0511..bdd722e2b6 100644 --- a/exportlegends.lua +++ b/exportlegends.lua @@ -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\n") file:write("\t\t"..event.event.."\n") - file:write("\t\t"..event.occasion_type.."\n") - file:write("\t\t"..event.site.."\n") + file:write("\t\t"..event.circumstance.."\n") + file:write("\t\t"..event.circumstance_id.."\n") file:write("\t\t"..event.reason.."\n") file:write("\t\n") end From fbd92ca9a83e00f8b51aba16abbd2ba0d49136b3 Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Fri, 20 Feb 2026 13:52:46 -0600 Subject: [PATCH 2/3] remove pointless typo corrections --- assign-beliefs.lua | 4 ---- assign-facets.lua | 4 ---- 2 files changed, 8 deletions(-) diff --git a/assign-beliefs.lua b/assign-beliefs.lua index 722773604c..cc0de2c282 100644 --- a/assign-beliefs.lua +++ b/assign-beliefs.lua @@ -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 = "PERSEVERANCE" - end if df.value_type[belief] then if level >= -3 and level <= 3 then local belief_value = calculate_random_belief_value(level) diff --git a/assign-facets.lua b/assign-facets.lua index 6b089d3aac..c91670f07c 100644 --- a/assign-facets.lua +++ b/assign-facets.lua @@ -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 = "PERSEVERANCE" - end if df.personality_facet_type[facet] then if level >= -3 and level <= 3 then local facet_strength = calculate_random_facet_strength(level) From 21281bb3e4f53b82a4b2bb7a95eac7ffde3a4e57 Mon Sep 17 00:00:00 2001 From: Kelly Kinkade Date: Fri, 20 Feb 2026 14:09:31 -0600 Subject: [PATCH 3/3] choose an element of `circumstance_id` at "random" --- exportlegends.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exportlegends.lua b/exportlegends.lua index bdd722e2b6..5488573063 100644 --- a/exportlegends.lua +++ b/exportlegends.lua @@ -913,7 +913,7 @@ local function export_more_legends_xml() file:write("\t\n") file:write("\t\t"..event.event.."\n") file:write("\t\t"..event.circumstance.."\n") - file:write("\t\t"..event.circumstance_id.."\n") + file:write("\t\t"..event.circumstance_id.Death.."\n") -- FIXME: Death has been chosen arbitrarily here file:write("\t\t"..event.reason.."\n") file:write("\t\n") end