Compare commits

..

No commits in common. "d7be28e94fe3ca7516868c7287d5a6240249305c" and "11104a179bd22d020e975d859b89b349b5598464" have entirely different histories.

View file

@ -87,9 +87,6 @@ if data.raw.item["rubber"] then
table.insert(shock_absorber_ingredients, {type="item", name="rubber", amount=1}) table.insert(shock_absorber_ingredients, {type="item", name="rubber", amount=1})
end end
local spring_icon = "__IntermediatesForYou2__/graphics/icons/spring.png"
local spring_icon_size = 64
data:extend({ data:extend({
{ {
type = "item", type = "item",
@ -114,8 +111,8 @@ data:extend({
{ {
type = "item", type = "item",
name = "spring", name = "spring",
icon = spring_icon, icon = "__IntermediatesForYou2__/graphics/icons/spring.png",
icon_size = spring_icon_size, icon_size = 64,
group = "intermediate-product", group = "intermediate-product",
subgroup = "intermediate-product", subgroup = "intermediate-product",
order = "a[spring]", order = "a[spring]",
@ -199,22 +196,18 @@ util.add_unlock("rocket-silo","satellite-body")
util.add_unlock("fast-inserter", "shock-absorber") util.add_unlock("fast-inserter", "shock-absorber")
if mods["bzfoundry2"] and data.raw.item["bronze-plate"] then if mods["bzfoundry2"] and data.raw.item["bronze-plate"] then
local bronze_plate_icon = data.raw.item["bronze-plate"].icon data:extend({
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", type = "recipe",
name = "bronze-spring", name = "bronze-spring",
category = "crafting", category = "crafting",
order = "s2[spring]", order = "s2[spring]",
icons = (data.raw.item["bronze-plate"] and icons = (mods["bztin2"] and
{ {
{ icon = spring_icon, icon_size = spring_icon_size }, { 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 } } { icon = "__bztin2__/graphics/icons/bronze-plate.png", icon_size = 128, scale = 0.125, shift = { -8, -8 } },
} or { } or {
{ icon = spring_icon, icon_size = spring_icon_size } { icon = "__IntermediatesForYou2__/graphics/icons/spring.png", icon_size = 128 }
} }
), ),
enabled = false, enabled = false,
@ -222,27 +215,27 @@ if mods["bzfoundry2"] and data.raw.item["bronze-plate"] then
ingredients = {{type="item", name="bronze-plate", amount=1}}, ingredients = {{type="item", name="bronze-plate", amount=1}},
results = {{type="item", name="spring", amount=2}}, results = {{type="item", name="spring", amount=2}},
} }
}) })
util.add_unlock("foundry", "bronze-spring") util.add_unlock("foundry", "bronze-spring")
end end
if mods["ThemTharHills-Updated"] then 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}} 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 if data.raw.item["solder"] then
table.insert(low_quality_advanced_circuit_ingredients, {type="item", name="solder", amount=4}) table.insert(low_quality_advanced_circuit_ingredients, {type="item", name="solder", amount=4})
end end
if data.raw.item["kr-electronic-components"] then if data.raw.item["kr-electronic-components"] then
table.insert(low_quality_advanced_circuit_ingredients, {type="item", name="kr-electronic-components", amount=2}) table.insert(low_quality_advanced_circuit_ingredients, {type="item", name="kr-electronic-components", amount=2})
end end
if data.raw.item["circuit-board"] then if data.raw.item["circuit-board"] then
table.insert(low_quality_advanced_circuit_ingredients, {type="item", name="circuit-board", amount=1}) table.insert(low_quality_advanced_circuit_ingredients, {type="item", name="circuit-board", amount=1})
end end
local low_quality_advanced_circuit_results = {{ type = "item", name = "advanced-circuit", amount=1, probability=0.75}} local low_quality_advanced_circuit_results = {{ type = "item", name = "advanced-circuit", amount=1, probability=0.75}}
if mods["space-exploration"] then if mods["space-exploration"] then
table.insert(low_quality_advanced_circuit_results, { type = "item", name = "se-scrap", amount=1, probability=0.25}) table.insert(low_quality_advanced_circuit_results, { type = "item", name = "se-scrap", amount=1, probability=0.25})
end end
data:extend({ data:extend({
{ {
type = "recipe", type = "recipe",
name = "low-quality-advanced-circuit", name = "low-quality-advanced-circuit",
@ -262,8 +255,8 @@ if mods["ThemTharHills-Updated"] then
ingredients = low_quality_advanced_circuit_ingredients, ingredients = low_quality_advanced_circuit_ingredients,
results = low_quality_advanced_circuit_results, results = low_quality_advanced_circuit_results,
} }
}) })
util.add_unlock("advanced-circuit", "low-quality-advanced-circuit") util.add_unlock("advanced-circuit", "low-quality-advanced-circuit")
end end
if mods["aai-industry"] or mods["Krastorio2"] then if mods["aai-industry"] or mods["Krastorio2"] then