adapt to updated structures

Author: myk002

fix/stable-temp.lua

@@ -1,22 +1,11 @@
--- Reset item temperature to the value of their tile.
---[====[
-
-fix/stable-temp
-===============
-Instantly sets the temperature of all free-lying items to be in equilibrium with
-the environment, which stops temperature updates until something changes.
-To maintain this efficient state, use `tweak fast-heat <tweak>`.
-
-]====]
-local args = {...}
+local args = { ... }
 
 local apply = (args[1] == 'apply')
 
 local count = 0
 local types = {} --as:number[]
 
-local function update_temp(item,btemp)
-    local item = item --as:df.item_actual
+local function update_temp(item, btemp)
     if item.temperature.whole ~= btemp then
         count = count + 1
         local tid = item:getType()
@@ -28,46 +17,49 @@ local function update_temp(item,btemp)
         item.temperature.fraction = 0
 
         if item.contaminants then
-            for _,c in ipairs(item.contaminants) do
-                c.temperature.whole = btemp
-                c.temperature.fraction = 0
+            for _, c in ipairs(item.contaminants) do
+                c.base.temperature.whole = btemp
+                c.base.temperature.fraction = 0
             end
         end
     end
 
-    for _,sub in ipairs(dfhack.items.getContainedItems(item)) do --as:df.item_actual
-        update_temp(sub,btemp)
+    for _, sub in ipairs(dfhack.items.getContainedItems(item)) do --as:df.item_actual
+        update_temp(sub, btemp)
     end
 
     if apply then
         item:checkTemperatureDamage()
     end
 end
 
-local last_frame = df.global.world.frame_counter-1
+local last_frame = df.global.world.frame_counter - 1
 
-for _,item in ipairs(df.global.world.items.other.IN_PLAY) do
-    local item = item --as:df.item_actual
-    if item.flags.on_ground and df.item_actual:is_instance(item) and
-       item.temp_updated_frame == last_frame then
-        local pos = item.pos
-        local block = dfhack.maps.getTileBlock(pos)
-        if block then
-            update_temp(item, block.temperature_1[pos.x%16][pos.y%16])
-        end
+for _, item in ipairs(df.global.world.items.other.IN_PLAY) do
+    if not item.flags.on_ground or
+        not df.item_actual:is_instance(item) or
+        item.temp_updated_frame ~= last_frame
+    then
+        goto continue
+    end
+    local pos = item.pos
+    local block = dfhack.maps.getTileBlock(pos)
+    if block then
+        update_temp(item, block.temperature_1[pos.x % 16][pos.y % 16])
     end
+    ::continue::
 end
 
 if apply then
-    print('Items updated: '..count)
+    print('Items updated: ' .. count)
 else
-    print("Use 'fix/stable-temp apply' to force-change temperature.")
-    print('Items not in equilibrium: '..count)
+    print("Use 'fix/stable-temp apply' to normalize temperature.")
+    print('Items not in equilibrium: ' .. count)
 end
 
 local tlist = {}
-for k,_ in pairs(types) do tlist[#tlist+1] = k end
-table.sort(tlist, function(a,b) return types[a] > types[b] end)
-for _,k in ipairs(tlist) do
-    print('    '..df.item_type[k]..':', types[k])
+for k, _ in pairs(types) do tlist[#tlist + 1] = k end
+table.sort(tlist, function(a, b) return types[a] > types[b] end)
+for _, k in ipairs(tlist) do
+    print('    ' .. df.item_type[k] .. ':', types[k])
 end

modtools/item-trigger.lua

@@ -165,7 +165,7 @@ function handler(data)
 
     if data.item.contaminants and #data.item.contaminants > 0 then --hint:df.item_actual
         for _, contaminant in ipairs(data.item.contaminants or {}) do --hint:df.item_actual
-            local contaminantMat = dfhack.matinfo.decode(contaminant.mat_type, contaminant.mat_index)
+            local contaminantMat = dfhack.matinfo.decode(contaminant.base.mat_type, contaminant.base.mat_index)
             data.contaminantMat = contaminantMat
             checkForTrigger(data)
             data.contaminantMat = nil