AAI / Bob's compatibility #960

Arch666Angel · Jan 1, 2024 · 955b1c2 · 955b1c2
1 parent 62f7e85
commit 955b1c2
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 7 deletions.
diff --git a/angelsbioprocessing/changelog.txt b/angelsbioprocessing/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.7.26
+Date: ???
+  Bugfixes:
+    - Fixed compatibility issue with AAI Industry and Bob's Assembling Machines (960)
+---------------------------------------------------------------------------------------------------
 Version: 0.7.25
 Date: 22.12.2023
   Changes:

diff --git a/angelsbioprocessing/info.json b/angelsbioprocessing/info.json
@@ -1,6 +1,6 @@
 {
   "name": "angelsbioprocessing",
-  "version": "0.7.25",
+  "version": "0.7.26",
   "factorio_version": "1.1",
   "title": "Angel's Bioprocessing",
   "author": "Arch666Angel",

diff --git a/angelsbioprocessing/prototypes/overrides/bio-processing-override-bob.lua b/angelsbioprocessing/prototypes/overrides/bio-processing-override-bob.lua
@@ -58,7 +58,7 @@ if bobmods then
   })
 end
 
-if mods["bobassembly"] and settings.startup["bobmods-assembly-burner"].value == true then
+if mods["bobassembly"] and data.raw.technology["basic-automation"] then
   OV.remove_prereq("bio-processing-brown", "automation")
   OV.add_prereq("bio-processing-brown", "basic-automation")
   OV.remove_prereq("basic-chemistry", "automation")

diff --git a/angelsindustries/changelog.txt b/angelsindustries/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.4.20
+Date: ???
+  Bugfixes:
+    - Fixed compatibility issue with AAI Industry and Bob's Assembling Machines (960)
+---------------------------------------------------------------------------------------------------
 Version: 0.4.19
 Date: 22.12.2023
   Changes:

diff --git a/angelsindustries/info.json b/angelsindustries/info.json
@@ -1,6 +1,6 @@
 {
   "name": "angelsindustries",
-  "version": "0.4.19",
+  "version": "0.4.20",
   "factorio_version": "1.1",
   "title": "Angel's Industries",
   "author": "Arch666Angel",

diff --git a/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua b/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua
@@ -37,7 +37,7 @@ if angelsmods.industries.tech then
   -------------------------------------------------------------------------------
   if mods["bobassembly"] then
     --assemblers
-    if settings.startup["bobmods-assembly-burner"].value == true then
+    if data.raw.technology["basic-automation"] then
       AI.core_replace("basic-automation", "processing", "basic")
       AI.core_replace("automation", "basic", "processing")
     end

diff --git a/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua b/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua
@@ -43,7 +43,7 @@ if angelsmods.industries.tech then
   if mods["bobassembly"] then
     --adds bobassembly stuffs
     -- burner assemblers and/ore tier 1 electric
-    if settings.startup["bobmods-assembly-burner"].value == true then
+    if data.raw.technology["basic-automation"] then
       AI.pack_replace("basic-automation", "red", "grey")
       AI.pack_replace("automation", "grey", "red")
     end

diff --git a/angelsrefining/changelog.txt b/angelsrefining/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.12.6
+Date: ???
+  Bugfixes:
+    - Fixed compatibility issue with AAI Industry and Bob's Assembling Machines (960)
+---------------------------------------------------------------------------------------------------
 Version: 0.12.5
 Date: 22.12.2023
   Changes:

diff --git a/angelsrefining/info.json b/angelsrefining/info.json
@@ -1,6 +1,6 @@
 {
   "name": "angelsrefining",
-  "version": "0.12.5",
+  "version": "0.12.6",
   "factorio_version": "1.1",
   "title": "Angel's Refining",
   "author": "Arch666Angel",

diff --git a/angelssmelting/prototypes/override/smelting-override-alloy-support.lua b/angelssmelting/prototypes/override/smelting-override-alloy-support.lua
@@ -43,7 +43,7 @@ if mods["bobplates"] then
 
   if mods["bobassembly"] and settings.startup["bobmods-assembly-multipurposefurnaces"].value then
     -- keep metal mixing furnaces around
-    if mods["bobassembly"] and settings.startup["bobmods-assembly-burner"].value == true then
+    if mods["bobassembly"] and data.raw.technology["basic-automation"] then
       OV.add_unlock("basic-automation", "stone-mixing-furnace")
     else
       OV.add_unlock("automation", "stone-mixing-furnace")