Electronics categories #424

Author: KiwiHawk

bobassembly/changelog.txt

@@ -3,6 +3,7 @@ Version: 2.0.2
 Date: ???
   Changes:
     - Added uk locale #176
+    - Reworked how electronics recipe categories are assigned #424
     - Added zh-TW locale #432
 ---------------------------------------------------------------------------------------------------
 Version: 2.0.1

bobassembly/info.json

@@ -7,8 +7,8 @@
   "contact": "",
   "homepage": "https://forums.factorio.com/viewforum.php?f=51",
   "dependencies": [
-    "base >= 2.0.33",
-    "boblibrary >= 2.0.0",
+    "base >= 2.0.49",
+    "boblibrary >= 2.0.1",
     "? bobplates >= 2.0.0"
   ],
   "description": "Requires Bob's functions library mod\n\nThis mod adds assembling machines 4, 5 and 6, and updates the recipe for assembling machine 3 to fit my progression pattern.\nThe mod also adds higher tiers of Electric furnace, Chemical plant and Oil refinery.\nIt also includes the Electronic assembling machine chain, and additional tiers of machines added by Bob's Metals, Chemicals and Intermediates mod.\n\nDesigned to work best with my full mod pack.\nAll additional machine tiers other than assembling machines can be turned off in the mod options."

bobassembly/prototypes/assembly-electronics-updates.lua

@@ -76,26 +76,13 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
   end
 
   -- add new electronics crafting categories
-  if data.raw.player then
-    bobmods.lib.machine.type_if_add_category("player", "crafting", "bob-electronics")
-  elseif data.raw.character then
-    bobmods.lib.machine.type_if_add_category("character", "crafting", "bob-electronics")
-  end
-  if data.raw["god-controller"] then
-    bobmods.lib.machine.type_if_add_category("god-controller", "crafting", "bob-electronics")
-  end
-  bobmods.lib.machine.type_if_add_category("assembling-machine", "crafting", "bob-electronics")
-  bobmods.lib.machine.type_if_add_category("assembling-machine", "crafting", "bob-electronics-machine")
-  bobmods.lib.machine.type_if_add_category("assembling-machine", "crafting-with-fluid", "bob-electronics-with-fluid")
-
-  data.raw.recipe["copper-cable"].category = "bob-electronics"
-
-  data.raw.recipe["electronic-circuit"].category = "bob-electronics"
-  data.raw.recipe["advanced-circuit"].category = "bob-electronics"
-  data.raw.recipe["processing-unit"].category = "bob-electronics-machine"
+  bobmods.lib.recipe.add_additional_category("copper-cable", "electronics")
+  bobmods.lib.recipe.add_additional_category("electronic-circuit", "electronics")
+  bobmods.lib.recipe.add_additional_category("advanced-circuit", "electronics")
+  bobmods.lib.recipe.add_additional_category("processing-unit", "electronics")
 
   if data.raw.recipe["bob-advanced-processing-unit"] then
-    data.raw.recipe["bob-advanced-processing-unit"].category = "bob-electronics-machine"
+    bobmods.lib.recipe.add_additional_category("bob-advanced-processing-unit", "electronics")
   end
   if data.raw.item["bob-advanced-processing-unit"] then
     bobmods.lib.recipe.replace_ingredient(

bobassembly/prototypes/assembly-electronics.lua

@@ -30,15 +30,11 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
   data:extend({
     {
       type = "recipe-category",
-      name = "bob-electronics",
+      name = "electronics",
     },
     {
       type = "recipe-category",
-      name = "bob-electronics-machine",
-    },
-    {
-      type = "recipe-category",
-      name = "bob-electronics-with-fluid",
+      name = "electronics-with-fluid",
     },
   })
 
@@ -156,7 +152,7 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
         },
         idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 },
       },
-      crafting_categories = { "bob-electronics", "bob-electronics-machine", "bob-electronics-with-fluid" },
+      crafting_categories = { "electronics", "electronics-with-fluid" },
       crafting_speed = 1,
       energy_source = {
         type = "electric",
@@ -331,7 +327,7 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
         },
         idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 },
       },
-      crafting_categories = { "bob-electronics", "bob-electronics-machine", "bob-electronics-with-fluid" },
+      crafting_categories = { "electronics", "electronics-with-fluid" },
       crafting_speed = 2.25,
       energy_source = {
         type = "electric",
@@ -512,7 +508,7 @@ if settings.startup["bobmods-assembly-electronicmachines"].value == true then
         },
         idle_sound = { filename = "__base__/sound/idle1.ogg", volume = 0.6 },
       },
-      crafting_categories = { "bob-electronics", "bob-electronics-machine", "bob-electronics-with-fluid" },
+      crafting_categories = { "electronics", "electronics-with-fluid" },
       crafting_speed = 4,
       energy_source = {
         type = "electric",

bobclasses/info.json

@@ -7,8 +7,8 @@
   "contact": "",
   "homepage": "https://forums.factorio.com/viewforum.php?f=51",
   "dependencies": [
-    "base >= 1.2.0",
-    "boblibrary >= 2.0.0",
+    "base >= 2.0.49",
+    "boblibrary >= 2.0.1",
     "? bobplates >= 2.0.0",
     "? boblogistics >= 2.0.0"
   ],

bobclasses/prototypes/recipe-updates.lua

@@ -34,10 +34,8 @@ elseif data.raw.item["bob-aluminium-plate"] then
   bobmods.lib.tech.add_prerequisite("bob-bodies", "bob-aluminium-processing")
 end
 
-if data.raw["recipe-category"]["bob-electronics"] then
-  data.raw.recipe["bob-player-brain"].category = "bob-electronics"
-  data.raw.recipe["bob-player-brain-2"].category = "bob-electronics"
-end
+bobmods.lib.recipe.add_additional_category("bob-player-brain", "electronics")
+bobmods.lib.recipe.add_additional_category("bob-player-brain-2", "electronics")
 
 if data.raw.item["bob-solder"] then
   bobmods.lib.recipe.add_ingredient("bob-player-brain", { type = "item", name = "bob-solder", amount = 5 })

bobelectronics/data-updates.lua

@@ -1,7 +1,6 @@
 require("prototypes.recipe-updates")
 require("prototypes.technology-updates")
 
-data.raw.recipe["copper-cable"].category = "bob-electronics"
 data.raw.item["copper-cable"].subgroup = "bob-electronic-components"
 data.raw.item["copper-cable"].order = "0-a1"
 
@@ -20,13 +19,6 @@ if data.raw["recipe-category"]["bob-mixing-furnace"] then
   end
 end
 
--- add new electronics crafting categories
-bobmods.lib.machine.type_if_add_category("character", "crafting", "bob-electronics")
-bobmods.lib.machine.type_if_add_category("god-controller", "crafting", "bob-electronics")
-bobmods.lib.machine.type_if_add_category("assembling-machine", "crafting", "bob-electronics")
-bobmods.lib.machine.type_if_add_category("assembling-machine", "crafting", "bob-electronics-machine")
-bobmods.lib.machine.type_if_add_category("assembling-machine", "crafting-with-fluid", "bob-electronics-with-fluid")
-
 if mods["quality"] then
   bobmods.lib.recipe.update_recycling_recipe({
     "bob-basic-electronic-components",

bobelectronics/info.json

@@ -7,8 +7,8 @@
   "contact": "",
   "homepage": "https://forums.factorio.com/viewforum.php?f=51",
   "dependencies": [
-    "base >= 1.2.0",
-    "boblibrary >= 2.0.0",
+    "base >= 2.0.49",
+    "boblibrary >= 2.0.1",
     "? bobplates >= 2.0.0"
   ],
   "description": "Requires Bob's functions library mod.\n\nThis mod changes the way you build electronics, making the process more realistic.\nFirst you have to assemble electronic components, then combine them into circuit boards.\nUnlike in the base game, each tier of circuit board does NOT require the previous tier.\nIt also adds a 4th tier of electronics used for high end machinery.\n\nAlthough it can work by itself, it is designed to function best with my entire set of mods installed."

bobelectronics/prototypes/category.lua

@@ -1,16 +1,4 @@
 data:extend({
-  {
-    type = "recipe-category",
-    name = "bob-electronics",
-  },
-  {
-    type = "recipe-category",
-    name = "bob-electronics-machine",
-  },
-  {
-    type = "recipe-category",
-    name = "bob-electronics-with-fluid",
-  },
   {
     type = "item-subgroup",
     name = "bob-resource",

bobelectronics/prototypes/electronics.lua

@@ -33,7 +33,7 @@ if data.raw.item["bob-tin-plate"] then
     {
       type = "recipe",
       name = "bob-tinned-copper-cable",
-      category = "bob-electronics",
+      category = "crafting",
       enabled = false,
       ingredients = {
         { type = "item", name = "copper-cable", amount = 3 },
@@ -62,7 +62,7 @@ data:extend({
   {
     type = "recipe",
     name = "bob-insulated-cable",
-    category = "bob-electronics",
+    category = "crafting",
     enabled = false,
     ingredients = {
       { type = "item", name = "copper-cable", amount = 2 },
@@ -91,7 +91,7 @@ if data.raw.item["bob-gold-plate"] then
     {
       type = "recipe",
       name = "bob-gilded-copper-cable",
-      category = "bob-electronics-machine",
+      category = "advanced-crafting",
       enabled = false,
       ingredients = {
         { type = "item", name = "copper-cable", amount = 3 },
@@ -122,7 +122,7 @@ if data.raw.item["bob-solder-alloy"] then
     {
       type = "recipe",
       name = "bob-solder",
-      category = "bob-electronics",
+      category = "crafting",
       energy_required = 2,
       enabled = false,
       auto_recycle = false,
@@ -154,7 +154,7 @@ data:extend({
   {
     type = "recipe",
     name = "bob-basic-electronic-components",
-    category = "bob-electronics-machine",
+    category = "advanced-crafting",
     energy_required = 2,
     enabled = false,
     ingredients = {
@@ -184,7 +184,7 @@ data:extend({
   {
     type = "recipe",
     name = "bob-electronic-components",
-    category = "bob-electronics-machine",
+    category = "advanced-crafting",
     energy_required = 3.5,
     enabled = false,
     ingredients = {
@@ -214,7 +214,7 @@ data:extend({
   {
     type = "recipe",
     name = "bob-integrated-electronics",
-    category = "bob-electronics-with-fluid",
+    category = "crafting-with-fluid",
     energy_required = 5,
     enabled = false,
     ingredients = {
@@ -245,7 +245,7 @@ data:extend({
   {
     type = "recipe",
     name = "bob-processing-electronics",
-    category = "bob-electronics-with-fluid",
+    category = "crafting-with-fluid",
     energy_required = 7,
     enabled = false,
     ingredients = {
@@ -285,7 +285,7 @@ data:extend({
   {
     type = "recipe",
     name = "bob-wooden-board",
-    category = "bob-electronics",
+    category = "crafting",
     auto_recycle = false,
     ingredients = {
       { type = "item", name = "wood", amount = 1 },
@@ -324,7 +324,7 @@ data:extend({
   {
     type = "recipe",
     name = "bob-phenolic-board",
-    category = "bob-electronics-machine",
+    category = "advanced-crafting",
     enabled = false,
     auto_recycle = false,
     ingredients = {
@@ -365,7 +365,7 @@ data:extend({
   {
     type = "recipe",
     name = "bob-fibreglass-board",
-    category = "bob-electronics-machine",
+    category = "advanced-crafting",
     enabled = false,
     auto_recycle = false,
     ingredients = {
@@ -402,7 +402,7 @@ data:extend({
   {
     type = "recipe",
     name = "bob-basic-circuit-board",
-    category = "bob-electronics",
+    category = "crafting",
     enabled = false,
     energy_required = 1,
     ingredients = {
@@ -443,7 +443,7 @@ data:extend({
   {
     type = "recipe",
     name = "bob-circuit-board",
-    category = "bob-electronics-with-fluid",
+    category = "crafting-with-fluid",
     energy_required = 5,
     enabled = false,
     ingredients = {
@@ -486,7 +486,7 @@ data:extend({
   {
     type = "recipe",
     name = "bob-superior-circuit-board",
-    category = "bob-electronics-with-fluid",
+    category = "crafting-with-fluid",
     energy_required = 10,
     enabled = false,
     ingredients = {
@@ -529,7 +529,7 @@ data:extend({
   {
     type = "recipe",
     name = "bob-multi-layer-circuit-board",
-    category = "bob-electronics-with-fluid",
+    category = "crafting-with-fluid",
     energy_required = 15,
     enabled = false,
     ingredients = {
@@ -560,7 +560,7 @@ data:extend({
   {
     type = "recipe",
     name = "electronic-circuit",
-    category = "bob-electronics",
+    category = "crafting",
     energy_required = 1,
     enabled = false,
     ingredients = {
@@ -589,7 +589,7 @@ data:extend({
   {
     type = "recipe",
     name = "advanced-circuit",
-    category = "bob-electronics",
+    category = "crafting",
     energy_required = 5,
     enabled = false,
     ingredients = {
@@ -619,7 +619,7 @@ data:extend({
   {
     type = "recipe",
     name = "processing-unit",
-    category = "bob-electronics",
+    category = "advanced-crafting",
     energy_required = 10,
     enabled = false,
     ingredients = {
@@ -650,7 +650,7 @@ data:extend({
   {
     type = "recipe",
     name = "bob-advanced-processing-unit",
-    category = "bob-electronics",
+    category = "advanced-crafting",
     energy_required = 15,
     enabled = false,
     ingredients = {
@@ -696,3 +696,23 @@ data:extend({
 data.raw["produce-per-hour-achievement"]["computer-age-1"].amount = 1000
 data.raw["produce-per-hour-achievement"]["computer-age-2"].amount = 5000
 data.raw["produce-per-hour-achievement"]["computer-age-3"].amount = 15000
+
+bobmods.lib.recipe.add_additional_category("bob-tinned-copper-cable", "electronics")
+bobmods.lib.recipe.add_additional_category("bob-insulated-cable", "electronics")
+bobmods.lib.recipe.add_additional_category("bob-gilded-copper-cable", "electronics")
+bobmods.lib.recipe.add_additional_category("bob-solder", "electronics")
+bobmods.lib.recipe.add_additional_category("bob-basic-electronic-components", "electronics")
+bobmods.lib.recipe.add_additional_category("bob-electronic-components", "electronics")
+bobmods.lib.recipe.add_additional_category("bob-integrated-electronics", "electronics-with-fluid")
+bobmods.lib.recipe.add_additional_category("bob-processing-electronics", "electronics-with-fluid")
+bobmods.lib.recipe.add_additional_category("bob-wooden-board", "electronics")
+bobmods.lib.recipe.add_additional_category("bob-phenolic-board", "electronics")
+bobmods.lib.recipe.add_additional_category("bob-fibreglass-board", "electronics")
+bobmods.lib.recipe.add_additional_category("bob-basic-circuit-board", "electronics")
+bobmods.lib.recipe.add_additional_category("bob-circuit-board", "electronics-with-fluid")
+bobmods.lib.recipe.add_additional_category("bob-superior-circuit-board", "electronics-with-fluid")
+bobmods.lib.recipe.add_additional_category("bob-multi-layer-circuit-board", "electronics-with-fluid")
+bobmods.lib.recipe.add_additional_category("electronic-circuit", "electronics")
+bobmods.lib.recipe.add_additional_category("advanced-circuit", "electronics")
+bobmods.lib.recipe.add_additional_category("processing-unit", "electronics")
+bobmods.lib.recipe.add_additional_category("bob-advanced-processing-unit", "electronics")