From 7753800bb23612c54e56ab81270654de9dbf6126 Mon Sep 17 00:00:00 2001 From: Brevven Date: Fri, 31 Dec 2021 04:23:05 -0800 Subject: [PATCH] several recipe updates, fe+ too --- carbon-recipe-updates.lua | 25 +++++++++++++++++++++---- carbon-recipe.lua | 4 ++-- changelog.txt | 19 ++++++++++++++++++- data-util.lua | 15 +++++++++++++++ info.json | 2 +- 5 files changed, 57 insertions(+), 8 deletions(-) diff --git a/carbon-recipe-updates.lua b/carbon-recipe-updates.lua index d1a28e6..5a4033e 100644 --- a/carbon-recipe-updates.lua +++ b/carbon-recipe-updates.lua @@ -64,12 +64,22 @@ util.add_ingredient("battery", "graphite", 1) util.add_ingredient("pump", "graphite", 2) -util.add_ingredient("speed-module-2", "diamond", 4) -util.add_ingredient("effectivity-module-2", "diamond", 4) -util.add_ingredient("productivity-module-2", "diamond", 4) +if data.raw.recipe["speed-module-5"] then + util.add_ingredient("speed-module-5", "diamond", 5) + util.add_ingredient("effectivity-module-5", "diamond", 5) + util.add_ingredient("productivity-module-5", "diamond", 5) +elseif data.raw.recipe["speed-module-4"] then + util.add_ingredient("speed-module-4", "diamond", 6) + util.add_ingredient("effectivity-module-4", "diamond", 6) + util.add_ingredient("productivity-module-4", "diamond", 6) +else + util.add_ingredient("speed-module-2", "diamond", 1) + util.add_ingredient("effectivity-module-2", "diamond", 1) + util.add_ingredient("productivity-module-2", "diamond", 1) +end util.add_ingredient("assembling-machine-3", "diamond", 4) util.add_ingredient("low-density-structure", "diamond", 1) -util.add_ingredient("centrifuge", "diamond", 10) +util.add_ingredient("laser-turret", "diamond", 1) if mods.Krastorio2 then util.replace_some_ingredient("steel-plate", "iron-plate", 2, "graphite", 4) @@ -144,6 +154,7 @@ util.add_ingredient("se-space-particle-accelerator", "graphite", 10) util.add_ingredient("se-space-particle-collider", "graphite", 10) util.add_ingredient("se-canister", "graphite", 1) util.add_ingredient("se-naquium-ingot", "graphite", 1) +util.add_ingredient("se-antimatter-reactor", "graphite", 500) util.replace_some_ingredient("se-naquium-powder", "se-vitalic-acid", 2, "graphene", 2) util.add_ingredient("se-quantum-processor", "graphene", 1) @@ -155,6 +166,8 @@ util.add_ingredient("se-space-genetics-facility", "graphene", 20) util.add_ingredient("se-space-growth-facility", "graphene", 4) util.add_ingredient("se-nanomaterial", "graphene", 1) util.add_ingredient("se-void-probe", "graphene", 100) +util.add_ingredient("se-adaptive-armour-equipment-4", "graphene", 20) +util.add_ingredient("se-thuster-suit-2", "graphene", 50) util.add_ingredient("se-space-radiator-2", "diamond", 16) util.add_ingredient("se-rigidity-data", "diamond", 1) @@ -228,3 +241,7 @@ util.add_ingredient("quarry-mk3", "diamond", 10) -- FastFurnaces util.add_ingredient("reika-fast-electric-mining-drill", "diamond", 1) + + +-- Power Armor Mk3 +util.add_ingredient("pamk3-pamk3", "graphene", 60) diff --git a/carbon-recipe.lua b/carbon-recipe.lua index 27b4f66..4c060b3 100644 --- a/carbon-recipe.lua +++ b/carbon-recipe.lua @@ -265,7 +265,7 @@ function lds_recipe() if mods.bztitanium then if mods.bzzirconium then return { - {type="item", name="titanium-plate", amount=2}, + {type="item", name=util.titanium_plate, amount=2}, {type="item", name="nanotubes", amount=2}, {type="item", name="plastic-bar", amount=2}, {type="item", name="zirconia", amount=2}, @@ -273,7 +273,7 @@ function lds_recipe() } end return { - {type="item", name="titanium-plate", amount=2}, + {type="item", name=util.titanium_plate, amount=2}, {type="item", name="nanotubes", amount=5}, {type="item", name="plastic-bar", amount=5}, {type="item", name="diamond", amount=1}, diff --git a/changelog.txt b/changelog.txt index 5fe15dd..e087721 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,23 @@ --------------------------------------------------------------------------------------------------- +Version: 0.0.3 +Date: 2021-12-31 + Changes: + - Diamonds no longer used in centrifuge + - Diamonds now used in laser turrets + - Module 2s require 1 diamond now. + - If tier 5 or 4 modules exist, use more diamonds there instead of tier 2 + - Some minor SE recipe updates + - Other minor compatibility tweaks + Fixes: + - Now loads with FE+ (loose compatibility) +--------------------------------------------------------------------------------------------------- +Version: 0.0.2 +Date: 2021-12-31 + Fixes: + - Works with Deadlock's Stacked Mining now. +--------------------------------------------------------------------------------------------------- Version: 0.0.1 -Date: 2021-11-29 +Date: 2021-12-30 Features: - Alpha version (things might change, possibly a lot) - Adds Flake Graphite, Graphite, Diamonds, Graphene diff --git a/data-util.lua b/data-util.lua index a416efc..e618ff2 100644 --- a/data-util.lua +++ b/data-util.lua @@ -8,6 +8,15 @@ local util = {} util.me = me util.get_setting = util.me.get_setting +util.titanium_plate = "" +util.titanium_processing = "" + +if mods["FactorioExtended-Plus-Core"] then + util.titanium_plate = "titanium-alloy" +else + util.titanium_plate = "titanium-plate" +end + function util.fe_plus(sub) if mods["FactorioExtended-Plus-"..sub] then return true @@ -435,4 +444,10 @@ function add_to_product(recipe, product, amount) end end +function util.add_minable_result(t, name, result) + if data.raw[t] and data.raw[t][name] and data.raw[t][name].minable and data.raw[t][name].minable.results then + table.insert(data.raw[t][name].minable.results, result) + end +end + return util diff --git a/info.json b/info.json index 6669ad6..d330af1 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bzcarbon", - "version": "0.0.2", + "version": "0.0.3", "factorio_version": "1.1", "title": "Graphite & Diamonds", "author": "Brevven",