diff --git a/carbon-recipe-updates.lua b/carbon-recipe-updates.lua index 559e634..4469269 100644 --- a/carbon-recipe-updates.lua +++ b/carbon-recipe-updates.lua @@ -7,8 +7,14 @@ util.add_prerequisite("low-density-structure", "diamond-processing") util.add_prerequisite("advanced-electronics-2", "diamond-processing") util.add_prerequisite("laser", "diamond-processing") -util.add_prerequisite("power-armor-mk2", "graphene") -util.add_prerequisite("rocket-control-unit", "graphene") + +if not mods["space-age"] then -- more uses for graphene in vanilla + util.add_prerequisite("power-armor-mk2", "graphene") + util.add_ingredient("power-armor-mk2", "graphene", 30) + + util.add_prerequisite("rocket-control-unit", "graphene") + util.add_ingredient("rocket-control-unit", "graphene", 1) +end util.add_prerequisite("electronics", "graphite-processing") @@ -168,8 +174,6 @@ util.replace_some_ingredient("se-cryonite-lubricant", "se-cryonite-slush", 10, " util.add_ingredient("nuclear-reactor", "graphite", 500) -util.add_ingredient("power-armor-mk2", "graphene", 30) -util.add_ingredient("rocket-control-unit", "graphene", 1) util.add_ingredient("satellite", "graphene", 100) -- K2 @@ -336,3 +340,5 @@ util.add_ingredient("offshore-pump-mk2", "graphite", 2) util.add_ingredient("pumpjack-mk2", "graphite", 2) util.add_ingredient("fusion-reactor-mk2-equipment", "graphene", 2) +util.add_shiftite_recipe("graphite", {"alpha"}, 1) +util.add_shiftite_recipe("diamond", {"beta", "epsilon"}, 1) diff --git a/carbon-recipe.lua b/carbon-recipe.lua index b8938d3..6fd1895 100644 --- a/carbon-recipe.lua +++ b/carbon-recipe.lua @@ -291,7 +291,7 @@ data:extend({ order = "d[graphite]", enabled = false, allow_productivity=true, - energy_required = 6, + energy_required = 5, ingredients = (mods["space-age"] or mods.Krastorio2) and { {type="item", name="graphite", amount=1}, {type="fluid", name="ammonia", amount=5}, diff --git a/changelog.txt b/changelog.txt index cd1fc36..0343f4e 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,30 @@ --------------------------------------------------------------------------------------------------- +Version: 2.0.3 +Date: 2025-02-04 + Changes: + - Fix softlock with Muluna +--------------------------------------------------------------------------------------------------- +Version: 2.0.3 +Date: 2025-01-31 + Changes: + - Add shiftite recipes for Janus mod. +--------------------------------------------------------------------------------------------------- +Version: 2.0.2 +Date: 2025-01-31 + Fixes: + - Fix compatibility issue with RCU Restored mod. + RCUs do not require graphene in Space Age, but still do in Vanilla. + Changes: + - In space age, Power Armor mk2 no longer requires graphene. Still requires in Vanilla. +--------------------------------------------------------------------------------------------------- +Version: 2.0.1 +Date: 2025-01-30 + Fixes: + - Space Age: With Titanium or Zirconium, unlock vacuum recipe earlier. + - Space Age: Fix unlock for polyacrylonitrile + - Space Age: Fix alternate ammonia recipe menu location + - Fix LDS localization +--------------------------------------------------------------------------------------------------- Version: 2.0.0 Date: 2025-01-29 Changes: diff --git a/data-final-fixes.lua b/data-final-fixes.lua index 4362a5d..452b431 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -12,6 +12,8 @@ local util = require("data-util"); util.add_minable_result("simple-entity", "huge-volcanic-rock", {type="item", name="flake-graphite", amount_min=10, amount_max=24}) util.add_minable_result("simple-entity", "big-volcanic-rock", {type="item", name="rough-diamond", amount_min=5, amount_max=10}) +util.set_localised_name("low-density-structure", {"item-name.low-density-structure"}) + -- supercapacitors with graphene cloned from supercapacitors with activated carbon if data.raw.recipe["supercapacitor"] then local new_recipe = futil.table.deepcopy(data.raw.recipe["supercapacitor"]) diff --git a/data-updates.lua b/data-updates.lua index 945d147..ade1fac 100644 --- a/data-updates.lua +++ b/data-updates.lua @@ -24,6 +24,10 @@ end util.redo_recycling() + +util.add_shiftite_recipe("graphite", {"alpha"}, 1) +util.add_shiftite_recipe("diamond", {"beta", "epsilon"}, 1) + require("compatibility/crafting-efficiency") -- Must be last util.create_list() diff --git a/data-util.lua b/data-util.lua index 9b471b3..0560a31 100644 --- a/data-util.lua +++ b/data-util.lua @@ -127,6 +127,35 @@ function util.copy_recipe(recipe_name, new_recipe_name) end end +function util.add_shiftite_recipe(item, shiftites, quantity) + if not mods["janus"] then return end + if not data.raw.item[item] then return end + local its = {} + for _, shiftite in pairs(shiftites) do + local it = "janus-shiftite-"..shiftite + if data.raw.item[it] then + table.insert(its, util.item(it, quantity)) + end + end + if its then + local name = "shiftite-to-"..item + data:extend({{ + type = "recipe", + name = name, + localised_name = {"", {"item-name."..item}, " ← Shiftite"}, + category = "janus-shiftite", + subgroup = "janus-basic-from-shiftite", + ingredients = its, + results = {util.item(item, 5)}, + energy_required = 2.5, + order = "zzz", + enabled = false, + auto_recycle = false, + }}) + util.add_unlock("janus-time-distorter", name) + end +end + -- Add the gleba rock. If it exists, still add resource to mine from it function util.add_gleba_rock(resource, amount_min, amount_max) if (not data.raw.planet.gleba or diff --git a/info.json b/info.json index e868729..a8edba9 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bzcarbon", - "version": "2.0.0", + "version": "2.0.4", "factorio_version": "2.0", "title": "Graphite & Diamonds", "author": "Brevven", diff --git a/me.lua b/me.lua index d34ad63..d749a88 100644 --- a/me.lua +++ b/me.lua @@ -80,7 +80,7 @@ function me.add_modified(name) end end -me.crucible_ingredients = {"zirconia", "silica", "alumina", "stone-brick"} +me.crucible_ingredients = {"zirconia", "silica", "stone-brick"} me.furnaces = { "electric-furnace", diff --git a/prototypes/activated-carbon.lua b/prototypes/activated-carbon.lua index c56e301..6b68a38 100644 --- a/prototypes/activated-carbon.lua +++ b/prototypes/activated-carbon.lua @@ -60,4 +60,6 @@ if mods["wood-industry"] then precursor = "charcoal" end util.add_unlock("advanced-oil-processing", "activated-carbon") util.add_unlock("advanced-oil-processing", "activated-carbon-black") util.add_ingredient("supercapacitor", "activated-carbon", 10) + util.add_unlock("advanced-oil-processing", "titanium-sublimation") + util.add_unlock("advanced-oil-processing", "zirconium-gettering") end diff --git a/prototypes/carbon-fiber.lua b/prototypes/carbon-fiber.lua index 39d8637..5a91526 100644 --- a/prototypes/carbon-fiber.lua +++ b/prototypes/carbon-fiber.lua @@ -8,6 +8,7 @@ if mods["space-age"] then type = "recipe", name = "ammonia-from-spoilage", category = "organic", + subgroup = "agriculture-processes", icons = { {icon = "__space-age__/graphics/icons/fluid/ammonia.png", icon_size = 64}, {icon = "__space-age__/graphics/icons/spoilage.png", icon_size = 64, scale= 0.25, shift = {-8,-8}}, @@ -62,6 +63,7 @@ if mods["space-age"] then util.replace_ingredient("carbon-fiber", "carbon", "polyacrylonitrile") util.set_item_icons("carbon-fiber", { {icon = "__bzcarbon__/graphics/icons/carbon-fiber.png", icon_size = 128,} }) util.add_unlock("biochamber", "ammonia-from-spoilage") + util.add_unlock("carbon-fiber", "polyacrylonitrile") else data:extend({ {