Bob's MCI and Revamp 2.0 (#252)

* Add subgroup to fluid * Add item sounds * Add item sounds * Revise item sounds * Add item sounds * Add item sounds * Add item sounds * Update chemicals.lua Add item sounds, add fluid subgroups, change fuel_value of deuterium to equal hydrogen. * Format code * Format Code * Format Code * Add item sounds * Add item sounds * Adjust expensive electrolysis to account for Quality * Add item sounds * Add item sounds * Switch enriched fuel to new subgroup * Fix first lead plate recipe being blocked * Fix first lead plate recipe being blocked * Add locale for revised lead plate recipe * Switch fuels to new fuel item category * Add new 64px icons * Update data-updates.lua Add additional hydrogen electrolysis adjustments to account for quality (baseline electrolyser energy usage reduced). Change distillery recipe category to only be added to assembling machines if distilleries don't exist somehow. Reorganize intermediates to only a single recipe group. * Reorganize intermediates to single group, remove unneeded subgroups * Move coal-from-wood to Bob's Materials group * Add "hidden" to void recipes * Update chemistry-recipe.lua Revise tungsten production to remove tungstic acid stage if Quality. Reduce salt water electrolysis hydrogen output by half, since the other half is consumed by NaOH. * Make tungstic acid barreling conditional on existence * Reorganize intermediates * Make tungstic acid conditional on no Quality * Reorganize intermediates * Make tungstic acid conditional * Remove bob-intermediate-products reference * Reorganize intermediates * Remove references to bob-intermediate-products * Remove references to bob-intermediate-products * Reorganize intermediates * Reorganize intermediates * Reorganize intermediates * Reorganize intermediates * Update icons to 64px * Revise coal-cracking to match version in bobplates * Change furnace conversion recipes setting to default to false * Update NaOH icon to 64px * Update NaOH icon to 64px * Update NaOH to 64px * Update NaOH to 64px * Reorganize intermediates * Update NaOH to 64px * Reorganize intermediates * Add recycling updates * Add recycling updates * Update solid-fuel-from-sour-gas icons and order * Update data-updates.lua Update reactors to use fuel_categories instead of fuel_category. Update descriptions. Change rocket parts to use advanced processing units (now that RCUs are removed). Update solid fuel organization. * Remove RCU section * Increase gear costs to 2 * Add missing recipe locale * Reorganize recipes * Reduce brine electrolysis hydrogen by half * Add item sounds * Add item sounds * Add item sounds * Change ammonium chloride recycling name to sidestep Quality recycling * Update rtg-updates.lua Change ammonium chloride recycling name to sidestep Quality recycling. Make replacing water with pure water conditional on pure water existing. * Change ammonium chloride recycling name to sidestep Quality recycling * Add migration for ammonium chloride recycling name change * Add recycling updates * Add purple boards to satellite in place of RCU * Correct prereqs for satellite now being on rocket-silo tech * Add recipe updates for cargo landing pad * Add fluid subgroup * Add fluid subgroup * Add fluid subgroup * Add fluid subgroup * Add subgroup for fluid resources * Add subgroup for fluid resources * Adjust recycling updates * Increase hydrogen electrolysis energy_required * Reduce lead oxide pollution * Make expensive electrolysis default to true * Update expensive electrolysis * Adjust expensive electrolysis * Fix inconsistent capitalization * Update distillery icons to 64px * Update distillery icons to 64px * Update distillery icon to 64px * Update distillery icon to 64px * Add distillery 1 tech icon Just in case * Switch heat shield to category advanced-crafting * Fixing comment typo * Fixed missing prerequisite * Removing references to item-group "bob-intermediate-products" * Unhiding fluid void recipes Else gas venting pump's input fluid box tooltip is not populated --------- Co-authored-by: KiwiHawk <[email protected]>
modded-factorio · Dec 16, 2024 · 6faa6dd · 6faa6dd
1 parent 80ec467
commit 6faa6dd
Show file tree

Hide file tree

Showing 58 changed files with 1,183 additions and 329 deletions.
diff --git a/bobassembly/graphics/icons/distillery-blue.png b/bobassembly/graphics/icons/distillery-blue.png
diff --git a/bobassembly/graphics/icons/distillery-green.png b/bobassembly/graphics/icons/distillery-green.png
diff --git a/bobassembly/graphics/icons/distillery-purple.png b/bobassembly/graphics/icons/distillery-purple.png
diff --git a/bobassembly/graphics/icons/distillery-red.png b/bobassembly/graphics/icons/distillery-red.png
diff --git a/bobassembly/prototypes/distillery.lua b/bobassembly/prototypes/distillery.lua
@@ -15,7 +15,6 @@ then
       type = "item",
       name = "bob-distillery-2",
       icon = "__bobassembly__/graphics/icons/distillery-red.png",
-      icon_size = 32,
       subgroup = "production-machine",
       order = "e[distillery]",
       place_result = "bob-distillery-2",
@@ -38,7 +37,6 @@ then
       type = "item",
       name = "bob-distillery-3",
       icon = "__bobassembly__/graphics/icons/distillery-blue.png",
-      icon_size = 32,
       subgroup = "production-machine",
       order = "e[distillery]",
       place_result = "bob-distillery-3",
@@ -62,7 +60,6 @@ then
       type = "item",
       name = "bob-distillery-4",
       icon = "__bobassembly__/graphics/icons/distillery-purple.png",
-      icon_size = 32,
       subgroup = "production-machine",
       order = "e[distillery]",
       place_result = "bob-distillery-4",
@@ -86,7 +83,6 @@ then
       type = "item",
       name = "bob-distillery-5",
       icon = "__bobassembly__/graphics/icons/distillery-green.png",
-      icon_size = 32,
       subgroup = "production-machine",
       order = "e[distillery]",
       place_result = "bob-distillery-5",
@@ -166,7 +162,6 @@ then
       {
         name = "bob-distillery-2",
         icon = "__bobassembly__/graphics/icons/distillery-red.png",
-        icon_size = 32,
         minable = { mining_time = 0.2, result = "bob-distillery-2" },
         max_health = 250,
         graphics_set = {
@@ -188,7 +183,6 @@ then
       {
         name = "bob-distillery-3",
         icon = "__bobassembly__/graphics/icons/distillery-blue.png",
-        icon_size = 32,
         minable = { mining_time = 0.2, result = "bob-distillery-3" },
         max_health = 300,
         graphics_set = {
@@ -219,7 +213,6 @@ then
       {
         name = "bob-distillery-4",
         icon = "__bobassembly__/graphics/icons/distillery-purple.png",
-        icon_size = 32,
         minable = { mining_time = 0.2, result = "bob-distillery-4" },
         max_health = 350,
         graphics_set = {
@@ -250,7 +243,6 @@ then
       {
         name = "bob-distillery-5",
         icon = "__bobassembly__/graphics/icons/distillery-green.png",
-        icon_size = 32,
         minable = { mining_time = 0.2, result = "bob-distillery-5" },
         max_health = 400,
         graphics_set = {

diff --git a/bobassembly/prototypes/electrolyser-updates.lua b/bobassembly/prototypes/electrolyser-updates.lua
@@ -10,9 +10,13 @@ then
     and settings.startup["bobmods-plates-expensive-electrolysis"].value == true
   then
     data.raw["assembling-machine"]["electrolyser-2"].energy_usage = "1625kW"
+    data.raw["assembling-machine"]["electrolyser-2"].energy_source.drain = "18kW"
     data.raw["assembling-machine"]["electrolyser-3"].energy_usage = "2400kW"
+    data.raw["assembling-machine"]["electrolyser-3"].energy_source.drain = "27kW"
     data.raw["assembling-machine"]["electrolyser-4"].energy_usage = "3025kW"
+    data.raw["assembling-machine"]["electrolyser-4"].energy_source.drain = "34kW"
     data.raw["assembling-machine"]["electrolyser-5"].energy_usage = "3500kW"
+    data.raw["assembling-machine"]["electrolyser-5"].energy_source.drain = "39kW"
   end
 
   data.raw["assembling-machine"]["electrolyser"].next_upgrade = "electrolyser-2"

diff --git a/bobclasses/data-updates.lua b/bobclasses/data-updates.lua
@@ -34,8 +34,4 @@ if data.raw["recipe-category"]["mixing-furnace"] then
   end
 end
 
-if data.raw["item-group"]["bob-intermediate-products"] then
-  data.raw["item-subgroup"]["body-parts"].group = "bob-intermediate-products"
-end
-
 require("prototypes.recipe-updates")
diff --git a/bobclasses/prototypes/category.lua b/bobclasses/prototypes/category.lua
@@ -9,6 +9,6 @@ data:extend({
     type = "item-subgroup",
     name = "body-parts",
     group = "intermediate-products",
-    order = "i",
+    order = "e-e2",
   },
 })
diff --git a/bobelectronics/data-updates.lua b/bobelectronics/data-updates.lua
@@ -2,6 +2,8 @@ require("prototypes.recipe-updates")
 require("prototypes.technology-updates")
 
 data.raw.recipe["copper-cable"].category = "electronics"
+data.raw.item["copper-cable"].subgroup = "bob-electronic-components"
+data.raw.item["copper-cable"].order = "0-a1"
 
 if data.raw["recipe-category"]["chemical-furnace"] then
   if data.raw.recipe["carbon"] then

diff --git a/bobelectronics/graphics/icons/gilded-copper-cable.png b/bobelectronics/graphics/icons/gilded-copper-cable.png
diff --git a/bobelectronics/graphics/icons/insulated-cable.png b/bobelectronics/graphics/icons/insulated-cable.png
diff --git a/bobelectronics/graphics/icons/tinned-copper-cable.png b/bobelectronics/graphics/icons/tinned-copper-cable.png
diff --git a/bobelectronics/locale/en/bobelectronics.cfg b/bobelectronics/locale/en/bobelectronics.cfg
@@ -42,7 +42,6 @@ synthetic-wood=Synthetic wood
 
 
 [item-group-name]
-bob-intermediate-products=Bob's Intermediate products
 bob-resource-products=Bob's Materials
 bob-fluid-products=Bob's Fluids
 

diff --git a/bobelectronics/locale/ru/bobelectronics.cfg b/bobelectronics/locale/ru/bobelectronics.cfg
@@ -42,7 +42,6 @@ synthetic-wood=Синтетическое дерево
 
 
 [item-group-name]
-bob-intermediate-products=Промежуточные продукты Боба
 bob-resource-products=Материалы Боба
 bob-fluid-products=Жидкости Боба
 

diff --git a/bobelectronics/prototypes/category.lua b/bobelectronics/prototypes/category.lua
@@ -70,30 +70,22 @@ data:extend({
     order = "c-b",
   },
 
-  {
-    type = "item-group",
-    name = "bob-intermediate-products",
-    order = "c-i",
-    icon = "__bobelectronics__/graphics/icons/technology/intermediates.png",
-    icon_size = 64,
-  },
-
   {
     type = "item-subgroup",
     name = "bob-electronic-components",
-    group = "bob-intermediate-products",
+    group = "intermediate-products",
     order = "e-a1",
   },
   {
     type = "item-subgroup",
     name = "bob-boards",
-    group = "bob-intermediate-products",
+    group = "intermediate-products",
     order = "e-a2",
   },
   {
     type = "item-subgroup",
     name = "bob-electronic-boards",
-    group = "bob-intermediate-products",
+    group = "intermediate-products",
     order = "e-a3",
   },
 })
diff --git a/bobelectronics/prototypes/chemicals.lua b/bobelectronics/prototypes/chemicals.lua
@@ -4,6 +4,7 @@ data:extend({
     name = "ferric-chloride-solution",
     icon = "__bobelectronics__/graphics/icons/ferric-chloride-solution.png",
     icon_size = 32,
+    subgroup = "bob-fluid",
     default_temperature = 25,
     heat_capacity = "1kJ",
     base_color = { r = 0.7, g = 0.6, b = 0.2 },
@@ -45,13 +46,13 @@ data:extend({
     name = "coal-cracking",
     icon = "__bobelectronics__/graphics/icons/coal-cracking.png",
     icon_size = 32,
-    subgroup = "bob-fluid",
-    order = "b[fluid-chemistry]-a[coal-cracking]",
+    subgroup = "fluid-recipes",
+    order = "a[oil-processing]-c[coal-cracking]",
     category = "chemistry",
     enabled = false,
-    energy_required = 2.5,
+    energy_required = 3,
     ingredients = {
-      { type = "item", name = "coal", amount = 2 },
+      { type = "item", name = "coal", amount = 3 },
       { type = "fluid", name = "water", amount = 15 },
     },
     results = {

diff --git a/bobelectronics/prototypes/electronics.lua b/bobelectronics/prototypes/electronics.lua
@@ -22,7 +22,6 @@ if data.raw.item["tin-plate"] then
       type = "item",
       name = "tinned-copper-cable",
       icon = "__bobelectronics__/graphics/icons/tinned-copper-cable.png",
-      icon_size = 32,
       subgroup = "bob-electronic-components",
       order = "0-a1[tinned-copper-cable]",
       stack_size = 200,
@@ -52,7 +51,6 @@ data:extend({
     type = "item",
     name = "insulated-cable",
     icon = "__bobelectronics__/graphics/icons/insulated-cable.png",
-    icon_size = 32,
     subgroup = "bob-electronic-components",
     order = "0-a2[insulated-cable]",
     stack_size = 200,
@@ -82,7 +80,6 @@ if data.raw.item["bob-gold-plate"] then
       type = "item",
       name = "gilded-copper-cable",
       icon = "__bobelectronics__/graphics/icons/gilded-copper-cable.png",
-      icon_size = 32,
       subgroup = "bob-electronic-components",
       order = "0-a3[gilded-copper-cable]",
       stack_size = 200,

diff --git a/bobgreenhouse/prototypes/updates.lua b/bobgreenhouse/prototypes/updates.lua
@@ -4,10 +4,6 @@ if data.raw["item-subgroup"]["bob-resource-chemical"] then
   bobmods.lib.item.set_subgroup("fertiliser", "bob-resource-chemical")
 end
 
-if data.raw["item-group"]["bob-intermediate-products"] then
-  data.raw["item-subgroup"]["bob-greenhouse-items"].group = "bob-intermediate-products"
-end
-
 if data.raw.item["bob-glass"] then
   bobmods.lib.recipe.replace_ingredient("bob-greenhouse", "copper-plate", "bob-glass")
 end

diff --git a/boblibrary/ore-functions.lua b/boblibrary/ore-functions.lua
@@ -326,6 +326,7 @@ function bobmods.lib.resource.create(inputs)
       name = inputs.name,
       flags = { "placeable-neutral" },
       category = inputs.category,
+      subgroup = inputs.subgroup,
       order = "b-d-" .. inputs.name,
       minimum = minimum,
       normal = normal,

diff --git a/boblogistics/prototypes/category.lua b/boblogistics/prototypes/category.lua
@@ -192,11 +192,3 @@ data:extend({
     order = "e-e",
   },
 })
-
-if data.raw["item-group"]["bob-intermediate-products"] then
-  data.raw["item-subgroup"]["bob-roboport-parts"].group = "bob-intermediate-products"
-  data.raw["item-subgroup"]["bob-roboport-parts-antenna"].group = "bob-intermediate-products"
-  data.raw["item-subgroup"]["bob-roboport-parts-door"].group = "bob-intermediate-products"
-  data.raw["item-subgroup"]["bob-roboport-parts-charge"].group = "bob-intermediate-products"
-  data.raw["item-subgroup"]["bob-robot-parts"].group = "bob-intermediate-products"
-end
diff --git a/bobores/prototypes/fluids.lua b/bobores/prototypes/fluids.lua
@@ -2,6 +2,7 @@ bobmods.ores.water = {
   name = "ground-water",
   icon = "__base__/graphics/icons/fluid/water.png",
   icon_size = 64,
+  subgroup = "bob-fluid",
   category = "water",
   infinite = true,
   minimum = 400000,
@@ -73,6 +74,7 @@ end
 bobmods.ores.lithia_water = {
   name = "lithia-water",
   icon = "__bobores__/graphics/icons/lithia-water.png",
+  subgroup = "bob-fluid",
   category = "water",
   infinite = true,
   minimum = 2000000,