Merge pull request #5265 from myk002/myk_great_reorg_pt2

finish updating modules for the Great Reorg

Author: myk002

library/lua/custom-raw-tokens.lua

@@ -300,7 +300,7 @@ local function getTokenArg1Else(userdata, token)
     elseif df.is_instance(df.building_workshopst, userdata) or df.is_instance(df.building_furnacest, userdata) then
         rawStruct = df.building_def.find(userdata.custom_type)
     elseif df.is_instance(df.interaction_instance, userdata) then
-        rawStruct = df.global.world.raws.interactions[userdata.interaction_id]
+        rawStruct = df.global.world.raws.interactions.all[userdata.interaction_id]
     else
         -- Assume raw struct *is* argument 1
         rawStruct = userdata

library/lua/dfhack/workshops.lua

@@ -509,7 +509,7 @@ local function addReactionJobs(ret,bid,wid,cid)
 end
 local function scanRawsOres()
     local ret={}
-    for idx,ore in ipairs(df.global.world.raws.inorganics) do
+    for idx,ore in ipairs(df.global.world.raws.inorganics.all) do
         if #ore.metal_ore.mat_index~=0 then
             ret[idx]=ore
         end

library/lua/gui/materials.lua

@@ -116,7 +116,7 @@ end
 function MaterialDialog:initInorganicMode()
     local choices = {}
 
-    for i,mat in ipairs(df.global.world.raws.inorganics) do
+    for i,mat in ipairs(df.global.world.raws.inorganics.all) do
         self:addMaterial(choices, mat.material, 0, i, false, mat)
     end
 
@@ -378,14 +378,14 @@ function ItemTraitsDialog(args)
     end
     --------------------------------------
     local set_ore_ix = {}
-    for i, raw in ipairs(df.global.world.raws.inorganics) do
+    for i, raw in ipairs(df.global.world.raws.inorganics.all) do
         for _, ix in ipairs(raw.metal_ore.mat_index) do
             set_ore_ix[ix] = true
         end
     end
     local ores = {}
     for ix in pairs(set_ore_ix) do
-        local raw = df.global.world.raws.inorganics[ix]
+        local raw = df.global.world.raws.inorganics.all[ix]
         ores[#ores+1] = {mat_index = ix, name = raw.material.state_name.Solid}
     end
     table.sort(ores, function(a,b) return a.name < b.name end)

plugins/lua/sort.lua

@@ -43,7 +43,7 @@ local function get_active_idx_cache()
 end
 
 local function is_original_dwarf(unit)
-    return df.global.plotinfo.fortress_age == unit.curse.time_on_site // 10
+    return df.global.plotinfo.fortress_age == unit.curse.interaction.time_on_site // 10
 end
 
 local WAVE_END_GAP = 10000
@@ -53,7 +53,7 @@ local function get_most_recent_wave_oldest_active_idx(cache)
     for idx=#active_units-1,0,-1 do
         local unit = active_units[idx]
         if not dfhack.units.isCitizen(unit) then goto continue end
-        if oldest_unit and unit.curse.time_on_site - oldest_unit.curse.time_on_site > WAVE_END_GAP then
+        if oldest_unit and unit.curse.interaction.time_on_site - oldest_unit.curse.interaction.time_on_site > WAVE_END_GAP then
             return cache[oldest_unit.id]
         else
             oldest_unit = unit

plugins/lua/stockflow.lua

@@ -283,7 +283,7 @@ function collect_reactions()
     reaction_entry(result, job_types.CatchLiveFish)
 
     -- Cutting, encrusting, and metal extraction.
-    local rock_types = df.global.world.raws.inorganics
+    local rock_types = df.global.world.raws.inorganics.all
     for rock_id = #rock_types-1, 0, -1 do
         local material = rock_types[rock_id].material
         local rock_name = material.state_adj.Solid

plugins/rendermax/rendermax.lua

@@ -164,7 +164,7 @@ function colorFrom16(col16)
     return {col[0],col[1],col[2]}
 end
 function addGems()
-    for k,v in pairs(df.global.world.raws.inorganics) do
+    for k,v in pairs(df.global.world.raws.inorganics.all) do
         if v.material.flags.IS_GEM then
             addMaterial("INORGANIC:"..v.id,colorFrom16(v.material.tile_color[0]+v.material.tile_color[2]*8))
         end