From 6902e714ddef80c5ffb8a26041b17aa70befd9c0 Mon Sep 17 00:00:00 2001 From: Adamo Date: Wed, 20 Dec 2023 18:37:40 -0500 Subject: [PATCH] Add deadlock crating. --- data-final-fixes.lua | 9 ++ data-updates.lua | 4 +- data.lua | 257 +++++++++++++++---------------------------- info.json | 3 +- 4 files changed, 102 insertions(+), 171 deletions(-) diff --git a/data-final-fixes.lua b/data-final-fixes.lua index b23ed3b..863f3b7 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -597,3 +597,12 @@ if data.raw["recipe-category"]["screening"] then end end end + +if deadlock_crating then + deadlock_crating.add_crate(calcite_item.name,"deadlock-crating-1") + deadlock_crating.add_crate(clinker_item.name,"deadlock-crating-1") + deadlock_crating.add_crate(gypsum_item.name,"deadlock-crating-1") + deadlock_crating.add_crate(fluorite_item.name,"deadlock-crating-1") + deadlock_crating.add_crate(cement_item.name,"deadlock-crating-1") + deadlock_crating.add_crate(quartz_item.name,"deadlock-crating-1") +end \ No newline at end of file diff --git a/data-updates.lua b/data-updates.lua index 3652aa1..cd7fbf5 100644 --- a/data-updates.lua +++ b/data-updates.lua @@ -95,5 +95,5 @@ if data.raw["assembling-machine"][kiln_name] then ) end -adamo.tech.add.recipe("advanced-material-processing-2","centrifuge") -adamo.tech.add.prereq("uranium-processing","advanced-material-processing-2") +adamo.recipe.set.tech("advanced-material-processing-2","centrifuge") +adamo.tech.add.prereq("uranium-processing","adamo-chemical-fluorine-processing") diff --git a/data.lua b/data.lua index c2dd4d3..fc16950 100644 --- a/data.lua +++ b/data.lua @@ -126,7 +126,7 @@ local fluorine_processing_tech = { recipe = "adamo-chemical-hydrofluoric-acid" }, }, - prerequisites = {"chemical-science-pack"}, + prerequisites = {"advanced-material-processing-2"}, unit = { count = 150, @@ -143,9 +143,8 @@ data:extend({ fluorine_processing_tech, }) -adamo.tech.add.prereq("advanced-material-processing-2","adamo-chemical-fluorine-processing") -local calcite_item = { +calcite_item = { type = "item", name = "adamo-chemical-calcite", icon = "__adamo-chemical__/graphics/icons/calcite.png", @@ -154,7 +153,7 @@ local calcite_item = { order = "g1[adamo-chemical-calcite]", stack_size = 50 } -local clinker_item = { +clinker_item = { type = "item", name = "adamo-chemical-clinker", icon = "__adamo-chemical__/graphics/icons/clinker.png", @@ -163,7 +162,7 @@ local clinker_item = { order = "g1[adamo-chemical-clinker]", stack_size = 50 } -local gypsum_item = { +gypsum_item = { type = "item", name = "adamo-chemical-gypsum", icon = "__adamo-chemical__/graphics/icons/gypsum.png", @@ -172,7 +171,7 @@ local gypsum_item = { order = "g1[adamo-chemical-gypsum]", stack_size = 50 } -local fluorite_item = { +fluorite_item = { type = "item", name = "adamo-chemical-fluorite", icon = "__adamo-chemical__/graphics/icons/fluorite.png", @@ -181,7 +180,7 @@ local fluorite_item = { order = "h1[adamo-chemical-fluorite]", stack_size = 50 } -local cement_item = { +cement_item = { type = "item", name = "adamo-chemical-cement", icon = "__adamo-chemical__/graphics/icons/cement.png", @@ -197,27 +196,19 @@ data:extend({ fluorite_item, cement_item }) -local found_sisiquartz = false -if data.raw.item["SiSi-quartz"] then - data.raw.item["SiSi-quartz"].order = "g[adamo-chemical-quartz]" - data.raw.item["SiSi-quartz"].subgroup = "raw-material" - --data.raw.item["SiSi-quartz"] - --.icon = "__adamo-chemical__/graphics/icons/quartz.png" - --data.raw.item["SiSi-quartz"] - --.icon_size = 64 - found_sisiquartz = true - if data.raw.recipe["SiSi-quartz"] then - data.raw.recipe["SiSi-quartz"] - .normal.hidden = true - data.raw.recipe["SiSi-quartz"] - .expensive.hidden = true - data.raw.recipe["SiSi-quartz"] - .icon = nil - data.raw.recipe["SiSi-quartz"] - .icon_size = nil +quartz_item = data.raw.item["SiSi-quartz"] +local quartz_recipe = data.raw.recipe["SiSi-quartz"] +if quartz_item then + quartz_item.order = "g[adamo-chemical-quartz]" + quartz_item.subgroup = "raw-material" + if quartz_recipe then + quartz_recipe.normal.hidden = true + quartz_recipe.expensive.hidden = true + quartz_recipe.icon = nil + quartz_recipe.icon_size = nil end else - local quartz_item = { + quartz_item = { type = "item", name = "adamo-chemical-quartz", icon = "__adamo-chemical__/graphics/icons/quartz.png", @@ -514,6 +505,37 @@ local basic_froth_flotation_recipe = { name = "water", amount = water_input_count }}, + results = {{ + type = "item", + name = quartz_item.name, + probability = adamo.geo.abundance.quartz, + amount = mineral_output_count*recover_ratio + },{ + type = "item", + name = calcite_item.name, + probability = adamo.geo.abundance.calcite, + amount = mineral_output_count*recover_ratio + },{ + type = "item", + name = gypsum_item.name, + probability = adamo.geo.abundance.gypsum, + amount = mineral_output_count*recover_ratio + },{ + type = "item", + name = "iron-ore", + probability = adamo.geo.abundance.iron, + amount = mineral_output_count*adv_recover_ratio + },{ + type = "item", + name = "copper-ore", + probability = adamo.geo.abundance.copper, + amount = mineral_output_count*adv_recover_ratio + },{ + type = "item", + name = "coal", + probability = adamo.geo.abundance.coal, + amount = mineral_output_count*adv_recover_ratio + }}, crafting_machine_tint = { primary = adamo.colors.softgreen, secondary = data.raw.fluid.water.base_color, @@ -543,6 +565,47 @@ local advanced_froth_flotation_recipe = { name = "water", amount = water_input_count }}, + results = {{ + type = "item", + name = quartz_item.name, + probability = adamo.geo.abundance.quartz, + amount = mineral_output_count*adv_recover_ratio + },{ + type = "item", + name = fluorite_item.name, + probability = adamo.geo.abundance.fluorite, + amount = mineral_output_count*adv_recover_ratio + },{ + type = "item", + name = calcite_item.name, + probability = adamo.geo.abundance.calcite, + amount = mineral_output_count*adv_recover_ratio + },{ + type = "item", + name = gypsum_item.name, + probability = adamo.geo.abundance.gypsum, + amount = mineral_output_count*adv_recover_ratio + },{ + type = "item", + name = "sulfur", + probability = adamo.geo.abundance.sulfur, + amount = mineral_output_count*adv_recover_ratio + },{ + type = "item", + name = "iron-ore", + probability = adamo.geo.abundance.iron, + amount = mineral_output_count*adv_recover_ratio + },{ + type = "item", + name = "copper-ore", + probability = adamo.geo.abundance.copper, + amount = mineral_output_count*adv_recover_ratio + },{ + type = "item", + name = "coal", + probability = adamo.geo.abundance.coal, + amount = mineral_output_count*adv_recover_ratio + }}, crafting_machine_tint = { primary = adamo.colors.softgreen, secondary = data.raw.fluid.water.base_color, @@ -550,148 +613,6 @@ local advanced_froth_flotation_recipe = { quaternary = adamo.colors.highbrown, }, } -if found_sisiquartz then - basic_froth_flotation_recipe.results = {{ - type = "item", - name = "adamo-chemical-calcite", - probability = adamo.geo.abundance.calcite, - amount = mineral_output_count*recover_ratio - },{ - type = "item", - name = "adamo-chemical-gypsum", - probability = adamo.geo.abundance.gypsum, - amount = mineral_output_count*recover_ratio - },{ - type = "item", - name = "iron-ore", - probability = adamo.geo.abundance.iron, - amount = mineral_output_count*adv_recover_ratio - },{ - type = "item", - name = "copper-ore", - probability = adamo.geo.abundance.copper, - amount = mineral_output_count*adv_recover_ratio - },{ - type = "item", - name = "coal", - probability = adamo.geo.abundance.coal, - amount = mineral_output_count*adv_recover_ratio - }} - advanced_froth_flotation_recipe.results = {{ - type = "item", - name = "SiSi-quartz", - probability = adamo.geo.abundance.quartz, - amount = mineral_output_count*adv_recover_ratio - },{ - type = "item", - name = "adamo-chemical-fluorite", - probability = adamo.geo.abundance.fluorite, - amount = mineral_output_count*adv_recover_ratio - },{ - type = "item", - name = "adamo-chemical-calcite", - probability = adamo.geo.abundance.calcite, - amount = mineral_output_count*adv_recover_ratio - },{ - type = "item", - name = "adamo-chemical-gypsum", - probability = adamo.geo.abundance.gypsum, - amount = mineral_output_count*adv_recover_ratio - },{ - type = "item", - name = "sulfur", - probability = adamo.geo.abundance.sulfur, - amount = mineral_output_count*adv_recover_ratio - },{ - type = "item", - name = "iron-ore", - probability = adamo.geo.abundance.iron, - amount = mineral_output_count*adv_recover_ratio - },{ - type = "item", - name = "copper-ore", - probability = adamo.geo.abundance.copper, - amount = mineral_output_count*adv_recover_ratio - },{ - type = "item", - name = "coal", - probability = adamo.geo.abundance.coal, - amount = mineral_output_count*adv_recover_ratio - }} -else - basic_froth_flotation_recipe.results = {{ - type = "item", - name = "adamo-chemical-quartz", - probability = adamo.geo.abundance.quartz, - amount = mineral_output_count*recover_ratio - },{ - type = "item", - name = "adamo-chemical-calcite", - probability = adamo.geo.abundance.calcite, - amount = mineral_output_count*recover_ratio - },{ - type = "item", - name = "adamo-chemical-gypsum", - probability = adamo.geo.abundance.gypsum, - amount = mineral_output_count*recover_ratio - },{ - type = "item", - name = "iron-ore", - probability = adamo.geo.abundance.iron, - amount = mineral_output_count*adv_recover_ratio - },{ - type = "item", - name = "copper-ore", - probability = adamo.geo.abundance.copper, - amount = mineral_output_count*adv_recover_ratio - },{ - type = "item", - name = "coal", - probability = adamo.geo.abundance.coal, - amount = mineral_output_count*adv_recover_ratio - }} - advanced_froth_flotation_recipe.results = {{ - type = "item", - name = "adamo-chemical-quartz", - probability = adamo.geo.abundance.quartz, - amount = mineral_output_count*adv_recover_ratio - },{ - type = "item", - name = "adamo-chemical-fluorite", - probability = adamo.geo.abundance.fluorite, - amount = mineral_output_count*adv_recover_ratio - },{ - type = "item", - name = "adamo-chemical-calcite", - probability = adamo.geo.abundance.calcite, - amount = mineral_output_count*adv_recover_ratio - },{ - type = "item", - name = "adamo-chemical-gypsum", - probability = adamo.geo.abundance.gypsum, - amount = mineral_output_count*adv_recover_ratio - },{ - type = "item", - name = "sulfur", - probability = adamo.geo.abundance.sulfur, - amount = mineral_output_count*adv_recover_ratio - },{ - type = "item", - name = "iron-ore", - probability = adamo.geo.abundance.iron, - amount = mineral_output_count*adv_recover_ratio - },{ - type = "item", - name = "copper-ore", - probability = adamo.geo.abundance.copper, - amount = mineral_output_count*adv_recover_ratio - },{ - type = "item", - name = "coal", - probability = adamo.geo.abundance.coal, - amount = mineral_output_count*adv_recover_ratio - }} -end data:extend({ calcite_recipe, gypsum_recipe, diff --git a/info.json b/info.json index 6cabb68..ee236d8 100644 --- a/info.json +++ b/info.json @@ -6,7 +6,8 @@ "dependencies": [ "base", "SimpleSilicon", - "? informatron" + "? informatron", + "? DeadlockCrating" ], "description": "Chemical reverse engineering.", "factorio_version": "1.1"