2.0 migration (#187)

* 2.0 compatibility upgrade

* Update README.md

* playtested and fixed a bunch of small things inc droid activity and settings modules

also fixed up the timing between new commands for the squads, they were sitting idle for like 5-10 minutes between new commands.  The sanity check time and multiplier was killing it.

---------

Co-authored-by: kyranf <kyfindlater@gmail.com>

Author: cyril-orlov

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016-2021 Kyran Findlater
+Copyright (c) 2016-2024 Kyran Findlater
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,8 +1,8 @@
-# Robot Army mod for Factorio V1.1+
+# Robot Army mod for Factorio V2.0+
 
 ## Version
-0.4.17,
-Known to be compatible with Factorio v1.1.42. Requires at least v1.1.38 due to mod script API features used.
+2.4.18,
+Known to be compatible with Factorio v2.0.23. Requires at least v2.0 due to mod script API features used.
 
 
 ## Description
@@ -17,14 +17,15 @@ The Factorio Forums thread can be found here: [Forum link](https://forums.factor
 Mod portal link here: [Mod Portal](https://mods.factorio.com/mods/kyranzor/robotarmy)
 
 ## Credits
-YuokiTani for the great models of the Droids
-Klonan for his Combat Units and permission to integrate the mod into mine, and his great work with the Unit Control mods
-Dauphin for his significant contributions to the codebase for squad AI and performance enhancements
-Earendel for inspiration and code examples for the RTS-style control of units from the AAI Programmable Vehicles mod.
-Felipe Bueno Aliski Alves for the Brazilian Portuguese translations
-Varoga for the russian translations
+* YuokiTani for the great models of the Droids
+* Klonan for his Combat Units and permission to integrate the mod into mine, and his great work with the Unit Control mods
+* Dauphin for his significant contributions to the codebase for squad AI and performance enhancements
+* Earendel for inspiration and code examples for the RTS-style control of units from the AAI Programmable Vehicles mod.
+* Felipe Bueno Aliski Alves for the Brazilian Portuguese translations
+* Varoga for the russian translations
+* cyril-orlov for the Factorio v2.0 migration work
 
 ## Donations
 If you are feeling generous or thankful for the work i've done, feel free to donate to me so I can bribe my wife with chocolate to help her put up with my late nights! Click the image below:
 [![](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.me/KyranF)
-Or simply use this: [Donate](https://www.paypal.me/KyranF)
+Or simply use this: [Donate](https://www.paypal.me/KyranF)

changelog.txt

@@ -1,4 +1,13 @@
 ---------------------------------------------------------------------------------------------------
+Version: 2.4.18
+Date: 2024.12.13
+  Changes:
+    - ported to support v2.0, thanks greatly to 
+    - changed target type to search&destroy for more direct fighting behaviours. can change target type back to 3 if you want.
+    - reducing flame droid fire resist from 100% to 95%, so they can eventually kill eachother if they get into friendly fire or against other forces
+  Bugfixes:
+    - much better AI update rates which you can tune in the config.lua sanity-check seconds and distance multiplier.
+---------------------------------------------------------------------------------------------------
 Version: 0.4.17
 Date: 2022.06.06
   Changes:

config/config.lua

@@ -21,8 +21,8 @@ GUARD_STATION_GARRISON_SIZE = 10 -- limit to how many a guard station will spawn
 USE_TELEPORTATION_FIX = 1 --if player is not looking, teleport stuck droids back to their squad-mates so they can keep moving
 PLAYER_VIEW_RADIUS = 60  -- this is very simplistic, but it's a start. helps avoid having teleporting droids while the player is looking.
 
-SANITY_CHECK_PERIOD_SECONDS = 120
-SANITY_CHECK_PATH_DISTANCE_DIV_FACTOR = 500 -- every extra 500 tiles should give us an extra SANITY_CHECK_PERIOD_SECONDS
+SANITY_CHECK_PERIOD_SECONDS = 10
+SANITY_CHECK_PATH_DISTANCE_DIV_FACTOR = 5000 -- every extra 500 tiles should give us an extra SANITY_CHECK_PERIOD_SECONDS
 PRINT_SQUAD_DEATH_MESSAGES = 1 --if you want it to tell you when squad x completely dies
 -- PRINT_SQUAD_MERGE_MESSAGES = 0
 ASSEMBLER_MERGE_TICKRATE = 180
@@ -31,7 +31,7 @@ SQUAD_UNITGROUP_FAILURE_DISTANCE_ESTIMATE = 40
 UG_FAILURE_RECENCY_TICKS = 300 --unit group command failure timeout
 MAX_CONSECUTIVE_UNITGROUP_FAILURES_BEFORE_RETREAT = 2 --how many times they totally fail before the squad disbands/retreats
 
-GLOBAL_TARGETING_TYPE = 3 -- see targeting.lua for type options
+GLOBAL_TARGETING_TYPE = 1 -- see targeting.lua for type options
 DEFAULT_KEEP_RADIUS_CLEAR = 500 -- in tiles from nearest assembler to squad. squad will keep this area clear as priority, and then check hunt radius.
 
 --CONFIG SETTINGS FOR THOSE WHO WANT TO SCALE THE DAMAGE AND HEALTH OF DROIDS

control.lua

@@ -11,45 +11,45 @@ require("stdlib/game")
 
 LOGGER = Logger.new("robotarmy", "robot_army_logs", false, {log_ticks = false})
 
-global.runOnce = false
+storage.runOnce = false
 
 function init_robotarmy()
     LOGGER.log("Robot Army mod Init script running...")
 
-    if not global.Squads then
-        global.Squads = {}
+    if not storage.Squads then
+        storage.Squads = {}
     end
 
-    if not global.uniqueSquadId then
-        global.uniqueSquadId = {}
+    if not storage.uniqueSquadId then
+        storage.uniqueSquadId = {}
     end
 
-    if not global.DroidAssemblers then
-        global.DroidAssemblers = {}
+    if not storage.DroidAssemblers then
+        storage.DroidAssemblers = {}
     end
 
-    if not global.droidCounters then
-        global.droidCounters = {}
+    if not storage.droidCounters then
+        storage.droidCounters = {}
     end
 
-    if not global.lootChests then
-        global.lootChests = {}
+    if not storage.lootChests then
+        storage.lootChests = {}
     end
 
-    if global.rallyBeacons then
-        global.rallyBeacons = nil
+    if storage.rallyBeacons then
+        storage.rallyBeacons = nil
     end
 
-    if not global.droidGuardStations then
-        global.droidGuardStations = {}
+    if not storage.droidGuardStations then
+        storage.droidGuardStations = {}
     end
 
-    if not global.updateTable then
-        global.updateTable = {}
+    if not storage.updateTable then
+        storage.updateTable = {}
     end
 
-    if not global.units then
-        global.units = {}
+    if not storage.units then
+        storage.units = {}
     end
 
     --deal with player force as default set-up process

info.json

@@ -1,14 +1,14 @@
 {
 	"name": "robotarmy",
-	"version": "0.4.17",
+	"version": "2.4.18",
 	"title": "Robot Army",
 	"author": "Kyranzor",
 	"contact": "kyranzor@gmail.com",
 	"homepage": "https://github.com/kyranf/robotarmyfactorio",
 	"description": "Manufacture and deploy automated robot soldiers to attack your foes and defend your factory!",
     "dependencies": [
-    	"base >= 1.1.38",
+    	"base >= 2.0.0",
     	"? Unit_Control >= 0.3.10"
     ],
-    "factorio_version": "1.1"
+    "factorio_version": "2.0"
 }

locale/en/locale.cfg

@@ -25,6 +25,16 @@ patrol-pole=Droid Patrol Post
 droid-pickup-tool=Droid Pick-Up Tool
 droid-selection-tool=Droid Squad Command Tool
 
+[recipe-name]
+droid-rifle-deploy=Deploy Clockwork Riflebot
+droid-smg-deploy=Deploy Battle Droid
+droid-rocket-deploy=Deploy Rocket Droid
+droid-flame-deploy=Deploy Flamebot
+terminator-deploy=Deploy Terminator
+defender-unit-deploy=Deploy Defender Robot Unit
+distractor-unit-deploy=Deploy Distractor Robot Unit
+destroyer-unit-deploy=Deploy Destroyer Robot Unit
+
 [item-description]
 droid-rifle=Long range slow-reload rifle-equipped droid. Good in swarms.
 droid-smg=Battle Droid, mounted with sub-machine gun.

migrations/robotarmy_0.4.12.lua

@@ -3,7 +3,7 @@ require("prototypes.DroidUnitList")
 require("robolib.util")
 game.reload_script()
 
-if not global.units then global.units = {} end
+if not storage.units then storage.units = {} end
 
 --prep list of names to check against for unit checking
 
@@ -30,9 +30,9 @@ for i, force_ in pairs(game.forces) do
         for _, unitFound in pairs(units) do
             if names[unitFound.name] then
                 if unitFound.valid then
-                    if not global.units[unitFound.unit_number] then
+                    if not storage.units[unitFound.unit_number] then
 
-                        global.units[unitFound.unit_number] = unitFound  -- reference to the LuaEntity with a lookup via the unit number.
+                        storage.units[unitFound.unit_number] = unitFound  -- reference to the LuaEntity with a lookup via the unit number.
                         numUnitsAdded = numUnitsAdded + 1
                     end
                 end

prototypes/building.lua

@@ -28,68 +28,74 @@ local droidAssembler = {
   fluid_boxes =
   {
     {
+      volume=100,
       production_type = "input",
       pipe_picture = assembler2pipepictures(),
       pipe_covers = pipecoverspictures(),
       base_area = 10,
       base_level = -1,
       pipe_connections = {{
-        type = "input",
-        position = {0, -2}
+        flow_direction = "input",
+        direction=0,
+        position = {0, -1.2}
       }}
     },
     {
+      volume=100,
       production_type = "output",
       pipe_picture = assembler2pipepictures(),
       pipe_covers = pipecoverspictures(),
       base_area = 10,
       base_level = 1,
       pipe_connections = {{
-        type = "output",
-        position = {0, 2}
+        flow_direction = "output",
+        direction=8,
+        position = {0, 1.2}
       }}
     },
-    off_when_no_fluid_recipe = false
   },
+  fluid_boxes_off_when_no_fluid_recipe = false,
   collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
   selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
-  animation =
-  {
-    layers =
-    {
-      {
-        filename = BUILPATH .. "droid-assembler.png",
-        width = 156,
-        height = 139,
-        frame_count = 1,
-        line_length = 1,
-        hr_version = {
-          filename = BUILPATH .. "hr-droid-assembler.png",
-          width = 312,
-          height = 278,
-          frame_count = 1,
-          line_length = 1,
-          scale = 0.5,
-        }
-      },
-      {
-        filename = BUILPATH .. "droid-assembler-shadow.png",
-        width = 156,
-        height = 139,
-        frame_count = 1,
-        line_length = 1,
-        draw_as_shadow = true,
-        hr_version = {
-          filename = BUILPATH .. "hr-droid-assembler-shadow.png",
-          width = 312,
-          height = 278,
-          frame_count = 1,
-          line_length = 1,
-          draw_as_shadow = true,
-          scale = 0.5,
-        }
-      }
-    }
+  graphics_set = {
+	  animation =
+	  {
+		layers =
+		{
+		  {
+			filename = BUILPATH .. "droid-assembler.png",
+			width = 156,
+			height = 139,
+			frame_count = 1,
+			line_length = 1,
+			hr_version = {
+			  filename = BUILPATH .. "hr-droid-assembler.png",
+			  width = 312,
+			  height = 278,
+			  frame_count = 1,
+			  line_length = 1,
+			  scale = 0.5,
+			}
+		  },
+		  {
+			filename = BUILPATH .. "droid-assembler-shadow.png",
+			width = 156,
+			height = 139,
+			frame_count = 1,
+			line_length = 1,
+			draw_as_shadow = true,
+			hr_version = {
+			  filename = BUILPATH .. "hr-droid-assembler-shadow.png",
+			  width = 312,
+			  height = 278,
+			  frame_count = 1,
+			  line_length = 1,
+			  draw_as_shadow = true,
+			  scale = 0.5,
+			}
+		  }
+		}
+	  }
   },
   open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 },
   close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 },
@@ -151,43 +157,45 @@ local guardStation = {
   },
   collision_box = {{-1.7, -1.7}, {1.7, 1.7}},
   selection_box = {{-2, -2}, {2, 2}},
-  animation =
-  {
-    layers =
-    {
-      {
-        filename = BUILPATH .. "guard-station.png",
-        width = 208,
-        height = 228,
-        frame_count = 1,
-        line_length = 1,
-        hr_version = {
-          filename = BUILPATH .. "hr-guard-station.png",
-          width = 416,
-          height = 456,
-          frame_count = 1,
-          line_length = 1,
-          scale = 0.5,
-        }
-      },
-      {
-        filename = BUILPATH .. "guard-station-shadow.png",
-        width = 208,
-        height = 228,
-        frame_count = 1,
-        line_length = 1,
-        draw_as_shadow = true,
-        hr_version = {
-          filename = BUILPATH .. "hr-guard-station-shadow.png",
-          width = 416,
-          height = 456,
-          frame_count = 1,
-          line_length = 1,
-          draw_as_shadow = true,
-          scale = 0.5,
-        }
-      }
-    }
+  graphics_set = {
+	  animation =
+	  {
+		layers =
+		{
+		  {
+			filename = BUILPATH .. "guard-station.png",
+			width = 208,
+			height = 228,
+			frame_count = 1,
+			line_length = 1,
+			hr_version = {
+			  filename = BUILPATH .. "hr-guard-station.png",
+			  width = 416,
+			  height = 456,
+			  frame_count = 1,
+			  line_length = 1,
+			  scale = 0.5,
+			}
+		  },
+		  {
+			filename = BUILPATH .. "guard-station-shadow.png",
+			width = 208,
+			height = 228,
+			frame_count = 1,
+			line_length = 1,
+			draw_as_shadow = true,
+			hr_version = {
+			  filename = BUILPATH .. "hr-guard-station-shadow.png",
+			  width = 416,
+			  height = 456,
+			  frame_count = 1,
+			  line_length = 1,
+			  draw_as_shadow = true,
+			  scale = 0.5,
+			}
+		  }
+		}
+	  }
   },
   open_sound = { filename = "__base__/sound/machine-open.ogg", volume = 0.85 },
   close_sound = { filename = "__base__/sound/machine-close.ogg", volume = 0.75 },