diff --git a/Cobalt2/changelog.txt b/Cobalt2/changelog.txt index 4b67468..ae96e74 100644 --- a/Cobalt2/changelog.txt +++ b/Cobalt2/changelog.txt @@ -1,50 +1,10 @@ --------------------------------------------------------------------------------------------------- -Version: 0.5.1 -Date: 2024-08-09 - Features: - - Added productivity to co-cr-aeroframe-pole. +Version: 2.0.1 +Date: 11.10.2025 + Bug Fixes: + - Increase mod compatibility --------------------------------------------------------------------------------------------------- -Version: 0.5.0 -Date: 2024-07-16 +Version: 2.0.0 +Date: 10.10.2025 Features: - - Added co-cr-aeroframe-pole recipe for SE. - - Added cobalt electromagnet to SE electromagnetic field data. - - Added high power cobalt magnet to SE quantum phenomenon data. - - Added cobalt ingot to SE energy science pack 2. ---------------------------------------------------------------------------------------------------- -Version: 0.4.0 -Date: 2024-07-04 - Features: - - Added cobalt data storage for SE. - - Fixed progression when using K2 but not SE ---------------------------------------------------------------------------------------------------- -Version: 0.3.1 -Date: 2024-01-21 - Features: - - Removed old unused files. ---------------------------------------------------------------------------------------------------- -Version: 0.3.0 -Date: 2024-01-13 - Features: - - Added cobaltite ore to SE core fragment. - - Added cobalt electromagnet. ---------------------------------------------------------------------------------------------------- -Version: 0.2.2 -Date: 2024-01-08 - Features: - - Fixed cobalt refining tech local. ---------------------------------------------------------------------------------------------------- -Version: 0.2.1 -Date: 2024-01-06 - Features: - - Fixed high power cobalt magnet unlock when not playing SE. ---------------------------------------------------------------------------------------------------- -Version: 0.2.0 -Date: 2024-01-02 - Features: - - Added Co-Cr alloy (if Chromium is installed) ---------------------------------------------------------------------------------------------------- -Version: 0.1.0 -Date: 2023-12-24 - Features: - - Alpha release. \ No newline at end of file + - Update to Factorio 2.0 \ No newline at end of file diff --git a/Cobalt2/data-util.lua b/Cobalt2/data-util.lua index 4b2d096..bcf164d 100644 --- a/Cobalt2/data-util.lua +++ b/Cobalt2/data-util.lua @@ -11,7 +11,7 @@ function util.se_landfill(params) type = "recipe", icons = { { icon = "__base__/graphics/icons/landfill.png", icon_size = 64, icon_mipmaps = 3 }, - { icon = "__Chromium2__/graphics/icons/"..params.ore..".png", icon_size = params.icon_size, scale = 0.33*64/params.icon_size}, + { icon = "__Cobalt2__/graphics/icons/"..params.ore..".png", icon_size = params.icon_size, scale = 0.33*64/params.icon_size}, }, energy_required = 1, enabled=false, @@ -48,7 +48,7 @@ function util.se_matter(params) icon_size = 64, scale = 0.5}, {icon = "__space-exploration-graphics__/graphics/icons/fluid/particle-stream.png", icon_size = 64, scale = 0.33, shift = {8,-8}}, - {icon = "__Chromium2__/graphics/icons/"..params.ore..".png", + {icon = "__Cobalt2__/graphics/icons/"..params.ore..".png", icon_size = params.icon_size, scale = 0.33 * 64/params.icon_size, shift={-8, 8}}, {icon = "__space-exploration-graphics__/graphics/icons/transition-arrow.png", icon_size = 64, scale = 0.5}, @@ -87,7 +87,7 @@ function util.se_matter(params) icon_size = 64, scale = 0.5}, {icon = "__space-exploration-graphics__/graphics/icons/fluid/particle-stream.png", icon_size = 64, scale = 0.33, shift = {-8,8}}, - {icon = "__Chromium2__/graphics/icons/"..params.ore..".png", + {icon = "__Cobalt2__/graphics/icons/"..params.ore..".png", icon_size = params.icon_size, scale = 0.33 * 64/params.icon_size, shift={8, -8}}, {icon = "__space-exploration-graphics__/graphics/icons/transition-arrow.png", icon_size = 64, scale = 0.5}, @@ -129,7 +129,7 @@ function util.se_matter(params) {"se-astronomic-science-pack-4", 1}, {"se-energy-science-pack-4", 1}, {"se-material-science-pack-4", 1}, - {"matter-tech-card", 1}, + {"kr-matter-tech-card", 1}, {"se-deep-space-science-pack-1", 1}, } }, diff --git a/Cobalt2/info.json b/Cobalt2/info.json index 9bb0f02..29f1d17 100644 --- a/Cobalt2/info.json +++ b/Cobalt2/info.json @@ -1,6 +1,6 @@ { "name": "Cobalt2", - "version": "2.0.0", + "version": "2.0.1", "factorio_version": "2.0", "title": "Cobalt", "author": "Timeken, cackling fiend", diff --git a/Cobalt2/prototypes/cobalt-248k.lua b/Cobalt2/prototypes/cobalt-248k.lua index 62fc23c..5fa24af 100644 --- a/Cobalt2/prototypes/cobalt-248k.lua +++ b/Cobalt2/prototypes/cobalt-248k.lua @@ -44,7 +44,7 @@ data:extend({ icon_size = 64, icons = (mods["Krastorio2"] and { - { icon = "__248k-Redux__/ressources/fluids/el_dirty_water.png", icon_size = 64}, + { icon = "__248k-Redux-graphics__/ressources/fluids/el_dirty_water.png", icon_size = 64}, { icon = "__Cobalt2__/graphics/icons/cobaltite-ore.png", icon_size = 64, scale=0.2, shift= {-8, -8}}, } or { { icon = "__Cobalt2__/graphics/icons/cobaltite-ore.png", icon_size = 64}, diff --git a/Cobalt2/prototypes/cobalt-enriched.lua b/Cobalt2/prototypes/cobalt-enriched.lua index a1d5490..70273ec 100644 --- a/Cobalt2/prototypes/cobalt-enriched.lua +++ b/Cobalt2/prototypes/cobalt-enriched.lua @@ -76,7 +76,7 @@ data:extend( { icon = data.raw.item["cobaltite-ore"].icon, icon_size = data.raw.item["cobaltite-ore"].icon_size, - scale = 0.20 * (data.raw.fluid["kr-dirty-water"].icon_size/data.raw.item["cobaltite-ore"].icon_size), + scale = 0.20, shift = {0, 4} } }, diff --git a/Cobalt2/prototypes/cobalt-matter.lua b/Cobalt2/prototypes/cobalt-matter.lua index 980435a..3919dc0 100644 --- a/Cobalt2/prototypes/cobalt-matter.lua +++ b/Cobalt2/prototypes/cobalt-matter.lua @@ -27,14 +27,14 @@ data:extend( { {"production-science-pack", 1}, {"utility-science-pack", 1}, - {"matter-tech-card", 1} + {"kr-matter-tech-card", 1} }, time = 45 } }, }) -matter.createMatterRecipe({ +matter.make_recipes({ material = { type = "item", name = "cobaltite-ore", amount = 10 }, matter_count = 5, energy_required = 1, @@ -42,7 +42,7 @@ matter.createMatterRecipe({ unlocked_by_technology = "cobalt-matter-processing" }) -matter.createMatterRecipe({ +matter.make_recipes({ material = { type = "item", name = "cobalt-plate", amount = 10 }, matter_count = 10, energy_required = 3, diff --git a/Cobalt2/prototypes/cobalt-recipe.lua b/Cobalt2/prototypes/cobalt-recipe.lua index f7f111e..8b95b4b 100644 --- a/Cobalt2/prototypes/cobalt-recipe.lua +++ b/Cobalt2/prototypes/cobalt-recipe.lua @@ -171,8 +171,8 @@ if mods["space-exploration"] then order = "z-01", enabled = false, energy_required = 10, - ingredients = {{type="item", name="glass", amount=2},{type="item", name="silicon", amount=2},{type="item", name="cobalt-plate", amount=4}}, - results = {{type="item", name="se-data-storage-substrate", amount=1}, {name="se-scrap", amount=1, probability=0.5}}, + ingredients = {{type="item", name="glass", amount=2},{type="item", name=mods["Krastorio2"] and "kr-silicon" or "silicon", amount=2},{type="item", name="cobalt-plate", amount=4}}, + results = {{type="item", name="se-data-storage-substrate", amount=1}, {type="item", name="se-scrap", amount=1, probability=0.5}}, }, { type = "recipe", diff --git a/Cobalt2/recipe-modify.lua b/Cobalt2/recipe-modify.lua index 9f5172a..a300e29 100644 --- a/Cobalt2/recipe-modify.lua +++ b/Cobalt2/recipe-modify.lua @@ -78,13 +78,13 @@ if mods["space-exploration"] then util.add_ingredient("se-electromagnetic-field-data", "cobalt-electromagnet", 1) util.set_ingredient("se-electromagnetic-field-data", "se-empty-data", 2) - util.add_product("se-electromagnetic-field-data", {name="cobalt-electromagnet", amount=1, probability=0.25}) + util.add_product("se-electromagnetic-field-data", {type="item", name="cobalt-electromagnet", amount=1, probability=0.25}) util.set_product_amount("se-electromagnetic-field-data", "se-junk-data", 2) util.set_product_amount("se-electromagnetic-field-data", "se-electromagnetic-field-data", 2) util.add_ingredient("se-quantum-phenomenon-data", "high-power-cobalt-magnet", 1) util.set_ingredient("se-quantum-phenomenon-data", "se-empty-data", 2) - util.add_product("se-quantum-phenomenon-data", {name="high-power-cobalt-magnet", amount=1, probability=0.50}) + util.add_product("se-quantum-phenomenon-data", {type="item", name="high-power-cobalt-magnet", amount=1, probability=0.50}) util.set_product_amount("se-quantum-phenomenon-data", "se-junk-data", 2) util.set_product_amount("se-quantum-phenomenon-data", "se-quantum-phenomenon-data", 2)