From a04aa198b26c946a2a7f205bb1ba3101efa603c7 Mon Sep 17 00:00:00 2001 From: Brevven Date: Tue, 28 Dec 2021 01:54:30 -0800 Subject: [PATCH] carbon, se fix --- changelog.txt | 6 ++++++ data-util.lua | 27 ++++++++++++++++++++++++++- info.json | 4 ++-- tungsten-recipe-updates.lua | 3 ++- tungsten-recipe.lua | 3 +++ 5 files changed, 39 insertions(+), 4 deletions(-) diff --git a/changelog.txt b/changelog.txt index 4662960..3139f80 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,10 @@ --------------------------------------------------------------------------------------------------- +Version: 0.4.2 +Date: 2021-12-31 + Changes: + - SE Void probe recipe + - Graphite compatibility +--------------------------------------------------------------------------------------------------- Version: 0.4.1 Date: 2021-12-05 Changes: diff --git a/data-util.lua b/data-util.lua index 03359d2..a416efc 100644 --- a/data-util.lua +++ b/data-util.lua @@ -109,7 +109,7 @@ end -- Add a given quantity of product to a given recipe. -- Only works for recipes with multiple products function util.add_product(recipe_name, product) - if data.raw.recipe[recipe_name] and data.raw.item[product] then + if data.raw.recipe[recipe_name] and (data.raw.item[product[1]] or data.raw.item[product.name]) then add_product(data.raw.recipe[recipe_name], product) add_product(data.raw.recipe[recipe_name].normal, product) add_product(data.raw.recipe[recipe_name].expensive, product) @@ -274,6 +274,31 @@ function has_ingredient(recipe, ingredient) return false end +-- Remove a product from a recipe, WILL NOT remove the only product +function util.remove_product(recipe_name, old) + if me.bypass[recipe_name] then return end + if data.raw.recipe[recipe_name] then + remove_product(data.raw.recipe[recipe_name], old) + remove_product(data.raw.recipe[recipe_name].normal, old) + remove_product(data.raw.recipe[recipe_name].expensive, old) + end +end + +function remove_product(recipe, old) + index = -1 + if recipe ~= nil and recipe.results ~= nil then + for i, result in pairs(recipe.results) do + if result.name == old or result[1] == old then + index = i + break + end + end + if index > -1 then + table.remove(recipe.results, index) + end + end +end + -- Replace one product with another in a recipe function util.replace_product(recipe_name, old, new) if data.raw.recipe[recipe_name] then diff --git a/info.json b/info.json index 85bed05..2c91573 100644 --- a/info.json +++ b/info.json @@ -1,5 +1,5 @@ { "name": "bztungsten", - "version": "0.4.1", + "version": "0.4.2", "factorio_version": "1.1", "title": "Tungsten", "author": "Brevven", @@ -13,6 +13,6 @@ "? DeadlockCrating", "? bzlead" ], - "description": "Adds tungsten ore (wolframite), tungsten plates, tungsten carbide and rocket engine nozzles to the base game.\n\nAvailable after green science, tungsten and the various intermediates are used throughout the vanilla game.\nClampompatible with RSO, Space Exploration and Krastorio 2, and several other mods. Part of BZ Mods." + "description": "Adds tungsten ore (wolframite), tungsten plates, tungsten carbide and rocket engine nozzles to the base game.\n\nCompatible with RSO, Space Exploration, Krastorio 2, and several other mods. Part of BZ Mods." } diff --git a/tungsten-recipe-updates.lua b/tungsten-recipe-updates.lua index 39aaa50..824b7c0 100644 --- a/tungsten-recipe-updates.lua +++ b/tungsten-recipe-updates.lua @@ -164,6 +164,7 @@ if mods["space-exploration"] then util.add_ingredient("se-spaceship-rocket-engine", "rocket-engine-nozzle", 4) util.add_ingredient("se-cargo-rocket-section", "rocket-engine-nozzle", 5) util.add_ingredient("se-cargo-rocket-section-beryllium", "rocket-engine-nozzle", 5) + util.add_ingredient("se-void-probe", "rocket-engine-nozzle", 1) --Tooling util.add_ingredient("se-space-assembling-machine", "tungsten-carbide", 8) @@ -271,7 +272,7 @@ if mods["zombiesextended-core"] then util.add_ingredient("heat-pipe-mk1", "tungsten-plate", 1) end util.add_ingredient("electric-mining-drill-mk2", "tungsten-carbide", tcamount) -util.add_ingredient("edrill-1to2", "tungsten-carbide", 10) +util.add_ingredient("edrill-1to2", "tungsten-carbide", tcamount) util.add_ingredient("electric-mining-drill-mk3", "tungsten-carbide", tcamount) util.add_ingredient("electric-mining-drill-mk4", "tungsten-carbide", tcamount) util.add_ingredient("electric-mining-drill-mk5", "tungsten-carbide", tcamount) diff --git a/tungsten-recipe.lua b/tungsten-recipe.lua index 8c984ee..e392d57 100644 --- a/tungsten-recipe.lua +++ b/tungsten-recipe.lua @@ -173,6 +173,9 @@ local nozzle_i = {{"tungsten-plate", 2}} if mods.bzzirconium then table.insert(nozzle_i, {"zirconium-plate", 1}) end +if mods.bzcarbon then + table.insert(nozzle_i, {"graphite", 1}) +end data:extend({ {