Prerequisite fixes (#943)

angelsbioprocessing/changelog.txt

@@ -12,6 +12,7 @@ Date: xx.xx.xxxx
       - Tech tree changes
     - Added custom error message for when trying to insert invalid items into butchery, composter, or hatchery (933)
     - Prevent Bob's mods from enabling Agriculture Modules for non bio recipes (937)
+    - Remove unnecessary prerequisites from Alien Farming (943)
   Bugfixes:
     - Fixed Gaseous atmosphere puffing recipe missing product Acid gas (942)
 ---------------------------------------------------------------------------------------------------

angelsbioprocessing/prototypes/bio-processing-override.lua

@@ -58,7 +58,7 @@ if angelsmods.trigger.smelting_products["glass"].plate then
       },
     },
   })
-  OV.remove_prereq("bio-processing-alien-1", "plastics")
+  OV.remove_prereq("bio-processing-alien-2", "plastics")
 end
 
 if angelsmods.functions.is_special_vanilla() then

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

@@ -1,8 +1,8 @@
 local OV = angelsmods.functions.OV
 
-if angelsmods.trigger.smelting_products["glass"].board then --only change it if glass is actually active
+if angelsmods.trigger.smelting_products["glass"].mixture then --only change it if glass is actually active
   OV.modify_input("bio-tile", { type = "item", name = "solid-glass-mixture", amount = 1 })
-  OV.add_prereq("bio-farm-2", "angels-glass-smelting-1")
+  OV.add_prereq("gardens-3", "angels-glass-smelting-1")
 end
 
 if angelsmods.industries and angelsmods.industries.overhaul then
@@ -38,7 +38,6 @@ else
   OV.modify_input("bio-tile", { type = "item", name = "steel-plate", amount = 1 })
   OV.disable_recipe("algae-brown-burning")
 end
-OV.add_unlock("bio-farm-2", "bio-tile")
 
 -- FARMING TOOLTIPS
 for _, item_name in pairs({ "solid-beans", "solid-corn", "solid-leafs", "solid-nuts", "solid-pips", "solid-fruit" }) do

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

@@ -115,7 +115,8 @@ else
       ingredients = { { name = "paste-cellulose", amount = "solid-wood-pulp" } },
     },
   })
-  --rereq clean-out
-  OV.remove_prereq("gardens-2", "bio-paper-1")
+  --prereq clean-out
+  OV.remove_prereq("gardens-3", "bio-paper-1")
+  OV.add_prereq("gardens-3", "bio-processing-paste")
   OV.remove_unlock("bio-processing-brown", "solid-alginic-acid")
 end

angelsbioprocessing/prototypes/recipes/bio-processing-alien.lua

@@ -1,24 +1,6 @@
 data:extend({
   --ALIEN ARTIFACTS
   --PRE
-  --{
-  --  type = "recipe",
-  --  name = "alien-air-filtering",
-  --  category = "petrochem-air-filtering",
-  --  subgroup = "bio-processing-alien-intermediate",
-  --  enabled = false,
-  --  energy_required = 20,
-  --  ingredients ={
-  --    {type="fluid", name="water-purified", amount=50},
-  --  },
-  --  results=
-  --  {
-  --    {type="fluid", name="alien-spores", amount=50},
-  --  },
-  --  icon = "__angelsbioprocessing__/graphics/icons/alien-spores.png",
-  --  icon_size = 32,
-  --  order = "a",
-  --},
   {
     type = "recipe",
     name = "alien-spores",

angelsbioprocessing/prototypes/technology/bio-processing-alien.lua

@@ -67,38 +67,23 @@ data:extend({
     prerequisites = {
       "bio-refugium-fish-1",
       "bio-processing-red",
-      "bio-processing-paste",
-      "plastics",
+      "chlorine-processing-1",
     },
     effects = {
       {
         type = "unlock-recipe",
-        --recipe = "alien-air-filtering"
         recipe = "alien-spores",
       },
       {
         type = "unlock-recipe",
         recipe = "alien-bacteria",
       },
-      {
-        type = "unlock-recipe",
-        recipe = "petri-dish",
-      },
-      {
-        type = "unlock-recipe",
-        recipe = "substrate-dish",
-      },
-      {
-        type = "unlock-recipe",
-        recipe = "seeded-dish",
-      },
     },
     unit = {
       count = 50,
       ingredients = {
         { type = "item", name = "automation-science-pack", amount = 1 },
         { type = "item", name = "logistic-science-pack", amount = 1 },
-        --{"chemical-science-pack", amount = 1},
       },
       time = 30,
     },
@@ -111,21 +96,21 @@ data:extend({
     order = "c-a",
     prerequisites = {
       "bio-processing-alien-1",
-      "geode-processing-2",
-      "ore-powderizer",
+      "bio-processing-paste",
+      "plastics",
     },
     effects = {
       {
         type = "unlock-recipe",
-        recipe = "crystal-powder-from-dust",
+        recipe = "petri-dish",
       },
       {
         type = "unlock-recipe",
-        recipe = "crystal-powder-slurry",
+        recipe = "substrate-dish",
       },
       {
         type = "unlock-recipe",
-        recipe = "crystal-enhancer",
+        recipe = "seeded-dish",
       },
     },
     unit = {
@@ -169,7 +154,7 @@ data:extend({
     order = "c-a",
     prerequisites = {
       "bio-refugium-fish-1",
-      "geode-processing-2",
+      "geode-processing-1",
     },
     effects = {
       {
@@ -215,7 +200,7 @@ data:extend({
     order = "c-a",
     prerequisites = {
       "bio-processing-crystal-splinter-1",
-      "bio-processing-alien-1",
+      "bio-processing-alien-2",
     },
     effects = {
       {
@@ -250,6 +235,7 @@ data:extend({
     prerequisites = {
       "bio-processing-crystal-splinter-2",
       "bio-processing-alien-2",
+      "ore-powderizer",
     },
     effects = {
       {
@@ -264,6 +250,14 @@ data:extend({
         type = "unlock-recipe",
         recipe = "crystal-powder-splinter-green",
       },
+      {
+        type = "unlock-recipe",
+        recipe = "crystal-powder-from-dust",
+      },
+      {
+        type = "unlock-recipe",
+        recipe = "crystal-powder-slurry",
+      },
     },
     unit = {
       count = 50,
@@ -283,12 +277,10 @@ data:extend({
     icon_size = 128,
     order = "c-a",
     prerequisites = {
-      "bio-processing-alien-1",
-      --"bio-refugium-hatchery",
+      "bio-processing-alien-2",
       "bio-refugium-puffer-2",
       "bio-processing-crystal-splinter-1",
       "ore-powderizer",
-      "geode-processing-2",
       "slag-processing-2",
     },
     effects = {
@@ -342,8 +334,13 @@ data:extend({
       "bio-processing-alien-2",
       "bio-processing-crystal-shard-1",
       "bio-processing-crystal-splinter-2",
+      "geode-processing-2",
     },
     effects = {
+      {
+        type = "unlock-recipe",
+        recipe = "crystal-enhancer",
+      },
       {
         type = "unlock-recipe",
         recipe = "crystal-shard-crystalization-2",

angelsbioprocessing/prototypes/technology/bio-refugium.lua

@@ -325,7 +325,7 @@ data:extend({
     order = "c-a",
     prerequisites = {
       "bio-farm-alien",
-      --"bio-refugium-butchery-2",
+      "bio-refugium-butchery-2",
       "bio-refugium-puffer-2",
       "bio-processing-crystal-splinter-2",
       "stone-wall",
@@ -588,6 +588,10 @@ data:extend({
         type = "unlock-recipe",
         recipe = "fish-butchery-3",
       },
+      {
+        type = "unlock-recipe",
+        recipe = "liquid-polluted-fish-atmosphere",
+      },
     },
     unit = {
       count = 50,

angelsbioprocessing/prototypes/technology/crop-farming.lua

@@ -74,7 +74,6 @@ data:extend({
     order = "c-a",
     prerequisites = {
       "bio-farm-1",
-      "bio-paper-1",
       "logistic-science-pack",
     },
     effects = {
@@ -107,14 +106,20 @@ data:extend({
     icon_size = 128,
     order = "c-a",
     prerequisites = {
+      "angels-stone-smelting-2",
       "bio-farm-alien",
+      "bio-paper-1",
       "chemical-science-pack",
     },
     effects = {
       {
         type = "unlock-recipe",
         recipe = "garden-cultivating",
       },
+      {
+        type = "unlock-recipe",
+        recipe = "bio-tile",
+      },
     },
     unit = {
       count = 100,
@@ -164,7 +169,6 @@ data:extend({
     prerequisites = {
       "bio-farm-1",
       "angels-nitrogen-processing-2",
-      "angels-stone-smelting-2",
     },
     effects = {
       {
@@ -190,14 +194,9 @@ data:extend({
     prerequisites = {
       "bio-farm-2",
       "bio-processing-alien-1",
-      "bio-refugium-butchery-1",
       "gardens-2",
     },
     effects = {
-      {
-        type = "unlock-recipe",
-        recipe = "liquid-polluted-fish-atmosphere",
-      },
       {
         type = "unlock-recipe",
         recipe = "alien-goo",

angelsdev-unit-test/unit-tests/unit-test-010.lua

@@ -454,6 +454,11 @@ local function add_ignores()
       },
     }
 
+    ignored_unlocks["bio-desert-farm"] = {
+      items = {
+        ["clay-brick"] = true,
+      },
+    }
     ignored_unlocks["bio-swamp-farm"] = {
       items = {
         ["bronze-pipe"] = true,
@@ -462,6 +467,7 @@ local function add_ignores()
     ignored_unlocks["bio-temperate-farm"] = {
       items = {
         ["bronze-pipe"] = true,
+        ["clay-brick"] = true,
       },
     }
   end

angelspetrochem/prototypes/override/angelspetrochem.lua

@@ -185,7 +185,6 @@ if angelsmods.functions.is_special_vanilla() then
   OV.disable_recipe({
     "solid-calcium-chloride",
   })
-  OV.remove_prereq("angels-nitrogen-processing-2", "chlorine-processing-1")
   angelsmods.functions.add_flag({
     "solid-calcium-chloride",
   }, "hidden")

angelspetrochem/prototypes/override/angelsrefining.lua

@@ -37,16 +37,12 @@ if angelsmods.refining then
   })
 
   OV.remove_unlock("water-treatment", "liquifier")
-  OV.add_unlock("basic-chemistry", "liquifier")
   OV.remove_prereq("slag-processing-1", "water-treatment")
   OV.remove_prereq("slag-processing-1", "ore-crushing")
   OV.add_prereq("advanced-ore-refining-1", "ore-crushing")
   OV.remove_unlock("slag-processing-1", "liquifier-2")
   OV.remove_unlock("slag-processing-2", "liquifier-3")
   OV.remove_unlock("slag-processing-3", "liquifier-4")
-  OV.add_unlock("angels-advanced-chemistry-1", "liquifier-2")
-  OV.add_unlock("angels-advanced-chemistry-2", "liquifier-3")
-  OV.add_unlock("angels-advanced-chemistry-4", "liquifier-4")
   OV.add_prereq("ore-advanced-floatation", "chlorine-processing-1")
 end
 

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

@@ -8,6 +8,10 @@ data:extend({
       "automation",
     },
     effects = {
+      {
+        type = "unlock-recipe",
+        recipe = "liquifier",
+      },
       {
         type = "unlock-recipe",
         recipe = "angels-electrolyser",
@@ -493,7 +497,6 @@ data:extend({
       "angels-nitrogen-processing-1",
       "angels-sulfur-processing-1",
       "angels-advanced-chemistry-1",
-      "chlorine-processing-1",
       "water-treatment-2",
     },
     effects = {

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

@@ -214,6 +214,10 @@ data:extend({
       "ore-floatation",
     },
     effects = {
+      {
+        type = "unlock-recipe",
+        recipe = "liquifier-2",
+      },
       {
         type = "unlock-recipe",
         recipe = "angels-electrolyser-2",
@@ -263,6 +267,10 @@ data:extend({
       "angels-sulfur-processing-2",
     },
     effects = {
+      {
+        type = "unlock-recipe",
+        recipe = "liquifier-3",
+      },
       {
         type = "unlock-recipe",
         recipe = "angels-electrolyser-3",
@@ -367,6 +375,10 @@ data:extend({
       "production-science-pack",
     },
     effects = {
+      {
+        type = "unlock-recipe",
+        recipe = "liquifier-4",
+      },
       {
         type = "unlock-recipe",
         recipe = "angels-electrolyser-4",

angelsrefining/changelog.txt

@@ -7,6 +7,8 @@ Date: xx.xx.xxxx
     - Compatibility with Bob's changes (911)
     - Enabled productivity modules for Thorium Ore sorting recipe (929)
     - Added custom error message for when trying to insert invalid items into a barreling pump (933)
+    - Changed Crystal catalyst recipe to require Crystallizer 2 (943)
+    - Removed Crystal catalyst from Bob's gem ore crystallization recipes (943)
 ---------------------------------------------------------------------------------------------------
 Version: 0.12.4
 Date: 23.02.2023