From 5b814414a3659ec3ef29e5be9c22220c5045dc87 Mon Sep 17 00:00:00 2001 From: Qatavin <108201496+Qatavin@users.noreply.github.com> Date: Sun, 22 Dec 2024 13:15:03 -0800 Subject: [PATCH] Productivity removal (#264) * Remove productivity * Remove productivity from solid fuel, to match enriched fuel * Remove productivity from vanilla sulfur * Remove productivity, make bob-fluid subgroup conditional * Make bob-fluid subgroup part of Plates only * Remove productivity, make bob-fluid subgroup conditional * Update fluid.lua Add subgroup "fluid". Remove conditional to change to "bob-fluid" (this conditional has been combined with the one in fluid-recipes.lua) * Remove productivity, make bob-fluid subgroup conditional * Remove productivity, make bob-fluid subgroup conditional * Remove ignored_by_productivity, make revamped rocket-fuel non-productive * Remove productivity * Remove unneeded ignored_by_productivity * Remove productivity * Fix gas sweetening locale, make capitalization consistent * Change default recipe category for Ferric Chloride Solution Else if Electronics is the only Bob's mod enabled, this recipe ends up on a tab on it's own * Formatting * Only add Bob's Materials group if bobplates mod is enabled * Formatting --------- Co-authored-by: KiwiHawk <59639+KiwiHawk@users.noreply.github.com> --- .../graphics/icons/technology/fluids.png | Bin 6106 -> 0 bytes .../icons/technology/intermediates.png | Bin 8562 -> 0 bytes .../graphics/icons/technology/resources.png | Bin 7050 -> 0 bytes bobelectronics/prototypes/category.lua | 59 ++---------------- bobelectronics/prototypes/chemicals.lua | 10 ++- bobelectronics/prototypes/resource.lua | 11 ++-- bobplates/data-updates.lua | 4 ++ bobplates/prototypes/category.lua | 6 +- .../prototypes/recipe/chemistry-recipe.lua | 19 ------ .../prototypes/recipe/resource-recipe.lua | 5 +- bobrevamp/data.lua | 2 +- bobrevamp/locale/en/bobrevamp.cfg | 18 +++--- bobrevamp/prototypes/hard-mode.lua | 9 +-- bobrevamp/prototypes/rocket-fuel-updates.lua | 5 +- bobrevamp/prototypes/rocket-fuel.lua | 57 ++++++++++------- bobrevamp/prototypes/rtg-updates.lua | 2 +- bobrevamp/prototypes/rtg.lua | 12 +--- bobwarfare/prototypes/item/fluid.lua | 10 +-- bobwarfare/prototypes/recipe/fluid-recipe.lua | 6 +- 19 files changed, 91 insertions(+), 144 deletions(-) delete mode 100644 bobelectronics/graphics/icons/technology/fluids.png delete mode 100644 bobelectronics/graphics/icons/technology/intermediates.png delete mode 100644 bobelectronics/graphics/icons/technology/resources.png diff --git a/bobelectronics/graphics/icons/technology/fluids.png b/bobelectronics/graphics/icons/technology/fluids.png deleted file mode 100644 index 9ad416b960c10c0e48cac117354438d5b498dc35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6106 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 diff --git a/bobelectronics/graphics/icons/technology/intermediates.png b/bobelectronics/graphics/icons/technology/intermediates.png deleted file mode 100644 index 03560fe77a888e726e15d0e563ade68b498f1e28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8562 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 diff --git a/bobelectronics/graphics/icons/technology/resources.png b/bobelectronics/graphics/icons/technology/resources.png deleted file mode 100644 index 6f6681cd44e22306d8dceec812edd1b3397217a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7050 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 diff --git a/bobelectronics/prototypes/category.lua b/bobelectronics/prototypes/category.lua index eeab75926..cdc0f6830 100644 --- a/bobelectronics/prototypes/category.lua +++ b/bobelectronics/prototypes/category.lua @@ -15,77 +15,28 @@ data:extend({ type = "recipe-category", name = "electronics-with-fluid", }, - - { - type = "item-group", - name = "bob-fluid-products", - order = "c-f", - icon = "__bobelectronics__/graphics/icons/technology/fluids.png", - icon_size = 64, - }, - - { - type = "item-subgroup", - name = "bob-fluid", - group = "bob-fluid-products", - order = "a-a", - }, - - { - type = "item-group", - name = "bob-resource-products", - order = "c-g", - icon = "__bobelectronics__/graphics/icons/technology/resources.png", - icon_size = 64, - }, - { type = "item-subgroup", name = "bob-resource", - group = "bob-resource-products", - order = "b-b", - }, - { - type = "item-subgroup", - name = "bob-resource-chemical", - group = "bob-resource-products", - order = "b-b-a", - }, - { - type = "item-subgroup", - name = "bob-material-smelting", - group = "bob-resource-products", - order = "c-a-a", - }, - { - type = "item-subgroup", - name = "bob-material-chemical", - group = "bob-resource-products", - order = "c-a-b", - }, - { - type = "item-subgroup", - name = "bob-alloy", - group = "bob-resource-products", - order = "c-b", + group = "intermediate-products", + order = "e-a1", }, - { type = "item-subgroup", name = "bob-electronic-components", group = "intermediate-products", - order = "e-a1", + order = "e-a2", }, { type = "item-subgroup", name = "bob-boards", group = "intermediate-products", - order = "e-a2", + order = "e-a3", }, { type = "item-subgroup", name = "bob-electronic-boards", group = "intermediate-products", - order = "e-a3", + order = "e-a4", }, }) diff --git a/bobelectronics/prototypes/chemicals.lua b/bobelectronics/prototypes/chemicals.lua index cf6216db3..82927dac9 100644 --- a/bobelectronics/prototypes/chemicals.lua +++ b/bobelectronics/prototypes/chemicals.lua @@ -4,7 +4,7 @@ data:extend({ name = "ferric-chloride-solution", icon = "__bobelectronics__/graphics/icons/ferric-chloride-solution.png", icon_size = 32, - subgroup = "bob-fluid", + subgroup = "fluid", default_temperature = 25, heat_capacity = "1kJ", base_color = { r = 0.7, g = 0.6, b = 0.2 }, @@ -18,7 +18,7 @@ data:extend({ name = "ferric-chloride-solution", icon = "__bobelectronics__/graphics/icons/ferric-chloride-solution.png", icon_size = 32, - subgroup = "bob-fluid", + subgroup = "fluid-recipes", order = "b[fluid-chemistry]-a[ferric-chloride-solution]", category = "chemistry", enabled = false, @@ -36,10 +36,14 @@ data:extend({ tertiary = { r = 0.0, g = 0.7, b = 0.7, a = 0.000 }, }, allow_decomposition = false, - allow_productivity = true, }, }) +if data.raw["item-subgroup"]["bob-fluid"] then + data.raw.recipe["ferric-chloride-solution"].subgroup = "bob-fluid" + data.raw.fluid["ferric-chloride-solution"].subgroup = "bob-fluid" +end + data:extend({ { type = "recipe", diff --git a/bobelectronics/prototypes/resource.lua b/bobelectronics/prototypes/resource.lua index a81617a33..9a24ef189 100644 --- a/bobelectronics/prototypes/resource.lua +++ b/bobelectronics/prototypes/resource.lua @@ -42,7 +42,7 @@ data:extend({ name = "bob-resin-oil", localised_name = { "item-name.resin" }, category = "chemistry", - subgroup = "bob-resource-chemical", + subgroup = "bob-resource", energy_required = 1, enabled = false, ingredients = { @@ -86,7 +86,7 @@ data:extend({ type = "recipe", name = "bob-rubber", localised_name = { "item-name.rubber" }, - subgroup = "bob-material-smelting", + subgroup = "bob-resource", category = "smelting", energy_required = 3.5, enabled = false, @@ -105,7 +105,7 @@ data:extend({ name = "synthetic-wood", icon = "__bobelectronics__/graphics/icons/synthetic-wood.png", icon_size = 32, - subgroup = "bob-resource-chemical", + subgroup = "bob-resource", localised_name = { "recipe-name.synthetic-wood" }, category = "chemistry", energy_required = 1, @@ -170,7 +170,7 @@ if data.raw.item["tin-plate"] then name = "solder-alloy", icon = "__bobelectronics__/graphics/icons/solder-plate.png", icon_size = 32, - subgroup = "bob-alloy", + subgroup = "raw-material", order = "c-b-h[solder]", stack_size = 200, drop_sound = { @@ -202,6 +202,9 @@ if data.raw.item["tin-plate"] then allow_productivity = true, }, }) + if data.raw["item-subgroup"]["bob-alloy"] then + data.raw.item["solder-alloy"].subgroup = "bob-alloy" + end if data.raw.item["silver-plate"] then table.insert(data.raw.recipe["solder-alloy"].ingredients, { type = "item", name = "silver-plate", amount = 1 }) end diff --git a/bobplates/data-updates.lua b/bobplates/data-updates.lua index cfd7501f6..7993ef621 100644 --- a/bobplates/data-updates.lua +++ b/bobplates/data-updates.lua @@ -7,6 +7,10 @@ if data.raw["god-controller"] and data.raw["god-controller"]["default"] then data.raw["god-controller"]["default"].inventory_size = settings.startup["bobmods-plates-inventorysize"].value end +--Sulfur update +data.raw.recipe["sulfur"].allow_productivity = false +data.raw.recipe["sulfuric-acid"].allow_productivity = false + --Electrolyser power if settings.startup["bobmods-plates-expensive-electrolysis"].value == true then if feature_flags["quality"] then diff --git a/bobplates/prototypes/category.lua b/bobplates/prototypes/category.lua index 9000c572c..d53113fb1 100644 --- a/bobplates/prototypes/category.lua +++ b/bobplates/prototypes/category.lua @@ -316,19 +316,19 @@ data:extend({ type = "item-subgroup", name = "bob-electronic-components", group = "intermediate-products", - order = "e-a1", + order = "e-a2", }, { type = "item-subgroup", name = "bob-boards", group = "intermediate-products", - order = "e-a2", + order = "e-a3", }, { type = "item-subgroup", name = "bob-electronic-boards", group = "intermediate-products", - order = "e-a3", + order = "e-a4", }, { diff --git a/bobplates/prototypes/recipe/chemistry-recipe.lua b/bobplates/prototypes/recipe/chemistry-recipe.lua index b7a144e9b..30d6ea29e 100644 --- a/bobplates/prototypes/recipe/chemistry-recipe.lua +++ b/bobplates/prototypes/recipe/chemistry-recipe.lua @@ -142,7 +142,6 @@ data:extend({ { type = "fluid", name = "oxygen", amount = 12.5 }, }, allow_decomposition = false, - allow_productivity = true, }, { @@ -169,7 +168,6 @@ data:extend({ tertiary = { r = 0.25, g = 0.5, b = 0.25, a = 0.000 }, }, allow_decomposition = false, - allow_productivity = true, }, { @@ -192,7 +190,6 @@ data:extend({ { type = "fluid", name = "hydrogen", amount = 10 }, }, allow_decomposition = false, - allow_productivity = true, }, { @@ -214,7 +211,6 @@ data:extend({ { type = "fluid", name = "hydrogen", amount = 20 }, }, allow_decomposition = false, - allow_productivity = true, }, { @@ -239,7 +235,6 @@ data:extend({ secondary = { r = 0.7, g = 0.0, b = 0.0, a = 0.000 }, tertiary = { r = 0.8, g = 0.0, b = 1.0, a = 0.000 }, }, - allow_productivity = true, }, { @@ -264,7 +259,6 @@ data:extend({ secondary = { r = 0.7, g = 0.7, b = 0.7, a = 0.000 }, tertiary = { r = 0.2, g = 0.7, b = 0.0, a = 0.000 }, }, - allow_productivity = true, }, { @@ -289,7 +283,6 @@ data:extend({ secondary = { r = 1.0, g = 0.7, b = 0.0, a = 0.000 }, tertiary = { r = 0.0, g = 0.0, b = 0.7, a = 0.000 }, }, - allow_productivity = true, }, { @@ -315,7 +308,6 @@ data:extend({ tertiary = { r = 0.0, g = 0.7, b = 0.7, a = 0.000 }, }, allow_decomposition = false, - allow_productivity = true, }, { @@ -367,7 +359,6 @@ data:extend({ tertiary = { r = 0.564, g = 0.795, b = 0.000, a = 0.000 }, -- #8fca0000 }, allow_decomposition = false, - allow_productivity = true, }, { @@ -391,7 +382,6 @@ data:extend({ tertiary = { r = 0.9, g = 0.9, b = 0.25, a = 0.000 }, }, allow_decomposition = false, - allow_productivity = true, }, { @@ -418,7 +408,6 @@ data:extend({ tertiary = { r = 0.7, g = 0.7, b = 0.7, a = 0.000 }, }, allow_decomposition = false, - allow_productivity = true, }, { @@ -482,7 +471,6 @@ data:extend({ }, results = { { type = "item", name = "salt", amount = 1 } }, allow_decomposition = false, - allow_productivity = true, }, { @@ -520,7 +508,6 @@ data:extend({ tertiary = { r = 0.960, g = 0.806, b = 0.000, a = 0.000 }, -- #f4cd0000 }, allow_decomposition = false, - allow_productivity = true, }, { @@ -541,7 +528,6 @@ data:extend({ secondary = { r = 0.7, g = 0.5, b = 0.0, a = 0.000 }, tertiary = { r = 0.5, g = 0.05, b = 0.4, a = 0.000 }, }, - allow_productivity = true, }, { @@ -776,7 +762,6 @@ data:extend({ secondary = { r = 1.0, g = 1.0, b = 1.0, a = 0.000 }, tertiary = { r = 0.9, g = 0.9, b = 0.45, a = 0.000 }, }, - allow_productivity = true, }, { @@ -799,7 +784,6 @@ data:extend({ tertiary = { r = 0.960, g = 0.806, b = 0.000 }, }, allow_decomposition = false, - allow_productivity = true, }, { @@ -826,7 +810,6 @@ data:extend({ tertiary = { r = 0.564, g = 0.795, b = 0.000 }, }, allow_decomposition = false, - allow_productivity = true, }, { @@ -873,7 +856,6 @@ data:extend({ { type = "fluid", name = "oxygen", amount = 12.5 }, }, allow_decomposition = false, - allow_productivity = true, }, }) @@ -904,7 +886,6 @@ if not feature_flags["quality"] then secondary = { r = 0.0, g = 0.7, b = 0.7, a = 0.000 }, tertiary = { r = 0.0, g = 0.0, b = 0.7, a = 0.000 }, }, - allow_productivity = true, }, { diff --git a/bobplates/prototypes/recipe/resource-recipe.lua b/bobplates/prototypes/recipe/resource-recipe.lua index 689768d9d..5f349deb3 100644 --- a/bobplates/prototypes/recipe/resource-recipe.lua +++ b/bobplates/prototypes/recipe/resource-recipe.lua @@ -249,7 +249,6 @@ data:extend({ secondary = { r = 0.589, g = 0.540, b = 0.615, a = 0.361 }, tertiary = { r = 0.469, g = 0.145, b = 0.695, a = 0.000 }, }, - allow_productivity = true, }, { @@ -273,3 +272,7 @@ data:extend({ }, }, }) + +data.raw.recipe["solid-fuel-from-petroleum-gas"].allow_productivity = false +data.raw.recipe["solid-fuel-from-light-oil"].allow_productivity = false +data.raw.recipe["solid-fuel-from-heavy-oil"].allow_productivity = false diff --git a/bobrevamp/data.lua b/bobrevamp/data.lua index 4fb4f6ea6..c1a017e7c 100644 --- a/bobrevamp/data.lua +++ b/bobrevamp/data.lua @@ -148,6 +148,7 @@ if settings.startup["bobmods-revamp-oil"].value == true then name = "sour-gas", icon = "__bobrevamp__/graphics/icons/sour-gas.png", icon_size = 64, + subgroup = "fluid", default_temperature = 25, heat_capacity = "0.1kJ", base_color = { r = 0.4, g = 0.1, b = 0.3 }, @@ -203,7 +204,6 @@ if settings.startup["bobmods-revamp-oil"].value == true then secondary = { r = 0.789, g = 0.540, b = 0.615 }, tertiary = { r = 0.669, g = 0.145, b = 0.695 }, }, - allow_productivity = true, }, }) diff --git a/bobrevamp/locale/en/bobrevamp.cfg b/bobrevamp/locale/en/bobrevamp.cfg index 30b6b4e37..81c2770aa 100644 --- a/bobrevamp/locale/en/bobrevamp.cfg +++ b/bobrevamp/locale/en/bobrevamp.cfg @@ -7,7 +7,7 @@ heat-shield=Heat shielding research low-density-structure=__ITEM__low-density-structure__ research thorium-power=Thorium nuclear power deuterium-power=Deuterium nuclear power -rtg=Radio Thermoelectric Generator +rtg=Radio thermoelectric generator [entity-name] @@ -31,7 +31,7 @@ sodium-carbonate=Sodium carbonate sodium-bicarbonate=Sodium bicarbonate ammonium-chloride=Ammonium chloride sodium-cobaltate=Sodium cobaltate -rtg=Radio Thermoelectric Generator +rtg=Radio thermoelectric generator [fluid-name] @@ -50,15 +50,15 @@ ammoniated-brine=Ammoniated brine [recipe-name] -oil-processing-with-sulfur=Oil processing with Sulfur -oil-processing-with-sulfur-dioxide=Oil processing with Sulfur dioxide -oil-processing-with-sulfur-dioxide-2=Oil processing with Sulfur dioxide -oil-processing-with-sulfur-dioxide-3=Oil processing with Sulfur dioxide +oil-processing-with-sulfur=Oil processing with sulfur +oil-processing-with-sulfur-dioxide=Oil processing with sulfur dioxide +oil-processing-with-sulfur-dioxide-2=Oil processing with sulfur dioxide +oil-processing-with-sulfur-dioxide-3=Oil processing with sulfur dioxide carbon-dioxide-oil-processing=Carbon dioxide mediated oil processing enriched-fuel-from-hydrazine=Enriched fuel block -petroleum-gas-sweetening=__FLUID__petroleum-gas_ sweetening -solid-fuel-from-sour-gas=Solid fuel from Sour gas +petroleum-gas-sweetening=Petroleum gas sweetening +solid-fuel-from-sour-gas=Solid fuel from sour gas bob-ammonium-chloride-recycling=Ammonium chloride recycling brine-electrolysis=Brine electrolysis @@ -75,7 +75,7 @@ bobmods-revamp-nuclear=Nuclear power overhaul bobmods-revamp-old-oil=Oil and sulfur overhaul bobmods-revamp-oil=New oil and sulfur overhaul bobmods-revamp-hardmode=Extra chemistry -bobmods-revamp-rtg=Radio Thermoelectric Generator +bobmods-revamp-rtg=Radio thermoelectric generator [mod-setting-description] diff --git a/bobrevamp/prototypes/hard-mode.lua b/bobrevamp/prototypes/hard-mode.lua index b5cd4b04e..bae1f2c8f 100644 --- a/bobrevamp/prototypes/hard-mode.lua +++ b/bobrevamp/prototypes/hard-mode.lua @@ -116,10 +116,9 @@ if bobmods.plates and settings.startup["bobmods-revamp-hardmode"].value == true main_product = "sodium-chlorate", results = { { type = "item", name = "sodium-chlorate", amount = 1 }, - { type = "fluid", name = "hydrogen", amount = 60, ignored_by_productivity = 60 }, + { type = "fluid", name = "hydrogen", amount = 60 }, }, allow_decomposition = false, - allow_productivity = true, }, { type = "recipe", @@ -138,10 +137,9 @@ if bobmods.plates and settings.startup["bobmods-revamp-hardmode"].value == true main_product = "sodium-perchlorate", results = { { type = "item", name = "sodium-perchlorate", amount = 1 }, - { type = "fluid", name = "hydrogen", amount = 20, ignored_by_productivity = 20 }, + { type = "fluid", name = "hydrogen", amount = 20 }, }, allow_decomposition = false, - allow_productivity = true, }, { type = "recipe", @@ -160,7 +158,7 @@ if bobmods.plates and settings.startup["bobmods-revamp-hardmode"].value == true main_product = "lithium-perchlorate", results = { { type = "item", name = "lithium-perchlorate", amount = 1 }, - { type = "item", name = "salt", amount = 1, ignored_by_productivity = 1 }, + { type = "item", name = "salt", amount = 1 }, }, allow_decomposition = false, }, @@ -179,7 +177,6 @@ if bobmods.plates and settings.startup["bobmods-revamp-hardmode"].value == true results = { { type = "fluid", name = "carbon-dioxide", amount = 25 }, }, - allow_productivity = true, }, { type = "recipe", diff --git a/bobrevamp/prototypes/rocket-fuel-updates.lua b/bobrevamp/prototypes/rocket-fuel-updates.lua index a07f6d173..4d05a300f 100644 --- a/bobrevamp/prototypes/rocket-fuel-updates.lua +++ b/bobrevamp/prototypes/rocket-fuel-updates.lua @@ -3,7 +3,7 @@ if data.raw.fluid.ammonia and data.raw.fluid.hydrazine and data.raw.fluid["dinit bobmods.lib.recipe.remove_result("hydrazine", "water") bobmods.lib.recipe.add_result( "hydrazine", - { type = "fluid", name = "pure-water", amount = 4, ignored_by_productivity = 4 } + { type = "fluid", name = "pure-water", amount = 4 } ) end @@ -11,6 +11,7 @@ if data.raw.fluid.ammonia and data.raw.fluid.hydrazine and data.raw.fluid["dinit { type = "fluid", name = "hydrazine", amount = 160 }, { type = "fluid", name = "dinitrogen-tetroxide", amount = 80 }, } + data.raw.recipe["rocket-fuel"].allow_productivity = false data.raw.recipe["rocket-fuel"].category = "chemistry" data.raw.recipe["rocket-fuel"].crafting_machine_tint = { @@ -46,7 +47,7 @@ if data.raw.fluid.ammonia and data.raw.fluid.hydrazine and data.raw.fluid["dinit bobmods.lib.recipe.remove_result("nitric-oxide", "water") bobmods.lib.recipe.add_result( "nitric-oxide", - { type = "fluid", name = "pure-water", amount = 12, ignored_by_productivity = 12 } + { type = "fluid", name = "pure-water", amount = 12 } ) end diff --git a/bobrevamp/prototypes/rocket-fuel.lua b/bobrevamp/prototypes/rocket-fuel.lua index 93ecaa20d..caf394a2a 100644 --- a/bobrevamp/prototypes/rocket-fuel.lua +++ b/bobrevamp/prototypes/rocket-fuel.lua @@ -5,7 +5,7 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen name = "ammonia", icon = "__bobrevamp__/graphics/icons/ammonia.png", icon_size = 64, - subgroup = "bob-fluid", + subgroup = "fluid", order = "a[fluid]-g[ammonia]", default_temperature = 15, max_temperature = 100, @@ -20,7 +20,7 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen name = "dinitrogen-tetroxide", icon = "__bobrevamp__/graphics/icons/dinitrogen-tetroxide.png", icon_size = 64, - subgroup = "bob-fluid", + subgroup = "fluid", order = "a[fluid]-g[dinitrogen-tetroxide]", default_temperature = 15, max_temperature = 100, @@ -35,7 +35,7 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen name = "hydrazine", icon = "__bobrevamp__/graphics/icons/hydrazine.png", icon_size = 64, - subgroup = "bob-fluid", + subgroup = "fluid", order = "a[fluid]-g[hydrazine]", default_temperature = 15, max_temperature = 100, @@ -52,7 +52,7 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen name = "hydrogen-peroxide", icon = "__bobrevamp__/graphics/icons/hydrogen-peroxide.png", icon_size = 64, - subgroup = "bob-fluid", + subgroup = "fluid", order = "a[fluid]-g[hydrogen-peroxide]", default_temperature = 15, max_temperature = 100, @@ -70,7 +70,7 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen name = "nitrogen-dioxide", icon = "__bobrevamp__/graphics/icons/nitrogen-dioxide.png", icon_size = 64, - subgroup = "bob-fluid", + subgroup = "fluid", order = "a[fluid]-g[nitrogen-dioxide]", default_temperature = 25, max_temperature = 100, @@ -91,7 +91,7 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen order = "b[fluid-chemistry]-b[ammonia]", energy_required = 1, category = "chemistry", - subgroup = "bob-fluid", + subgroup = "fluid", enabled = false, ingredients = { { type = "fluid", name = "nitrogen", amount = 10 }, @@ -106,7 +106,6 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen secondary = { r = 0.7, g = 0.7, b = 0.7, a = 0.000 }, tertiary = { r = 0.5, g = 0.5, b = 1.0, a = 0.000 }, }, - allow_productivity = true, }, { @@ -117,7 +116,7 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen order = "b[fluid-chemistry]-b[hydrogen-peroxide]", energy_required = 1, category = "chemistry", - subgroup = "bob-fluid", + subgroup = "fluid", enabled = false, ingredients = { { type = "fluid", name = "hydrogen", amount = 16 }, @@ -132,7 +131,6 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen secondary = { r = 0.8, g = 0.0, b = 0.0, a = 0.000 }, tertiary = { r = 0.0, g = 0.5, b = 1.0, a = 0.000 }, }, - allow_productivity = true, }, { @@ -143,7 +141,7 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen order = "b[fluid-chemistry]-b[hydrazine]", energy_required = 1, category = "chemistry", - subgroup = "bob-fluid", + subgroup = "fluid", enabled = false, ingredients = { { type = "fluid", name = "ammonia", amount = 20 }, @@ -151,7 +149,7 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen }, results = { { type = "fluid", name = "hydrazine", amount = 8 }, - { type = "fluid", name = "water", amount = 4, ignored_by_productivity = 4 }, + { type = "fluid", name = "water", amount = 4 }, }, main_product = "hydrazine", crafting_machine_tint = { @@ -159,7 +157,6 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen secondary = { r = 0.0, g = 0.5, b = 1.0, a = 0.000 }, tertiary = { r = 0.7, g = 0.7, b = 1.0, a = 0.000 }, }, - allow_productivity = true, }, { @@ -170,7 +167,7 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen order = "b[fluid-chemistry]-b[nitrogen-dioxide]", energy_required = 1, category = "chemistry", - subgroup = "bob-fluid", + subgroup = "fluid", enabled = false, ingredients = { { type = "fluid", name = "nitrogen", amount = 10 }, @@ -185,7 +182,6 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen secondary = { r = 0.7, g = 0.0, b = 0.0, a = 0.000 }, tertiary = { r = 0.8, g = 0.0, b = 1.0, a = 0.000 }, }, - allow_productivity = true, }, { @@ -196,7 +192,7 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen order = "b[fluid-chemistry]-b[dinitrogen-tetroxide]", energy_required = 1, category = "chemistry", - subgroup = "bob-fluid", + subgroup = "fluid", enabled = false, ingredients = { { type = "fluid", name = "nitrogen-dioxide", amount = 20 }, @@ -210,7 +206,6 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen secondary = { r = 0.7, g = 0.7, b = 0.7, a = 0.000 }, tertiary = { r = 0.7, g = 0.7, b = 0.3, a = 0.000 }, }, - allow_productivity = true, }, }) @@ -218,6 +213,19 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen bobmods.plates.make_void_fluid_recipe("ammonia", 25, 15) end + if data.raw["item-subgroup"]["bob-fluid"] then + data.raw.fluid["ammonia"].subgroup = "bob-fluid" + data.raw.fluid["dinitrogen-tetroxide"].subgroup = "bob-fluid" + data.raw.fluid["hydrazine"].subgroup = "bob-fluid" + data.raw.fluid["hydrogen-peroxide"].subgroup = "bob-fluid" + data.raw.fluid["nitrogen-dioxide"].subgroup = "bob-fluid" + data.raw.recipe["ammonia"].subgroup = "bob-fluid" + data.raw.recipe["hydrogen-peroxide"].subgroup = "bob-fluid" + data.raw.recipe["hydrazine"].subgroup = "bob-fluid" + data.raw.recipe["nitrogen-dioxide"].subgroup = "bob-fluid" + data.raw.recipe["dinitrogen-tetroxide"].subgroup = "bob-fluid" + end + if settings.startup["bobmods-revamp-hardmode"].value == true then data:extend({ { @@ -225,7 +233,7 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen name = "nitric-oxide", icon = "__bobrevamp__/graphics/icons/nitric-oxide.png", icon_size = 64, - subgroup = "bob-fluid", + subgroup = "fluid", order = "a[fluid]-g[nitric-oxide]", default_temperature = 15, max_temperature = 100, @@ -243,7 +251,7 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen order = "b[fluid-chemistry]-b[nitric-oxide]", energy_required = 1, category = "chemistry", - subgroup = "bob-fluid", + subgroup = "fluid", enabled = false, ingredients = { { type = "fluid", name = "ammonia", amount = 20 }, @@ -251,7 +259,7 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen }, results = { { type = "fluid", name = "nitric-oxide", amount = 20 }, - { type = "fluid", name = "water", amount = 12, ignored_by_productivity = 12 }, + { type = "fluid", name = "water", amount = 12 }, }, main_product = "nitric-oxide", crafting_machine_tint = { @@ -259,7 +267,6 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen secondary = { r = 0.8, g = 0.0, b = 0.0, a = 0.000 }, tertiary = { r = 1.0, g = 0.0, b = 1.0, a = 0.000 }, }, - allow_productivity = true, }, { @@ -270,7 +277,7 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen order = "b[fluid-chemistry]-b[nitrogen-dioxide]", energy_required = 1, category = "chemistry", - subgroup = "bob-fluid", + subgroup = "fluid", enabled = false, ingredients = { { type = "fluid", name = "nitric-oxide", amount = 20 }, @@ -285,9 +292,15 @@ if data.raw.fluid.hydrogen and data.raw.fluid.oxygen and data.raw.fluid.nitrogen secondary = { r = 0.7, g = 0.0, b = 0.0, a = 0.000 }, tertiary = { r = 0.8, g = 0.0, b = 1.0, a = 0.000 }, }, - allow_productivity = true, }, }) + + if data.raw["item-subgroup"]["bob-fluid"] then + data.raw.fluid["nitric-oxide"].subgroup = "bob-fluid" + data.raw.recipe["nitric-oxide"].subgroup = "bob-fluid" + data.raw.recipe["nitrogen-dioxide"].subgroup = "bob-fluid" + end + end if data.raw.item["enriched-fuel"] then diff --git a/bobrevamp/prototypes/rtg-updates.lua b/bobrevamp/prototypes/rtg-updates.lua index ba0a9c472..9de147e3a 100644 --- a/bobrevamp/prototypes/rtg-updates.lua +++ b/bobrevamp/prototypes/rtg-updates.lua @@ -3,7 +3,7 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then data.raw.recipe["sodium-cobaltate"].emissions_multiplier = 0.2 bobmods.lib.recipe.add_result( "sodium-cobaltate", - { type = "fluid", name = "carbon-dioxide", amount = 150, ignored_by_productivity = 150 } + { type = "fluid", name = "carbon-dioxide", amount = 150 } ) if data.raw.fluid["pure-water"] then diff --git a/bobrevamp/prototypes/rtg.lua b/bobrevamp/prototypes/rtg.lua index 8c21a1389..17cfb2e41 100644 --- a/bobrevamp/prototypes/rtg.lua +++ b/bobrevamp/prototypes/rtg.lua @@ -112,7 +112,6 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then secondary = { r = 0.5, g = 0.5, b = 0.8, a = 0.000 }, tertiary = { r = 0.4, g = 0.4, b = 0.8, a = 0.000 }, }, - allow_productivity = true, }, { type = "recipe", @@ -135,7 +134,6 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then secondary = { r = 0.5, g = 0.5, b = 0.8, a = 0.000 }, tertiary = { r = 0.4, g = 0.4, b = 0.8, a = 0.000 }, }, - allow_productivity = true, }, { type = "recipe", @@ -153,7 +151,7 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then }, results = { { type = "item", name = "sodium-bicarbonate", amount = 1 }, - { type = "item", name = "ammonium-chloride", amount = 1, ignored_by_productivity = 1 }, + { type = "item", name = "ammonium-chloride", amount = 1 }, }, main_product = "sodium-bicarbonate", crafting_machine_tint = { @@ -161,7 +159,6 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then secondary = { r = 0.7, g = 0.7, b = 0.7, a = 0.000 }, tertiary = { r = 0.4, g = 0.4, b = 0.4, a = 0.000 }, }, - allow_productivity = true, }, { type = "recipe", @@ -178,7 +175,7 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then }, results = { { type = "item", name = "sodium-carbonate", amount = 1 }, - { type = "fluid", name = "water", amount = 10, fluidbox_index = 1, ignored_by_productivity = 10 }, + { type = "fluid", name = "water", amount = 10, fluidbox_index = 1 }, { type = "fluid", name = "carbon-dioxide", amount = 25, fluidbox_index = 2 }, }, main_product = "sodium-carbonate", @@ -187,7 +184,6 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then secondary = { r = 0.0, g = 0.5, b = 0.8, a = 0.000 }, tertiary = { r = 0.8, g = 0.4, b = 0.4, a = 0.000 }, }, - allow_productivity = true, }, { type = "recipe", @@ -262,7 +258,6 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then secondary = { r = 0.7, g = 0.7, b = 0.7, a = 0.000 }, tertiary = { r = 0.4, g = 0.4, b = 0.4, a = 0.000 }, }, - allow_productivity = true, }, }) end @@ -317,7 +312,7 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then }, results = { { type = "item", name = "sodium-cobaltate", amount = 5 }, - { type = "fluid", name = "oxygen", amount = 200, ignored_by_productivity = 200 }, + { type = "fluid", name = "oxygen", amount = 200 }, }, main_product = "sodium-cobaltate", crafting_machine_tint = { @@ -325,7 +320,6 @@ if bobmods.plates and settings.startup["bobmods-revamp-rtg"].value == true then secondary = { r = 0.7, g = 0.7, b = 0.7, a = 0.000 }, tertiary = { r = 0.8, g = 0.4, b = 0.4, a = 0.000 }, }, - allow_productivity = true, }, { type = "recipe", diff --git a/bobwarfare/prototypes/item/fluid.lua b/bobwarfare/prototypes/item/fluid.lua index 0db300976..ed7c98ade 100644 --- a/bobwarfare/prototypes/item/fluid.lua +++ b/bobwarfare/prototypes/item/fluid.lua @@ -10,12 +10,10 @@ if data.raw.fluid["nitric-acid"] then max_temperature = 100, icon = "__bobwarfare__/graphics/icons/sulfuric-nitric-acid.png", icon_size = 32, + subgroup = "fluid", order = "a[fluid]-g[sulfuric-nitric-acid]", }, }) - if data.raw["item-subgroup"]["bob-fluid"] then - data.raw.fluid["sulfuric-nitric-acid"].subgroup = "bob-fluid" - end end data:extend({ @@ -29,6 +27,7 @@ data:extend({ max_temperature = 100, icon = "__bobwarfare__/graphics/icons/nitroglycerin.png", icon_size = 64, + subgroup = "fluid", order = "a[fluid]-g[nitroglycerin]", }, @@ -42,11 +41,8 @@ data:extend({ max_temperature = 100, icon = "__bobwarfare__/graphics/icons/glycerol.png", icon_size = 64, + subgroup = "fluid", order = "a[fluid]-g[glycerol]", fuel_value = "730kJ", --"1.46MJ" }, }) -if data.raw["item-subgroup"]["bob-fluid"] then - data.raw.fluid["nitroglycerin"].subgroup = "bob-fluid" - data.raw.fluid["glycerol"].subgroup = "bob-fluid" -end diff --git a/bobwarfare/prototypes/recipe/fluid-recipe.lua b/bobwarfare/prototypes/recipe/fluid-recipe.lua index a0e602c75..791e103b8 100644 --- a/bobwarfare/prototypes/recipe/fluid-recipe.lua +++ b/bobwarfare/prototypes/recipe/fluid-recipe.lua @@ -17,7 +17,6 @@ if data.raw.fluid["nitric-acid"] then icon = "__bobwarfare__/graphics/icons/sulfuric-nitric-acid.png", icon_size = 32, order = "b[fluid-chemistry]-b[sulfuric-nitric-acid]", - allow_productivity = true, }, }) end @@ -39,7 +38,6 @@ data:extend({ icon = "__bobwarfare__/graphics/icons/glycerol.png", icon_size = 64, order = "b[fluid-chemistry]-b[glycerol]", - allow_productivity = true, }, { @@ -59,14 +57,16 @@ data:extend({ icon = "__bobwarfare__/graphics/icons/nitroglycerin.png", icon_size = 64, order = "b[fluid-chemistry]-b[nitroglycerin]", - allow_productivity = true, }, }) if data.raw["item-subgroup"]["bob-fluid"] then if data.raw.recipe["sulfuric-nitric-acid"] then data.raw.recipe["sulfuric-nitric-acid"].subgroup = "bob-fluid" + data.raw.fluid["sulfuric-nitric-acid"].subgroup = "bob-fluid" end data.raw.recipe["glycerol"].subgroup = "bob-fluid" data.raw.recipe["nitroglycerin"].subgroup = "bob-fluid" + data.raw.fluid["glycerol"].subgroup = "bob-fluid" + data.raw.fluid["nitroglycerin"].subgroup = "bob-fluid" end