Compare commits

...

6 commits
2.0.2 ... main

Author SHA1 Message Date
Simon Brodtmann
9df5d0fcc3 2.0.3 2025-12-10 19:42:33 +01:00
Simon Brodtmann
ceb4dfe657 Fix autoplace of rich-copper-ore 2025-12-10 19:29:59 +01:00
Simon Brodtmann
4627a45cdb Cleanup 2025-12-10 19:25:46 +01:00
Simon Brodtmann
e11da23987 Fix recipe name of blank-tech-card-silver 2025-11-16 11:53:34 +01:00
pla
1a411368c5
Fix tech coal-liquefaction has no prereq with catalysis off 2025-11-07 11:41:01 +01:00
Simon Brodtmann
99cab50b68 Forgot thanks 2025-11-01 23:00:22 +01:00
6 changed files with 203 additions and 198 deletions

View file

@ -1,8 +1,15 @@
--------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------
Version: 2.0.3
Date: 10.12.2025
Bug Fixes:
- Fix tech coal-liquefaction has no prereq with catalysis off
- Fix recipe name of blank-tech-card-silver
- Fix autoplace of rich-copper-ore
---------------------------------------------------------------------------------------------------
Version: 2.0.2 Version: 2.0.2
Date: 01.11.2025 Date: 01.11.2025
Bug Fixes: Bug Fixes:
- Fix K2 matter integration - Fix K2 matter integration (thanks pla)
--------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------
Version: 2.0.1 Version: 2.0.1
Date: 21.10.2025 Date: 21.10.2025

View file

@ -21,8 +21,5 @@ require("compatibility/248k")
local util = require("data-util"); local util = require("data-util");
if util.se6() then
end
-- Must be last -- Must be last
util.create_list() util.create_list()

View file

@ -1,6 +1,6 @@
{ {
"name": "bzgold2", "name": "bzgold2",
"version": "2.0.2", "version": "2.0.3",
"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.",

View file

@ -72,6 +72,7 @@ end
if mods.Krastorio2 and util.me.silver() then if mods.Krastorio2 and util.me.silver() then
local tc = futil.table.deepcopy(data.raw.recipe["kr-blank-tech-card"]) local tc = futil.table.deepcopy(data.raw.recipe["kr-blank-tech-card"])
tc.name = "blank-tech-card-silver" tc.name = "blank-tech-card-silver"
tc.localised_name = { "item-name.blank-tech-card" }
data:extend({tc}) data:extend({tc})
util.replace_ingredient("blank-tech-card-silver", "copper-cable", "silver-wire") util.replace_ingredient("blank-tech-card-silver", "copper-cable", "silver-wire")
local amt = util.get_amount("kr-blank-tech-card") local amt = util.get_amount("kr-blank-tech-card")

View file

@ -23,7 +23,6 @@ if mods.Krastorio2 then
util.set_main_product("rare-metals-1", "kr-rare-metals") util.set_main_product("rare-metals-1", "kr-rare-metals")
util.set_main_product("rare-metals-2", "kr-rare-metals") util.set_main_product("rare-metals-2", "kr-rare-metals")
if util.me.platinum() and util.me.palladium() then if util.me.platinum() and util.me.palladium() then
util.replace_some_product("rare-metals-1", "kr-rare-metals", 2, "platinum-powder", 2, { force = true }) util.replace_some_product("rare-metals-1", "kr-rare-metals", 2, "platinum-powder", 2, { force = true })
util.replace_some_product("rare-metals-1", "kr-rare-metals", 2, "palladium-powder", 2, { force = true }) util.replace_some_product("rare-metals-1", "kr-rare-metals", 2, "palladium-powder", 2, { force = true })
@ -74,18 +73,17 @@ elseif util.me.palladium() then
{ type = "item", name = "copper-plate", amount = 2, probability = 0.75 }, { type = "item", name = "copper-plate", amount = 2, probability = 0.75 },
{ type = "item", name = "palladium-powder", amount = 1, probability = 0.5 }, { type = "item", name = "palladium-powder", amount = 1, probability = 0.5 },
} }
else -- should never happen else
-- should never happen
results = { results = {
{ type = "item", name = "copper-plate", amount = 2 }, { type = "item", name = "copper-plate", amount = 2 },
} }
end end
if data.raw.resource["copper-ore"] then if data.raw.resource["copper-ore"] then
if mods["space-exploration"] then if mods["space-exploration"] then
-- decrease richness of copper a bit (ok if it stacks with aluminum) -- decrease richness of copper a bit (ok if it stacks with aluminum)
data.raw.resource["copper-ore"].autoplace.richness_expression = data.raw.resource["copper-ore"].autoplace.richness_expression = data.raw.resource["copper-ore"].autoplace.richness_expression .. "*(3/4)"
data.raw.resource["copper-ore"].autoplace.richness_expression .. "*(3/4)"
else else
log("Replacing vanilla copper-ore autoplace") log("Replacing vanilla copper-ore autoplace")
local resource_autoplace = require('resource-autoplace'); local resource_autoplace = require('resource-autoplace');
@ -102,6 +100,7 @@ if data.raw.resource["copper-ore"] then
end end
if util.se6() then if util.se6() then
data.raw.planet.nauvis.map_gen_settings.autoplace_controls["rich-copper-ore"] = {}
data:extend({ data:extend({
{ {
type = "autoplace-control", type = "autoplace-control",
@ -113,6 +112,9 @@ if util.se6() then
}) })
end end
data.raw.planet.nauvis.map_gen_settings.autoplace_settings.entity.settings["rich-copper-ore"] = {}
resource_autoplace.initialize_patch_set("rich-copper-ore", true)
data:extend({ data:extend({
{ {
type = "resource", type = "resource",
@ -124,8 +126,7 @@ data:extend({
map_color = { r = 0.9, g = 0.5, b = 0.4 }, map_color = { r = 0.9, g = 0.5, b = 0.4 },
tree_removal_probability = 0.7, tree_removal_probability = 0.7,
tree_removal_max_distance = 32 * 32, tree_removal_max_distance = 32 * 32,
minable = minable = {
{
hardness = 1, hardness = 1,
mining_particle = "copper-ore-particle", mining_particle = "copper-ore-particle",
mining_time = 1, mining_time = 1,
@ -148,10 +149,8 @@ data:extend({
}, },
stage_counts = { 15000, 9500, 5500, 2900, 1300, 400, 150, 80 }, stage_counts = { 15000, 9500, 5500, 2900, 1300, 400, 150, 80 },
stages = stages = {
{ sheet = {
sheet =
{
filename = "__bzgold2__/graphics/entity/ores/hr-rich-copper-ore.png", filename = "__bzgold2__/graphics/entity/ores/hr-rich-copper-ore.png",
priority = "extra-high", priority = "extra-high",
size = 128, size = 128,
@ -178,7 +177,6 @@ data:extend({
}, },
}) })
data:extend({ data:extend({
{ {
type = "recipe", type = "recipe",

View file

@ -21,6 +21,8 @@ end
util.add_unlock("processing-unit", "cpu") util.add_unlock("processing-unit", "cpu")
util.add_unlock("processing-unit", "mainboard") util.add_unlock("processing-unit", "mainboard")
if settings.startup["bzgold-catalysis"].value == true then
util.add_prerequisite("coal-liquefaction", "catalysis") util.add_prerequisite("coal-liquefaction", "catalysis")
util.remove_prerequisite("coal-liquefaction", "production-science-pack") util.remove_prerequisite("coal-liquefaction", "production-science-pack")
util.remove_prerequisite("coal-liquefaction", "advanced-oil-processing") util.remove_prerequisite("coal-liquefaction", "advanced-oil-processing")
end