diff --git a/bzutil/data-util.lua b/bzutil/data-util.lua index 971f3ae..effcd73 100644 --- a/bzutil/data-util.lua +++ b/bzutil/data-util.lua @@ -1,7 +1,3 @@ --- WARNING WARNING WARNING --- This file will be overwritten in mod zipfiles, edit bzlib/data-util.lua --- WARNING WARNING WARNING - local futil = require("util") local me = require("me") local util = {} @@ -9,24 +5,8 @@ local util = {} util.me = me util.get_setting = util.me.get_setting -util.bz = {} -util.bz.carbon = mods["bzcarbon"] and "bzcarbon" or mods["bzcarbon2"] and "bzcarbon2" -util.bz.lead = mods["bzlead"] and "bzlead" or mods["bzlead2"] and "bzlead2" -util.bz.silicon = mods["bzsilicon"] and "bzsilicon" or mods["bzsilicon2"] and "bzsilicon2" -util.bz.tin = mods["bztin"] and "bztin" or mods["bztin2"] and "bztin2" -util.bz.titanium = mods["bztitanium"] and "bztitanium" or mods["bztitanium2"] and "bztitanium2" -util.bz.zirconium = mods["bzzirconium"] and "bzzirconium" or mods["bzzirconium2"] and "bzzirconium2" -util.bz.gold = mods["bzgold"] and "bzgold" or mods["bzgold2"] and "bzgold2" -util.bz.aluminum = mods["bzaluminum"] and "bzaluminum" or mods["bzaluminum2"] and "bzaluminum2" -util.bz.gas = mods["bzgas"] and "bzgas" or mods["bzgas2"] and "bzgas2" -util.bz.chlorine = mods["bzchlorine"] and "bzchlorine" or mods["bzchlorine2"] and "bzchlorine2" -util.bz.tungsten = mods["bztungsten"] and "bztungsten" or mods["bztungsten2"] and "bztungsten2" -util.bz.foundry = mods["bzfoundry"] and "bzfoundry" or mods["bzfoundry2"] and "bzfoundry2" - util.titanium_plate = "" util.titanium_processing = "" -util.bismuth_plate = "" -util.bismuth_processing = "" local item_sounds_helper = [[ local item_sounds = require('__base__.prototypes.item_sounds') @@ -58,18 +38,14 @@ util.ALC = { { "automation-science-pack", 1 }, { "logistic-science-pack", 1 }, { if mods["FactorioExtended-Plus-Core"] then util.titanium_plate = "titanium-alloy" - util.bismuth_plate = "bismuth-alloy" else util.titanium_plate = "titanium-plate" - util.bismuth_plate = "bismuth-plate" end if mods["pyrawores"] then util.titanium_processing = "titanium-mk01" - util.bismuth_processing = "bismuth-mk01" else util.titanium_processing = "titanium-processing" - util.bismuth_processing = "bismuth-processing" end util.vacuum_icon = { icon = "__base__/graphics/icons/fluid/steam.png", tint = { r = .1, g = .1, b = .5, a = .5 } } @@ -992,7 +968,7 @@ end function add_ingredient_raw(recipe, ingredient) if recipe ~= nil and recipe.ingredients ~= nil then for i, existing in pairs(recipe.ingredients) do - if (existing.name and existing.name == ingredient.name) then + if existing.name == ingredient.name then return end end @@ -1053,6 +1029,8 @@ function add_product(recipe, product) return end end + recipe.result = nil + recipe.result_count = nil table.insert(recipe.results, product) end end