Release version 1.1.1 (#730)

Author: LovelySanta

.gitignore

@@ -2,9 +2,14 @@
 *.zip
 *.dat
 mod-list.json
+
 # Python
 __pycache__/
+
 # IDE config
 .idea/
 .vscode/
+
+# Unit test files
+angelsdev-unit-test/log/
 run_unit_tests_PWJ.bat

angelsaddons-cab/changelog.txt

@@ -1,6 +1,6 @@
 ---------------------------------------------------------------------------------------------------
 Version: 0.2.8
-Date: ##.##.202#
+Date: 19.12.2021
   Changes:
     - Added tips and tricks for the CAB
 ---------------------------------------------------------------------------------------------------

angelsaddons-cab/locale/en/cab.cfg

@@ -47,7 +47,7 @@ deploy-driveSpeed=Cannot deploy the __ENTITY__angels-cab__ while the vehicle is
 deploy-alreadyDeployed=Cannot deploy the __ENTITY__angels-cab__ when it's already deployed.
 deploy-noEnergyInterface=Cannot deploy the __ENTITY__angels-cab__ if there is no __1__ in the grid.
 undeploy-notDeployed=The __ENTITY__angels-cab__ wasn't deployed.
-deployed-driveSpeed=The __ENTITY__angels-cab__ can't move while beiing deployed.
+deployed-driveSpeed=The __ENTITY__angels-cab__ can't move while being deployed.
 grid-noEnergyInterfaceRemoval=Cannot remove __1__ while it is in use. Undeploy the __ENTITY__angels-cab__ first.
 grid-noSecondEnergyInterfaceInsertion=Cannot insert more than one __1__ into this grid.
 grid-noPreviousEnergyInterfacePresent=Cannot insert __1__ when the previous tier is not present in this grid.

angelsaddons-mobility/locale/en/tips-and-tricks.cfg

@@ -2,5 +2,5 @@
 angelsaddons-mobility=Angel's Addons (Mass Transit) Mobility
 
 [tips-and-tricks-description]
-angelsaddons-mobility=This mod adds a variety of angels themed trains independantly of angels modset.\nThe three themed trains include [img=item/crawler-locomotive]Crawler, [img=item/smelting-locomotive-1]Smelting, and [img=item/petro-locomotive-1]Petrochem.\nEach train theme has different working values such as mass, power, capacity, braking, and max speed.\n\n[font=default-bold]NOTES[/font]: Each train (with some small exceptions) has compatible copy/paste information including schedule, color, and these are also blueprint compatible.
+angelsaddons-mobility=This mod adds a variety of angels themed trains independently of angels modset.\nThe three themed trains include [img=item/crawler-locomotive]Crawler, [img=item/smelting-locomotive-1]Smelting, and [img=item/petro-locomotive-1]Petrochem.\nEach train theme has different working values such as mass, power, capacity, braking, and max speed.\n\n[font=default-bold]NOTES[/font]: Each train (with some small exceptions) has compatible copy/paste information including schedule, color, and these are also blueprint compatible.
 angelsaddons-mobility-notes=\n[font=default-bold]NOTES[/font]:Tenders are locomotives with high air resistance, but high power, good as a secondary locomotive for larger trains.\n[font=default-bold]NOTES[/font]:Bot wagons are cargo wagons which can use roboport equipment.

angelsaddons-storage/changelog.txt

@@ -1,4 +1,10 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.0.8
+Date: 19.12.2021
+  Bugfixes:
+    - Fixed technology cost of logistics silos when not playing with bobslogisitcs
+    - Fixed technology cost of logistics warehouses when not playing with bobslogisitcs
+---------------------------------------------------------------------------------------------------
 Version: 0.0.7
 Date: 10.08.2021
   Changes:

angelsaddons-storage/info.json

@@ -1,6 +1,6 @@
 {
   "name": "angelsaddons-storage",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "factorio_version": "1.1",
   "title": "Angel's Addons - Storage Options",
   "author": "Arch666Angel",

angelsaddons-storage/locale/en/tips-and-tricks.cfg

@@ -2,5 +2,5 @@
 angelsaddons-storage=Angel's Addons Storage Options
 
 [tips-and-tricks-description]
-angelsaddons-storage=This mod adds a variety of angels silos, warehouses and pressure tanks independantly of angels modset.
+angelsaddons-storage=This mod adds a variety of angels silos, warehouses and pressure tanks independently of angels modset.
 angelsaddons-storage-notes=\n\n[font=default-bold]NOTES[/font]: Silos are 4x4 storage boxes with 256 slots (logistics versions vary)\n[font=default-bold]NOTES[/font]: Warehouses are 6x6 storage boxes with 768 slots (logistics versions vary)\n[font=default-bold]NOTES[/font]: Fluid storage tanks contain larger volumes than vanilla 

angelsaddons-storage/prototypes/overrides/silos.lua

@@ -66,4 +66,14 @@ if angelsmods.industries then
   data.raw["item-subgroup"]["angels-silo"].order = "ac[chests-silo]"
   data.raw["item-subgroup"]["angels-ore-silo"].group = "angels-logistics"
   data.raw["item-subgroup"]["angels-ore-silo"].order = "ac[chests-silo]"
+end
+
+--OVERRIDE FOR BOBS
+--LOGISTICS
+if angelsmods.addons.storage.silos then
+  if mods["boblogistics"] then
+  else
+    table.insert(data.raw.technology["logistic-silos"].unit.ingredients,
+      {type = "item", name = "utility-science-pack", amount = 1})
+  end
 end

angelsaddons-storage/prototypes/overrides/warehouses.lua

@@ -1,17 +1,26 @@
-if angelsmods.addons.storage.icon_scaling then
-  if angelsmods.addons.storage.warehouses then
+if angelsmods.addons.storage.warehouses then
+  if angelsmods.addons.storage.icon_scaling then
     data.raw["container"]["angels-warehouse"].scale_info_icons = true
     data.raw["logistic-container"]["angels-warehouse-passive-provider"].scale_info_icons = true
     data.raw["logistic-container"]["angels-warehouse-active-provider"].scale_info_icons = true
     data.raw["logistic-container"]["angels-warehouse-storage"].scale_info_icons = true
     data.raw["logistic-container"]["angels-warehouse-requester"].scale_info_icons = true
     data.raw["logistic-container"]["angels-warehouse-buffer"].scale_info_icons = true
   end
-end
 
---OVERRIDE FOR ANGELS
---INDUSTRIES
-if angelsmods.industries then
-  data.raw["item-subgroup"]["angels-warehouse"].group = "angels-logistics"
-  data.raw["item-subgroup"]["angels-warehouse"].order = "ad[chests-warehouse]"
+  --OVERRIDE FOR ANGELS
+  --INDUSTRIES
+  if angelsmods.industries then
+    data.raw["item-subgroup"]["angels-warehouse"].group = "angels-logistics"
+    data.raw["item-subgroup"]["angels-warehouse"].order = "ad[chests-warehouse]"
+  end
+
+  --OVERRIDE FOR BOBS
+  --LOGISTICS
+  if mods["boblogistics"] then
+  else
+    table.insert(data.raw.technology["angels-logistic-warehouses"].unit.ingredients,
+      {type = "item", name = "utility-science-pack", amount = 1})
+  end
+
 end