diff --git a/changelog.txt b/changelog.txt index 1417f35..1be64bf 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,16 @@ --------------------------------------------------------------------------------------------------- +Version: 0.3.10 +Date: 2022-08-06 + Fixes: + - Steam is now properly required in vtk deepcore mining + - Bypass setting fixed for added products +--------------------------------------------------------------------------------------------------- +Version: 0.3.9 +Date: 2022-08-03 + Fixes: + - Balance no-uranium vtk deepcore mining recipe. + - Add some missing vtk deepcore mining strings +--------------------------------------------------------------------------------------------------- Version: 0.3.8 Date: 2022-08-02 Changes: diff --git a/compatibility/vtkdeepcoremining.lua b/compatibility/vtkdeepcoremining.lua new file mode 100644 index 0000000..5cf545a --- /dev/null +++ b/compatibility/vtkdeepcoremining.lua @@ -0,0 +1,49 @@ +local util = require("data-util"); + +if mods["vtk-deep-core-mining"] then + if util.me.use_rough_diamond() then + local amt = 0 + if data.raw.recipe["vtk-deepcore-mining-ore-chunk-refining"] then + for i, product in pairs(data.raw.recipe["vtk-deepcore-mining-ore-chunk-refining"].results) do + if product.name == "vtk-deepcore-mining-rough-diamond-chunk" then + amt = product.amount - 1 + end + if product[1] == "vtk-deepcore-mining-rough-diamond-chunk" then + amt = product[2] - 1 + end + end + util.add_to_product("vtk-deepcore-mining-ore-chunk-refining", + "vtk-deepcore-mining-rough-diamond-chunk", 0-amt) + util.add_to_product("vtk-deepcore-mining-ore-chunk-refining", + "vtk-deepcore-mining-flake-graphite-chunk", amt) + end + amt = 0 + if data.raw.recipe["vtk-deepcore-mining-ore-chunk-refining-no-uranium"] then + for i, product in pairs(data.raw.recipe["vtk-deepcore-mining-ore-chunk-refining-no-uranium"].results) do + if product.name == "vtk-deepcore-mining-rough-diamond-chunk" then + amt = product.amount - 1 + end + if product[1] == "vtk-deepcore-mining-rough-diamond-chunk" then + amt = product[2] - 1 + end + end + util.add_to_product("vtk-deepcore-mining-ore-chunk-refining-no-uranium", + "vtk-deepcore-mining-rough-diamond-chunk", 0-amt) + util.add_to_product("vtk-deepcore-mining-ore-chunk-refining-no-uranium", + "vtk-deepcore-mining-flake-graphite-chunk", amt) + end + end + + + -- deepcore mining was not adding required fluid, add if it doesn't have + for i, resource in pairs({"flake-graphite-patch", "flake-graphite-patch-chunk", "flake-graphite-patch-ore"}) do + if data.raw.resource[resource] and + data.raw.resource[resource].minable and + not data.raw.resource[resource].minable.required_fluid then + data.raw.resource[resource].minable.required_fluid = "steam" + data.raw.resource[resource].minable.fluid_amount = 1 + end + end + +end + diff --git a/data-final-fixes.lua b/data-final-fixes.lua index b8c6c09..833022f 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -3,28 +3,11 @@ require("carbon-recipe-final-k2") require("carbon-recipe-final-se") require("carbon-recipe-final-rrr") require("low-density-structure-nanotubes") +require("compatibility/vtkdeepcoremining") require("carbon-recipe-modules") -- Should be last import, need in both updates and final-fixes local util = require("data-util"); -if util.me.use_rough_diamond() then - local amt = 0 - if data.raw.recipe["vtk-deepcore-mining-ore-chunk-refining"] then - for i, product in pairs(data.raw.recipe["vtk-deepcore-mining-ore-chunk-refining"].results) do - if product.name == "vtk-deepcore-mining-rough-diamond-chunk" then - amt = product.amount - 1 - end - if product[1] == "vtk-deepcore-mining-rough-diamond-chunk" then - amt = product[2] - end - end - util.add_to_product("vtk-deepcore-mining-ore-chunk-refining", - "vtk-deepcore-mining-rough-diamond-chunk", 0-amt) - util.add_to_product("vtk-deepcore-mining-ore-chunk-refining", - "vtk-deepcore-mining-flake-graphite-chunk", amt) - end -end - -- Green circuits in final fixes due to K2 shenanigans if mods.MDbobelectronics or mods.bobelectronics then diff --git a/info.json b/info.json index 0e51482..d0e5620 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bzcarbon", - "version": "0.3.8", + "version": "0.3.10", "factorio_version": "1.1", "title": "Graphite & Diamonds", "author": "Brevven", diff --git a/locale/en/carbon.cfg b/locale/en/carbon.cfg index b5d4b51..95fe467 100644 --- a/locale/en/carbon.cfg +++ b/locale/en/carbon.cfg @@ -72,6 +72,8 @@ dirty-water-filtration-graphite=Filter dirty water [item=flake-graphite] vtk-deepcore-mining-ore-chunk-refining-graphite-focus=__ITEM__graphite__ focused ore chunk refining vtk-deepcore-mining-ore-chunk-refining-diamond-focus=__ITEM__diamond__ focused ore chunk refining +vtk-deepcore-mining-graphite-chunk-refining=__ITEM__flake-graphite__ chunk refining +vtk-deepcore-mining-diamond-chunk-refining=__ITEM__rough-diamond__ chunk refining [recipe-description] graphite-carbon-black=Convert excess carbon black to graphite at an unfavorable ratio.