From 8a89efb2b5e69db748c9ab755dba3fbb70065fcb Mon Sep 17 00:00:00 2001 From: kingarthur91 Date: Wed, 25 Sep 2024 22:57:57 -0400 Subject: [PATCH] base_flow_rate --- bobelectronics/prototypes/chemicals.lua | 1 + bobplates/prototypes/item/alien.lua | 12 ++++++++---- bobplates/prototypes/item/chemicals.lua | 14 ++++++++++++++ bobrevamp/data.lua | 3 ++- bobrevamp/prototypes/hard-mode.lua | 3 ++- bobrevamp/prototypes/rocket-fuel.lua | 18 ++++++++++++------ bobwarfare/prototypes/item/fluid.lua | 5 ++++- 7 files changed, 43 insertions(+), 13 deletions(-) diff --git a/bobelectronics/prototypes/chemicals.lua b/bobelectronics/prototypes/chemicals.lua index af340a342..00be852af 100644 --- a/bobelectronics/prototypes/chemicals.lua +++ b/bobelectronics/prototypes/chemicals.lua @@ -5,6 +5,7 @@ data:extend({ icon = "__bobelectronics__/graphics/icons/ferric-chloride-solution.png", icon_size = 32, default_temperature = 25, + base_flow_rate = 100, heat_capacity = "1kJ", base_color = { r = 0.7, g = 0.6, b = 0.2 }, flow_color = { r = 0.5, g = 0.5, b = 0.5 }, diff --git a/bobplates/prototypes/item/alien.lua b/bobplates/prototypes/item/alien.lua index 928e7e03e..257f422cb 100644 --- a/bobplates/prototypes/item/alien.lua +++ b/bobplates/prototypes/item/alien.lua @@ -36,7 +36,8 @@ then order = "f[alien]-c", default_temperature = 20, max_temperature = 100, - heat_capacity = "1kJ", + base_flow_rate = 100, + heat_capacity = "1kJ", base_color = { r = 0.4, g = 0.0, b = 0.8 }, flow_color = { r = 0.6, g = 0.5, b = 1.0 }, }, @@ -50,7 +51,8 @@ then order = "f[alien]-d", default_temperature = 20, max_temperature = 100, - heat_capacity = "1kJ", + base_flow_rate = 100, + heat_capacity = "1kJ", base_color = { r = 0.8, g = 0.8, b = 0.0 }, flow_color = { r = 1.0, g = 1.0, b = 0.5 }, }, @@ -63,7 +65,8 @@ then subgroup = "bob-alien-resource", order = "f[alien]-e", default_temperature = 20, - heat_capacity = "1kJ", + base_flow_rate = 100, + heat_capacity = "1kJ", base_color = { r = 0.0, g = 0.8, b = 0.0 }, flow_color = { r = 0.5, g = 1.0, b = 0.5 }, max_temperature = 100, @@ -77,7 +80,8 @@ then subgroup = "bob-alien-resource", order = "f[alien]-f", default_temperature = 20, - heat_capacity = "1kJ", + base_flow_rate = 100, + heat_capacity = "1kJ", base_color = { r = 0.8, g = 0, b = 0 }, flow_color = { r = 1.0, g = 0.5, b = 0.5 }, max_temperature = 100, diff --git a/bobplates/prototypes/item/chemicals.lua b/bobplates/prototypes/item/chemicals.lua index 000549c9b..9a387a139 100644 --- a/bobplates/prototypes/item/chemicals.lua +++ b/bobplates/prototypes/item/chemicals.lua @@ -22,6 +22,7 @@ data:extend({ name = "liquid-air", default_temperature = 25, max_temperature = 100, + base_flow_rate = 100, heat_capacity = "1kJ", base_color = { r = 0, g = 0, b = 0 }, flow_color = { r = 0.5, g = 1.0, b = 1.0 }, @@ -49,6 +50,7 @@ data:extend({ type = "fluid", name = "hydrogen", default_temperature = 25, + base_flow_rate = 100, heat_capacity = "1kJ", base_color = { r = 0.7, g = 0.7, b = 0.7 }, flow_color = { r = 1, g = 1, b = 1 }, @@ -65,6 +67,7 @@ data:extend({ type = "fluid", name = "oxygen", default_temperature = 25, + base_flow_rate = 100, heat_capacity = "1kJ", base_color = { r = 0.7, g = 0, b = 0 }, flow_color = { r = 1, g = 0, b = 0 }, @@ -79,6 +82,7 @@ data:extend({ type = "fluid", name = "nitrogen", default_temperature = 25, + base_flow_rate = 100, heat_capacity = "1kJ", base_color = { r = 0.0, g = 0.0, b = 1.0 }, flow_color = { r = 0.0, g = 0.0, b = 1.0 }, @@ -93,6 +97,7 @@ data:extend({ type = "fluid", name = "chlorine", default_temperature = 25, + base_flow_rate = 100, heat_capacity = "1kJ", base_color = { r = 0, g = 0.7, b = 0.2 }, flow_color = { r = 0, g = 1, b = 0.3 }, @@ -107,6 +112,7 @@ data:extend({ type = "fluid", name = "hydrogen-chloride", default_temperature = 25, + base_flow_rate = 100, heat_capacity = "1kJ", base_color = { r = 0.2, g = 0.7, b = 0 }, flow_color = { r = 0.3, g = 1, b = 0 }, @@ -121,6 +127,7 @@ data:extend({ type = "fluid", name = "nitrogen-dioxide", default_temperature = 25, + base_flow_rate = 100, heat_capacity = "1kJ", base_color = { r = 0.8, g = 0.0, b = 1.0 }, flow_color = { r = 0.8, g = 0.0, b = 1.0 }, @@ -135,6 +142,7 @@ data:extend({ type = "fluid", name = "sulfur-dioxide", default_temperature = 25, + base_flow_rate = 100, heat_capacity = "1kJ", base_color = { r = 0.7, g = 0.7, b = 0 }, flow_color = { r = 1, g = 0.5, b = 0 }, @@ -149,6 +157,7 @@ data:extend({ type = "fluid", name = "nitric-acid", default_temperature = 25, + base_flow_rate = 100, heat_capacity = "1kJ", base_color = { r = 1.0, g = 0.7, b = 0.0 }, flow_color = { r = 0.0, g = 0.0, b = 1.0 }, @@ -162,6 +171,7 @@ data:extend({ type = "fluid", name = "tungstic-acid", default_temperature = 25, + base_flow_rate = 100, heat_capacity = "1kJ", base_color = { r = 0, g = 0.2, b = 0.7 }, flow_color = { r = 0.5, g = 0.5, b = 0.5 }, @@ -175,6 +185,7 @@ data:extend({ type = "fluid", name = "ferric-chloride-solution", default_temperature = 25, + base_flow_rate = 100, heat_capacity = "1kJ", base_color = { r = 0.7, g = 0.6, b = 0.2 }, flow_color = { r = 0.5, g = 0.5, b = 0.5 }, @@ -188,6 +199,7 @@ data:extend({ type = "fluid", name = "liquid-fuel", default_temperature = 25, + base_flow_rate = 100, heat_capacity = "1kJ", base_color = { r = 1.0, g = 0.9, b = 0.5 }, flow_color = { r = 0.5, g = 0.5, b = 0.5 }, @@ -379,6 +391,7 @@ data:extend({ default_temperature = 25, max_temperature = 100, gas_temperature = -251.02, + base_flow_rate = 100, heat_capacity = "1kJ", base_color = { r = 0.7, g = 0.7, b = 0.4 }, flow_color = { r = 1, g = 1, b = 0.6 }, @@ -394,6 +407,7 @@ data:extend({ default_temperature = 25, max_temperature = 100, gas_temperature = -60, + base_flow_rate = 100, heat_capacity = "1kJ", base_color = { r = 0.7, g = 0.7, b = 0 }, flow_color = { r = 1, g = 1, b = 0.5 }, diff --git a/bobrevamp/data.lua b/bobrevamp/data.lua index fe61e347e..e496d3349 100644 --- a/bobrevamp/data.lua +++ b/bobrevamp/data.lua @@ -145,7 +145,8 @@ if settings.startup["bobmods-revamp-oil"].value == true then icon = "__bobrevamp__/graphics/icons/sour-gas.png", icon_size = 64, default_temperature = 25, - heat_capacity = "0.1kJ", + base_flow_rate = 100, + heat_capacity = "0.1kJ", base_color = { r = 0.4, g = 0.1, b = 0.3 }, flow_color = { r = 0.8, g = 0.2, b = 0.6 }, max_temperature = 100, diff --git a/bobrevamp/prototypes/hard-mode.lua b/bobrevamp/prototypes/hard-mode.lua index 3cc78f600..589ddfd70 100644 --- a/bobrevamp/prototypes/hard-mode.lua +++ b/bobrevamp/prototypes/hard-mode.lua @@ -9,7 +9,8 @@ if bobmods.plates and settings.startup["bobmods-revamp-hardmode"].value == true default_temperature = 15, max_temperature = 100, gas_temperature = -56.6, - heat_capacity = "1kJ", + base_flow_rate = 100, + heat_capacity = "1kJ", base_color = { r = 0.5, g = 0.0, b = 0.0 }, flow_color = { r = 0.0, g = 0.0, b = 0.0 }, }, diff --git a/bobrevamp/prototypes/rocket-fuel.lua b/bobrevamp/prototypes/rocket-fuel.lua index 77f551d28..45bac92be 100644 --- a/bobrevamp/prototypes/rocket-fuel.lua +++ b/bobrevamp/prototypes/rocket-fuel.lua @@ -8,7 +8,8 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen order = "a[fluid]-g[ammonia]", default_temperature = 15, max_temperature = 100, - heat_capacity = "1kJ", + base_flow_rate = 100, + heat_capacity = "1kJ", base_color = { r = 0.5, g = 0.5, b = 1.0 }, flow_color = { r = 0.5, g = 0.5, b = 1.0 }, gas_temperature = -34, @@ -22,7 +23,8 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen order = "a[fluid]-g[dinitrogen-tetroxide]", default_temperature = 15, max_temperature = 100, - heat_capacity = "1kJ", + base_flow_rate = 100, + heat_capacity = "1kJ", base_color = { r = 0.7, g = 0.7, b = 0.3 }, flow_color = { r = 0.3, g = 0.3, b = 0.7 }, gas_temperature = 21, @@ -36,7 +38,8 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen order = "a[fluid]-g[hydrazine]", default_temperature = 15, max_temperature = 100, - heat_capacity = "1kJ", + base_flow_rate = 100, + heat_capacity = "1kJ", base_color = { r = 0.7, g = 0.7, b = 1.0 }, flow_color = { r = 0.3, g = 0.3, b = 0.0 }, gas_temperature = 114, @@ -52,7 +55,8 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen order = "a[fluid]-g[hydrogen-peroxide]", default_temperature = 15, max_temperature = 100, - heat_capacity = "1kJ", + base_flow_rate = 100, + heat_capacity = "1kJ", base_color = { r = 0.0, g = 0.5, b = 1.0 }, flow_color = { r = 0.7, g = 0.7, b = 0.7 }, gas_temperature = 150, @@ -69,7 +73,8 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen order = "a[fluid]-g[nitrogen-dioxide]", default_temperature = 25, max_temperature = 100, - heat_capacity = "1kJ", + base_flow_rate = 100, + heat_capacity = "1kJ", base_color = { r = 0.8, g = 0.0, b = 1.0 }, flow_color = { r = 0.8, g = 0.0, b = 1.0 }, gas_temperature = -12, @@ -218,7 +223,8 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen order = "a[fluid]-g[nitric-oxide]", default_temperature = 15, max_temperature = 100, - heat_capacity = "1kJ", + base_flow_rate = 100, + heat_capacity = "1kJ", base_color = { r = 1.0, g = 0.0, b = 1.0 }, flow_color = { r = 1.0, g = 0.2, b = 1.0 }, gas_temperature = -152, diff --git a/bobwarfare/prototypes/item/fluid.lua b/bobwarfare/prototypes/item/fluid.lua index 78b66566a..6e86996b2 100644 --- a/bobwarfare/prototypes/item/fluid.lua +++ b/bobwarfare/prototypes/item/fluid.lua @@ -4,7 +4,8 @@ if data.raw.fluid["nitric-acid"] then type = "fluid", name = "sulfuric-nitric-acid", default_temperature = 25, - heat_capacity = "1kJ", + base_flow_rate = 100, + heat_capacity = "1kJ", base_color = { r = 0.0, g = 0.0, b = 1.0 }, flow_color = { r = 1.0, g = 1.0, b = 0.0 }, max_temperature = 100, @@ -20,6 +21,7 @@ data:extend({ type = "fluid", name = "nitroglycerin", default_temperature = 25, + base_flow_rate = 100, heat_capacity = "1kJ", base_color = { r = 0.3, g = 0.3, b = 1.0 }, flow_color = { r = 1.0, g = 0.3, b = 0.3 }, @@ -33,6 +35,7 @@ data:extend({ type = "fluid", name = "glycerol", default_temperature = 25, + base_flow_rate = 100, heat_capacity = "1kJ", base_color = { r = 1.0, g = 1.0, b = 0.5 }, flow_color = { r = 0.5, g = 0.5, b = 0.5 },