From ef72fe66cec047e3245c1151a763f03dcc47da33 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sat, 11 Oct 2025 17:41:22 +0200 Subject: [PATCH 1/2] Mod compatibility fixes --- ChemistryForYou2/data-util.lua | 2 +- ChemistryForYou2/prototypes/recipes.lua | 58 +++++++++++----------- ChemistryForYou2/prototypes/technology.lua | 12 ++--- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/ChemistryForYou2/data-util.lua b/ChemistryForYou2/data-util.lua index 4b2d096..81def01 100644 --- a/ChemistryForYou2/data-util.lua +++ b/ChemistryForYou2/data-util.lua @@ -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/ChemistryForYou2/prototypes/recipes.lua b/ChemistryForYou2/prototypes/recipes.lua index 69749d5..a113d75 100644 --- a/ChemistryForYou2/prototypes/recipes.lua +++ b/ChemistryForYou2/prototypes/recipes.lua @@ -245,7 +245,7 @@ data:extend({ enabled = false, energy_required = 10, ingredients = {(data.raw.item["aluminum-plate"] and {type="item", name="aluminum-plate", amount=2}) or {type="item", name="iron-plate", amount=2}, {type="item", name="sodium-hydroxide", amount=2}, {type="fluid", name="water", amount=20}}, - results = {{type="item", name="aluminium-hydroxide", amount=2}, (data.raw.fluid["hydrogen"] and {type="fluid", name="hydrogen", amount=30}) or {type="fluid", name="water", amount=10}}, + results = {{type="item", name="aluminium-hydroxide", amount=2}, (data.raw.fluid["kr-hydrogen"] and {type="fluid", name="kr-hydrogen", amount=30}) or {type="fluid", name="water", amount=10}}, }, { type = "recipe", @@ -261,8 +261,8 @@ data:extend({ }) local sodium_diuranate_ingredients = {{type="item", name="sodium-hydroxide", amount = 10}, { type = "fluid", name = "water", amount = 100 }} -if data.raw.item["sand"] then - table.insert(sodium_diuranate_ingredients, {type="item", name="sand", amount=1}) +if data.raw.item[mods["Krastorio2"] and "kr-sand" or "sand"] then + table.insert(sodium_diuranate_ingredients, {type="item", name=mods["Krastorio2"] and "kr-sand" or "sand", amount=1}) end data:extend({ { @@ -390,9 +390,9 @@ data:extend({ } }) -local hydrogen_peroxide_ingredients = {(data.raw.fluid["hydrogen"] and { type = "fluid", name = "hydrogen", amount = 50 }) or { type = "fluid", name = "water", amount = 100 }} -if data.raw.fluid["oxygen"] then - table.insert(hydrogen_peroxide_ingredients, { type = "fluid", name = "oxygen", amount = 50 }) +local hydrogen_peroxide_ingredients = {(data.raw.fluid["kr-hydrogen"] and { type = "fluid", name = "kr-hydrogen", amount = 50 }) or { type = "fluid", name = "water", amount = 100 }} +if data.raw.fluid["kr-oxygen"] then + table.insert(hydrogen_peroxide_ingredients, { type = "fluid", name = "kr-oxygen", amount = 50 }) end if data.raw.item["palladium-ingot"] then table.insert(hydrogen_peroxide_ingredients, {type="item", name="palladium-ingot", amount=1}) @@ -418,8 +418,8 @@ local hydrogen_peroxide_disproportionation_results = {{ type = "fluid", name = " if data.raw.item["platinum-ingot"] then table.insert(hydrogen_peroxide_disproportionation_ingredients, {type="item", name="platinum-ingot", amount=1}) end -if data.raw.fluid["oxygen"] then - table.insert(hydrogen_peroxide_disproportionation_results, { type = "fluid", name = "oxygen", amount = 25 }) +if data.raw.fluid["kr-oxygen"] then + table.insert(hydrogen_peroxide_disproportionation_results, { type = "fluid", name = "kr-oxygen", amount = 25 }) end data:extend({ @@ -552,7 +552,7 @@ local science_pack = "__ChemistryForYou2__/graphics/icons/productivity-science-p type = "recipe", name = "rich-water-filtration", category = fluidFiltrationCraft, - icon = "__248k-Redux__/ressources/fluids/fi_dirty_water.png", + icon = "__248k-Redux-graphics__/ressources/fluids/fi_dirty_water.png", icon_size = 64, group = "fi_item_group", subgroup = "fi_item_subgroup_f", @@ -567,8 +567,8 @@ local science_pack = "__ChemistryForYou2__/graphics/icons/productivity-science-p name = "nuclear-waste-extraction", category = "chemistry", icons = { - { icon = "__248k-Redux__/ressources/fission/fi_fuel/fi_fuel_plutonium239_item.png", icon_size = 64}, - { icon = "__248k-Redux__/ressources/fission/fi_materials/fi_materials_waste.png", icon_size = 64, scale=0.25, shift= {-8, -8}}, + { icon = "__248k-Redux-graphics__/ressources/fission/fi_fuel/fi_fuel_plutonium239_item.png", icon_size = 64}, + { icon = "__248k-Redux-graphics__/ressources/fission/fi_materials/fi_materials_waste.png", icon_size = 64, scale=0.25, shift= {-8, -8}}, }, group = "fi_item_group", subgroup = "fi_item_subgroup_f", @@ -588,13 +588,13 @@ if mods["Krastorio2"] then if data.raw.item["nylon"] then table.insert(ammonium_nitrate_explosive_ingredients, {type="item", name="nylon", amount = 8 }) end - local sulfur_trioxide_ingredients = {{ type = "fluid", name = "sulfur-dioxide", amount = 100 }, { type = "fluid", name = "oxygen", amount = 50 }} + local sulfur_trioxide_ingredients = {{ type = "fluid", name = "sulfur-dioxide", amount = 100 }, { type = "fluid", name = "kr-oxygen", amount = 50 }} if data.raw.item["platinum-ingot"] then table.insert(sulfur_trioxide_ingredients, {type="item", name="platinum-ingot", amount=1}) end local sulfur_trioxide_results = {{ type = "fluid", name = "sulfur-trioxide", amount = 100 }} if data.raw.item["platinum-ingot"] then - table.insert(sulfur_trioxide_results, {name="platinum-ingot", amount=1, probability=0.6}) + table.insert(sulfur_trioxide_results, {type="item", name="platinum-ingot", amount=1, probability=0.6}) end data:extend({ { @@ -643,7 +643,7 @@ data:extend({ order = "a", enabled = false, energy_required = 8, - ingredients = {{ type = "fluid", name = "nitrate", amount = 100 }, { type = "fluid", name = "ammonia", amount = 100 }}, + ingredients = {{ type = "fluid", name = "nitrate", amount = 100 }, { type = "fluid", name = "kr-ammonia", amount = 100 }}, results = {{type="item", name="ammonium-nitrate",amount = 10 }}, }, { @@ -665,13 +665,13 @@ data:extend({ order = "n", enabled = false, energy_required = 10, - ingredients = {{ type = "fluid", name = "nitrogen", amount = 50 }, { type = "fluid", name = "oxygen", amount = 150 }},--should be made from Nitric acid but this works for now + ingredients = {{ type = "fluid", name = "nitrogen", amount = 50 }, { type = "fluid", name = "kr-oxygen", amount = 150 }},--should be made from Nitric acid but this works for now results = {{ type = "fluid", name = "nitrate", amount = 100 }}, }, { type = "recipe", name = "carbon-dioxide-condensation", - category = "atmosphere-condensation", + category = "kr-atmosphere-condensation", subgroup = "raw-material", order = "c", enabled = false, @@ -720,13 +720,13 @@ data:extend({ order = "a[fluid]-i[sulfur]", enabled = false, energy_required = 10, - ingredients = {{type = "item", name = "sulfur",amount = 10 }, { type = "fluid", name = "oxygen", amount = 150 }}, + ingredients = {{type = "item", name = "sulfur",amount = 10 }, { type = "fluid", name = "kr-oxygen", amount = 150 }}, results = {{ type = "fluid", name = "sulfur-trioxide", amount = 100 }}, }, { type = "recipe", name = "grow-wood-with-carbon-dioxide", - category = "bioprocessing", + category = "kr-bioprocessing", subgroup = "chemical", main_porduct = "wood", order = "a-b", @@ -743,7 +743,7 @@ data:extend({ order = "w", enabled = false, energy_required = 3, - ingredients = {{type = "item", name = "sodium-carbonate", amount = 10 }, { type = "fluid", name = "mineral-water", amount = 100 }}, + ingredients = {{type = "item", name = "sodium-carbonate", amount = 10 }, { type = "fluid", name = "kr-mineral-water", amount = 100 }}, results = {{ type = "fluid", name = "water", amount = 100 }}, } }) @@ -853,17 +853,17 @@ if mods["bzsilicon"] then order = "s", icons = (mods["Krastorio2"] and { - { icon = "__Krastorio2Assets__/icons/items-with-variations/silicon/silicon.png", icon_size = 64}, + { icon = "__Krastorio2Assets__/icons/items/silicon.png", icon_size = 64}, { icon = "__ChemistryForYou2__/graphics/icons/sodium-aluminate.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, } or { - { icon = "__Krastorio2Assets__/icons/items-with-variations/silicon/silicon.png", icon_size = 64}, + { icon = "__Krastorio2Assets__/icons/items/silicon.png", icon_size = 64}, }), main_product = "silica", subgroup = "chemical", enabled = false, energy_required = 10, ingredients = {{type="item", name="sodium-aluminate", amount=10}, { type = "fluid", name = "water", amount = 100 }}, - results = {{type="item", name="silica", 10}, {"sodium-aluminate", amount=9}, { type = "fluid", name = "water", amount = 90 }} + results = {{type="item", name="silica", amount=10}, {type="item", name="sodium-aluminate", amount=9}, { type = "fluid", name = "water", amount = 90 }} }, { type = "recipe", @@ -877,12 +877,12 @@ if mods["bzsilicon"] then } or { { icon = "__bzsilicon__/graphics/icons/silicon.png", icon_size = 64}, }), - main_product = "silicon", + main_product = mods["Krastorio2"] and "kr-silicon" or "silicon", subgroup = "intermediate-product", enabled = false, energy_required = 10, - ingredients = {{type="item", name="silica", 9}, {type = "item", name = "aluminum-plate", amount=12}}, - results = {{type="item", name="silicon", 9}, {type = "item", name = "alumina", amount=6}} + ingredients = {{type="item", name="silica", amount=9}, {type = "item", name = "aluminum-plate", amount=12}}, + results = {{type="item", name=mods["Krastorio2"] and "kr-silicon" or "silicon", amount=9}, {type = "item", name = "alumina", amount=6}} }, }) if mods["bzgas"] then @@ -917,11 +917,11 @@ if mods["bzsilicon"] then order = "c", icons = { { icon = "__Nylon2__/graphics/icons/coal-tar.png", icon_size = 64}, - { icon = "__Krastorio2Assets__/icons/items-with-variations/biomass/biomass.png", icon_size = 64, scale=0.2, shift= {-8, -8}},}, + { icon = "__Krastorio2Assets__/icons/items/biomass.png", icon_size = 64, scale=0.2, shift= {-8, -8}},}, subgroup = "chemical", enabled = false, energy_required = 4, - ingredients = {{type="item", name="biomass", amount=10}, {type = "item", name = "sodium-hydroxide", amount=10}}, + ingredients = {{type="item", name="kr-biomass", amount=10}, {type = "item", name = "sodium-hydroxide", amount=10}}, results = {{ type = "fluid", name = "coal-tar", amount = 10 }} }, }) @@ -1131,7 +1131,7 @@ if mods["space-exploration"] then order = "a-b", enabled = false, energy_required = 20, - ingredients = {{type="item", name="se-vulcanite-block", amount=1}, {"fi_thorium232_item", amount=10}}, + ingredients = {{type="item", name="se-vulcanite-block", amount=1}, {type="item", name="fi_thorium232_item", amount=10}}, results = {{type="item", name="se-vulcanite-enriched", amount=5}}, }, { @@ -1202,7 +1202,7 @@ if mods["space-exploration"] then order = "t", enabled = false, energy_required = 30, - ingredients = {{type="item", name="tungsten-trioxide", amount=10}, { type = "fluid", name = "hydrogen", amount = 300 }}, + ingredients = {{type="item", name="tungsten-trioxide", amount=10}, { type = "fluid", name = "kr-hydrogen", amount = 300 }}, results = {{type="item", name="tungsten-plate", amount=10}, { type = "fluid", name = "water", amount = 300 }}, }, { diff --git a/ChemistryForYou2/prototypes/technology.lua b/ChemistryForYou2/prototypes/technology.lua index b365308..5953537 100644 --- a/ChemistryForYou2/prototypes/technology.lua +++ b/ChemistryForYou2/prototypes/technology.lua @@ -493,7 +493,7 @@ if mods["Krastorio2"] then { type = "technology", name = "advanced-silicon-processing", - icon = "__Krastorio2Assets__/icons/items-with-variations/silicon/silicon.png", + icon = "__Krastorio2Assets__/icons/items/silicon.png", icon_size = 64, prerequisites = {"productivity-science-pack"}, effects = { @@ -560,7 +560,7 @@ if mods["248k-Redux"] then { type = "technology", name = "rich-water-filtration", - icon = "__248k-Redux__/ressources/fluids/fi_dirty_water.png", + icon = "__248k-Redux-graphics__/ressources/fluids/fi_dirty_water.png", icon_size = 64, prerequisites = rich_water_filtration_pre, effects = { @@ -587,10 +587,10 @@ if mods["248k-Redux"] then name = "nuclear-waste-extraction", icons = (mods["Krastorio2"] and { - { icon = "__248k-Redux__/ressources/fission/fi_fuel/fi_fuel_plutonium239_item.png", icon_size = 64}, - { icon = "__248k-Redux__/ressources/fission/fi_materials/fi_materials_waste.png", icon_size = 64, scale=0.5, shift= {-8, -8}}, + { icon = "__248k-Redux-graphics__/ressources/fission/fi_fuel/fi_fuel_plutonium239_item.png", icon_size = 64}, + { icon = "__248k-Redux-graphics__/ressources/fission/fi_materials/fi_materials_waste.png", icon_size = 64, scale=0.5, shift= {-8, -8}}, } or { - { icon = "__248k-Redux__/ressources/fission/fi_fuel/fi_fuel_plutonium239_item.png", icon_size = 64}, + { icon = "__248k-Redux-graphics__/ressources/fission/fi_fuel/fi_fuel_plutonium239_item.png", icon_size = 64}, } ), prerequisites = {"rich-water-filtration", "nuclear-power"}, @@ -670,7 +670,7 @@ if mods["space-exploration"] then {"production-science-pack", 1}, {"se-material-science-pack-3", 1}, {"se-energy-science-pack-3", 1}, - {"matter-tech-card", 1} + {"kr-matter-tech-card", 1} } preMatterParticle = {"kr-matter-tech-card", "se-material-science-pack-3"} end From e4e82c98e85cebc8b26476d4605ce26b50e19380 Mon Sep 17 00:00:00 2001 From: Simon Brodtmann Date: Sat, 11 Oct 2025 17:42:47 +0200 Subject: [PATCH 2/2] 2.0.1 --- ChemistryForYou2/changelog.txt | 88 +++------------------------------- ChemistryForYou2/info.json | 2 +- 2 files changed, 8 insertions(+), 82 deletions(-) diff --git a/ChemistryForYou2/changelog.txt b/ChemistryForYou2/changelog.txt index ea72d02..3f99fcd 100644 --- a/ChemistryForYou2/changelog.txt +++ b/ChemistryForYou2/changelog.txt @@ -1,84 +1,10 @@ --------------------------------------------------------------------------------------------------- -Version: 0.5.2 -Date: 2024-08-23 - Features: - - Fixed lithium-chemistry prerequisites. - - Fixed saltpeter-sulfuric-acid dependencies check. +Version: 2.0.1 +Date: 10.10.2025 + Bug Fixes: + - Increase mod compatibility --------------------------------------------------------------------------------------------------- -Version: 0.5.1 -Date: 2024-08-15 +Version: 2.0.0 +Date: 10.10.2025 Features: - - Added glass if there is no mod that adds it. - - Fixed missing organic-chemistry technology. - - Fixed missing item groups and sub groups. ---------------------------------------------------------------------------------------------------- -Version: 0.5.0 -Date: 2024-08-07 - Features: - - Added deep space ore enrichment recipe for SE and 248K. - - Added productivity to vitalic extract. ---------------------------------------------------------------------------------------------------- -Version: 0.4.0 -Date: 2024-07-27 - Features: - - Added vitalic slurry recipe for SE. - - Added vitalic extract recipe for SE. - - Added water softening recipe for K2. - - Added lithium peroxide to SE bioscrubber. - - Added 248K vulcanite enrichment. - - Added matter to particle recipe for SE. - - Fixed missing icon when BrimStuff is not installed. - - Fixed lithuim tech unlock when not using K2. ---------------------------------------------------------------------------------------------------- -Version: 0.3.4 -Date: 2024-07-16 - Features: - - Added cobalt nanotubes to SE holmium cable. ---------------------------------------------------------------------------------------------------- -Version: 0.3.3 -Date: 2024-06-27 - Features: - - Added cobalt nanotubes to SE tensile strength data. - - Fixed start up errors. - - Fixed many up missing mod errors. - - Fixed error when not using Tantalite mod. - - Fixed typo. ---------------------------------------------------------------------------------------------------- -Version: 0.3.2 -Date: 2024-01-21 - Features: - - Removed old unused files. ---------------------------------------------------------------------------------------------------- -Version: 0.3.1 -Date: 2024-01-14 - Features: - - Added SE delivery cannon recipe for fluids. - - Fixed carbon dioxide recipe when playing without bzgas. ---------------------------------------------------------------------------------------------------- -Version: 0.3.0 -Date: 2024-01-13 - Features: - - Added smart glass. - - Added tungsten trioxide. - - Added cobalt nanotubes. - - Added cobalt hydroxide. ---------------------------------------------------------------------------------------------------- -Version: 0.2.1 -Date: 2024-01-10 - Features: - - Fixed start up error when playing BrimStuff without chemical waste. - - Fixed start up error when fuel subgroup does not exist. ---------------------------------------------------------------------------------------------------- -Version: 0.2.0 -Date: 2024-01-09 - Features: - - Added lithium carbonate. - - Added lithium peroxide. (used for CO2 scrupping in SE) - - Added lithium hydroxide lubricant. - - Fixed startup error when playing K2+SE+BZ without 248K. - - Fixed lithium hydroxide not replacing lithium in 248K lithium battery. ---------------------------------------------------------------------------------------------------- -Version: 0.1.0 -Date: 2024-01-08 - Features: - - Alpha release. \ No newline at end of file + - Update to Factorio 2.0 \ No newline at end of file diff --git a/ChemistryForYou2/info.json b/ChemistryForYou2/info.json index e67dd3e..6ac751c 100644 --- a/ChemistryForYou2/info.json +++ b/ChemistryForYou2/info.json @@ -1,6 +1,6 @@ { "name": "ChemistryForYou2", - "version": "2.0.0", + "version": "2.0.1", "factorio_version": "2.0", "title": "ChemistryForYou", "author": "Timeken, cackling fiend",