Compare commits

...

5 commits
2.0.2 ... main

Author SHA1 Message Date
Simon Brodtmann
33997002bc 2.0.4 2025-11-14 23:12:22 +01:00
Simon Brodtmann
8e690efb7c Fix deadlock stacking, remove crating 2025-11-14 23:03:02 +01:00
Simon Brodtmann
a607118e44 2.0.3 2025-11-05 10:09:50 +01:00
pla
0f0c52e789
K2 mineral water change 2025-11-04 20:55:51 +01:00
pla
f0061c6a7f Fix K2 matter recipe generation and tech icon (#1)
I found that while cleaning.
![image](/attachments/2f42cfd0-6093-448f-8eb4-82095d0108fb)

Co-authored-by: pla
Reviewed-on: #1
Co-authored-by: pla <pla@noreply.example.org>
Co-committed-by: pla <pla@noreply.example.org>
2025-11-03 22:15:49 +01:00
6 changed files with 97 additions and 89 deletions

View file

@ -1,4 +1,15 @@
---------------------------------------------------------------------------------------------------
Version: 2.0.4
Date: 14.11.2025
Bug Fixes:
- Fix deadlock stacking, remove crating
---------------------------------------------------------------------------------------------------
Version: 2.0.3
Date: 05.11.2025
Bug Fixes:
- Fix K2 matter integration (thanks pla)
- Fixes after breaking change for mineral water in K2 (pla)
---------------------------------------------------------------------------------------------------
Version: 2.0.2
Date: 02.11.2025
Bug Fixes:

View file

@ -109,65 +109,65 @@ function util.se_landfill(params)
end
end
-- k2 matter
-- params: {k2matter}, k2baseicon , {icon}
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"
icon = util.k2assets() .. "/technologies/matter-" .. params.k2baseicon .. ".png"
else
icon = util.k2assets().."/technologies/backgrounds/matter.png"
icon = util.k2assets() .. "/technologies/backgrounds/matter.png"
end
data:extend(
{
data:extend({
{
type = "technology",
name = params.k2matter.unlocked_by_technology,
icons =
{
name = params.k2matter.unlocked_by,
icons = {
{
icon = icon,
icon_size = 256,
},
params.icon,
},
prerequisites = {"kr-matter-processing"},
unit =
{
prerequisites = { "kr-matter-processing" },
unit = {
count = 350,
ingredients = mods["space-exploration"] and
{
{"automation-science-pack", 1},
{"logistic-science-pack", 1},
{"chemical-science-pack", 1},
{"se-astronomic-science-pack-4", 1},
{"se-energy-science-pack-4", 1},
{"se-material-science-pack-4", 1},
{"se-deep-space-science-pack-2", 1},
{"se-kr-matter-science-pack-2", 1},
} or
{
{"production-science-pack", 1},
{"utility-science-pack", 1},
{"kr-matter-tech-card", 1}
ingredients = mods["space-exploration"] and {
{ "automation-science-pack", 1 },
{ "logistic-science-pack", 1 },
{ "chemical-science-pack", 1 },
{ "se-astronomic-science-pack-4", 1 },
{ "se-energy-science-pack-4", 1 },
{ "se-material-science-pack-4", 1 },
{ "se-deep-space-science-pack-2", 1 },
{ "se-kr-matter-science-pack-2", 1 },
} or {
{ "production-science-pack", 1 },
{ "utility-science-pack", 1 },
{ "kr-matter-tech-card", 1 },
},
time = 45,
},
localised_name = {"technology-name.k2-conversion", {"item-name."..params.k2matter.item_name}},
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

View file

@ -1,6 +1,6 @@
{
"name": "bztungsten2",
"version": "2.0.2",
"version": "2.0.4",
"factorio_version": "2.0",
"title": "Tungsten",
"description": "Adds tungsten ore (wolframite), tungsten plates, tungsten carbide and rocket engine nozzles to the base game.",

View file

@ -1,22 +1,32 @@
-- 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")
matter.make_recipes({
material = { type = "item", name = "tungsten-ore", amount = 1 },
util.k2matter({
k2matter = {
material = { type = "item", name = "tungsten-ore", amount = 30 },
item_name = "tungsten-ore",
matter_count = 6,
energy_required = 1,
need_stabilizer = false,
unlocked_by_technology = "tungsten-matter-processing",
icon = {icon = "__bztungsten2__/graphics/icons/tungsten-ore.png", icon_size = 64, scale = 1.25}
needs_stabilizer = false,
unlocked_by = "tungsten-matter-processing",
},
icon = {
icon = "__bztungsten2__/graphics/icons/tungsten-ore.png",
icon_size = 64,
scale = 1
},
})
matter.make_recipes({
material = { type = "item", name = "tungsten-plate", amount = 1 },
util.k2matter({
k2matter = {
material = { type = "item", name = "tungsten-plate", amount = 10 },
item_name = "tungsten-plate",
matter_count = 10,
energy_required = 2,
need_stabilizer = false,
unlocked_by_technology = "tungsten-matter-processing",
only_deconversion = true,
needs_stabilizer = true,
unlocked_by = "tungsten-matter-processing",
},
})
end

View file

@ -2,42 +2,21 @@
local util = require("data-util");
if deadlock then
deadlock.add_stack("tungsten-ore", "__bztungsten2__/graphics/icons/stacked/tungsten-ore-stacked.png", "deadlock-stacking-2", 64)
deadlock.add_stack("tungsten-plate", "__bztungsten2__/graphics/icons/stacked/tungsten-plate-stacked.png" , "deadlock-stacking-2", 128)
deadlock.add_stack("tungsten-carbide", "__bztungsten2__/graphics/icons/stacked/tungsten-carbide-stacked.png" , "deadlock-stacking-2", 128)
deadlock.add_stack("rocket-engine-nozzle", "__bztungsten2__/graphics/icons/stacked/rocket-engine-nozzle-stacked.png" , "deadlock-stacking-2", 128)
if deadlock_stacking then
deadlock_stacking.create("tungsten-ore", "__bztungsten2__/graphics/icons/stacked/tungsten-ore-stacked.png", "deadlock-stacking-2", 64)
deadlock_stacking.create("tungsten-plate", "__bztungsten2__/graphics/icons/stacked/tungsten-plate-stacked.png" , "deadlock-stacking-2", 128)
deadlock_stacking.create("tungsten-carbide", "__bztungsten2__/graphics/icons/stacked/tungsten-carbide-stacked.png" , "deadlock-stacking-2", 128)
deadlock_stacking.create("rocket-engine-nozzle", "__bztungsten2__/graphics/icons/stacked/rocket-engine-nozzle-stacked.png" , "deadlock-stacking-2", 128)
if mods["Krastorio2"] then
deadlock.add_stack("enriched-tungsten", "__bztungsten2__/graphics/icons/stacked/enriched-tungsten-stacked.png" , "deadlock-stacking-2", 64)
deadlock_stacking.create("enriched-tungsten", "__bztungsten2__/graphics/icons/stacked/enriched-tungsten-stacked.png" , "deadlock-stacking-2", 64)
end
if data.raw.item["tungsten-ingot"] then
deadlock.add_stack("tungsten-ingot", nil, "deadlock-stacking-2", nil)
deadlock_stacking.create("tungsten-ingot", nil, "deadlock-stacking-2", nil)
end
if util.me.cuw() then
deadlock.add_stack("cuw", "__bztungsten2__/graphics/icons/stacked/cuw-stacked.png" , "deadlock-stacking-2", 128)
deadlock_stacking.create("cuw", "__bztungsten2__/graphics/icons/stacked/cuw-stacked.png" , "deadlock-stacking-2", 128)
end
if data.raw.item["tungsten-powder"] then
deadlock.add_stack("tungsten-powder", nil, "deadlock-stacking-2", nil)
deadlock_stacking.create("tungsten-powder", nil, "deadlock-stacking-2", nil)
end
end
-- Deadlock crating recipes
if deadlock_crating then
deadlock_crating.add_crate("tungsten-ore", "deadlock-crating-2")
deadlock_crating.add_crate("tungsten-plate", "deadlock-crating-2")
deadlock_crating.add_crate("tungsten-carbide", "deadlock-crating-2")
deadlock_crating.add_crate("rocket-engine-nozzle", "deadlock-crating-2")
if mods["Krastorio2"] then
deadlock_crating.add_crate("enriched-tungsten", "deadlock-crating-2")
end
if data.raw.item["tungsten-ingot"] then
deadlock_crating.add_crate("tungsten-ingot", "deadlock-crating-2")
end
if util.me.cuw() then
deadlock_crating.add_crate("cuw", "deadlock-crating-2")
end
if data.raw.item["tungsten-powder"] then
deadlock_crating.add_crate("tungsten-powder", "deadlock-crating-2")
end
end

View file

@ -1,4 +1,4 @@
local util = require("data-util");
local util = require("data-util")
local cuw = "tungsten-plate"
if util.me.cuw() then cuw = "cuw" end
@ -102,6 +102,14 @@ util.add_ingredient("deadlock-floor-lamp", "tungsten-plate", 2)
---- K2
if mods["Krastorio2"] then
util.remove_prerequisite("kr-mineral-water-gathering", "chemical-science-pack")
util.add_prerequisite("kr-mineral-water-gathering", "kr-fluids-chemistry")
util.add_prerequisite("kr-mineral-water-gathering", "logistic-science-pack")
util.set_tech_recipe(
"kr-mineral-water-gathering",
{ { "kr-basic-tech-card", 1 }, { "automation-science-pack", 1 }, { "logistic-science-pack", 1 } }
)
util.set_tech_recipe("engine", {{"kr-basic-tech-card", 1}, {"automation-science-pack", 1}, {"logistic-science-pack", 1}})
util.set_tech_recipe("fluid-handling", {{"kr-basic-tech-card", 1}, {"automation-science-pack", 1}, {"logistic-science-pack", 1}})
util.set_tech_recipe("lamp", {{"kr-basic-tech-card", 1}, {"automation-science-pack", 1}, {"logistic-science-pack", 1}})