From 3aa1cd01289844ae09c7421491d6b745387436bc Mon Sep 17 00:00:00 2001 From: Brevven Date: Fri, 23 Dec 2022 13:33:17 -0800 Subject: [PATCH] stacking, landfill, modmash --- carbon-recipe-final-stacking.lua | 3 ++ carbon-recipe-se.lua | 1 + changelog.txt | 7 +++++ data-final-fixes.lua | 47 ++++++++++++++++++++++++++++++++ info.json | 3 +- 5 files changed, 60 insertions(+), 1 deletion(-) diff --git a/carbon-recipe-final-stacking.lua b/carbon-recipe-final-stacking.lua index f635003..11f021d 100644 --- a/carbon-recipe-final-stacking.lua +++ b/carbon-recipe-final-stacking.lua @@ -15,6 +15,9 @@ if deadlock then if util.me.use_carbon_black() then deadlock.add_stack("carbon-black", "__bzcarbon__/graphics/icons/stacked/carbon-black-stacked.png", "deadlock-stacking-2", 64) end + if util.me.use_rough_diamond() then + deadlock.add_stack("rough-diamond", "__bzcarbon__/graphics/icons/stacked/rough-diamond-stacked.png" , "deadlock-stacking-2", 64) + end end -- Deadlock crating recipes diff --git a/carbon-recipe-se.lua b/carbon-recipe-se.lua index c61d6bd..2af1e21 100644 --- a/carbon-recipe-se.lua +++ b/carbon-recipe-se.lua @@ -13,6 +13,7 @@ end se_delivery_cannon_recipes["graphite"] = {name= "graphite"} se_delivery_cannon_recipes["diamond"] = {name= "diamond"} if util.me.use_flake_graphite() then + util.se_landfill({ore="flake-graphite"}) se_delivery_cannon_recipes["flake-graphite"] = {name= "flake-graphite"} if mods["space-exploration"] > "0.6" then util.se_matter({ore="flake-graphite", energy_required=1, quant_out=10, stream_out=60}) diff --git a/changelog.txt b/changelog.txt index 9f0a53e..b7a66bf 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,11 @@ --------------------------------------------------------------------------------------------------- +Version: 0.5.2 +Date: 2022-12-08 + Changes: + - Enable rough diamond stacking, stacked mining. + - SE: Landfill from graphite + - Compatibility fix for ModMash Splinter Subspace Logistics +--------------------------------------------------------------------------------------------------- Version: 0.5.1 Date: 2022-12-05 Fixes: diff --git a/data-final-fixes.lua b/data-final-fixes.lua index 2e6695d..aa6b781 100644 --- a/data-final-fixes.lua +++ b/data-final-fixes.lua @@ -123,5 +123,52 @@ if not mods.bzaluminum then util.replace_ingredients_prior_to("electronics", "electronic-circuit", "copper-cable", 2) end +if mods.modmashsplintersubspacelogistics then + for i, item in pairs({"graphite", "diamond"}) do + if data.raw.item["super-container-for-"..item] then + for i, icon in pairs(data.raw.item["super-container-for-"..item].icons) do + log(serpent.dump(icon)) + if string.find(icon.icon, item) then + icon.size = 128 + icon.scale = icon.scale / 2 + icon.icon_scale = icon.icon_scale / 2 + end + end + end + if data.raw.recipe["super-container-for-"..item] then + for i, icon in pairs(data.raw.recipe["super-container-for-"..item].icons) do + if string.find(icon.icon, item) then + icon.size = 128 + icon.scale = icon.scale / 4 + icon.icon_scale = icon.icon_scale / 4 + end + end + end + if data.raw.recipe["empty-super-container-of-"..item] then + for i, icon in pairs(data.raw.recipe["empty-super-container-of-"..item].icons) do + if string.find(icon.icon, item) then + icon.size = 128 + icon.scale = icon.scale / 4 + icon.icon_scale = icon.icon_scale / 4 + end + end + end + for i, technology in pairs(data.raw.technology) do + log(technology.name) + if string.find(technology.name, "containment") then + if technology.icons then + for j, icon in pairs(technology.icons) do + if string.find(icon.icon, item) then + icon.size = 128 + icon.scale = icon.scale / 8 + icon.icon_scale = icon.icon_scale / 8 + end + end + end + end + end + end +end + -- Must be last util.create_list() diff --git a/info.json b/info.json index fa08e6f..33ee8fb 100644 --- a/info.json +++ b/info.json @@ -1,6 +1,6 @@ { "name": "bzcarbon", - "version": "0.5.1", + "version": "0.5.2", "factorio_version": "1.1", "title": "Graphite & Diamonds", "author": "Brevven", @@ -15,6 +15,7 @@ "? aai-industry", "? Krastorio2", "? 248k", + "(?) modmashsplintersubspacelogistics", "? deadlock-beltboxes-loaders", "? DeadlockCrating" ],