Merge pull request #1564 from DFHack/updates-for-structures-872

changes required for DFHack/df-structures#872

Author: ab9rf

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,

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 = "PERSEVERENCE"
-        end
         if df.value_type[belief] then
             if level >= -3 and level <= 3 then
                 local belief_value = calculate_random_belief_value(level)

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 = "PERSEVERENCE"
-        end
         if df.personality_facet_type[facet] then
             if level >= -3 and level <= 3 then
                 local facet_strength = calculate_random_facet_strength(level)

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()

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<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