From f5c83d7152b86eae10017a4179a80f59b030e75d Mon Sep 17 00:00:00 2001 From: Adamo Date: Fri, 26 Jun 2020 02:39:47 -0400 Subject: [PATCH] Updated with new recipe trolling algorithm. --- changelog.txt | 4 +- data-final-fixes.lua | 13 ----- data-updates.lua | 33 +++++++++++ data.lua | 133 +++++++++++++------------------------------ 4 files changed, 75 insertions(+), 108 deletions(-) delete mode 100644 data-final-fixes.lua diff --git a/changelog.txt b/changelog.txt index 797a107..5144eb4 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,11 +1,13 @@ --------------------------------------------------------------------------------------------------- Version: 0.2.0 -Date: 2020-06-22 +Date: 2020-06-26 Changes: - Added algorithm to replace vanilla uranium items with Adamo Nuclear uranium items. - Added boolean settings for recipe overrides. + - Added steel sink for depleted uranium. + --------------------------------------------------------------------------------------------------- Version: 0.1.3 diff --git a/data-final-fixes.lua b/data-final-fixes.lua deleted file mode 100644 index 075a915..0000000 --- a/data-final-fixes.lua +++ /dev/null @@ -1,13 +0,0 @@ -require("factsheet") - -if settings.startup["adamo-nuclear-recipe-trolling"].value then - for _,recipe in pairs(data.raw.recipe) do - if recipe_uses(recipe,"uranium-238") then - replace_in_recipe_io( - recipe, - "uranium-238", - "adamo-nuclear-DU-oxide" - ) - end - end -end \ No newline at end of file diff --git a/data-updates.lua b/data-updates.lua index 129f710..63ea087 100644 --- a/data-updates.lua +++ b/data-updates.lua @@ -339,3 +339,36 @@ if not data.raw.fluid["adamo-chemical-hydrofluoric-acid"] then } ) end + + +adamomods.logging=true + +if settings.startup["adamo-nuclear-recipe-trolling"].value then + for _,recipe in pairs(data.raw.recipe) do + if recipe_uses(recipe,"uranium-238") then + replace_recipe_io( + recipe, + "uranium-238", + "adamo-nuclear-DU-oxide" + ) + end + if recipe_uses(recipe,"uranium-235") then + replace_recipe_io( + recipe, + "uranium-235", + "adamo-nuclear-HEU-oxide" + ) + end + end +end + +local FeU_recipe = table.deepcopy(data.raw.recipe["steel-plate"]) +FeU_recipe.name = "adamo-nuclear-steel-plate" +local fe_name,fe_count = get_ingredient(FeU_recipe,'iron-plate') +add_ingredient(FeU_recipe,'adamo-nuclear-DU-oxide',fe_count) +replace_recipe_io(FeU_recipe,'iron-plate','iron-ore') +mult_recipe_io(FeU_recipe,2,'steel-plate') +data:extend({FeU_recipe}) +add_recipe_to_tech("uranium-processing","adamo-nuclear-steel-plate") + +adamomods.logging=false \ No newline at end of file diff --git a/data.lua b/data.lua index 17a90a8..eb03822 100644 --- a/data.lua +++ b/data.lua @@ -1052,105 +1052,50 @@ data:extend({ thermal_reactor_recipe, prod_reactor_recipe, }) -add_recipe_to_tech("uranium-processing", - "adamo-nuclear-urania-by-H2SO4" -) -add_recipe_to_tech("uranium-processing", - "adamo-nuclear-urania-by-HF" -) -add_recipe_to_tech("uranium-processing", - "adamo-nuclear-natural-uranium-hex" -) -add_recipe_to_tech("uranium-processing", - "adamo-nuclear-LEU-enrichment" -) -add_recipe_to_tech("uranium-processing", - "adamo-nuclear-LEU-fuel-cell" -) -add_recipe_to_tech("uranium-processing", +add_recipes_to_tech("uranium-processing", { + "adamo-nuclear-urania-by-H2SO4", + "adamo-nuclear-urania-by-HF", + "adamo-nuclear-natural-uranium-hex", + "adamo-nuclear-LEU-enrichment", + "adamo-nuclear-LEU-fuel-cell", "adamo-nuclear-thermal-reactor" -) -add_recipe_to_tech("nuclear-power", - "adamo-nuclear-HEU-enrichment" -) -add_recipe_to_tech("nuclear-power", - "adamo-nuclear-WGU-enrichment" -) -move_recipe_to_tech("nuclear-power", +}) +add_recipes_to_tech("nuclear-power", { + "adamo-nuclear-HEU-enrichment", + "adamo-nuclear-WGU-enrichment", "atomic-bomb" -) -add_recipe_to_tech("nuclear-fuel-reprocessing", - "adamo-nuclear-LEU-PUREX-by-HF" -) -add_recipe_to_tech("nuclear-fuel-reprocessing", - "adamo-nuclear-LEU-PUREX-by-H2SO4" -) -add_recipe_to_tech("nuclear-fuel-reprocessing", - "adamo-nuclear-LEU-REMIX" -) -add_recipe_to_tech("nuclear-fuel-reprocessing", - "adamo-nuclear-HEU-PUREX-by-HF" -) -add_recipe_to_tech("nuclear-fuel-reprocessing", - "adamo-nuclear-HEU-PUREX-by-H2SO4" -) -add_recipe_to_tech("nuclear-fuel-reprocessing", - "adamo-nuclear-LEU-PUREX-enrichment" -) -add_recipe_to_tech("nuclear-fuel-reprocessing", - "adamo-nuclear-HEU-PUREX-enrichment" -) -add_recipe_to_tech("nuclear-fuel-reprocessing", - "adamo-nuclear-transmute-Pu238-oxide" -) -add_recipe_to_tech("nuclear-fuel-reprocessing", - "adamo-nuclear-highgrade-RGPu-oxide" -) -add_recipe_to_tech("nuclear-fuel-reprocessing", +}) +add_recipes_to_tech("nuclear-fuel-reprocessing", { + "adamo-nuclear-LEU-PUREX-by-HF", + "adamo-nuclear-LEU-PUREX-by-H2SO4", + "adamo-nuclear-LEU-REMIX", + "adamo-nuclear-HEU-PUREX-by-HF", + "adamo-nuclear-HEU-PUREX-by-H2SO4", + "adamo-nuclear-LEU-PUREX-enrichment", + "adamo-nuclear-HEU-PUREX-enrichment", + "adamo-nuclear-transmute-Pu238-oxide", + "adamo-nuclear-highgrade-RGPu-oxide", "adamo-nuclear-raffinate-processing" -) -add_recipe_to_tech("kovarex-enrichment-process", - "adamo-nuclear-aqueous-raffinate-processing" -) -add_recipe_to_tech("kovarex-enrichment-process", - "adamo-nuclear-production-reactor" -) -add_recipe_to_tech("kovarex-enrichment-process", - "adamo-nuclear-MOX-fuel-cell" -) -add_recipe_to_tech("kovarex-enrichment-process", +}) +add_recipes_to_tech("kovarex-enrichment-process", { + "adamo-nuclear-aqueous-raffinate-processing", + "adamo-nuclear-production-reactor", + "adamo-nuclear-MOX-fuel-cell", "adamo-nuclear-MOX-REMIX" -) -add_recipe_to_tech("atomic-bomb", - "adamo-nuclear-WGPu-enrichment" -) -add_recipe_to_tech("atomic-bomb", +}) +add_recipes_to_tech("atomic-bomb", { + "adamo-nuclear-WGPu-enrichment", "adamo-nuclear-thermonuclear-rocket" -) -for _,table_name in pairs({ - "productivity-module", - "productivity-module-2", - "productivity-module-3" -}) do - table.insert(data.raw.module[table_name].limitation, - "adamo-nuclear-urania-by-H2SO4" - ) - table.insert(data.raw.module[table_name].limitation, - "adamo-nuclear-urania-by-HF" - ) - table.insert(data.raw.module[table_name].limitation, - "adamo-nuclear-raffinate-processing" - ) - table.insert(data.raw.module[table_name].limitation, - "adamo-nuclear-transmute-Pu238-oxide" - ) - table.insert(data.raw.module[table_name].limitation, - "adamo-nuclear-natural-uranium-hex" - ) - table.insert(data.raw.module[table_name].limitation, - "adamo-nuclear-highgrade-RGPu-oxide" - ) -end +}) +set_productivity_recipes({ + "adamo-nuclear-urania-by-H2SO4", + "adamo-nuclear-urania-by-HF", + "adamo-nuclear-raffinate-processing", + "adamo-nuclear-transmute-Pu238-oxide", + "adamo-nuclear-natural-uranium-hex", + "adamo-nuclear-highgrade-RGPu-oxide" +}) + -- Oxides and hexes. local order_number = 1 data:extend({{