From f42acf7e7e47edf22571d779b2dac944fa59496c Mon Sep 17 00:00:00 2001 From: hraukr Date: Fri, 19 Dec 2025 22:40:35 -0500 Subject: [PATCH 1/4] Load bronze-plate item icon from existing gamedata --- IntermediatesForYou2/prototypes/recipes.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/IntermediatesForYou2/prototypes/recipes.lua b/IntermediatesForYou2/prototypes/recipes.lua index b7ed29d..d735f26 100644 --- a/IntermediatesForYou2/prototypes/recipes.lua +++ b/IntermediatesForYou2/prototypes/recipes.lua @@ -196,6 +196,10 @@ util.add_unlock("rocket-silo","satellite-body") util.add_unlock("fast-inserter", "shock-absorber") if mods["bzfoundry2"] and data.raw.item["bronze-plate"] then + local bronze_plate_icon = data.raw.item["bronze-plate"].icon + or data.raw.item["bronze-plate"].icons and data.raw.item["bronze-plate"].icons[1].icon + local bronze_plate_icon_size = data.raw.item["bronze-plate"].icon_size + or data.raw.item["bronze-plate"].icons and data.raw.item["bronze-plate"].icons[1].icon_size data:extend({ { type = "recipe", @@ -205,7 +209,7 @@ data:extend({ icons = (mods["bztin2"] and { { icon = "__IntermediatesForYou2__/graphics/icons/spring.png", icon_size = 64 }, - { icon = "__bztin2__/graphics/icons/bronze-plate.png", icon_size = 128, scale = 0.125, shift = { -8, -8 } }, + { icon = bronze_plate_icon, icon_size = bronze_plate_icon_size, scale = 0.125, shift = { -8, -8 } } } or { { icon = "__IntermediatesForYou2__/graphics/icons/spring.png", icon_size = 128 } } From 675637934d8109185fb43dcf30e68c8416f82831 Mon Sep 17 00:00:00 2001 From: hraukr Date: Fri, 19 Dec 2025 22:42:57 -0500 Subject: [PATCH 2/4] Genericize bronze-spring recipe icon mod check --- IntermediatesForYou2/prototypes/recipes.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IntermediatesForYou2/prototypes/recipes.lua b/IntermediatesForYou2/prototypes/recipes.lua index d735f26..f3bfb7f 100644 --- a/IntermediatesForYou2/prototypes/recipes.lua +++ b/IntermediatesForYou2/prototypes/recipes.lua @@ -206,7 +206,7 @@ data:extend({ name = "bronze-spring", category = "crafting", order = "s2[spring]", - icons = (mods["bztin2"] and + icons = (data.raw.item["bronze-plate"] and { { icon = "__IntermediatesForYou2__/graphics/icons/spring.png", icon_size = 64 }, { icon = bronze_plate_icon, icon_size = bronze_plate_icon_size, scale = 0.125, shift = { -8, -8 } } From 53184cfbfb8f1103b73250b2d4c847367829b643 Mon Sep 17 00:00:00 2001 From: hraukr Date: Fri, 19 Dec 2025 23:01:34 -0500 Subject: [PATCH 3/4] Abstract bronze-spring icon and size to variables --- IntermediatesForYou2/prototypes/recipes.lua | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/IntermediatesForYou2/prototypes/recipes.lua b/IntermediatesForYou2/prototypes/recipes.lua index f3bfb7f..4cc1583 100644 --- a/IntermediatesForYou2/prototypes/recipes.lua +++ b/IntermediatesForYou2/prototypes/recipes.lua @@ -87,6 +87,9 @@ if data.raw.item["rubber"] then table.insert(shock_absorber_ingredients, {type="item", name="rubber", amount=1}) end +local spring_icon = "__IntermediatesForYou2__/graphics/icons/spring.png" +local spring_icon_size = 64 + data:extend({ { type = "item", @@ -111,8 +114,8 @@ data:extend({ { type = "item", name = "spring", - icon = "__IntermediatesForYou2__/graphics/icons/spring.png", - icon_size = 64, + icon = spring_icon, + icon_size = spring_icon_size, group = "intermediate-product", subgroup = "intermediate-product", order = "a[spring]", @@ -208,10 +211,10 @@ data:extend({ order = "s2[spring]", icons = (data.raw.item["bronze-plate"] and { - { icon = "__IntermediatesForYou2__/graphics/icons/spring.png", icon_size = 64 }, + { icon = spring_icon, icon_size = spring_icon_size }, { icon = bronze_plate_icon, icon_size = bronze_plate_icon_size, scale = 0.125, shift = { -8, -8 } } } or { - { icon = "__IntermediatesForYou2__/graphics/icons/spring.png", icon_size = 128 } + { icon = spring_icon, icon_size = spring_icon_size } } ), enabled = false, From d7be28e94fe3ca7516868c7287d5a6240249305c Mon Sep 17 00:00:00 2001 From: hraukr Date: Fri, 19 Dec 2025 23:03:54 -0500 Subject: [PATCH 4/4] Improve indent consistency --- IntermediatesForYou2/prototypes/recipes.lua | 112 ++++++++++---------- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/IntermediatesForYou2/prototypes/recipes.lua b/IntermediatesForYou2/prototypes/recipes.lua index 4cc1583..ae05024 100644 --- a/IntermediatesForYou2/prototypes/recipes.lua +++ b/IntermediatesForYou2/prototypes/recipes.lua @@ -203,67 +203,67 @@ if mods["bzfoundry2"] and data.raw.item["bronze-plate"] then or data.raw.item["bronze-plate"].icons and data.raw.item["bronze-plate"].icons[1].icon local bronze_plate_icon_size = data.raw.item["bronze-plate"].icon_size or data.raw.item["bronze-plate"].icons and data.raw.item["bronze-plate"].icons[1].icon_size -data:extend({ - { - type = "recipe", - name = "bronze-spring", - category = "crafting", - order = "s2[spring]", - icons = (data.raw.item["bronze-plate"] and - { - { icon = spring_icon, icon_size = spring_icon_size }, - { icon = bronze_plate_icon, icon_size = bronze_plate_icon_size, scale = 0.125, shift = { -8, -8 } } - } or { - { icon = spring_icon, icon_size = spring_icon_size } - } - ), - enabled = false, - energy_required = 2, - ingredients = {{type="item", name="bronze-plate", amount=1}}, - results = {{type="item", name="spring", amount=2}}, - } -}) + data:extend({ + { + type = "recipe", + name = "bronze-spring", + category = "crafting", + order = "s2[spring]", + icons = (data.raw.item["bronze-plate"] and + { + { icon = spring_icon, icon_size = spring_icon_size }, + { icon = bronze_plate_icon, icon_size = bronze_plate_icon_size, scale = 0.125, shift = { -8, -8 } } + } or { + { icon = spring_icon, icon_size = spring_icon_size } + } + ), + enabled = false, + energy_required = 2, + ingredients = {{type="item", name="bronze-plate", amount=1}}, + results = {{type="item", name="spring", amount=2}}, + } + }) util.add_unlock("foundry", "bronze-spring") end if mods["ThemTharHills-Updated"] then -local low_quality_advanced_circuit_ingredients = {{type="item", name="copper-cable", amount=3}, {type="item", name="electronic-circuit", amount=3}} -if data.raw.item["solder"] then - table.insert(low_quality_advanced_circuit_ingredients, {type="item", name="solder", amount=4}) -end -if data.raw.item["kr-electronic-components"] then - table.insert(low_quality_advanced_circuit_ingredients, {type="item", name="kr-electronic-components", amount=2}) -end -if data.raw.item["circuit-board"] then - table.insert(low_quality_advanced_circuit_ingredients, {type="item", name="circuit-board", amount=1}) -end -local low_quality_advanced_circuit_results = {{ type = "item", name = "advanced-circuit", amount=1, probability=0.75}} -if mods["space-exploration"] then - table.insert(low_quality_advanced_circuit_results, { type = "item", name = "se-scrap", amount=1, probability=0.25}) -end + local low_quality_advanced_circuit_ingredients = {{type="item", name="copper-cable", amount=3}, {type="item", name="electronic-circuit", amount=3}} + if data.raw.item["solder"] then + table.insert(low_quality_advanced_circuit_ingredients, {type="item", name="solder", amount=4}) + end + if data.raw.item["kr-electronic-components"] then + table.insert(low_quality_advanced_circuit_ingredients, {type="item", name="kr-electronic-components", amount=2}) + end + if data.raw.item["circuit-board"] then + table.insert(low_quality_advanced_circuit_ingredients, {type="item", name="circuit-board", amount=1}) + end + local low_quality_advanced_circuit_results = {{ type = "item", name = "advanced-circuit", amount=1, probability=0.75}} + if mods["space-exploration"] then + table.insert(low_quality_advanced_circuit_results, { type = "item", name = "se-scrap", amount=1, probability=0.25}) + end -data:extend({ - { - type = "recipe", - name = "low-quality-advanced-circuit", - category = "crafting", - icons = (mods["Krastorio2"] and - { - { icon = "__base__/graphics/icons/advanced-circuit.png", icon_size = 64}, - { icon = "__base__/graphics/icons/copper-cable.png", icon_size = 64, scale=0.25, shift= {-8, -8}}, - } or { - { icon = "__base__/graphics/icons/advanced-circuit.png", icon_size = 64}, - } - ), - main_product = "advanced-circuit", - order = "f", - enabled = false, - energy_required = 6, - ingredients = low_quality_advanced_circuit_ingredients, - results = low_quality_advanced_circuit_results, - } -}) -util.add_unlock("advanced-circuit", "low-quality-advanced-circuit") + data:extend({ + { + type = "recipe", + name = "low-quality-advanced-circuit", + category = "crafting", + icons = (mods["Krastorio2"] and + { + { icon = "__base__/graphics/icons/advanced-circuit.png", icon_size = 64}, + { icon = "__base__/graphics/icons/copper-cable.png", icon_size = 64, scale=0.25, shift= {-8, -8}}, + } or { + { icon = "__base__/graphics/icons/advanced-circuit.png", icon_size = 64}, + } + ), + main_product = "advanced-circuit", + order = "f", + enabled = false, + energy_required = 6, + ingredients = low_quality_advanced_circuit_ingredients, + results = low_quality_advanced_circuit_results, + } + }) + util.add_unlock("advanced-circuit", "low-quality-advanced-circuit") end if mods["aai-industry"] or mods["Krastorio2"] then