diff --git a/Bio_Industries_2/prototypes/Bio_Cannon/recipe.lua b/Bio_Industries_2/prototypes/Bio_Cannon/recipe.lua index a92e641..ea73fb5 100644 --- a/Bio_Industries_2/prototypes/Bio_Cannon/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Cannon/recipe.lua @@ -10,7 +10,6 @@ if BI.Settings.Bio_Cannon then name = "bi-bio-cannon", localised_name = {"entity-name.bi-bio-cannon"}, localised_description = {"entity-description.bi-bio.cannon"}, - normal = { enabled = false, energy_required = 50, ingredients = { @@ -23,24 +22,6 @@ if BI.Settings.Bio_Cannon then allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = true, -- Added for 0.18.34/1.1.4 allow_decomposition = false, -- Added for 0.18.34/1.1.4 - }, - expensive = { - enabled = false, - energy_required = 100, - ingredients = { - {type="item", name="concrete", amount=100}, - {type="item", name="radar", amount=1}, - {type="item", name="steel-plate", amount=120}, - {type="item", name="electric-engine-unit", amount=15}, - }, - results = {{type="item", name="bi-bio-cannon", amount=1}}, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = true, -- Added for 0.18.34/1.1.4 - allow_decomposition = false, -- Added for 0.18.34/1.1.4 - }, - allow_as_intermediate = false, - always_show_made_in = true, -- Changed for 0.18.34/1.1.4 - allow_decomposition = false, -- Changed for 0.18.34/1.1.4 subgroup = "defensive-structure", order = "b[turret]-e[bi-prototype-artillery-turret]" }, diff --git a/Bio_Industries_2/prototypes/Bio_Farm/recipe.lua b/Bio_Industries_2/prototypes/Bio_Farm/recipe.lua index 0831639..601cb20 100644 --- a/Bio_Industries_2/prototypes/Bio_Farm/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Farm/recipe.lua @@ -428,7 +428,6 @@ data:extend({ icon_size = 64, } }, - normal = { enabled = false, --~ energy_required = 5, energy_required = 2.5, @@ -442,27 +441,8 @@ data:extend({ allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = false, -- Added for 0.18.34/1.1.4 - }, - expensive = { - enabled = false, - --~ energy_required = 8, - energy_required = 4, - ingredients = { - {type="item", name="iron-stick", amount=15}, - {type="item", name="stone-brick", amount=15}, - {type="item", name="small-lamp", amount=5}, - }, - results = {{type="item", name="bi-bio-greenhouse", amount=1}}, - main_product = "", - allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = false, -- Added for 0.18.34/1.1.4 - }, subgroup = "bio-bio-farm-fluid-entity", order = "a[bi]", - allow_as_intermediate = true, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 }, @@ -480,7 +460,6 @@ data:extend({ icon_size = 64, } }, - normal = { enabled = false, --~ energy_required = 10, energy_required = 5, @@ -494,27 +473,8 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - expensive = { - enabled = false, - --~ energy_required = 15, - energy_required = 7.5, - ingredients = { - {type="item", name="bi-bio-greenhouse", amount=8}, - {type="item", name="stone-crushed", amount=20}, - {type="item", name="copper-cable", amount=20}, - }, - results = {{type="item", name="bi-bio-farm", amount=1}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, subgroup = "bio-bio-farm-fluid-entity", order = "b[bi]", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 }, @@ -1122,7 +1082,6 @@ data:extend({ icon_size = 64, } }, - normal = { enabled = false, energy_required = 8, ingredients = { @@ -1134,27 +1093,8 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - expensive = { - enabled = false, - energy_required = 10, - ingredients = { - {type="item", name="stone-furnace", amount=3}, - {type="item", name="steel-plate", amount=12}, - }, - results = {{type="item", name="bi-cokery", amount=1}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, subgroup = "bio-bio-farm-raw-entity", order = "a[bi]", - --~ always_show_made_in = true, - --~ allow_decomposition = false, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 }, @@ -1172,7 +1112,6 @@ data:extend({ icon_size = 64, } }, - normal = { enabled = false, energy_required = 3, ingredients = { @@ -1185,28 +1124,8 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - expensive = { - enabled = false, - energy_required = 5, - ingredients = { - {type="item", name="iron-plate", amount=12}, - {type="item", name="steel-plate", amount=12}, - {type="item", name="iron-gear-wheel", amount=8}, - }, - results = {{type="item", name="bi-stone-crusher", amount=1}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, subgroup = "bio-bio-farm-raw-entity", order = "b[bi]", - --~ always_show_made_in = true, - --~ allow_decomposition = false, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 }, @@ -1390,7 +1309,6 @@ data:extend({ icon_size = 64, } }, - normal = { enabled = false, energy_required = 8, ingredients = { @@ -1402,25 +1320,6 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - expensive = { - enabled = false, - energy_required = 8, - ingredients = { - {type="item", name="bi-seed", amount=400}, - {type="item", name="rocket", amount=2}, - }, - results = {{type="item", name="bi-seed-bomb-basic", amount=1}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - --~ always_show_made_in = true, - --~ allow_decomposition = false, - allow_as_intermediate = false, -- Changed for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 subgroup = "bi-ammo", order = "a[rocket-launcher]-x[seed-bomb]-a", }, @@ -1430,8 +1329,6 @@ data:extend({ { type = "recipe", name = "bi-seed-bomb-standard", - --~ localised_name = {"item-name.bi-seed-bomb-standard"}, - --~ localised_description = {"item-description.bi-seed-bomb-standard"}, icon = ICONPATH .. "Seed_bomb_icon_s.png", icon_size = 64, icons = { @@ -1440,7 +1337,6 @@ data:extend({ icon_size = 64, } }, - normal = { enabled = false, energy_required = 8, ingredients = { @@ -1453,26 +1349,6 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - expensive = { - enabled = false, - energy_required = 8, - ingredients = { - {type="item", name="bi-seed", amount=400}, - {type="item", name="fertilizer", amount=200}, - {type="item", name="rocket", amount=2}, - }, - results = {{type="item", name="bi-seed-bomb-standard", amount=1}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - --~ always_show_made_in = true, - --~ allow_decomposition = false, - allow_as_intermediate = false, -- Changed for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 subgroup = "bi-ammo", order = "a[rocket-launcher]-x[seed-bomb]-b", }, @@ -1492,7 +1368,6 @@ data:extend({ icon_size = 64, } }, - normal = { enabled = false, energy_required = 8, ingredients = { @@ -1505,26 +1380,6 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - expensive = { - enabled = false, - energy_required = 8, - ingredients = { - {type="item", name="bi-seed", amount=400}, - {type="item", name="bi-adv-fertilizer", amount=200}, - {type="item", name="rocket", amount=2}, - }, - results = {{type="item", name="bi-seed-bomb-advanced", amount=1}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - --~ always_show_made_in = true, - --~ allow_decomposition = false, - allow_as_intermediate = false, -- Changed for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 subgroup = "bi-ammo", order = "a[rocket-launcher]-x[seed-bomb]-c", }, @@ -1544,7 +1399,6 @@ data:extend({ icon_size = 64, } }, - normal = { enabled = false, energy_required = 10, ingredients = { @@ -1557,28 +1411,6 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - expensive = { - enabled = false, - energy_required = 15, - ingredients = { - {type="item", name="bi-bio-greenhouse", amount=4}, - {type="item", name="assembling-machine-2", amount=4}, - {type="item", name="stone-brick", amount=20}, - }, - results = {{type="item", name="bi-arboretum-area", amount=1}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - subgroup = "bio-arboretum-fluid", - order = "1-a[bi]", - --~ always_show_made_in = true, - --~ allow_decomposition = false, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 }, diff --git a/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua b/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua index 901bb82..9ffbc1e 100644 --- a/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Fuel/recipe.lua @@ -21,7 +21,6 @@ data:extend({ icon_size = 64, } }, - normal = { enabled = false, energy_required = 20, ingredients = { @@ -34,28 +33,8 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - expensive = { - enabled = false, - energy_required = 30, - ingredients = { - {type="item", name="assembling-machine-1", amount=2}, - {type="item", name="steel-plate", amount=5}, - {type="item", name="electronic-circuit", amount=5}, - }, - results = {{type="item", name="bi-bio-reactor", amount=1}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, subgroup = "bio-bio-fuel-fluid", order = "a", - --~ always_show_made_in = true, - --~ allow_decomposition = false, - allow_as_intermediate = false, -- Changed for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 }, }, -- BIOMASS 1 -- { @@ -140,7 +119,6 @@ if BI.Settings.BI_Bio_Fuel then icon_size = 64, } }, - normal = { enabled = false, energy_required = 10, ingredients = { @@ -153,25 +131,6 @@ if BI.Settings.BI_Bio_Fuel then allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - expensive = { - enabled = false, - energy_required = 15, - ingredients = { - {type="item", name="boiler", amount=2}, - {type="item", name="steel-plate", amount=5}, - {type="item", name="concrete", amount=5}, - }, - results = {{type="item", name="bi-bio-boiler", amount=1}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - allow_as_intermediate = false, -- Changed for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 - --~ subgroup = "bio-energy-boiler", subgroup = "energy", -- Changed for 0.18.34/1.1.4 order = "b-[steam-power]-a[boiler]-a[bi-bio-boiler]" -- Changed for 0.18.34/1.1.4 }, diff --git a/Bio_Industries_2/prototypes/Bio_Turret/recipe.lua b/Bio_Industries_2/prototypes/Bio_Turret/recipe.lua index 6ecac23..1e3b25a 100644 --- a/Bio_Industries_2/prototypes/Bio_Turret/recipe.lua +++ b/Bio_Industries_2/prototypes/Bio_Turret/recipe.lua @@ -17,7 +17,6 @@ data:extend({ icon_size = 64, } }, - normal = { enabled = true, energy_required = 4, ingredients = { @@ -28,24 +27,6 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - expensive = { - enabled = true, - energy_required = 6, - ingredients = { - {type="item", name="wood", amount=10}, - }, - results = {{type="item", name="bi-dart-magazine-basic", amount=8}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - --~ always_show_made_in = true, - --~ allow_decomposition = false, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 subgroup = "bi-ammo", order = "[bio-ammo]-a-[darts]-1", -- This is a custom property for use by "Krastorio 2" (it will change @@ -67,7 +48,6 @@ data:extend({ icon_size = 64, } }, - normal = { enabled = false, energy_required = 5, ingredients = { @@ -79,25 +59,6 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - expensive = { - enabled = false, - energy_required = 8, - ingredients = { - {type="item", name="bi-dart-magazine-basic", amount=8}, - {type="item", name="copper-plate", amount=5}, - }, - results = {{type="item", name="bi-dart-magazine-standard", amount=8}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - --~ always_show_made_in = true, - --~ allow_decomposition = false, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 subgroup = "bi-ammo", order = "[bio-ammo]-a-[darts]-2", }, @@ -116,7 +77,6 @@ data:extend({ icon_size = 64, } }, - normal = { enabled = false, energy_required = 6, ingredients = { @@ -128,25 +88,6 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - expensive = { - enabled = false, - energy_required = 9, - ingredients = { - {type="item", name="bi-dart-magazine-standard", amount=8}, - {type="item", name="plastic-bar", amount=5}, - }, - results = {{type="item", name="bi-dart-magazine-enhanced", amount=8}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - --~ always_show_made_in = true, - --~ allow_decomposition = false, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 subgroup = "bi-ammo", order = "[bio-ammo]-a-[darts]-3", }, @@ -165,7 +106,6 @@ data:extend({ icon_size = 64, } }, - normal = { enabled = false, energy_required = 8, ingredients = { @@ -177,25 +117,6 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - expensive = { - enabled = false, - energy_required = 12, - ingredients = { - {type="item", name="bi-dart-magazine-enhanced", amount=8}, - {type="item", name="poison-capsule", amount=5}, - }, - results = {{type="item", name="bi-dart-magazine-poison", amount=8}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - --~ always_show_made_in = true, - --~ allow_decomposition = false, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 subgroup = "bi-ammo", order = "[bio-ammo]-a-[darts]-4", }, @@ -214,7 +135,6 @@ data:extend({ icon_size = 64, } }, - normal = { enabled = true, energy_required = 8, ingredients = { @@ -226,25 +146,6 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - expensive = { - enabled = true, - energy_required = 16, - ingredients = { - {type="item", name="iron-gear-wheel", amount=10}, - {type="item", name="wood", amount=25}, - }, - results = {{type="item", name="bi-dart-turret", amount=1}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - --~ always_show_made_in = true, - --~ allow_decomposition = false, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 subgroup = "defensive-structure", order = "b[turret]-e[bi-dart-turret]", -- This is a custom property for use by "Krastorio 2" (it will change @@ -266,7 +167,6 @@ data:extend({ icon_size = 64, } }, - normal = { enabled = true, energy_required = 8, ingredients = { @@ -278,27 +178,7 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - expensive = { - enabled = true, - energy_required = 16, - ingredients = { - {type="item", name="copper-plate", amount=10}, - {type="item", name="wood", amount=25}, - }, - results = {{type="item", name="bi-dart-rifle", amount=1}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - --~ always_show_made_in = true, - --~ allow_decomposition = false, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 subgroup = "gun", - --~ order = "[bi-dart-rifle]" order = "a[basic-clips]-b[bi-dart-rifle]" }, -- This is a custom property for use by "Krastorio 2" (it will change diff --git a/Bio_Industries_2/prototypes/Industrial_Revolution.lua b/Bio_Industries_2/prototypes/Industrial_Revolution.lua index 2de35e1..d7d03b3 100644 --- a/Bio_Industries_2/prototypes/Industrial_Revolution.lua +++ b/Bio_Industries_2/prototypes/Industrial_Revolution.lua @@ -37,7 +37,7 @@ BioInd.show("Changing localization for", v) ------------------------------------------------------------------------------------ local i_old = "stone-crushed" local i_new = "gravel" - local replaced, check, add + local replaced, recipe, add for recipe_name, recipe in pairs(data.raw.recipe) do -- Ingredients @@ -45,40 +45,26 @@ BioInd.show("Changing localization for", v) BioInd.writeDebug("Replaced ingredient %s with %s in recipe %s: %s", {i_old, i_new, recipe_name, replaced}) -- Results - for t, tab in ipairs({"", "normal", "expensive"}) do ---~ BioInd.show("tab", tab) - check = (tab == "") and recipe or recipe[tab] - thxbob.lib.result_check(check) -- Make sure we have results! -BioInd.writeDebug("Recipe%s: %s", {tab == "" and "" or " for difficulty " .. tab, check or "nil"}) ---~ BioInd.show("check", check) - for r, result in ipairs(check and check.results or {}) do ---~ BioInd.show("result", result) + thxbob.lib.result_check(recipe) -- Make sure we have results! + for r, result in ipairs(recipe and recipe.results or {}) do if result.name == i_old then ---~ BioInd.show("Must replace", result.name) -- Store the properties of the original result add = { type = result.type, name = i_new, amount = result.amount } ---~ BioInd.show("Must add", add) thxbob.lib.recipe.remove_result(recipe_name, i_old) ---~ BioInd.show("Removed results", recipe) - thxbob.lib.item.add(check.results, add) -BioInd.writeDebug("Exchanged %s in %sresults of %s with %s:\t%s", - {i_old, tab == "" and tab or " " .. tab .. " ", recipe_name, i_new, recipe}) + thxbob.lib.item.add(recipe.results, add) else BioInd.show("Skipping", result.name) end end -- Don't forget to change main_product as well! - if check and check.main_product and check.main_product == i_old then - check.main_product = i_new -BioInd.writeDebug("Exchanged %s in main_product%s of %s with %s:\t%s", - {i_old, tab == "" and tab or " (" .. tab .. ")", recipe_name, i_new, recipe}) + if recipe and recipe.main_product and recipe.main_product == i_old then + recipe.main_product = i_new end - end end -- Add recipe unlocks diff --git a/Bio_Industries_2/prototypes/Wood_Products/containers-recipe.lua b/Bio_Industries_2/prototypes/Wood_Products/containers-recipe.lua index 6893b17..6378d17 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/containers-recipe.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/containers-recipe.lua @@ -22,7 +22,6 @@ data:extend({ icon_size = 64, } }, - normal = { energy_required = 2, enabled = false, ingredients = { @@ -36,27 +35,6 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - expensive = { - energy_required = 4, - enabled = false, - ingredients = { - {type="item", name="copper-plate", amount=24}, - {type="item", name="resin", amount=32}, - {type="item", name="wooden-chest", amount=8} - }, - results = {{type="item", name="bi-wooden-chest-large", amount=1}}, - main_product = "", - requester_paste_multiplier = 4, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - --~ always_show_made_in = true, - --~ allow_decomposition = false, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 subgroup = "storage", order = "a[items]-aa[wooden-chest]", }, @@ -75,7 +53,6 @@ data:extend({ icon_size = 64, } }, - normal = { energy_required = 2, enabled = false, ingredients = { @@ -89,27 +66,6 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - expensive = { - energy_required = 4, - enabled = false, - ingredients = { - {type="item", name="iron-stick", amount=48}, - {type="item", name="stone-brick", amount=48}, - {type="item", name="bi-wooden-chest-large", amount=16} - }, - results = {{type="item", name="bi-wooden-chest-huge", amount=1}}, - main_product = "", - requester_paste_multiplier = 4, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - --~ always_show_made_in = true, - --~ allow_decomposition = false, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 subgroup = "storage", order = "a[items]-ab[wooden-chest]", }, @@ -128,7 +84,6 @@ data:extend({ icon_size = 64, } }, - normal = { energy_required = 4, enabled = false, ingredients = { @@ -142,28 +97,6 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - expensive = { - energy_required = 6, - enabled = false, - ingredients = { - {type="item", name="steel-plate", amount=48}, - {type="item", name="concrete", amount=48}, - {type="item", name="bi-wooden-chest-huge", amount=16} - }, - main_product = "", - results = {{type="item", name="bi-wooden-chest-giga", amount=1}}, - main_product = "", - requester_paste_multiplier = 4, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - --~ always_show_made_in = true, - --~ allow_decomposition = false, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 subgroup = "storage", order = "a[items]-ac[wooden-chest]", }, diff --git a/Bio_Industries_2/prototypes/Wood_Products/recipe.lua b/Bio_Industries_2/prototypes/Wood_Products/recipe.lua index 7848141..1cb5b1b 100644 --- a/Bio_Industries_2/prototypes/Wood_Products/recipe.lua +++ b/Bio_Industries_2/prototypes/Wood_Products/recipe.lua @@ -18,7 +18,6 @@ data:extend({ icon_size = 64, } }, - normal = { enabled = false, ingredients = { {type="item", name="wood", amount=5}, @@ -29,24 +28,6 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - expensive = { - enabled = false, - ingredients = { - {type="item", name="wood", amount=10}, - {type="item", name="small-electric-pole", amount=4}, - }, - results = {{type="item", name="bi-wooden-pole-big", amount=1}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - --~ always_show_made_in = true, - --~ allow_decomposition = false, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 subgroup = "energy-pipe-distribution", order = "a[energy]-b[small-electric-pole]", -- This is a custom property for use by "Krastorio 2" (it will change @@ -68,7 +49,6 @@ data:extend({ icon_size = 64, } }, - normal = { enabled = false, ingredients = { {type="item", name="wood", amount=5}, @@ -80,25 +60,6 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - expensive = { - enabled = false, - ingredients = { - {type="item", name="wood", amount=10}, - {type="item", name="concrete", amount=150}, - {type="item", name="bi-wooden-pole-big", amount=10}, - }, - results = {{type="item", name="bi-wooden-pole-huge", amount=1}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - --~ always_show_made_in = true, - --~ allow_decomposition = false, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 subgroup = "energy-pipe-distribution", order = "a[energy]-d[big-electric-pole]", -- This is a custom property for use by "Krastorio 2" (it will change @@ -120,7 +81,6 @@ data:extend({ icon_size = 64, } }, - normal = { enabled = true, ingredients = { {type="item", name="wood", amount=2}, @@ -130,23 +90,6 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - expensive = { - enabled = true, - ingredients = { - {type="item", name="wood", amount=4}, - }, - results = {{type="item", name="bi-wooden-fence", amount=1}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - --~ always_show_made_in = true, - --~ allow_decomposition = false, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 subgroup = "defensive-structure", -- This is a custom property for use by "Krastorio 2" (it will change -- ingredients/results; used for wood/wood pulp) @@ -167,7 +110,6 @@ data:extend({ icon_size = 64, } }, - normal = { energy_required = 1, enabled = true, ingredients = { @@ -180,26 +122,6 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - expensive = { - energy_required = 2, - enabled = true, - ingredients = { - {type="item", name="copper-plate", amount=1}, - {type="item", name="wood", amount=12} - }, - results = {{type="item", name="bi-wood-pipe", amount=4}}, - main_product = "", - requester_paste_multiplier = 15, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - --~ always_show_made_in = true, - --~ allow_decomposition = false, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 subgroup = "energy-pipe-distribution", order = "a[pipe]-1a[pipe]", -- This is a custom property for use by "Krastorio 2" (it will change @@ -221,7 +143,6 @@ data:extend({ icon_size = 64, } }, - normal = { energy_required = 2, enabled = true, ingredients = { @@ -233,25 +154,6 @@ data:extend({ allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 always_show_made_in = false, -- Added for 0.18.34/1.1.4 allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - expensive = { - energy_required = 4, - enabled = true, - ingredients = { - {type="item", name="copper-plate", amount=5}, - {type="item", name="bi-wood-pipe", amount=6} - }, - results = {{type="item", name="bi-wood-pipe-to-ground", amount=2}}, - main_product = "", - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Added for 0.18.34/1.1.4 - allow_decomposition = true, -- Added for 0.18.34/1.1.4 - }, - --~ always_show_made_in = true, - --~ allow_decomposition = false, - allow_as_intermediate = false, -- Added for 0.18.34/1.1.4 - always_show_made_in = false, -- Changed for 0.18.34/1.1.4 - allow_decomposition = true, -- Changed for 0.18.34/1.1.4 subgroup = "energy-pipe-distribution", order = "a[pipe]-1b[pipe-to-ground]", },