diff --git a/Cobalt2/changelog.txt b/Cobalt2/changelog.txt index 397581c..6081be3 100644 --- a/Cobalt2/changelog.txt +++ b/Cobalt2/changelog.txt @@ -1,4 +1,17 @@ --------------------------------------------------------------------------------------------------- +Version: 2.0.4 +Date: 01.11.2025 + Bug Fixes: + - Fix K2 matter integration (thanks pla) +--------------------------------------------------------------------------------------------------- +Version: 2.0.3 +Date: 21.10.2025 + Changes: + - Switch to bz mods forks + - Add incompatibility with Space Age + Bug Fixes: + - Fix recipe with missing ingredient type +--------------------------------------------------------------------------------------------------- Version: 2.0.2 Date: 13.10.2025 Bug Fixes: diff --git a/Cobalt2/data-util.lua b/Cobalt2/data-util.lua index bcf164d..87fedb7 100644 --- a/Cobalt2/data-util.lua +++ b/Cobalt2/data-util.lua @@ -855,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 :| diff --git a/Cobalt2/info.json b/Cobalt2/info.json index f2bc814..d72b47a 100644 --- a/Cobalt2/info.json +++ b/Cobalt2/info.json @@ -1,19 +1,20 @@ { "name": "Cobalt2", - "version": "2.0.2", + "version": "2.0.4", "factorio_version": "2.0", "title": "Cobalt", + "description": "Cobalt is a mod adding the element Cobalt.\n\nThis mod is inspired by Brevven's BZ mods.", "author": "Timeken, cackling fiend", "homepage": "https://discord.gg/ufvFUJtVwk", "dependencies": [ "base >= 2.0.0", "? 248k-Redux", "? bobassembly", - "? bzfoundry", + "? bzfoundry2", "? Chromium2", "? Krastorio2", "? space-exploration", - "? Tantalite2" - ], - "description": "Cobalt is a mod adding the element Cobalt.\n\nThis mod is inspired by Brevven's BZ mods. \n\n Most if not all art is placeholder." + "? Tantalite2", + "! space-age" + ] } \ No newline at end of file diff --git a/Cobalt2/locale/en/Cobalt.cfg b/Cobalt2/locale/en/Cobalt.cfg index 35d2ce3..4149de3 100644 --- a/Cobalt2/locale/en/Cobalt.cfg +++ b/Cobalt2/locale/en/Cobalt.cfg @@ -3,6 +3,7 @@ cobalt-refining=Cobalt refining cobalt-carbide=Cobalt carbide cobalt-electromagnet=Cobalt electromagnet cobalt-substrates=Cobalt substrates +cobalt-matter-processing=Cobalt conversion [technology-description] diff --git a/Cobalt2/prototypes/cobalt-matter.lua b/Cobalt2/prototypes/cobalt-matter.lua index 3919dc0..13367bf 100644 --- a/Cobalt2/prototypes/cobalt-matter.lua +++ b/Cobalt2/prototypes/cobalt-matter.lua @@ -10,15 +10,16 @@ data:extend( icons = { { - icon = "__Krastorio2Assets__/technologies/matter-coal.png", + icon = "__Krastorio2Assets__/technologies/backgrounds/matter.png", icon_size = 256, }, { icon = "__Cobalt2__/graphics/icons/cobaltite-ore.png", icon_size = 64, - scale = 1.4, + scale = 1, } }, + effects = {}, prerequisites = {"kr-matter-processing"}, unit = { @@ -38,16 +39,16 @@ matter.make_recipes({ material = { type = "item", name = "cobaltite-ore", amount = 10 }, matter_count = 5, energy_required = 1, - need_stabilizer = false, - unlocked_by_technology = "cobalt-matter-processing" + needs_stabilizer = false, + unlocked_by = "cobalt-matter-processing" }) -matter.make_recipes({ +matter.make_deconversion_recipe({ material = { type = "item", name = "cobalt-plate", amount = 10 }, matter_count = 10, energy_required = 3, - only_deconversion = true, - need_stabilizer = true, - unlocked_by_technology = "cobalt-matter-processing" + -- only_deconversion = true, + needs_stabilizer = true, + unlocked_by = "cobalt-matter-processing" }) end \ No newline at end of file diff --git a/Cobalt2/prototypes/cobalt-recipe-se.lua b/Cobalt2/prototypes/cobalt-recipe-se.lua index f62062b..31c5ec0 100644 --- a/Cobalt2/prototypes/cobalt-recipe-se.lua +++ b/Cobalt2/prototypes/cobalt-recipe-se.lua @@ -49,7 +49,7 @@ if mods["space-exploration"] then }, energy_required = 45, ingredients = { - {name = mods["Krastorio2"] and "enriched-cobalt" or "cobaltite-ore", amount = 24}, + {type = "item", name = mods["Krastorio2"] and "enriched-cobalt" or "cobaltite-ore", amount = 24}, {type = "fluid", name = "se-pyroflux", amount = 10}, }, enabled = false, diff --git a/Cobalt2/prototypes/cobalt-recipe.lua b/Cobalt2/prototypes/cobalt-recipe.lua index 097d68a..1ceb136 100644 --- a/Cobalt2/prototypes/cobalt-recipe.lua +++ b/Cobalt2/prototypes/cobalt-recipe.lua @@ -9,7 +9,7 @@ data:extend({{ }) local founding_category = "crafting" -if mods["bzfoundry"] then +if mods["bzfoundry2"] then founding_category = "founding" end