diff --git a/carbon-recipe-final-se.lua b/carbon-recipe-final-se.lua index f48ab59..e0830de 100644 --- a/carbon-recipe-final-se.lua +++ b/carbon-recipe-final-se.lua @@ -2,57 +2,59 @@ local futil = require("util") local util = require("__bzcarbon__.data-util"); if mods["space-exploration"] then -if util.me.use_fullerenes() then - -- Add an extra nanotube aeroframe scaffold recipe. - -- This could be moved to data-updates in future if necessary - data:extend({ - { - type = "recipe", - name = "aeroframe-scaffold-nanotubes", - icons = { - { icon = data.raw.item["se-aeroframe-scaffold"].icon, icon_size = data.raw.item["se-aeroframe-scaffold"].icon_size}, - { icon = "__bzcarbon__/graphics/icons/nanotube.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, - }, - category = "crafting", - order = data.raw.item["se-aeroframe-scaffold"].order.."z", - enabled = false, - energy_required = 2, - ingredients = { - {"nanotubes", 2}, - table.unpack(futil.table.deepcopy(data.raw.recipe["se-aeroframe-scaffold"].ingredients)), - }, - result = "se-aeroframe-scaffold", - result_count = 2, - }, - }) - util.add_effect("se-aeroframe-scaffold", {type="unlock-recipe", recipe="aeroframe-scaffold-nanotubes"}) - - data:extend({ - { - type = "recipe", - name = "nanomaterial-nanotubes", - icons = { - { icon = data.raw.item["se-nanomaterial"].icon, icon_size = data.raw.item["se-nanomaterial"].icon_size}, - { icon = "__bzcarbon__/graphics/icons/nanotube.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, - }, - category = data.raw.recipe["se-nanomaterial"].category, - order = data.raw.item["se-nanomaterial"].order.."z", - subgroup = data.raw.item["se-nanomaterial"].subgroup, - enabled = false, - energy_required = data.raw.recipe["se-nanomaterial"].energy_required, - ingredients = { - {"nanotubes", 2}, - table.unpack(futil.table.deepcopy(data.raw.recipe["se-nanomaterial"].ingredients)), - }, - results = { - table.unpack(futil.table.deepcopy(data.raw.recipe["se-nanomaterial"].results)), - } - } - }) - util.add_to_product("nanomaterial-nanotubes", "se-nanomaterial", 16) - util.add_effect("se-nanomaterial", {type="unlock-recipe", recipe="nanomaterial-nanotubes"}) - -- core mining balancing - util.add_to_product("se-core-fragment-omni", "graphite", -3) + util.add_to_product("se-core-fragment-omni", "flake-graphite", -3) + util.remove_product("se-core-fragment-omni", "rough-diamond") + + if util.me.use_fullerenes() then + -- Add an extra nanotube aeroframe scaffold recipe. + -- This could be moved to data-updates in future if necessary + data:extend({ + { + type = "recipe", + name = "aeroframe-scaffold-nanotubes", + icons = { + { icon = data.raw.item["se-aeroframe-scaffold"].icon, icon_size = data.raw.item["se-aeroframe-scaffold"].icon_size}, + { icon = "__bzcarbon__/graphics/icons/nanotube.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, + }, + category = "crafting", + order = data.raw.item["se-aeroframe-scaffold"].order.."z", + enabled = false, + energy_required = 2, + ingredients = { + {"nanotubes", 2}, + table.unpack(futil.table.deepcopy(data.raw.recipe["se-aeroframe-scaffold"].ingredients)), + }, + result = "se-aeroframe-scaffold", + result_count = 2, + }, + }) + util.add_effect("se-aeroframe-scaffold", {type="unlock-recipe", recipe="aeroframe-scaffold-nanotubes"}) + + data:extend({ + { + type = "recipe", + name = "nanomaterial-nanotubes", + icons = { + { icon = data.raw.item["se-nanomaterial"].icon, icon_size = data.raw.item["se-nanomaterial"].icon_size}, + { icon = "__bzcarbon__/graphics/icons/nanotube.png", icon_size = 128, scale=0.125, shift= {-8, -8}}, + }, + category = data.raw.recipe["se-nanomaterial"].category, + order = data.raw.item["se-nanomaterial"].order.."z", + subgroup = data.raw.item["se-nanomaterial"].subgroup, + enabled = false, + energy_required = data.raw.recipe["se-nanomaterial"].energy_required, + ingredients = { + {"nanotubes", 2}, + table.unpack(futil.table.deepcopy(data.raw.recipe["se-nanomaterial"].ingredients)), + }, + results = { + table.unpack(futil.table.deepcopy(data.raw.recipe["se-nanomaterial"].results)), + } + } + }) + util.add_to_product("nanomaterial-nanotubes", "se-nanomaterial", 16) + util.add_effect("se-nanomaterial", {type="unlock-recipe", recipe="nanomaterial-nanotubes"}) + end end diff --git a/changelog.txt b/changelog.txt index d8bf9cb..96d4a4c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,10 @@ --------------------------------------------------------------------------------------------------- +Version: 0.0.21 +Date: 2022-01-25 + Changes: + - SE core mining omni - no diamonds, fix graphite balance + - Minor compatibility tweaks +--------------------------------------------------------------------------------------------------- Version: 0.0.20 Date: 2022-01-19 Features: diff --git a/info.json b/info.json index 74daf91..336e866 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bzcarbon", - "version": "0.0.20", + "version": "0.0.21", "factorio_version": "1.1", "title": "Graphite & Diamonds", "author": "Brevven",