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 <[email protected]>
modded-factorio · Dec 22, 2024 · 5b81441 · 5b81441
1 parent 835d40e
commit 5b81441
Show file tree

Hide file tree

Showing 19 changed files with 91 additions and 144 deletions.
diff --git a/bobelectronics/graphics/icons/technology/fluids.png b/bobelectronics/graphics/icons/technology/fluids.png
diff --git a/bobelectronics/graphics/icons/technology/intermediates.png b/bobelectronics/graphics/icons/technology/intermediates.png
diff --git a/bobelectronics/graphics/icons/technology/resources.png b/bobelectronics/graphics/icons/technology/resources.png
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,
     },
   })