update to canonicalized field names

Author: myk002

assign-preferences.lua

@@ -305,7 +305,7 @@ local preference_functions = {
                 item_type = df.item_type.POWDER_MISC
             elseif food_mat_index.CookableSeed > -1 then
                 item_type = df.item_type.SEEDS
-            elseif food_mat_index.CookableLeaf > -1 then
+            elseif food_mat_index.CookablePlantGrowth > -1 then
                 --[[
                 In case of plant growths, "mat_info" stores the item type as a specific subtype ("FLOWER", or "FRUIT",
                 etc.) instead of the generic "PLANT_GROWTH" item type. Also, the IDs of the different types of growths

ban-cooking.lua

@@ -268,7 +268,7 @@ funcs.fruit = function()
         for k, g in ipairs(p.growths) do
             local matinfo = dfhack.matinfo.decode(g)
             local m = matinfo.material
-            if m.id == "FRUIT" and m.flags.EDIBLE_COOKED and m.flags.LEAF_MAT then
+            if m.id == "FRUIT" and m.flags.EDIBLE_COOKED and m.flags.STOCKPILE_PLANT_GROWTH then
                 for _, s in ipairs(m.reaction_product.id) do
                     if s.value == "DRINK_MAT" then
                         ban_cooking(p.name .. ' ' .. m.id, matinfo.type, matinfo.index, df.item_type.PLANT_GROWTH, k)

combine.lua

@@ -192,7 +192,7 @@ local function stacks_add_item(stockpile, stacks, stack_type, item, container)
         else
             comp_key = ('%s+%s+%s+%s+%s'):format(stack_type.type_id, item.race, item.caste, item:getActualMaterial(), item:getActualMaterialIndex())
         end
-    elseif item:isAmmo() then
+    elseif item:isCrafted() then
         if item:getQuality() == df.item_quality.Masterful then
             comp_key = ('%s+%s+%s+%s+%s'):format(stack_type.type_id, item.mat_type, item.mat_index, item:getQuality(), item:getMaker())
         else
@@ -446,7 +446,7 @@ local function stacks_add_items(stockpile, stacks, items, container, ind)
                     local casteRaw = raceRaw.caste[item.caste]
                     log(4, ('      %sitem:%40s <%6d> is incl, type:%d, race:%s, caste:%s'):format(
                         ind, utils.getItemDescription(item), item.id, type_id,  raceRaw.creature_id,  casteRaw.caste_id))
-                elseif item:isAmmo() then
+                elseif item:isCrafted() then
                     local mat_info = dfhack.matinfo.decode(item.mat_type, item.mat_index)
                     log(4, ('      %sitem:%40s <%6d> is incl, type:%d, info:%s, quality:%d, maker:%d'):format(
                         ind, utils.getItemDescription(item), item.id, type_id, mat_info:toString(), item:getQuality(), item:getMaker()))

deteriorate.lua

@@ -41,7 +41,7 @@ local function keep_usable(opts, item)
                     item.corpse_flags.bone or
                     item.corpse_flags.horn or
                     item.corpse_flags.leather or
-                    item.corpse_flags.skull2 or
+                    item.corpse_flags.skull or
                     item.corpse_flags.tooth) or (
                 item.corpse_flags.hair_wool or
                 item.corpse_flags.pearl or

devel/tree-info.lua

@@ -53,7 +53,7 @@ function printTreeTile(bits)
         dfhack.print(' ')
     end
 
-    if bits.twigs then
+    if bits.leaves then
         chars = chars-1
         exists = true
         print_color(';', COLOR_GREEN)

extinguish.lua

@@ -50,8 +50,8 @@ end
 function extinguishContaminant(spatter)
     -- reset temperature of any contaminants to prevent them from causing reignition
     -- (just in case anyone decides to play around with molten gold or whatnot)
-    spatter.temperature.whole = 10050
-    spatter.temperature.fraction = 0
+    spatter.base.temperature.whole = 10050
+    spatter.base.temperature.fraction = 0
 end
 
 ---@param item df.item

gui/create-item.lua

@@ -130,7 +130,7 @@ local function getMatFilter(itemtype, opts)
             return mat.flags.STRUCTURAL_PLANT_MAT
         end,
         LEAVES = function(mat, parent, typ, idx)
-            return mat.flags.LEAF_MAT
+            return mat.flags.STOCKPILE_PLANT_GROWTH
         end,
         MEAT = function(mat, parent, typ, idx)
             return mat.flags.MEAT

internal/quickfort/build.lua

@@ -802,8 +802,7 @@ local building_db_raw = {
     Mrsssqq=make_roller_entry(df.screw_pump_direction.FromWest, 30000),
     Mrsssqqq=make_roller_entry(df.screw_pump_direction.FromWest, 20000),
     Mrsssqqqq=make_roller_entry(df.screw_pump_direction.FromWest, 10000),
-    -- Instruments are not yet supported by DFHack
-    -- I={label='Instrument', type=df.building_type.Instrument},
+    I={label='Instrument', type=df.building_type.Instrument},
     S={label='Support', type=df.building_type.Support,
        is_valid_tile_fn=is_valid_tile_has_space},
     m={label='Animal Trap', type=df.building_type.AnimalTrap},

modtools/create-item.lua

@@ -141,8 +141,8 @@ local function createCorpsePiece(creator, bodypart, partlayer, creatureID, caste
             item.corpse_flags.tooth = true
             item.material_amount.Tooth = 1
         elseif layerName == 'NERVE' then    -- check if nervous tissue
-            item.corpse_flags.skull1 = true -- apparently "skull1" is supposed to be named "rots/can_rot"
-            item.corpse_flags.separated_part = true
+            item.corpse_flags.rottable = true
+            item.corpse_flags.use_blood_color = true
             -- elseif layerName == "NAIL" then -- check if nail (NO SPECIAL FLAGS)
         elseif layerName == 'HORN' or layerName == 'HOOF' then -- check if nail
             item.corpse_flags.horn = true
@@ -153,7 +153,7 @@ local function createCorpsePiece(creator, bodypart, partlayer, creatureID, caste
         end
         -- checking for skull
         if not generic and not isCorpse and creatorBody.body_parts[bodypart].token == 'SKULL' then
-            item.corpse_flags.skull2 = true
+            item.corpse_flags.skull = true
         end
     end
     local matType
@@ -176,10 +176,10 @@ local function createCorpsePiece(creator, bodypart, partlayer, creatureID, caste
         end
         -- on a dwarf tissue index 3 (bone) is 22, but this is not always the case for all creatures, so we get the mat_type of index 3 instead
         -- here we also set the actual referenced creature material of the corpsepiece
-        item.bone1.mat_type = matType
-        item.bone1.mat_index = creatureID
-        item.bone2.mat_type = matType
-        item.bone2.mat_index = creatureID
+        item.largest_tissue.mat_type = matType
+        item.largest_tissue.mat_index = creatureID
+        item.largest_unrottable_tissue.mat_type = matType
+        item.largest_unrottable_tissue.mat_index = creatureID
         -- skin (and presumably other parts) use body part modifiers for size or amount
         for i = 0,200 do                          -- fuck it this works
             -- inserts
@@ -226,7 +226,7 @@ local function createCorpsePiece(creator, bodypart, partlayer, creatureID, caste
         if wholePart then
             for i in pairs(creatorBody.body_parts[bodypart].layers) do
                 item.body.components.layer_status[creatorBody.body_parts[bodypart].layers[i].layer_id].gone = false
-                item.corpse_flags.separated_part = true
+                item.corpse_flags.use_blood_color = true
                 item.corpse_flags.unbutchered = true
             end
         end

modtools/reaction-trigger-transition.lua

@@ -36,7 +36,7 @@ for _,reaction in ipairs(df.global.world.raws.reactions.reactions) do
   end
   local inorganic = df.global.world.raws.inorganics[product.mat_index]
   local didInorganicName
-  for _,syndrome in ipairs(inorganic.material.syndrome) do
+  for _,syndrome in ipairs(inorganic.material.syndrome.syndrome) do
    local workerOnly = true
    local allowMultipleTargets = false;
    local command