Compare commits
No commits in common. "3d57c4f70ec01d3582a51b4888dbd791d6ddeeed" and "2de2ae2f0bdb8277566915f1162a6fad021ff310" have entirely different histories.
3d57c4f70e
...
2de2ae2f0b
2 changed files with 180 additions and 181 deletions
|
|
@ -855,8 +855,8 @@ function util.replace_ingredients_prior_to(tech, old, new, multiplier)
|
||||||
end
|
end
|
||||||
util.remove_prior_unlocks(tech, old)
|
util.remove_prior_unlocks(tech, old)
|
||||||
for i, recipe in pairs(data.raw.recipe) do
|
for i, recipe in pairs(data.raw.recipe) do
|
||||||
if (recipe.enabled and recipe.enabled ~= false)
|
if (recipe.enabled and recipe.enabled ~= 'false')
|
||||||
and (not recipe.hidden or recipe.hidden == true) -- probably don't want to change hidden recipes
|
and (not recipe.hidden or recipe.hidden == 'true') -- probably don't want to change hidden recipes
|
||||||
and string.sub(recipe.name, 1, 3) ~= 'se-' -- have to exlude SE in general :(
|
and string.sub(recipe.name, 1, 3) ~= 'se-' -- have to exlude SE in general :(
|
||||||
then
|
then
|
||||||
-- log("BZZZ due to 'enabled' replacing " .. old .. " with " .. new .." in " .. recipe.name) -- Handy Debug :|
|
-- log("BZZZ due to 'enabled' replacing " .. old .. " with " .. new .." in " .. recipe.name) -- Handy Debug :|
|
||||||
|
|
|
||||||
|
|
@ -12,199 +12,198 @@ 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
|
||||||
|
if mods["248k-Redux"] then
|
||||||
|
thoriated_filament_ingredients = {{type="item", name="thorium-ore", amount=1}}
|
||||||
|
if mods["bztungsten2"] then
|
||||||
|
table.insert(thoriated_filament_ingredients, {type="item", name="tungsten-plate", amount=1})
|
||||||
|
end
|
||||||
|
data:extend({
|
||||||
|
{
|
||||||
|
type = "recipe",
|
||||||
|
name = "thorium-processing",
|
||||||
|
category = "centrifuging",
|
||||||
|
order = "t",
|
||||||
|
enabled = false,
|
||||||
|
energy_required = 14,
|
||||||
|
ingredients = {{type="item", name="thorium-ore", amount=10}},
|
||||||
|
results = {{type="item", name="fi_thorium232_item", amount=1}},
|
||||||
|
}
|
||||||
|
})
|
||||||
|
util.add_unlock("uranium-processing", "thorium-processing") --maybe add its own tech later
|
||||||
end
|
end
|
||||||
if mods["248k-Redux"] then
|
data:extend({
|
||||||
thoriated_filament_ingredients = { { type = "item", name = "thorium-ore", amount = 1 } }
|
{
|
||||||
if mods["bztungsten2"] then
|
type = "item",
|
||||||
table.insert(thoriated_filament_ingredients, { type = "item", name = "tungsten-plate", amount = 1 })
|
name = "thoriated-filament",
|
||||||
|
icon = "__Tantalite2__/graphics/icons/thoriated-filament.png",
|
||||||
|
icon_size = 128,
|
||||||
|
subgroup = "intermediate-product",
|
||||||
|
order = "b[thoriated-filament]",
|
||||||
|
stack_size = 100,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type = "recipe",
|
||||||
|
name = "thoriated-filament",
|
||||||
|
category = "advanced-crafting",
|
||||||
|
order = "d[thoriated-filament]",
|
||||||
|
enabled = false,
|
||||||
|
energy_required = 2,
|
||||||
|
ingredients = thoriated_filament_ingredients,
|
||||||
|
results = {{type="item", name="thoriated-filament", amount=1}},
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
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}}
|
||||||
|
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
|
||||||
|
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"
|
||||||
end
|
end
|
||||||
data:extend({
|
data:extend({
|
||||||
|
{
|
||||||
|
type = "item",
|
||||||
|
name = "electron-gun",
|
||||||
|
icon = "__Tantalite2__/graphics/icons/electron-gun.png",
|
||||||
|
icon_size = 128,
|
||||||
|
category = "intermediate-product",
|
||||||
|
subgroup = electron_gun_subgroup,
|
||||||
|
order = "e[electron-gun]",
|
||||||
|
stack_size = 100,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
type = "recipe",
|
type = "recipe",
|
||||||
name = "thorium-processing",
|
name = "electron-gun",
|
||||||
category = "centrifuging",
|
category = "advanced-crafting",
|
||||||
order = "t",
|
order = "e[electron-gun]",
|
||||||
enabled = false,
|
enabled = false,
|
||||||
energy_required = 14,
|
energy_required = 8,
|
||||||
ingredients = { { type = "item", name = "thorium-ore", amount = 10 } },
|
ingredients = electron_gun_ingredients,
|
||||||
results = { { type = "item", name = "fi_thorium232_item", amount = 1 } },
|
results = {{type="item", name="electron-gun", amount=1}},
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
util.add_unlock("uranium-processing", "thorium-processing") --maybe add its own tech later
|
|
||||||
end
|
|
||||||
data:extend({
|
|
||||||
{
|
|
||||||
type = "item",
|
|
||||||
name = "thoriated-filament",
|
|
||||||
icon = "__Tantalite2__/graphics/icons/thoriated-filament.png",
|
|
||||||
icon_size = 128,
|
|
||||||
subgroup = "intermediate-product",
|
|
||||||
order = "b[thoriated-filament]",
|
|
||||||
stack_size = 100,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type = "recipe",
|
|
||||||
name = "thoriated-filament",
|
|
||||||
category = "advanced-crafting",
|
|
||||||
order = "d[thoriated-filament]",
|
|
||||||
enabled = false,
|
|
||||||
energy_required = 2,
|
|
||||||
ingredients = thoriated_filament_ingredients,
|
|
||||||
results = { { type = "item", name = "thoriated-filament", amount = 1 } },
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
local glass_name = mods["Krastorio2"] and "kr-glass" or "glass"
|
local crt_ingredients = {{type="item", name="electron-gun", amount=1}, {type="item", name="coal", amount=1}, {type="item", name="advanced-circuit", amount=3}}
|
||||||
|
|
||||||
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
|
|
||||||
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"
|
|
||||||
end
|
|
||||||
data:extend({
|
|
||||||
{
|
|
||||||
type = "item",
|
|
||||||
name = "electron-gun",
|
|
||||||
icon = "__Tantalite2__/graphics/icons/electron-gun.png",
|
|
||||||
icon_size = 128,
|
|
||||||
category = "intermediate-product",
|
|
||||||
subgroup = electron_gun_subgroup,
|
|
||||||
order = "e[electron-gun]",
|
|
||||||
stack_size = 100,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type = "recipe",
|
|
||||||
name = "electron-gun",
|
|
||||||
category = "advanced-crafting",
|
|
||||||
order = "e[electron-gun]",
|
|
||||||
enabled = false,
|
|
||||||
energy_required = 8,
|
|
||||||
ingredients = electron_gun_ingredients,
|
|
||||||
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 } }
|
|
||||||
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
|
||||||
end
|
local crt_subgroup = "intermediate-product"
|
||||||
if mods["bzcarbon2"] and mods["bismuth"] and mods["bzaluminum2"] then
|
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 }, { type = "item", name = "pcb-solder", amount = 3 }, { type = "item", name = "aluminum-plate", amount = 5 } }
|
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
|
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}}
|
||||||
crt_subgroup = "electronic"
|
if data.raw.item[glass_name] then
|
||||||
end
|
table.insert(crt_ingredients, {type="item", name=glass_name, amount=3})
|
||||||
data:extend({
|
end
|
||||||
{
|
end
|
||||||
type = "item",
|
if mods["space-exploration"] then
|
||||||
name = "crt",
|
crt_subgroup = "electronic"
|
||||||
icon = "__Tantalite2__/graphics/icons/crt.png",
|
end
|
||||||
icon_size = 64,
|
data:extend({
|
||||||
category = "intermediate-product",
|
{
|
||||||
subgroup = crt_subgroup,
|
type = "item",
|
||||||
order = "c[crt]",
|
name = "crt",
|
||||||
stack_size = 100,
|
icon = "__Tantalite2__/graphics/icons/crt.png",
|
||||||
},
|
icon_size = 64,
|
||||||
{
|
category = "intermediate-product",
|
||||||
type = "recipe",
|
subgroup = crt_subgroup,
|
||||||
name = "crt",
|
order = "c[crt]",
|
||||||
category = "advanced-crafting",
|
stack_size = 100,
|
||||||
order = "c[crt]",
|
},
|
||||||
enabled = false,
|
{
|
||||||
energy_required = 12,
|
type = "recipe",
|
||||||
ingredients = crt_ingredients,
|
name = "crt",
|
||||||
results = { { type = "item", name = "crt", amount = 1 } },
|
category = "advanced-crafting",
|
||||||
}
|
order = "c[crt]",
|
||||||
})
|
enabled = false,
|
||||||
|
energy_required = 12,
|
||||||
|
ingredients = crt_ingredients,
|
||||||
|
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
|
||||||
tantalum_capacitor_subgroup = "electronic"
|
tantalum_capacitor_subgroup = "electronic"
|
||||||
end
|
end
|
||||||
data:extend({
|
data:extend({
|
||||||
{
|
{
|
||||||
type = "item",
|
type = "item",
|
||||||
name = "tantalum-capacitor",
|
name = "tantalum-capacitor",
|
||||||
icon = "__Tantalite2__/graphics/icons/tantalum-capacitor.png",
|
icon = "__Tantalite2__/graphics/icons/tantalum-capacitor.png",
|
||||||
icon_size = 64,
|
icon_size = 64,
|
||||||
subgroup = tantalum_capacitor_subgroup,
|
subgroup = tantalum_capacitor_subgroup,
|
||||||
order = "t",
|
order = "t",
|
||||||
stack_size = 100,
|
stack_size = 100,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type = "item",
|
type = "item",
|
||||||
name = "tantalum-titanium-beam",
|
name = "tantalum-titanium-beam",
|
||||||
icon = "__Tantalite2__/graphics/icons/tantalum-titanium-beam.png",
|
icon = "__Tantalite2__/graphics/icons/tantalum-titanium-beam.png",
|
||||||
icon_size = 64,
|
icon_size = 64,
|
||||||
subgroup = "intermediate-product",
|
subgroup = "intermediate-product",
|
||||||
order = "t",
|
order = "t",
|
||||||
stack_size = 100,
|
stack_size = 100,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type = "recipe",
|
type = "recipe",
|
||||||
name = "tantalum-capacitor",
|
name = "tantalum-capacitor",
|
||||||
category = "advanced-crafting",
|
category = "advanced-crafting",
|
||||||
order = "t",
|
order = "t",
|
||||||
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",
|
||||||
name = "tantalum-titanium-beam",
|
name = "tantalum-titanium-beam",
|
||||||
category = "crafting",
|
category = "crafting",
|
||||||
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)
|
||||||
util.add_ingredient("kr-electronic-components-with-lithium", "tantalum-capacitor", 3)
|
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",
|
||||||
|
|
@ -213,14 +212,14 @@ if mods["space-exploration"] then
|
||||||
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")
|
||||||
Loading…
Add table
Add a link
Reference in a new issue