diff --git a/bzlib/data-util.lua b/bzlib/data-util.lua index 7a91f89..d4b9a46 100644 --- a/bzlib/data-util.lua +++ b/bzlib/data-util.lua @@ -80,6 +80,13 @@ function util.initialize(them) util.me = me end +function util.get_setting(name) + if settings.startup[name] == nil then + return nil + end + return settings.startup[name].value +end + function util.item(item, quantity, probability) if not quantity then quantity = 1 @@ -117,13 +124,13 @@ end allbypass = {} if get_setting("bz-recipe-bypass") then - for recipe in string.gmatch(me.get_setting("bz-recipe-bypass"), '[^",%s]+') do + for recipe in string.gmatch(util.get_setting("bz-recipe-bypass"), '[^",%s]+') do allbypass[recipe] = true end end function util.is_foundry() - return util.bz.foundry and not me.get_setting("bzfoundry-minimal") + return util.bz.foundry and not util.get_setting("bzfoundry-minimal") end function should_force(options) @@ -131,7 +138,7 @@ function should_force(options) end function bypass(recipe_name) - if me.bypass[recipe_name] then + if me and me.bypass[recipe_name] then return true end if allbypass[recipe_name] then @@ -416,7 +423,7 @@ function util.add_gleba_rock(resource, amount_min, amount_max) }) local probability = data.raw["simple-entity"]["gleba-rock"].autoplace.probability_expression -- A lot more common near starting point when aps gleba - local factor = (mods["any-planet-start"] and me.get_setting("aps-planet") == "gleba" and 20) or 1 + local factor = (mods["any-planet-start"] and util.get_setting("aps-planet") == "gleba" and 20) or 1 data.raw["simple-entity"]["gleba-rock"].autoplace.probability_expression = probability .. [[* if(distance_from_nearest_point{x = x, y = y, points = starting_positions} < 200, ]] .. factor .. [[, if(distance_from_nearest_point{x = x, y = y, points = starting_positions} < 700, @@ -425,8 +432,8 @@ function util.add_gleba_rock(resource, amount_min, amount_max) end if data.raw.item[resource] then - amount_min = (amount_min or 10) * ((mods["any-planet-start"] and me.get_setting("aps-planet") == "gleba" and 4) or 1) - amount_max = (amount_max or 20) * ((mods["any-planet-start"] and me.get_setting("aps-planet") == "gleba" and 4) or 1) + amount_min = (amount_min or 10) * ((mods["any-planet-start"] and util.get_setting("aps-planet") == "gleba" and 4) or 1) + amount_max = (amount_max or 20) * ((mods["any-planet-start"] and util.get_setting("aps-planet") == "gleba" and 4) or 1) util.add_minable_result( "simple-entity", "gleba-rock", { type = "item", name = resource, amount_min = amount_min, amount_max = amount_max }) @@ -960,7 +967,7 @@ function util.add_ingredient(recipe_name, ingredient, quantity, options) end local is_fluid = not not data.raw.fluid[ingredient] if data.raw.recipe[recipe_name] and (util.get_item(ingredient) or is_fluid) then - me.add_modified(recipe_name) + if me then me.add_modified(recipe_name) end prepare_redo_recycling(recipe_name) add_ingredient(data.raw.recipe[recipe_name], ingredient, quantity, is_fluid) end @@ -1123,7 +1130,7 @@ function util.replace_ingredient(recipe_name, old, new, amount, multiply, option return end if data.raw.recipe[recipe_name] and (data.raw.item[new] or data.raw.fluid[new]) and (data.raw.item[old] or data.raw.fluid[old]) then - me.add_modified(recipe_name) + if me then me.add_modified(recipe_name) end prepare_redo_recycling(recipe_name) replace_ingredient(data.raw.recipe[recipe_name], old, new, amount, multiply) end @@ -1157,7 +1164,7 @@ function util.remove_ingredient(recipe_name, old, options) return end if data.raw.recipe[recipe_name] then - me.add_modified(recipe_name) + if me then me.add_modified(recipe_name) end prepare_redo_recycling(recipe_name) remove_ingredient(data.raw.recipe[recipe_name], old) end @@ -1960,6 +1967,10 @@ function util.sum_products(recipe_name) return 0 end +function util.add_productivity(recipe) + data.raw.recipe[recipe].allow_productivity = true +end + function util.set_vtk_dcm_ingredients() if mods["vtk-deep-core-mining"] then local sum = util.sum_products("vtk-deepcore-mining-ore-chunk-refining")