Merge pull request #1497 from Droseran/ban-cooking-modded-honey

Support for modded honey in ban-cooking

Author: ab9rf

ban-cooking.lua

@@ -80,9 +80,18 @@ funcs.booze = function()
 end
 
 funcs.honey = function()
-    local mat = dfhack.matinfo.find("CREATURE:HONEY_BEE:HONEY")
-    if mat then
-        ban_cooking('honey bee honey', mat.type, mat.index, df.item_type.LIQUID_MISC, -1)
+    for _, c in ipairs(df.global.world.raws.creatures.all) do
+        for _, m in ipairs(c.material) do
+            if m.flags.EDIBLE_COOKED then
+                for _, s in ipairs(m.reaction_product.id) do
+                    if s.value == "DRINK_MAT" then
+                        local matinfo = dfhack.matinfo.find(c.creature_id, m.id)
+                        ban_cooking(c.name[2] .. ' ' .. m.id, matinfo.type, matinfo.index, df.item_type.LIQUID_MISC, -1)
+                        break
+                    end
+                end
+            end
+        end
     end
 end
 

changelog.txt

@@ -34,6 +34,7 @@ Template for new versions:
 ## New Features
 
 ## Fixes
+- `ban-cooking`: bans honey added by creatures other than vanilla honey bee
 - `uniform-unstick`: added quivers, backpacks, and flasks/waterskins to uniform analysis
 - `uniform-unstick`: the ``--drop`` option now only evaluates clothing as possible items to drop
 - `uniform-unstick`: the ``--free`` option no longer redundantly reports an improperly assigned item when that item is removed from a uniform