armor fixes
This commit is contained in:
parent
988e3a51f3
commit
06c422dc49
2 changed files with 26 additions and 1 deletions
|
|
@ -1,6 +1,8 @@
|
||||||
---------------------------------------------------------------------------------------------------
|
---------------------------------------------------------------------------------------------------
|
||||||
Version: 2.0.16
|
Version: 2.0.16
|
||||||
Date: 2025-01-25
|
Date: 2025-01-25
|
||||||
|
Fixes:
|
||||||
|
- Improve compatibility with mods that change armor recipes in certain ways
|
||||||
Changes:
|
Changes:
|
||||||
- When byproducts are turned off, don't add extra furnace output
|
- When byproducts are turned off, don't add extra furnace output
|
||||||
---------------------------------------------------------------------------------------------------
|
---------------------------------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
|
@ -804,11 +804,19 @@ function add_or_add_to_ingredient(recipe, ingredient, quantity)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function util.get_item(name)
|
||||||
|
if data.raw.item[name] then return data.raw.item[name] end
|
||||||
|
if data.raw.armor[name] then return data.raw.armor[name] end
|
||||||
|
if data.raw["space-platform-starter-pack"] and data.raw["space-platform-starter-pack"][name] then return data.raw["space-platform-starter-pack"][name] end
|
||||||
|
-- TODO add more subtypes of item here
|
||||||
|
return nil
|
||||||
|
end
|
||||||
|
|
||||||
-- Add a given quantity of ingredient to a given recipe
|
-- Add a given quantity of ingredient to a given recipe
|
||||||
function util.add_ingredient(recipe_name, ingredient, quantity, options)
|
function util.add_ingredient(recipe_name, ingredient, quantity, options)
|
||||||
if not should_force(options) and bypass(recipe_name) then return end
|
if not should_force(options) and bypass(recipe_name) then return end
|
||||||
local is_fluid = not not data.raw.fluid[ingredient]
|
local is_fluid = not not data.raw.fluid[ingredient]
|
||||||
if data.raw.recipe[recipe_name] and (data.raw.item[ingredient] or is_fluid) then
|
if data.raw.recipe[recipe_name] and (util.get_item(ingredient) or is_fluid) then
|
||||||
me.add_modified(recipe_name)
|
me.add_modified(recipe_name)
|
||||||
prepare_redo_recycling(recipe_name)
|
prepare_redo_recycling(recipe_name)
|
||||||
add_ingredient(data.raw.recipe[recipe_name], ingredient, quantity, is_fluid)
|
add_ingredient(data.raw.recipe[recipe_name], ingredient, quantity, is_fluid)
|
||||||
|
|
@ -1769,6 +1777,21 @@ function util.redo_recycling()
|
||||||
recycling.generate_recycling_recipe(recipe)
|
recycling.generate_recycling_recipe(recipe)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
-- Find all recycling recipes that result in armor and make sure not to output more than 1
|
||||||
|
for _, recipe in pairs(data.raw.recipe) do
|
||||||
|
if recipe.name:find("recycling") then
|
||||||
|
for _, product in pairs(recipe.results) do
|
||||||
|
if data.raw.armor[product.name] then
|
||||||
|
if product.amount then
|
||||||
|
if product.amount > .99 then
|
||||||
|
product.amount = 1
|
||||||
|
product.extra_count_fraction = nil
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue