fix bakelite requirements

This commit is contained in:
Brevven 2022-07-27 17:36:19 -07:00
parent fa89dce139
commit cc2a28d007
5 changed files with 36 additions and 23 deletions

View file

@ -1,4 +1,11 @@
--------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------
Version: 0.0.10
Date: 2022-07-28
Fixes:
- SE/K2: Fix incorrect extreme quantity of bakelite needed.
Changes:
- Bakelite is now also created much faster in chemical plants.
---------------------------------------------------------------------------------------------------
Version: 0.0.9 Version: 0.0.9
Date: 2022-07-26 Date: 2022-07-26
Localization: Localization:

View file

@ -15,8 +15,12 @@ if data.raw.recipe["electronic-circuit-stone"] then
util.set_hidden("electronic-circuit-stone") util.set_hidden("electronic-circuit-stone")
end end
util.replace_ingredient("electronic-circuit", "wood", "bakelite") -- electronic circuits should each require one bakelite
util.replace_ingredient_add_to("electronic-circuit", "iron-plate", "bakelite") local amt = util.get_amount("electronic-circuit")
util.remove_ingredient("electronic-circuit", "wood")
util.remove_ingredient("electronic-circuit", "iron-plate")
util.remove_ingredient("electronic-circuit", "stone-tablet")
util.add_ingredient("electronic-circuit", "bakelite", amt)
util.set_icons("electronic-circuit", nil) util.set_icons("electronic-circuit", nil)
-- Vanilla burner phase tweaks -- green circuits after electronics -- Vanilla burner phase tweaks -- green circuits after electronics

View file

@ -282,27 +282,29 @@ function add_product(recipe, product)
end end
end end
function util.replace_ingredient_add_to(recipe_name, old, new) -- Get the amount of the result, will check base/normal not expensive
if me.bypass[recipe_name] then return end function util.get_amount(recipe_name, product)
if data.raw.recipe[recipe_name] and (data.raw.item[new] or data.raw.fluid[new]) then if not product then product = recipe_name end
me.add_modified(recipe_name) local recipe = data.raw.recipe[recipe_name]
replace_ingredient_add_to(data.raw.recipe[recipe_name], old, new) if recipe then
replace_ingredient_add_to(data.raw.recipe[recipe_name].normal, old, new) if recipe.normal and recipe.normal.results then
replace_ingredient_add_to(data.raw.recipe[recipe_name].expensive, old, new) for i, result in pairs(recipe.normal.results) do
end if result[1] == product then return result[2] end
end if result.name == product then return result.amount end
function replace_ingredient_add_to(recipe, old, new)
if recipe ~= nil and recipe.ingredients ~= nil then
for i, existing in pairs(recipe.ingredients) do
if existing[1] == new or existing.name == new then
add_to_ingredient(recipe, new, existing[2] and existing[2] or existing.amount)
remove_ingredient(recipe, old)
return
end end
elseif recipe.normal and recipe.normal.result_count then
return recipe.normal.result_count
elseif recipe.results then
for i, result in pairs(recipe.results) do
if result[1] == product then return result[2] end
if result.name == product then return result.amount end
end
elseif recipe.result_count then
return recipe.result_count
end end
replace_ingredient(recipe, old, new) return 1
end end
return 0
end end
-- Replace one ingredient with another in a recipe -- Replace one ingredient with another in a recipe

View file

@ -1,6 +1,6 @@
{ {
"name": "bzgas", "name": "bzgas",
"version": "0.0.9", "version": "0.0.10",
"factorio_version": "1.1", "factorio_version": "1.1",
"title": "Natural Gas", "title": "Natural Gas",
"author": "Brevven", "author": "Brevven",

View file

@ -25,7 +25,7 @@ data:extend({
{util.me.use_phenol() and "phenol" or "coal", 1}, {util.me.use_phenol() and "phenol" or "coal", 1},
{type="fluid", name="formaldehyde", amount=10} {type="fluid", name="formaldehyde", amount=10}
}, },
energy_required = 6, energy_required = 2,
results = { results = {
{type="item", name="bakelite", amount = 2}, {type="item", name="bakelite", amount = 2},
}, },