diff --git a/carbon-recipe-updates.lua b/carbon-recipe-updates.lua index 4edc85c..1b7e719 100644 --- a/carbon-recipe-updates.lua +++ b/carbon-recipe-updates.lua @@ -20,6 +20,9 @@ for i, ingredient in pairs(util.me.crucible_ingredients) do end for i, furnace in pairs(util.me.furnaces) do util.add_ingredient(furnace, "crucible", 1) + for j, ingredient in pairs(util.me.crucible_ingredients) do + util.remove_ingredient(furnace, ingredient) + end end -- fullerenes & nanotubes @@ -59,7 +62,7 @@ if util.me.use_carbon_black() then end util.add_effect("plastics", {type="unlock-recipe", recipe="carbon-black"}) - util.add_effect("plastics", {type="unlock-recipe", recipe="graphite-carbon-black"}) + util.add_effect("oil-processing", {type="unlock-recipe", recipe="graphite-carbon-black"}) end diff --git a/changelog.txt b/changelog.txt index e64ffb1..aa3fe16 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,8 +1,17 @@ --------------------------------------------------------------------------------------------------- +Version: 0.1.2 +Date: 2022-01-30 + Changes: + - More minor tech tree tweaks + - More compatibility tweaks +--------------------------------------------------------------------------------------------------- Version: 0.1.1 Date: 2022-01-29 Changes: - SE ballistic shielding data recipe + - Minor rough diamond icon tweak + - Minor description tweaks + - Minor tech tree tweaks --------------------------------------------------------------------------------------------------- Version: 0.1.0 Date: 2022-01-27 diff --git a/data-final-fixes.lua b/data-final-fixes.lua index da7a1f4..64229a9 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -65,7 +65,7 @@ for i, entity in pairs(data.raw["assembling-machine"]) do diamondsInElectricSmelter(entity) end --- furnace recipe rework, remove crucible ingredients +-- furnace recipe rework, remove crucible ingredients one more time for i, furnace in pairs(util.me.furnaces) do for j, ingredient in pairs(util.me.crucible_ingredients) do util.remove_ingredient(furnace, ingredient) diff --git a/data-util.lua b/data-util.lua index 46f501f..38e91d0 100644 --- a/data-util.lua +++ b/data-util.lua @@ -539,6 +539,15 @@ function util.set_icons(recipe_name, icons) end end +-- Set recipe icons +function util.set_item_icons(item_name, icons) + if data.raw.recipe[item_name] then + data.raw.recipe[item_name].icons = icons + data.raw.recipe[item_name].icon = nil + data.raw.recipe[item_name].icon_size = nil + end +end + function util.set_to_founding(recipe) util.set_category(recipe, "founding") util.set_subgroup(recipe, "foundry-intermediate") diff --git a/info.json b/info.json index 7f5951e..93ef6e5 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bzcarbon", - "version": "0.1.1", + "version": "0.1.2", "factorio_version": "1.1", "title": "Graphite & Diamonds", "author": "Brevven", diff --git a/locale/en/carbon.cfg b/locale/en/carbon.cfg index e03efcd..8b08e7f 100644 --- a/locale/en/carbon.cfg +++ b/locale/en/carbon.cfg @@ -59,7 +59,7 @@ low-density-structure-nanotubes=__ITEM__low-density-structure__ se-low-density-structure-beryllium=__ITEM__low-density-structure__ [recipe-description] -graphite-carbon-black=Convert excess carbon black to graphite at a low ratio. +graphite-carbon-black=Convert excess carbon black to graphite at an unfavorable ratio. # Settings diff --git a/me.lua b/me.lua index 0a3e01e..aa6829a 100644 --- a/me.lua +++ b/me.lua @@ -44,7 +44,13 @@ function me.add_modified(name) end end -me.crucible_ingredients = {"tungsten-plate", "zirconia", "stone-brick", "silica"} +me.crucible_ingredients = {"tungsten-plate", "zirconia", "silica"} +if (mods and mods.bzaluminum) or (game and game.active_mods and game.active_mods.bzaluminum) then + table.insert(me.crucible_ingredients, "alumina") +else + table.insert(me.crucible_ingredients, "stone-brick") +end + me.furnaces = { "electric-furnace", "electric-foundry", -- BZ