cacklingfiend/ChemistryForYou2
1
0
Fork 1
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

248k update fixes #1

Open
Morganite wants to merge 1 commit from Morganite/ChemistryForYou2:main into main
pull from: Morganite/ChemistryForYou2:main
merge into: cacklingfiend:main
Conversation 0 Commits 1 Files changed 3 +11 -11
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ChemistryForYou2/info.json
View file

@ -8,7 +8,7 @@
"homepage": "https://discord.gg/ufvFUJtVwk", "homepage": "https://discord.gg/ufvFUJtVwk",
"dependencies": [ "dependencies": [
"base >= 2.0.0", "base >= 2.0.0",
"? 248k-Redux", "? 248k-Redux >= 0.1.35",
"? Bio_Industries_2", "? Bio_Industries_2",
"? BrassTacks-Updated", "? BrassTacks-Updated",
"? bobassembly", "? bobassembly",

10
ChemistryForYou2/prototypes/recipes.lua
View file

@ -536,7 +536,7 @@ local science_pack = "__ChemistryForYou2__/graphics/icons/productivity-science-p
science_pack = "__Krastorio2Assets__/icons/cards/production-tech-card.png" science_pack = "__Krastorio2Assets__/icons/cards/production-tech-card.png"
end end
if mods["248k-Redux"] then if mods["248k-Redux"] then
local rich_water_filtration_results = {data.raw.item[lithium] and {type = "item", name=lithium, amount=5} or {type = "item", name="el_lithium_item", amount=5}, {type="fluid", name="water", amount=100}} local rich_water_filtration_results = {data.raw.item[lithium] and {type = "item", name=lithium, amount=5} or {type = "item", name="el_lithium", amount=5}, {type="fluid", name="water", amount=100}}
if data.raw.item["cobaltite-ore"] then if data.raw.item["cobaltite-ore"] then
table.insert(rich_water_filtration_results, { type = "item", name = "cobaltite-ore", amount=1, probability=0.2}) table.insert(rich_water_filtration_results, { type = "item", name = "cobaltite-ore", amount=1, probability=0.2})
end end
@ -577,8 +577,8 @@ local science_pack = "__ChemistryForYou2__/graphics/icons/productivity-science-p
order = "a-b", order = "a-b",
enabled = false, enabled = false,
energy_required = 60, energy_required = 60,
ingredients = {data.raw.fluid["kr-nitric-acid"] and {type="fluid", name="kr-nitric-acid", amount=100} or {type="fluid", name="sulfuric-acid", amount=100}, {type="item", name="fi_materials_waste", amount=1}}, ingredients = {data.raw.fluid["kr-nitric-acid"] and {type="fluid", name="kr-nitric-acid", amount=100} or {type="fluid", name="sulfuric-acid", amount=100}, {type="item", name="fi_waste", amount=1}},
results = {{type="item", name="fi_plutonium239_item", amount=1, probability=0.05}, {type="item", name="uranium-238", amount=1, probability=0.1}, {type="item", name="fi_thorium232_item", amount=1, probability=0.2}}, results = {{type="item", name="fi_plutonium239", amount=1, probability=0.05}, {type="item", name="uranium-238", amount=1, probability=0.1}, {type="item", name="fi_thorium232", amount=1, probability=0.2}},
} }
}) })
end end
@ -1119,7 +1119,7 @@ if mods["space-exploration"] then
util.add_productivity("vitalic-purification") util.add_productivity("vitalic-purification")
table.insert(data.raw.lab["se-space-science-lab"].inputs, "productivity-science-pack") table.insert(data.raw.lab["se-space-science-lab"].inputs, "productivity-science-pack")
if mods["248k-Redux"] then if mods["248k-Redux"] then
local deep_space_ore_enrichment_ingredients = {{type="item", name="fu_space_probe_ore_item", amount=10}} local deep_space_ore_enrichment_ingredients = {{type="item", name="fu_space_probe_ore", amount=10}}
if data.raw.item["cobalt-nanotubes"] then if data.raw.item["cobalt-nanotubes"] then
table.insert(deep_space_ore_enrichment_ingredients, {type="item", name="cobalt-nanotubes", amount=8}) table.insert(deep_space_ore_enrichment_ingredients, {type="item", name="cobalt-nanotubes", amount=8})
end end
@ -1138,7 +1138,7 @@ if mods["space-exploration"] then
order = "a-b", order = "a-b",
enabled = false, enabled = false,
energy_required = 20, energy_required = 20,
ingredients = {{type="item", name="se-vulcanite-block", amount=1}, {type="item", name="fi_thorium232_item", amount=10}}, ingredients = {{type="item", name="se-vulcanite-block", amount=1}, {type="item", name="fi_thorium232", amount=10}},
results = {{type="item", name="se-vulcanite-enriched", amount=5}}, results = {{type="item", name="se-vulcanite-enriched", amount=5}},
}, },
{ {

10
ChemistryForYou2/recipe-modify.lua
View file

@ -6,7 +6,7 @@ local glass_name = mods["Krastorio2"] and "kr-glass" or "glass"
-- Mod changes -- Mod changes
if mods["248k-Redux"] then if mods["248k-Redux"] then
util.remove_ingredient("satellite", "fu_materials_KFK") util.remove_ingredient("satellite", "fu_KFK")
util.add_prerequisite("fi_ceramic_tech","productivity-science-pack") util.add_prerequisite("fi_ceramic_tech","productivity-science-pack")
data.raw.technology["fi_ceramic_tech"].unit.ingredients[#data.raw.technology["fi_ceramic_tech"].unit.ingredients+1] = {"productivity-science-pack", 1} data.raw.technology["fi_ceramic_tech"].unit.ingredients[#data.raw.technology["fi_ceramic_tech"].unit.ingredients+1] = {"productivity-science-pack", 1}
@ -25,11 +25,11 @@ if mods["248k-Redux"] then
util.add_unlock("el_lithium_tech","lithium-hydroxide") util.add_unlock("el_lithium_tech","lithium-hydroxide")
if mods["LithiumFix"] then if mods["LithiumFix"] then
util.replace_ingredient("el_lithium_battery_recipe", "lithium", "lithium-hydroxide", 4) util.replace_ingredient("el_lithium_battery", "lithium", "lithium-hydroxide", 4)
util.replace_ingredient("el_lithium_basic_battery_recipe", "lithium", "lithium-hydroxide", 4) util.replace_ingredient("el_lithium_basic_battery", "lithium", "lithium-hydroxide", 4)
else else
util.replace_ingredient("el_lithium_battery_recipe", "el_lithium_item", "lithium-hydroxide", 4) util.replace_ingredient("el_lithium_battery", "el_lithium", "lithium-hydroxide", 4)
util.replace_ingredient("el_lithium_basic_battery_recipe", "el_lithium_item", "lithium-hydroxide", 4) util.replace_ingredient("el_lithium_basic_battery", "el_lithium", "lithium-hydroxide", 4)
end end
end end