Compare commits
No commits in common. "main" and "main" have entirely different histories.
8 changed files with 24 additions and 53 deletions
|
|
@ -1,11 +1,4 @@
|
|||
---------------------------------------------------------------------------------------------------
|
||||
Version: 2.0.4
|
||||
Date: 01.11.2025
|
||||
Changes:
|
||||
- This mod can now be used with either original bz mods or the forks
|
||||
Bug Fixes:
|
||||
- Fix K2 matter integration (thanks pla)
|
||||
---------------------------------------------------------------------------------------------------
|
||||
Version: 2.0.3
|
||||
Date: 21.10.2025
|
||||
Changes:
|
||||
|
|
|
|||
|
|
@ -1,19 +1,5 @@
|
|||
local util = {}
|
||||
|
||||
util.bz = {}
|
||||
util.bz.carbon = mods["bzcarbon"] and "bzcarbon" or mods["bzcarbon2"] and "bzcarbon2"
|
||||
util.bz.lead = mods["bzlead"] and "bzlead" or mods["bzlead2"] and "bzlead2"
|
||||
util.bz.silicon = mods["bzsilicon"] and "bzsilicon" or mods["bzsilicon2"] and "bzsilicon2"
|
||||
util.bz.tin = mods["bztin"] and "bztin" or mods["bztin2"] and "bztin2"
|
||||
util.bz.titanium = mods["bztitanium"] and "bztitanium" or mods["bztitanium2"] and "bztitanium2"
|
||||
util.bz.zirconium = mods["bzzirconium"] and "bzzirconium" or mods["bzzirconium2"] and "bzzirconium2"
|
||||
util.bz.gold = mods["bzgold"] and "bzgold" or mods["bzgold2"] and "bzgold2"
|
||||
util.bz.aluminum = mods["bzaluminum"] and "bzaluminum" or mods["bzaluminum2"] and "bzaluminum2"
|
||||
util.bz.gas = mods["bzgas"] and "bzgas" or mods["bzgas2"] and "bzgas2"
|
||||
util.bz.chlorine = mods["bzchlorine"] and "bzchlorine" or mods["bzchlorine2"] and "bzchlorine2"
|
||||
util.bz.tungsten = mods["bztungsten"] and "bztungsten" or mods["bztungsten2"] and "bztungsten2"
|
||||
util.bz.foundry = mods["bzfoundry"] and "bzfoundry" or mods["bzfoundry2"] and "bzfoundry2"
|
||||
|
||||
-- se landfill
|
||||
-- params: ore, icon_size
|
||||
function util.se_landfill(params)
|
||||
|
|
@ -869,8 +855,8 @@ function util.replace_ingredients_prior_to(tech, old, new, multiplier)
|
|||
end
|
||||
util.remove_prior_unlocks(tech, old)
|
||||
for i, recipe in pairs(data.raw.recipe) do
|
||||
if (recipe.enabled and recipe.enabled ~= false)
|
||||
and (not recipe.hidden or recipe.hidden == true) -- probably don't want to change hidden recipes
|
||||
if (recipe.enabled and recipe.enabled ~= 'false')
|
||||
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 :(
|
||||
then
|
||||
-- log("BZZZ due to 'enabled' replacing " .. old .. " with " .. new .." in " .. recipe.name) -- Handy Debug :|
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "Indium2",
|
||||
"version": "2.0.4",
|
||||
"version": "2.0.3",
|
||||
"factorio_version": "2.0",
|
||||
"title": "Indium",
|
||||
"description": "Indium2 is a mod adding the element indium.\n\nThis mod is inspired by Brevven's BZ mods.",
|
||||
|
|
@ -10,15 +10,10 @@
|
|||
"base >= 2.0.0",
|
||||
"? bismuth",
|
||||
"? BrassTacks-Updated",
|
||||
"? bzcarbon",
|
||||
"? bzcarbon2",
|
||||
"? bzfoundry",
|
||||
"? bzfoundry2",
|
||||
"? bzlead",
|
||||
"? bzlead2",
|
||||
"? bzsilicon",
|
||||
"? bzsilicon2",
|
||||
"? bztin",
|
||||
"? bztin2",
|
||||
"? IfNickel-Updated",
|
||||
"? Krastorio2",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
[technology-name]
|
||||
indium-processing=Indium processing
|
||||
indium-matter-processing=Indium conversion
|
||||
indium-pcb-solder=Indium pcb solder
|
||||
|
||||
[technology-description]
|
||||
|
|
|
|||
|
|
@ -10,16 +10,15 @@ data:extend(
|
|||
icons =
|
||||
{
|
||||
{
|
||||
icon = "__Krastorio2Assets__/technologies/backgrounds/matter.png",
|
||||
icon = "__Krastorio2Assets__/technologies/matter-coal.png",
|
||||
icon_size = 256,
|
||||
},
|
||||
{
|
||||
icon = "__Indium2__/graphics/icons/indite-ore.png",
|
||||
icon_size = 64,
|
||||
scale = 1,
|
||||
scale = 1.4,
|
||||
}
|
||||
},
|
||||
effects = {},
|
||||
prerequisites = {"kr-matter-processing"},
|
||||
unit =
|
||||
{
|
||||
|
|
@ -39,16 +38,16 @@ matter.make_recipes({
|
|||
material = { type = "item", name = "indite-ore", amount = 10 },
|
||||
matter_count = 5,
|
||||
energy_required = 1,
|
||||
needs_stabilizer = false,
|
||||
unlocked_by = "indium-matter-processing"
|
||||
need_stabilizer = false,
|
||||
unlocked_by_technology = "indium-matter-processing"
|
||||
})
|
||||
|
||||
matter.make_deconversion_recipe({
|
||||
matter.make_recipes({
|
||||
material = { type = "item", name = "indium-plate", amount = 10 },
|
||||
matter_count = 10,
|
||||
energy_required = 3,
|
||||
-- only_deconversion = true,
|
||||
needs_stabilizer = true,
|
||||
unlocked_by = "indium-matter-processing"
|
||||
only_deconversion = true,
|
||||
need_stabilizer = true,
|
||||
unlocked_by_technology = "indium-matter-processing"
|
||||
})
|
||||
end
|
||||
|
|
@ -40,12 +40,12 @@ data:extend({
|
|||
})
|
||||
|
||||
local solder_ingredients = {{type="item", name="indium-plate", amount=6}}
|
||||
if util.bz.lead then
|
||||
if mods["bzlead2"] then
|
||||
solder_ingredients = {{type="item", name="indium-plate", amount=3}, {type="item", name="lead-plate", amount=3}}
|
||||
end
|
||||
local solder_category = "crafting"
|
||||
local solder_subgroup = "intermediate-product"
|
||||
if util.bz.foundry then
|
||||
if mods["bzfoundry2"] then
|
||||
solder_category = "founding"
|
||||
solder_subgroup = "foundry-intermediate"
|
||||
end
|
||||
|
|
@ -94,19 +94,18 @@ data:extend({
|
|||
}
|
||||
})
|
||||
|
||||
if util.bz.silicon and data.raw.item["solar-cell"] then
|
||||
if mods["bzsilicon2"] and data.raw.item["solar-cell"] then
|
||||
local solar_cell_ingredients = {{type="item", name="copper-plate", amount=1}, {type="item", name="indium-plate", amount=1}, {type="item", name="electronic-circuit", amount=2}}
|
||||
if mods["Krastorio2"] then
|
||||
table.insert(solar_cell_ingredients, {type="item", name="kr-rare-metals", amount=1})
|
||||
end
|
||||
|
||||
data:extend({
|
||||
{
|
||||
type = "recipe",
|
||||
name = "indium-solar-cell",
|
||||
icons =
|
||||
{
|
||||
{ icon = "__" .. util.bz.silicon .. "__/graphics/icons/solar-cell.png", icon_size = 64 },
|
||||
{ icon = "__bzsilicon2__/graphics/icons/solar-cell.png", icon_size = 64 },
|
||||
{ icon = "__Indium2__/graphics/icons/indium-plate.png", icon_size = 64, scale=0.2, shift= {-8, -8}},
|
||||
},
|
||||
category = "advanced-crafting",
|
||||
|
|
@ -122,22 +121,22 @@ if util.bz.silicon and data.raw.item["solar-cell"] then
|
|||
end
|
||||
|
||||
local solder_pcb_ingredients = {{type="item", name="indium-plate", amount=10}}
|
||||
if util.bz.tin then
|
||||
if mods["bztin2"] then
|
||||
solder_pcb_ingredients = {{type="item", name="indium-plate", amount=6}, {type="item", name="tin-plate", amount=5}}
|
||||
end
|
||||
local solder_pcb_category = "crafting"
|
||||
local solder_pcb_subgroup = "intermediate-product"
|
||||
if util.bz.foundry then
|
||||
if mods["bzfoundry2"] then
|
||||
solder_pcb_category = "founding"
|
||||
solder_pcb_subgroup = "foundry-intermediate"
|
||||
end
|
||||
if mods["bismuth"] and util.bz.tin then
|
||||
if mods["bismuth"] and mods["bztin2"] then
|
||||
data:extend({
|
||||
{
|
||||
type = "recipe",
|
||||
name = "indium-pcb-solder",
|
||||
icons = {
|
||||
{ icon = "__" .. util.bz.tin .. "__/graphics/icons/solder.png", icon_size = 128, tint = {r = 0.7, g = 0.5, b = 0.9, a = 1} },
|
||||
{ icon = "__bztin2__/graphics/icons/solder.png", icon_size = 128, tint = {r = 0.7, g = 0.5, b = 0.9, a = 1} },
|
||||
{ icon = "__Indium2__/graphics/icons/indium-plate.png", icon_size = 64, scale=0.2, shift= {-8, -8}},
|
||||
},
|
||||
group = "intermediate-products",
|
||||
|
|
@ -167,7 +166,7 @@ if mods["BrassTacks-Updated"] and data.raw.item["airtight-seal"]then
|
|||
order = "c",
|
||||
enabled = false,
|
||||
energy_required = 5,
|
||||
ingredients = {{type="item", name="bolted-flange", amount=1}, util.bz.carbon and {type="item", name="graphite", amount=4}, {type="item", name="indium-solder", amount=2}},
|
||||
ingredients = {{type="item", name="bolted-flange", amount=1}, mods["bzcarbon2"] and {type="item", name="graphite", amount=4}, {type="item", name="indium-solder", amount=2}},
|
||||
results = {{type="item", name="airtight-seal", amount=2}},
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ data:extend(
|
|||
}
|
||||
},
|
||||
})
|
||||
if (util.bz.tin and mods["bismuth"]) or false then
|
||||
if (mods["bztin2"] and mods["bismuth"]) or false then
|
||||
data:extend(
|
||||
{
|
||||
{
|
||||
|
|
@ -65,7 +65,7 @@ data:extend(
|
|||
name = "indium-pcb-solder",
|
||||
icons =
|
||||
{
|
||||
{ icon = "__" .. util.bz.tin .. "__/graphics/icons/solder.png", icon_size = 128, tint = {r = 0.7, g = 0.5, b = 0.9, a = 1} },
|
||||
{ icon = "__bztin2__/graphics/icons/solder.png", icon_size = 128, tint = {r = 0.7, g = 0.5, b = 0.9, a = 1} },
|
||||
{ icon = "__Indium2__/graphics/icons/indium-plate.png", icon_size = 64, shift= {-8, -8}},
|
||||
},
|
||||
prerequisites = {"indium-processing"},
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ local util = require("data-util")
|
|||
|
||||
-- Mod changes
|
||||
if mods["IfNickel-Updated"] then
|
||||
if mods["IfNickel-Updated"] and util.bz.thungsten then
|
||||
util.replace_some_ingredient(mods["IfNickel-Updated"] and "gimbaled-thruster", util.bz.thungsten and "rocket-engine-nozzle", 1, "cryogenic-seal", 1)
|
||||
if mods["IfNickel-Updated"] and mods["bztungsten2"] then
|
||||
util.replace_some_ingredient(mods["IfNickel-Updated"] and "gimbaled-thruster", mods["bztungsten2"] and "rocket-engine-nozzle", 1, "cryogenic-seal", 1)
|
||||
end
|
||||
util.remove_ingredient("satellite", "gimbaled-thruster")
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue