forked from cacklingfiend/bzaluminum2
Compare commits
7 commits
90290e98cd
...
3d759145b0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3d759145b0 | ||
|
|
b6a39a3b0b | ||
|
|
b982103c6b | ||
|
|
81374bf265 | ||
|
|
05e340a170 | ||
|
|
da36100046 | ||
| 3013cec07a |
6 changed files with 80 additions and 74 deletions
|
|
@ -14,17 +14,15 @@ if not mods.Krastorio2 and not mods["aai-industry"] then
|
|||
util.add_ingredient("repair-pack", "aluminum-cable", 3)
|
||||
util.set_ingredient("repair-pack", "iron-gear-wheel", 3)
|
||||
|
||||
util.add_effect("electronics", { type = "unlock-recipe", recipe = "electronic-circuit" })
|
||||
util.add_effect("electronics", { type = "unlock-recipe", recipe = "inserter" })
|
||||
util.remove_recipe_effect("electronics", "copper-cable")
|
||||
util.add_effect("electronics", { type = "unlock-recipe", recipe = "long-handed-inserter" })
|
||||
util.remove_recipe_effect("electronics", "lab")
|
||||
util.remove_recipe_effect("automation", "long-handed-inserter")
|
||||
util.set_enabled("electronic-circuit", false)
|
||||
util.set_enabled("inserter", false)
|
||||
util.add_prerequisite("automation-science-pack", "copper-processing")
|
||||
util.remove_prerequisite("automation-science-pack", "electronics")
|
||||
util.add_prerequisite("logistic-science-pack", "electronics")
|
||||
util.remove_prerequisite("automation-science-pack", "electronics")
|
||||
util.add_prerequisite("copper-processing", "automation-science-pack")
|
||||
util.remove_prerequisite("automation-science-pack", "electronics")
|
||||
util.add_effect("steam-power", { type = "unlock-recipe", recipe = "lab" })
|
||||
util.remove_prerequisite("fast-inserter", "automation-science-pack")
|
||||
util.add_prerequisite("fast-inserter", "electronics")
|
||||
|
|
@ -46,13 +44,15 @@ if mods.Krastorio2 then
|
|||
util.remove_ingredient("kr-basic-tech-card", "copper-cable")
|
||||
util.add_ingredient("kr-basic-tech-card", "aluminum-cable", 1)
|
||||
|
||||
util.add_prerequisite("automation-science-pack", "copper-processing")
|
||||
if mods.bobassembly then
|
||||
util.set_prerequisite("basic-automation", {"kr-automation-core"})
|
||||
util.set_tech_recipe("basic-automation", {{"kr-basic-tech-card", 1}})
|
||||
end
|
||||
util.remove_prerequisite("automation", "smelting") -- Bitumen mod
|
||||
|
||||
util.remove_prerequisite("logistic-science-pack", "automation-science-pack")
|
||||
util.add_prerequisite("logistic-science-pack", "electronics")
|
||||
|
||||
-- For warptorio2 expansion with K2
|
||||
util.remove_prerequisite("laboratory", "automation-science-pack")
|
||||
util.set_tech_recipe("laboratory", {{"kr-basic-tech-card", 1}})
|
||||
|
|
@ -73,6 +73,9 @@ if mods["aai-industry"] then
|
|||
util.replace_ingredient("motor", "iron-plate", "aluminum-plate")
|
||||
util.replace_ingredient("repair-pack", "copper-plate", "aluminum-plate")
|
||||
util.replace_ingredient("burner-lab", "copper-plate", "aluminum-plate")
|
||||
util.add_prerequisite("copper-processing", "automation-science-pack")
|
||||
util.remove_recipe_effect("electricity", "copper-cable")
|
||||
util.add_effect("copper-processing", { type = "unlock-recipe", recipe = "copper-cable" })
|
||||
end
|
||||
|
||||
if mods["aai-industry"] and mods.Krastorio2 then
|
||||
|
|
@ -131,13 +134,9 @@ require("compatibility/textplates")
|
|||
|
||||
-- All customizations or custom unlocks prior to this block
|
||||
util.add_unlock_force("electronics", "electronic-circuit")
|
||||
-- Disabled for now because replace_ingredients_prior_to has an infinite recursion
|
||||
--util.replace_ingredients_prior_to("electronics", "electronic-circuit", "aluminum-cable")
|
||||
--util.replace_ingredients_prior_to("copper-processing", "copper-cable", "aluminum-cable")
|
||||
--util.replace_ingredients_prior_to("copper-processing", "copper-plate", "aluminum-plate")
|
||||
util.replace_ingredients_prior_to("electronics", "electronic-circuit", "aluminum-cable")
|
||||
util.replace_ingredients_prior_to("copper-processing", "copper-cable", "aluminum-cable")
|
||||
util.replace_ingredients_prior_to("copper-processing", "copper-plate", "aluminum-plate")
|
||||
-- Any post-fixes (eg aluminum back to copper) after this block
|
||||
|
||||
util.remove_prerequisite("copper-processing", "automation")
|
||||
|
||||
|
||||
-- End of file
|
||||
|
|
|
|||
|
|
@ -1,68 +1,62 @@
|
|||
-- Matter recipes for Krastorio2
|
||||
if mods["Krastorio2"] then
|
||||
local util = require("data-util");
|
||||
local matter = require("__Krastorio2__/prototypes/libraries/matter")
|
||||
local util = require("data-util")
|
||||
local matter = require("__Krastorio2__/prototypes/libraries/matter")
|
||||
|
||||
data:extend(
|
||||
{
|
||||
data:extend({
|
||||
{
|
||||
type = "technology",
|
||||
name = "aluminum-matter-processing",
|
||||
icons =
|
||||
icons = {
|
||||
{
|
||||
{
|
||||
icon = util.k2assets().."/technologies/matter-coal.png",
|
||||
icon = util.k2assets() .. "/technologies/backgrounds/matter.png",
|
||||
icon_size = 256,
|
||||
},
|
||||
{
|
||||
icon = "__bzaluminum2__/graphics/icons/aluminum-ore.png",
|
||||
icon_size = 64,
|
||||
scale = 1.4,
|
||||
}
|
||||
scale = 1,
|
||||
},
|
||||
prerequisites = {"kr-matter-processing"},
|
||||
unit =
|
||||
{
|
||||
},
|
||||
effects = {},
|
||||
prerequisites = { "kr-matter-processing" },
|
||||
unit = {
|
||||
count = 350,
|
||||
ingredients =
|
||||
{
|
||||
{"production-science-pack", 1},
|
||||
{"utility-science-pack", 1},
|
||||
{"kr-matter-tech-card", 1}
|
||||
ingredients = {
|
||||
{ "production-science-pack", 1 },
|
||||
{ "utility-science-pack", 1 },
|
||||
{ "kr-matter-tech-card", 1 },
|
||||
},
|
||||
time = 45
|
||||
}
|
||||
time = 45,
|
||||
},
|
||||
})
|
||||
},
|
||||
})
|
||||
|
||||
local aluminum_ore_matter =
|
||||
{
|
||||
local aluminum_ore_matter = {
|
||||
material = { type = "item", name = "aluminum-ore", amount = 10 },
|
||||
matter_count = 5,
|
||||
energy_required = 1,
|
||||
need_stabilizer = false,
|
||||
unlocked_by_technology = "aluminum-matter-processing"
|
||||
needs_stabilizer = false,
|
||||
unlocked_by = "aluminum-matter-processing",
|
||||
}
|
||||
matter.make_recipes(aluminum_ore_matter)
|
||||
matter.make_recipes(aluminum_ore_matter)
|
||||
|
||||
local alumina_matter =
|
||||
{
|
||||
local alumina_matter = {
|
||||
material = { type = "item", name = "alumina", amount = 10 },
|
||||
matter_count = 7.5,
|
||||
energy_required = 2,
|
||||
only_deconversion = true,
|
||||
need_stabilizer = true,
|
||||
unlocked_by_technology = "aluminum-matter-processing"
|
||||
-- only_deconversion = true,
|
||||
needs_stabilizer = true,
|
||||
unlocked_by = "aluminum-matter-processing",
|
||||
}
|
||||
matter.make_recipes(alumina_matter)
|
||||
local aluminum_plate_matter =
|
||||
{
|
||||
matter.make_deconversion_recipe(alumina_matter)
|
||||
local aluminum_plate_matter = {
|
||||
material = { type = "item", name = "aluminum-plate", amount = 10 },
|
||||
matter_count = 10,
|
||||
energy_required = 3,
|
||||
only_deconversion = true,
|
||||
need_stabilizer = true,
|
||||
unlocked_by_technology = "aluminum-matter-processing"
|
||||
-- only_deconversion = true,
|
||||
needs_stabilizer = true,
|
||||
unlocked_by = "aluminum-matter-processing",
|
||||
}
|
||||
matter.make_recipes(aluminum_plate_matter)
|
||||
matter.make_deconversion_recipe(aluminum_plate_matter)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -137,9 +137,7 @@ data:extend({
|
|||
order = "b-b",
|
||||
},
|
||||
})
|
||||
if mods["aai-industry"] then
|
||||
util.add_prerequisite("copper-processing", "electricity")
|
||||
else
|
||||
if not mods["aai-industry"] then
|
||||
util.add_prerequisite("copper-processing", "automation")
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,14 @@
|
|||
---------------------------------------------------------------------------------------------------
|
||||
Version: 2.0.4
|
||||
Date: 05.11.2025
|
||||
Bug Fixes:
|
||||
- Fix early game progression
|
||||
---------------------------------------------------------------------------------------------------
|
||||
Version: 2.0.3
|
||||
Date: 01.11.2025
|
||||
Bug Fixes:
|
||||
- Fix K2 matter integration (thanks pla)
|
||||
---------------------------------------------------------------------------------------------------
|
||||
Version: 2.0.2
|
||||
Date: 22.10.2025
|
||||
Bug Fixes:
|
||||
|
|
|
|||
|
|
@ -115,12 +115,12 @@ end
|
|||
function util.k2matter(params)
|
||||
local matter = require("__Krastorio2__/prototypes/libraries/matter")
|
||||
if mods["space-exploration"] then
|
||||
params.k2matter.need_stabilizer = true
|
||||
params.k2matter.needs_stabilizer = true
|
||||
end
|
||||
if not params.k2matter.minimum_conversion_quantity then
|
||||
params.k2matter.minimum_conversion_quantity = 10
|
||||
end
|
||||
if not data.raw.technology[params.k2matter.unlocked_by_technology] then
|
||||
if not data.raw.technology[params.k2matter.unlocked_by] then
|
||||
local icon = ""
|
||||
if params.k2baseicon then
|
||||
icon = util.k2assets().."/technologies/matter-"..params.k2baseicon..".png"
|
||||
|
|
@ -132,7 +132,7 @@ function util.k2matter(params)
|
|||
{
|
||||
{
|
||||
type = "technology",
|
||||
name = params.k2matter.unlocked_by_technology,
|
||||
name = params.k2matter.unlocked_by,
|
||||
icons =
|
||||
{
|
||||
{
|
||||
|
|
@ -163,11 +163,16 @@ function util.k2matter(params)
|
|||
},
|
||||
time = 45,
|
||||
},
|
||||
effects = {},
|
||||
localised_name = {"technology-name.k2-conversion", {"item-name."..params.k2matter.item_name}},
|
||||
},
|
||||
})
|
||||
end
|
||||
if params.k2matter.only_deconversion then
|
||||
matter.make_deconversion_recipe(params.k2matter)
|
||||
else
|
||||
matter.make_recipes(params.k2matter)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "bzaluminum2",
|
||||
"version": "2.0.2",
|
||||
"version": "2.0.4",
|
||||
"factorio_version": "2.0",
|
||||
"title": "Aluminum",
|
||||
"description": "Adds aluminum, alumina, cables, alloys and more to the game.",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue