Merge pull request #936 from KiwiHawk/wooden-boards

Bob's boards recipes

angelsbioprocessing/changelog.txt

@@ -11,6 +11,9 @@ Date: xx.xx.xxxx
       - Recipe changes for Tree seed generators, Arboretum, and Composter
       - Tech tree changes
     - Added custom error message for when trying to insert invalid items into butchery, composter, or hatchery (933)
+    - Reworked recipes for Bob's circuit boards (936)
+      - Removed recipe paper to wooden boards
+      - Modified phenolic board recipe to require paper + liquid resin
     - Prevent Bob's mods from enabling Agriculture Modules for non bio recipes (937)
     - Remove unnecessary prerequisites from Alien Farming (943)
   Bugfixes:

angelsbioprocessing/data.lua

@@ -57,7 +57,7 @@ angelsmods.triggers.bio_plastic = angelsmods.triggers.bio_plastic
   or (angelsmods.trigger.plastic and (angelsmods.triggers.bio_resin or angelsmods.triggers.bio_rubber))
   or false
 
-angelsmods.triggers.paper = not angelsmods.functions.is_special_vanilla()
+angelsmods.triggers.paper = (not angelsmods.functions.is_special_vanilla()) or (mods["bobelectronics"] and true or false)
 if angelsmods.triggers.paper then
   angelsmods.trigger.water_red_waste = true
   angelsmods.trigger.early_chemical_furnace = true

angelsbioprocessing/prototypes/bio-processing-override.lua

@@ -105,32 +105,6 @@ if data.raw.tile["frozen-snow-0"] then
     alien_biomes.list_tiles(alien_biomes.exclude_tags(alien_biomes.all_tiles(), { "frozen", "volcanic" }))
 end
 
---ADDED RECIPES BOBS
-if bobmods then
-  if bobmods.electronics and angelsmods.triggers.paper then
-    data:extend({
-      --CIRCUIT BOARD
-      {
-        type = "recipe",
-        name = "wooden-board-paper",
-        category = "advanced-crafting",
-        subgroup = "bio-paper",
-        enabled = false,
-        energy_required = 4,
-        ingredients = {
-          { type = "item", name = "solid-paper", amount = 2 },
-        },
-        results = {
-          { type = "item", name = "wooden-board", amount = 1 },
-        },
-        icon_size = 32,
-        order = "m",
-      },
-    })
-    OV.add_unlock("bio-paper-1", "wooden-board-paper")
-  end
-end
-
 --OTHER BOB OVERRIDES
 require("prototypes.overrides.bio-processing-override-bob")
 require("prototypes.overrides.bio-processing-override-bobmodules")

angelsbioprocessing/prototypes/overrides/bio-processing-override-bob.lua

@@ -64,3 +64,28 @@ if mods["bobassembly"] and settings.startup["bobmods-assembly-burner"].value ==
   OV.remove_prereq("basic-chemistry", "automation")
   OV.add_prereq("basic-chemistry", "basic-automation")
 end
+
+if mods["bobelectronics"] then
+  OV.patch_recipes({
+    {
+      name = "wooden-board",
+      result_count = 1,
+    }
+  })
+  angelsmods.functions.remove_productivity("wooden-board")
+
+  OV.patch_recipes({
+    {
+      name = "phenolic-board",
+      energy_required = 2,
+      ingredients = {
+        { "!!" },
+        { type = "fluid", name = "liquid-resin", amount = 10 },
+        { type = "item", name = "solid-paper", amount = 10 },
+      }
+    },
+  })
+  OV.add_prereq("advanced-electronics", "bio-paper-1")
+  OV.add_prereq("advanced-electronics", "resins")
+  angelsmods.functions.remove_productivity("phenolic-board")
+end

angelsbioprocessing/prototypes/technology/bio-processing-wood-paper.lua

@@ -580,6 +580,7 @@ data:extend({
     prerequisites = {
       "basic-chemistry",
       "bio-processing-brown",
+      "logistic-science-pack",
     },
     effects = {
       {
@@ -599,10 +600,10 @@ data:extend({
       count = 50,
       ingredients = {
         { type = "item", name = "automation-science-pack", amount = 1 },
+        { type = "item", name = "logistic-science-pack", amount = 1 },
       },
       time = 30,
     },
-    ignore_tech_cost_multiplier = true,
   },
   {
     type = "technology",
@@ -613,6 +614,7 @@ data:extend({
     prerequisites = {
       "angels-nitrogen-processing-2",
       "bio-paper-1",
+      "chemical-science-pack",
       "chlorine-processing-1",
     },
     effects = {
@@ -638,6 +640,7 @@ data:extend({
       ingredients = {
         { type = "item", name = "automation-science-pack", amount = 1 },
         { type = "item", name = "logistic-science-pack", amount = 1 },
+        { type = "item", name = "chemical-science-pack", amount = 1 },
       },
       time = 30,
     },
@@ -651,6 +654,7 @@ data:extend({
     prerequisites = {
       "bio-paper-2",
       "sodium-processing-2",
+      "production-science-pack",
     },
     effects = {
       {
@@ -680,6 +684,7 @@ data:extend({
         { type = "item", name = "automation-science-pack", amount = 1 },
         { type = "item", name = "logistic-science-pack", amount = 1 },
         { type = "item", name = "chemical-science-pack", amount = 1 },
+        { type = "item", name = "production-science-pack", amount = 1 },
       },
       time = 30,
     },

angelsbioprocessing/prototypes/technology/crop-farming.lua

@@ -30,6 +30,7 @@ data:extend({
       },
       time = 15,
     },
+    ignore_tech_cost_multiplier = true,
   },
   {
     type = "technology",
@@ -236,6 +237,7 @@ data:extend({
     order = "c-a",
     prerequisites = {
       "bio-farm-1",
+      "logistic-science-pack",
     },
     effects = {
       {
@@ -280,6 +282,7 @@ data:extend({
       ingredients = {
         { type = "item", name = "automation-science-pack", amount = 4 },
         { type = "item", name = "token-bio", amount = 1 },
+        { type = "item", name = "logistic-science-pack", amount = 4 },
       },
       time = 30,
     },
@@ -375,6 +378,7 @@ data:extend({
     order = "c-a",
     prerequisites = {
       "bio-farm-1",
+      "logistic-science-pack",
     },
     effects = {
       {
@@ -419,6 +423,7 @@ data:extend({
       ingredients = {
         { type = "item", name = "automation-science-pack", amount = 4 },
         { type = "item", name = "token-bio", amount = 1 },
+        { type = "item", name = "logistic-science-pack", amount = 4 },
       },
       time = 30,
     },
@@ -514,6 +519,7 @@ data:extend({
     order = "c-a",
     prerequisites = {
       "bio-farm-1",
+      "logistic-science-pack",
     },
     effects = {
       {
@@ -558,6 +564,7 @@ data:extend({
       ingredients = {
         { type = "item", name = "automation-science-pack", amount = 4 },
         { type = "item", name = "token-bio", amount = 1 },
+        { type = "item", name = "logistic-science-pack", amount = 4 },
       },
       time = 30,
     },

angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-assemblers-update.lua

@@ -126,7 +126,9 @@ if angelsmods.industries.components then
       OV.add_prereq("electronics-machine-2", "angels-components-construction-3")
       OV.add_prereq("electronics-machine-2", "advanced-electronics")
       OV.add_prereq("electronics-machine-3", "angels-components-construction-5")
-      OV.add_prereq("electronics-machine-3", "advanced-electronics-3")
+      if data.raw.technology["advanced-electronics-3"] then
+        OV.add_prereq("electronics-machine-3", "advanced-electronics-3")
+      end
       OV.set_science_pack("electronics-machine-3", "utility-science-pack")
       if angelsmods.industries.tech then
         OV.add_prereq("electronics-machine-1", "tech-specialised-labs-basic-enhance-1")

angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua

@@ -51,7 +51,6 @@ if angelsmods.industries.components then
   -- BOB ELECTRONICS ----------------------------------------------------------
   -----------------------------------------------------------------------------
   if mods["bobelectronics"] then
-    OV.disable_recipe("wooden-board-paper")
     OV.disable_recipe("superior-circuit-board")
   end
 

angelsindustries/prototypes/overrides/global-tech-base-cores.lua

@@ -199,6 +199,8 @@ if angelsmods.industries.tech then
   OV.set_science_pack("rubber", "datacore-processing-1", 2)
   AI.core_replace("rocket-booster-1", "war", "processing")
   AI.core_replace("rocket-booster-2", "war", "processing")
+  -- BIOPROCESSING
+  AI.core_replace("angels-composting", "basic", "processing")
   OV.execute() ------------------------------------------------------------------
 
   -- now upgrade the cores to tier 2 and let them depend on the correct technology

angelsindustries/prototypes/overrides/global-tech-base-packs.lua

@@ -73,6 +73,7 @@ if angelsmods.industries.tech then
   AI.pack_replace("lubricant", "blue", "green")
   -- BIO PROCESSING
   OV.add_prereq("bio-refugium-fish-1", "water-treatment-2")
+  AI.pack_replace("bio-paper-2", "blue", "green")
   -- INDUSTRIES
   OV.remove_prereq("tech-orange-circuit", "angels-components-batteries-3")
   OV.add_prereq("tech-orange-circuit", "angels-components-batteries-2")
@@ -204,6 +205,8 @@ if angelsmods.industries.tech then
   -- SMELTING
   OV.remove_prereq("angels-metallurgy-4", "production-science-pack")
   OV.remove_science_pack("angels-tungsten-smelting-2", "production-science-pack")
+  -- BIOPROCESSING
+  OV.remove_prereq("bio-paper-3", "production-science-pack")
   -- INDUSTRIES
   AI.pack_replace("tech-yellow-circuit", "yellow", "blue")
   OV.remove_prereq("tech-yellow-circuit", "angels-components-batteries-5")

angelsindustries/prototypes/technology/components-electronics-technology.lua

@@ -1,6 +1,8 @@
 local OV = angelsmods.functions.OV
 if angelsmods.industries.components then
   OV.add_unlock("bio-paper-1", "circuit-grey-board-alternative")
+  OV.remove_science_pack("bio-paper-1", "logistic-science-pack")
+  OV.remove_prereq("bio-paper-1", "logistic-science-pack")
   OV.execute()
 
   data:extend({

angelspetrochem/prototypes/override/angelssmelting.lua

@@ -34,10 +34,6 @@ else
     "solid-sodium-hydroxide-solid-sodium-sulfate",
   })
   angelsmods.functions.add_flag("solid-sodium-cyanide", "hidden")
-  OV.remove_unlock("sodium-processing-1", "solid-sodium-hydroxide")
-  OV.remove_unlock("sodium-processing-1", "solid-sodium-sulfate-separation")
-  OV.add_unlock("sodium-processing-2", "solid-sodium-hydroxide")
-  OV.add_unlock("sodium-processing-2", "solid-sodium-sulfate-separation")
-  OV.remove_prereq("sodium-processing-2", "sodium-processing-1")
-  OV.disable_technology({ "sodium-processing-1" })
+  OV.remove_prereq("sodium-processing-1", "chlorine-processing-1")
+  OV.add_prereq("sodium-processing-1", "chlorine-processing-3")
 end

angelspetrochem/prototypes/override/bobrevamp.lua

@@ -40,6 +40,6 @@ if mods["bobrevamp"] and mods["bobplates"] then
         },
       })
     end
-    OV.add_prereq("rtg", "sodium-processing-2")
+    OV.add_prereq("rtg", "angels-coal-processing-3")
   end
 end

angelspetrochem/prototypes/technology/petrochem-basic-chemistry.lua

@@ -551,7 +551,7 @@ data:extend({
       "angels-nitrogen-processing-2",
       "angels-advanced-chemistry-3",
       "chlorine-processing-2",
-      "sodium-processing-2",
+      "sodium-processing-1",
       "flammables",
     },
     effects = {
@@ -749,7 +749,7 @@ data:extend({
     icons = angelsmods.functions.create_gas_tech_icon("ClClCl"),
     prerequisites = {
       "chlorine-processing-3",
-      "sodium-processing-2",
+      "sodium-processing-1",
       "angels-advanced-chemistry-3",
     },
     effects = {
@@ -784,6 +784,7 @@ data:extend({
     icon_size = 128,
     prerequisites = {
       "angels-sulfur-processing-1",
+      "chemical-science-pack",
       "chlorine-processing-1",
     },
     effects = {
@@ -799,12 +800,17 @@ data:extend({
         type = "unlock-recipe",
         recipe = "solid-sodium-hydroxide",
       },
+      {
+        type = "unlock-recipe",
+        recipe = "liquid-aqueous-sodium-hydroxide",
+      },
     },
     unit = {
       count = 50,
       ingredients = {
         { type = "item", name = "automation-science-pack", amount = 1 },
         { type = "item", name = "logistic-science-pack", amount = 1 },
+        { type = "item", name = "chemical-science-pack", amount = 1 },
       },
       time = 15,
     },
@@ -819,13 +825,10 @@ data:extend({
       "chlorine-processing-3",
       "angels-coal-processing-3",
       "angels-nitrogen-processing-2",
+      "production-science-pack",
       "sodium-processing-1",
     },
     effects = {
-      {
-        type = "unlock-recipe",
-        recipe = "liquid-aqueous-sodium-hydroxide",
-      },
       {
         type = "unlock-recipe",
         recipe = "liquid-aqueous-sodium-hydroxide-reverse",
@@ -853,6 +856,7 @@ data:extend({
         { type = "item", name = "automation-science-pack", amount = 1 },
         { type = "item", name = "logistic-science-pack", amount = 1 },
         { type = "item", name = "chemical-science-pack", amount = 1 },
+        { type = "item", name = "production-science-pack", amount = 1 },
       },
       time = 15,
     },

angelssmelting/prototypes/override/smelting-override-productivity.lua

@@ -46,7 +46,6 @@ angelsmods.functions.allow_productivity("angels-plate-glass-2")
 angelsmods.functions.allow_productivity("angels-plate-glass-3")
 angelsmods.functions.allow_productivity("angels-coil-glass-fiber")
 angelsmods.functions.allow_productivity("angels-coil-glass-fiber-fast")
-angelsmods.functions.allow_productivity("angels-glass-fiber-board")
 
 angelsmods.functions.allow_productivity("angels-plate-silver")
 angelsmods.functions.allow_productivity("angels-wire-coil-silver-converting")