forked from cacklingfiend/bzgold2
Compare commits
4 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
99cab50b68 | ||
|
|
db3137985e | ||
|
|
04a1e986dd | ||
| 8db4982e5b |
6 changed files with 49 additions and 38 deletions
|
|
@ -1,4 +1,9 @@
|
||||||
---------------------------------------------------------------------------------------------------
|
---------------------------------------------------------------------------------------------------
|
||||||
|
Version: 2.0.2
|
||||||
|
Date: 01.11.2025
|
||||||
|
Bug Fixes:
|
||||||
|
- Fix K2 matter integration (thanks pla)
|
||||||
|
---------------------------------------------------------------------------------------------------
|
||||||
Version: 2.0.1
|
Version: 2.0.1
|
||||||
Date: 21.10.2025
|
Date: 21.10.2025
|
||||||
Changes:
|
Changes:
|
||||||
|
|
|
||||||
|
|
@ -115,12 +115,12 @@ end
|
||||||
function util.k2matter(params)
|
function util.k2matter(params)
|
||||||
local matter = require("__Krastorio2__/prototypes/libraries/matter")
|
local matter = require("__Krastorio2__/prototypes/libraries/matter")
|
||||||
if mods["space-exploration"] then
|
if mods["space-exploration"] then
|
||||||
params.k2matter.need_stabilizer = true
|
params.k2matter.needs_stabilizer = true
|
||||||
end
|
end
|
||||||
if not params.k2matter.minimum_conversion_quantity then
|
if not params.k2matter.minimum_conversion_quantity then
|
||||||
params.k2matter.minimum_conversion_quantity = 10
|
params.k2matter.minimum_conversion_quantity = 10
|
||||||
end
|
end
|
||||||
if not data.raw.technology[params.k2matter.unlocked_by_technology] then
|
if not data.raw.technology[params.k2matter.unlocked_by] then
|
||||||
local icon = ""
|
local icon = ""
|
||||||
if params.k2baseicon then
|
if params.k2baseicon then
|
||||||
icon = util.k2assets().."/technologies/matter-"..params.k2baseicon..".png"
|
icon = util.k2assets().."/technologies/matter-"..params.k2baseicon..".png"
|
||||||
|
|
@ -132,7 +132,7 @@ function util.k2matter(params)
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
type = "technology",
|
type = "technology",
|
||||||
name = params.k2matter.unlocked_by_technology,
|
name = params.k2matter.unlocked_by,
|
||||||
icons =
|
icons =
|
||||||
{
|
{
|
||||||
{
|
{
|
||||||
|
|
@ -163,11 +163,16 @@ function util.k2matter(params)
|
||||||
},
|
},
|
||||||
time = 45,
|
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
|
end
|
||||||
matter.make_recipes(params.k2matter)
|
if params.k2matter.only_deconversion then
|
||||||
|
matter.make_deconversion_recipe(params.k2matter)
|
||||||
|
else
|
||||||
|
matter.make_recipes(params.k2matter)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1188,8 +1193,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 :|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "bzgold2",
|
"name": "bzgold2",
|
||||||
"version": "2.0.1",
|
"version": "2.0.2",
|
||||||
"factorio_version": "2.0",
|
"factorio_version": "2.0",
|
||||||
"title": "Noble Metals",
|
"title": "Noble Metals",
|
||||||
"description": "Adds silver, gold, platinum, palladium and more to the base game. Reworks processing units.",
|
"description": "Adds silver, gold, platinum, palladium and more to the base game. Reworks processing units.",
|
||||||
|
|
|
||||||
|
|
@ -1,30 +1,31 @@
|
||||||
-- Matter recipes for Krastorio2
|
-- Matter recipes for Krastorio2
|
||||||
if mods["Krastorio2"] then
|
if mods["Krastorio2"] then
|
||||||
local util = require("data-util");
|
local util = require("data-util")
|
||||||
|
|
||||||
util.k2matter({
|
if not data.raw.recipe["kr-gold-ore-to-matter"] then
|
||||||
k2matter = {
|
util.k2matter({
|
||||||
material = { type = "item", name = "gold-ore", amount = 30 },
|
k2matter = {
|
||||||
item_name = "gold-ore",
|
material = { type = "item", name = "gold-ore", amount = 30 },
|
||||||
matter_count = 30,
|
item_name = "gold-ore",
|
||||||
energy_required = 10,
|
matter_count = 30,
|
||||||
need_stabilizer = false,
|
energy_required = 10,
|
||||||
unlocked_by_technology = "gold-matter-processing",
|
needs_stabilizer = false,
|
||||||
},
|
unlocked_by = "gold-matter-processing",
|
||||||
k2baseicon = "stone",
|
},
|
||||||
icon = {icon = "__bzgold2__/graphics/icons/gold-ore.png", icon_size = 128, scale = 1}
|
icon = { icon = "__bzgold2__/graphics/icons/gold-ore.png", icon_size = 128, scale = 0.5 },
|
||||||
})
|
})
|
||||||
|
end
|
||||||
util.k2matter({
|
if settings.startup["bzgold-silver"].value then
|
||||||
k2matter = {
|
util.k2matter({
|
||||||
material = { type = "item", name = "silver-ore", amount = 8 },
|
k2matter = {
|
||||||
item_name = "silver-ore",
|
material = { type = "item", name = "silver-ore", amount = 8 },
|
||||||
matter_count = 8,
|
item_name = "silver-ore",
|
||||||
energy_required = 5,
|
matter_count = 8,
|
||||||
need_stabilizer = false,
|
energy_required = 5,
|
||||||
unlocked_by_technology = "silver-matter-processing",
|
needs_stabilizer = false,
|
||||||
},
|
unlocked_by = "silver-matter-processing",
|
||||||
k2baseicon = "stone",
|
},
|
||||||
icon = {icon = "__bzgold2__/graphics/icons/silver-ore.png", icon_size = 128, scale = 1}
|
icon = { icon = "__bzgold2__/graphics/icons/silver-ore.png", icon_size = 128, scale = 0.5 },
|
||||||
})
|
})
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
local util = require("data-util");
|
local util = require("data-util")
|
||||||
|
|
||||||
if mods.Krastorio2 then
|
if mods.Krastorio2 then
|
||||||
|
|
||||||
|
|
@ -92,7 +92,7 @@ data:extend({
|
||||||
{
|
{
|
||||||
icon = data.raw.item["gold-ore"].icon,
|
icon = data.raw.item["gold-ore"].icon,
|
||||||
icon_size = data.raw.item["gold-ore"].icon_size,
|
icon_size = data.raw.item["gold-ore"].icon_size,
|
||||||
scale = 0.2,
|
scale = 0.2 * 64 / (data.raw.item["gold-ore"].icon_size or 64),
|
||||||
shift = {0, 4}
|
shift = {0, 4}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
local util = require("data-util");
|
local util = require("data-util")
|
||||||
|
|
||||||
if mods.Krastorio2 and util.me.silver() then
|
if mods.Krastorio2 and util.me.silver() then
|
||||||
data:extend({
|
data:extend({
|
||||||
|
|
@ -111,7 +111,7 @@ data:extend({
|
||||||
{
|
{
|
||||||
icon = data.raw.item["silver-ore"].icon,
|
icon = data.raw.item["silver-ore"].icon,
|
||||||
icon_size = data.raw.item["silver-ore"].icon_size,
|
icon_size = data.raw.item["silver-ore"].icon_size,
|
||||||
scale = 0.2,
|
scale = 0.2 * 64 / (data.raw.item["silver-ore"].icon_size or 64),
|
||||||
shift = {0, 4}
|
shift = {0, 4}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue