This commit is contained in:
Simon Brodtmann 2025-12-25 21:07:30 +01:00
parent 2de2ae2f0b
commit ecfece5b79

View file

@ -12,14 +12,14 @@ data:extend({
} }
}) })
local thoriated_filament_ingredients = {{type="item", name="uranium-238", amount=1},{type="item", name="iron-plate", amount=1}} local thoriated_filament_ingredients = { { type = "item", name = "uranium-238", amount = 1 }, { type = "item", name = "iron-plate", amount = 1 } }
if mods["space-exploration"] then if mods["space-exploration"] then
thoriated_filament_ingredients = {{type="item", name="uranium-ore", amount=1},{type="item", name="iron-plate", amount=1}} thoriated_filament_ingredients = { { type = "item", name = "uranium-ore", amount = 1 }, { type = "item", name = "iron-plate", amount = 1 } }
end end
if mods["248k-Redux"] then if mods["248k-Redux"] then
thoriated_filament_ingredients = {{type="item", name="thorium-ore", amount=1}} thoriated_filament_ingredients = { { type = "item", name = "thorium-ore", amount = 1 } }
if mods["bztungsten2"] then if mods["bztungsten2"] then
table.insert(thoriated_filament_ingredients, {type="item", name="tungsten-plate", amount=1}) table.insert(thoriated_filament_ingredients, { type = "item", name = "tungsten-plate", amount = 1 })
end end
data:extend({ data:extend({
{ {
@ -29,8 +29,8 @@ data:extend({
order = "t", order = "t",
enabled = false, enabled = false,
energy_required = 14, energy_required = 14,
ingredients = {{type="item", name="thorium-ore", amount=10}}, ingredients = { { type = "item", name = "thorium-ore", amount = 10 } },
results = {{type="item", name="fi_thorium232_item", amount=1}}, results = { { type = "item", name = "fi_thorium232_item", amount = 1 } },
} }
}) })
util.add_unlock("uranium-processing", "thorium-processing") --maybe add its own tech later util.add_unlock("uranium-processing", "thorium-processing") --maybe add its own tech later
@ -53,30 +53,30 @@ data:extend({
enabled = false, enabled = false,
energy_required = 2, energy_required = 2,
ingredients = thoriated_filament_ingredients, ingredients = thoriated_filament_ingredients,
results = {{type="item", name="thoriated-filament", amount=1}}, results = { { type = "item", name = "thoriated-filament", amount = 1 } },
} }
}) })
local glass_name = mods["Krastorio2"] and "kr-glass" or "glass" local glass_name = mods["Krastorio2"] and "kr-glass" or "glass"
local electron_gun_ingredients = {{type="item", name="tantalum-plate", amount=1}, {type="item", name="thoriated-filament", amount=1}, {type="item", name="electronic-circuit", amount=2}} local electron_gun_ingredients = { { type = "item", name = "tantalum-plate", amount = 1 }, { type = "item", name = "thoriated-filament", amount = 1 }, { type = "item", name = "electronic-circuit", amount = 2 } }
if mods["bismuth"] then
table.insert(electron_gun_ingredients, { type = "item", name = "pcb-solder", amount = 2 })
end
if data.raw.item[glass_name] then
table.insert(electron_gun_ingredients, { type = "item", name = glass_name, amount = 2 })
end
if mods["LasingAround-Updated"] then
electron_gun_ingredients = { { type = "item", name = "tantalum-plate", amount = 1 }, { type = "item", name = "thoriated-filament", amount = 1 }, { type = "item", name = "electronic-circuit", amount = 2 }, { type = "item", name = "empty-amplifier-tube", amount = 1 } }
if mods["bismuth"] then if mods["bismuth"] then
table.insert(electron_gun_ingredients, {type="item", name="pcb-solder", amount=2}) table.insert(electron_gun_ingredients, { type = "item", name = "pcb-solder", amount = 2 })
end end
if data.raw.item[glass_name] then end
table.insert(electron_gun_ingredients, {type="item", name=glass_name, amount=2}) local electron_gun_subgroup = "intermediate-product"
end if mods["space-exploration"] then
if mods["LasingAround-Updated"] then
electron_gun_ingredients = {{type="item", name="tantalum-plate", amount=1}, {type="item", name="thoriated-filament", amount=1}, {type="item", name="electronic-circuit", amount=2}, {type="item", name="empty-amplifier-tube", amount=1}}
if mods["bismuth"] then
table.insert(electron_gun_ingredients, {type="item", name="pcb-solder", amount=2})
end
end
local electron_gun_subgroup = "intermediate-product"
if mods["space-exploration"] then
electron_gun_subgroup = "electronic" electron_gun_subgroup = "electronic"
end end
data:extend({ data:extend({
{ {
type = "item", type = "item",
name = "electron-gun", name = "electron-gun",
@ -95,31 +95,31 @@ data:extend({
enabled = false, enabled = false,
energy_required = 8, energy_required = 8,
ingredients = electron_gun_ingredients, ingredients = electron_gun_ingredients,
results = {{type="item", name="electron-gun", amount=1}}, results = { { type = "item", name = "electron-gun", amount = 1 } },
} }
}) })
local crt_ingredients = {{type="item", name="electron-gun", amount=1}, {type="item", name="coal", amount=1}, {type="item", name="advanced-circuit", amount=3}} local crt_ingredients = { { type = "item", name = "electron-gun", amount = 1 }, { type = "item", name = "coal", amount = 1 }, { type = "item", name = "advanced-circuit", amount = 3 } }
if data.raw.item[glass_name] then
table.insert(crt_ingredients, { type = "item", name = glass_name, amount = 3 })
end
local crt_subgroup = "intermediate-product"
if mods["bzcarbon2"] then
crt_ingredients = { { type = "item", name = "electron-gun", amount = 1 }, { type = "item", name = "graphene", amount = 1 }, { type = "item", name = "advanced-circuit", amount = 3 } }
if data.raw.item[glass_name] then if data.raw.item[glass_name] then
table.insert(crt_ingredients, {type="item", name=glass_name, amount=3}) table.insert(crt_ingredients, { type = "item", name = glass_name, amount = 3 })
end end
local crt_subgroup = "intermediate-product" end
if mods["bzcarbon2"] then if mods["bzcarbon2"] and mods["bismuth"] and mods["bzaluminum2"] then
crt_ingredients = {{type="item", name="electron-gun", amount=1}, {type="item", name="graphene", amount=1}, {type="item", name="advanced-circuit", amount=3}} crt_ingredients = { { type = "item", name = "electron-gun", amount = 1 }, { type = "item", name = "graphene", amount = 1 }, { type = "item", name = "advanced-circuit", amount = 3 }, { type = "item", name = "pcb-solder", amount = 3 }, { type = "item", name = "aluminum-plate", amount = 5 } }
if data.raw.item[glass_name] then if data.raw.item[glass_name] then
table.insert(crt_ingredients, {type="item", name=glass_name, amount=3}) table.insert(crt_ingredients, { type = "item", name = glass_name, amount = 3 })
end end
end end
if mods["bzcarbon2"] and mods["bismuth"] and mods["bzaluminum2"] then if mods["space-exploration"] then
crt_ingredients = {{type="item", name="electron-gun", amount=1}, {type="item", name="graphene", amount=1}, {type="item", name="advanced-circuit", amount=3}, {type="item", name="pcb-solder", amount=3}, {type="item", name="aluminum-plate", amount=5}}
if data.raw.item[glass_name] then
table.insert(crt_ingredients, {type="item", name=glass_name, amount=3})
end
end
if mods["space-exploration"] then
crt_subgroup = "electronic" crt_subgroup = "electronic"
end end
data:extend({ data:extend({
{ {
type = "item", type = "item",
name = "crt", name = "crt",
@ -138,19 +138,19 @@ data:extend({
enabled = false, enabled = false,
energy_required = 12, energy_required = 12,
ingredients = crt_ingredients, ingredients = crt_ingredients,
results = {{type="item", name="crt", amount=1}}, results = { { type = "item", name = "crt", amount = 1 } },
} }
}) })
local tantalum_capacitor_ingredients = {{type="item", name="tantalum-plate", amount=1},{type="item", name="copper-cable", amount=1}} local tantalum_capacitor_ingredients = { { type = "item", name = "tantalum-plate", amount = 1 }, { type = "item", name = "copper-cable", amount = 1 } }
local tantalum_capacitor_subgroup = "intermediate-product" local tantalum_capacitor_subgroup = "intermediate-product"
if mods["bzlead2"] or mods["manganese"] then if mods["bzlead2"] or mods["manganese"] then
tantalum_capacitor_ingredients = {{type="item", name="tantalum-plate", amount=1}} tantalum_capacitor_ingredients = { { type = "item", name = "tantalum-plate", amount = 1 } }
if mods["bzlead2"] then if mods["bzlead2"] then
table.insert(tantalum_capacitor_ingredients, {type="item", name="lead-plate", amount = 1}) table.insert(tantalum_capacitor_ingredients, { type = "item", name = "lead-plate", amount = 1 })
end end
if mods["manganese"] then if mods["manganese"] then
table.insert(tantalum_capacitor_ingredients, {type="item", name="manganese-plate", amount=1}) table.insert(tantalum_capacitor_ingredients, { type = "item", name = "manganese-plate", amount = 1 })
end end
end end
if mods["space-exploration"] then if mods["space-exploration"] then
@ -183,7 +183,7 @@ data:extend({
enabled = false, enabled = false,
energy_required = 2, energy_required = 2,
ingredients = tantalum_capacitor_ingredients, ingredients = tantalum_capacitor_ingredients,
results = {{type="item", name="tantalum-capacitor", amount=5}}, results = { { type = "item", name = "tantalum-capacitor", amount = 5 } },
}, },
{ {
type = "recipe", type = "recipe",
@ -192,18 +192,18 @@ data:extend({
order = "t", order = "t",
enabled = false, enabled = false,
energy_required = 2, energy_required = 2,
ingredients = {{type="item", name="tantalum-plate", amount=2}, (data.raw.item["titanium-plate"] and {type="item", name="titanium-plate", amount=1}) or {type="item", name="iron-plate", amount=1}}, ingredients = { { type = "item", name = "tantalum-plate", amount = 2 }, (data.raw.item["titanium-plate"] and { type = "item", name = "titanium-plate", amount = 1 }) or { type = "item", name = "iron-plate", amount = 1 } },
results = {{type="item", name="tantalum-titanium-beam", amount=1}}, results = { { type = "item", name = "tantalum-titanium-beam", amount = 1 } },
} }
}) })
util.add_unlock("advanced-circuit", "tantalum-capacitor") util.add_unlock("advanced-circuit", "tantalum-capacitor")
if mods["Krastorio2"] then if mods["Krastorio2"] then
util.add_ingredient("kr-electronic-components", "tantalum-capacitor", 2) util.add_ingredient("kr-electronic-components", "tantalum-capacitor", 2)
else else
util.add_ingredient("advanced-circuit", "tantalum-capacitor", 2) util.add_ingredient("advanced-circuit", "tantalum-capacitor", 2)
end end
if mods["space-exploration"] then if mods["space-exploration"] then
data:extend({ data:extend({
{ {
type = "recipe", type = "recipe",
@ -212,14 +212,14 @@ data:extend({
order = "h", order = "h",
enabled = false, enabled = false,
energy_required = 8, energy_required = 8,
ingredients = {{type="item", name="tantalite-ore", amount=10}}, ingredients = { { type = "item", name = "tantalite-ore", amount = 10 } },
results = {{type="item", name="tantalum-plate", amount=7}}, results = { { type = "item", name = "tantalum-plate", amount = 7 } },
} }
}) })
util.add_productivity("tantalum-refining") util.add_productivity("tantalum-refining")
end end
util.add_productivity("thoriated-filament") util.add_productivity("thoriated-filament")
util.add_productivity("electron-gun") util.add_productivity("electron-gun")
util.add_productivity("crt") util.add_productivity("crt")
util.add_productivity("tantalum-capacitor") util.add_productivity("tantalum-capacitor")