2.4.21 rc1 (#198)

kyranf · web-flow · commit 7103034d8e2c · 2025-04-01T22:08:34.000-07:00
* Fix commandable checks and german locale encoding

* Update version to 2.4.21 and changelog notes

* another instance of fix for issue 197

* date for changelog

* removing all patrol pole from mod to avoid users trying it
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,11 @@
+Version: 2.4.21
+Date: 2025.04.01
+  Changes:
+    - completely removed patrol poles from the mod, will replace with something else in the future, maybe.
+  Bugfixes:
+    - Fixed german locale file encoding
+    - added more unitgroup/commandable validity checks to reduce crashing
+---------------------------------------------------------------------------------------------------
 Version: 2.4.20
 Date: 2025.01.05
   Bugfixes:
diff --git a/config/config.lua b/config/config.lua
@@ -42,6 +42,5 @@ DAMAGE_SCALAR = 1.0 -- scales base damage by this value. default is 1.0. 0.5 mak
 					-- that into consideration.
 
 ARTIFACT_GRAB_RADIUS = 30 --now obsolete, artifact grab script is not used now, as of Factorio 0.15+
-GUARD_POLE_CONNECTION_RANGE = 30 -- this is for electrical connection range and therefore spacing of patrol poles, checking range is.
 
 GRAB_ARTIFACTS = 0 --set this to 1 and you should have access to the loot chests, enables artifact grabbing AI routine. save CPU and keep this off if you don't need it.
diff --git a/graphics/entity/buildings/patrol-pole-shadow.png b/graphics/entity/buildings/patrol-pole-shadow.png
diff --git a/graphics/entity/buildings/patrol-pole.png b/graphics/entity/buildings/patrol-pole.png
diff --git a/graphics/icons/patrol-pole.png b/graphics/icons/patrol-pole.png
diff --git a/info.json b/info.json
@@ -1,6 +1,6 @@
 {
 	"name": "robotarmy",
-	"version": "2.4.20",
+	"version": "2.4.21",
 	"title": "Robot Army",
 	"author": "Kyranzor",
 	"contact": "kyranzor@gmail.com",
diff --git a/locale/de/locale.cfg b/locale/de/locale.cfg
@@ -8,11 +8,10 @@ droid-rifle-dummy=Uhrwerk Gewehrroboter (einsetzbar)
 droid-assembling-machine=Robotmontagemaschine
 terminator=Terminator
 terminator-dummy=Terminator (einsetzbar)
-droid-counter=Roboter Aktivit�tsmodul
+droid-counter=Roboter Aktivitätsmodul
 loot-chest=Armee Beutekiste
 droid-guard-station=Roboterwachstation
 droid-flame=Flamebot (undeployed)
-patrol-pole=Droid Patrol Post
 droid-settings=Droid Settings Module
 
 
@@ -22,11 +21,10 @@ droid-rocket=Rocket Droid
 droid-rifle=Uhrwerk Gewehrroboter
 droid-assembling-machine=Robotmontagemaschine
 terminator=Terminator
-droid-counter=Roboter Aktivit�tsmodul
+droid-counter=Roboter Aktivitätsmodul
 loot-chest=Armee Beutekiste
 droid-guard-station=Roboterwachstation
 droid-flame=Flamebot
-patrol-pole=Droid Patrol Post
 droid-settings=Droid Settings Module
 
 
@@ -39,12 +37,11 @@ droid-rifle-deploy=Uhrwerk Gewehrroboter (eingesetzt)
 droid-rocket-deploy=Raketendroide (eingesetzt)
 terminator=Terminator (nicht eingesetzt)
 terminator-deploy=Terminator (eingesetzt)
-droid-counter=Roboter Aktivit�tsmodul
+droid-counter=Roboter Aktivitätsmodul
 loot-chest=Armee Beutekiste
 droid-guard-station=Roboterwachstation
 droid-flame=Flamebot (Undeployed)
 droid-flame-deploy=Flamebot (Deployed)
-patrol-pole=Droid Patrol Post
 droid-settings=Droid Settings Module
 
 
diff --git a/migrations/robotarmy_0.4.11.lua b/migrations/robotarmy_0.4.11.lua
@@ -14,7 +14,6 @@ for i, force in pairs(game.forces) do
         if (GRAB_ARTIFACTS == 1) then
             force.recipes["loot-chest"].enabled = true
         end
-        force.recipes["patrol-pole"].enabled = true
         force.recipes["droid-guard-station"].enabled = true
         force.recipes["droid-assembling-machine"].enabled = true
         force.recipes["droid-pickup-tool"].enabled = true
diff --git a/migrations/robotarmy_0.4.16.lua b/migrations/robotarmy_0.4.16.lua
@@ -9,7 +9,6 @@ for i, force in pairs(game.forces) do
 
     force.recipes["droid-rifle"].enabled = false
     force.recipes["droid-rifle-deploy"].enabled = false
-    force.recipes["patrol-pole"].enabled = false
     force.recipes["droid-guard-station"].enabled = false
     force.recipes["droid-assembling-machine"].enabled = false
     force.recipes["droid-pickup-tool"].enabled = false
diff --git a/prototypes/building.lua b/prototypes/building.lua
@@ -234,97 +234,4 @@ local guardStation = {
 }
 
 
-
-local patrolPole = {
-  type = "electric-pole",
-  name = "patrol-pole",
-  icon_size = 64,
-  icon = "__base__/graphics/icons/medium-electric-pole.png",
-  flags = {"placeable-neutral", "player-creation"},
-  minable = {hardness = 0.2, mining_time = 0.5, result = "patrol-pole"},
-  max_health = 1000,
-  corpse = "small-remnants",
-  resistances =
-  {
-    {
-      type = "fire",
-      percent = 100
-    }
-  },
-  collision_box = {{-0.15, -0.15}, {0.15, 0.15}},
-  selection_box = {{-0.5, -0.5}, {0.5, 0.5}},
-  drawing_box = {{-0.5, -2.8}, {0.5, 0.5}},
-  maximum_wire_distance = GUARD_POLE_CONNECTION_RANGE,
-  supply_area_distance = 0,
-  vehicle_impact_sound =  { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 },
-  pictures =
-  {
-    layers = {
-      {
-        filename = BUILPATH .. "patrol-pole.png",
-        priority = "high",
-        width = 136,
-        height = 122,
-        tint = {r=1.0, g=0.9, b=0.9, a=0.8},
-        direction_count = 1,
-        shift = {1.4, -1.0},
-        hr_version = {
-          filename = BUILPATH .. "hr-patrol-pole.png",
-          priority = "high",
-          width = 272,
-          height = 244,
-          tint = {r=1.0, g=0.9, b=0.9, a=1},
-          direction_count = 1,
-          shift = {1.4, -1.0},
-          scale = 0.5,
-        }
-      },
-      {
-        filename = BUILPATH .. "patrol-pole-shadow.png",
-        priority = "high",
-        width = 136,
-        height = 122,
-        direction_count = 1,
-        shift = {1.4, -1.0},
-        draw_as_shadow = true,
-        hr_version = {
-          filename = BUILPATH .. "hr-patrol-pole-shadow.png",
-          priority = "high",
-          width = 272,
-          height = 244,
-          direction_count = 1,
-          shift = {1.4, -1.0},
-          draw_as_shadow = true,
-          scale = 0.5,
-        }
-      },
-    }
-  },
-  connection_points =
-  {
-    {
-    shadow =
-    {
-      copper = {2.55, 0.4},
-      green = {2.0, 0.4},
-      red = {3.05, 0.4}
-    },
-    wire =
-    {
-      copper = {-0.03125, -2.46875},
-      green = {-0.34375, -2.46875},
-      red = {0.25, -2.46875}
-    }
-    }
-  },
-  radius_visualisation_picture =
-  {
-    filename = "__base__/graphics/entity/small-electric-pole/electric-pole-radius-visualization.png",
-    width = 12,
-    height = 12,
-    priority = "extra-high-no-scale"
-  },
-}
-
-
- data:extend({droidAssembler,guardStation, patrolPole})
+ data:extend({droidAssembler,guardStation})
diff --git a/prototypes/item.lua b/prototypes/item.lua
@@ -102,17 +102,6 @@ local a =
     subgroup = "robotarmy-droids",
     order = "z[droid]-i",
   },
-  {
-    type = "item",
-    name = "patrol-pole",
-    icon = ICONPATH .. "patrol-pole.png",
-    icon_size = 64,
-    flags = {},
-    place_result = "patrol-pole",
-    stack_size = 50,
-    subgroup = "robotarmy-droids",
-    order = "z[droid]-j",
-  },
 
 
 
diff --git a/prototypes/recipe.lua b/prototypes/recipe.lua
@@ -224,18 +224,6 @@ local a = {
     },
     results={ {type="item", name="droid-flame-dummy", amount=1} },
   },
-  {
-    type = "recipe",
-    name = "patrol-pole",
-    enabled = false,
-    ingredients =
-    {
-      {type="item", name="steel-plate", amount=5},
-      {type="item", name="electronic-circuit", amount=5},
-    },
-    results={ {type="item", name="patrol-pole", amount=1} },
-    requester_paste_multiplier = 1
-  },
   -- adding in support for Klonan's Combat Units
   {
     type = "recipe",
diff --git a/prototypes/technology.lua b/prototypes/technology.lua
@@ -51,10 +51,6 @@ data:extend({
     },
     effects =
     {
-      {
-        type = "unlock-recipe",
-        recipe = "patrol-pole"
-      },
       {
         type = "unlock-recipe",
         recipe = "droid-guard-station"
diff --git a/robolib/Squad.lua b/robolib/Squad.lua
@@ -141,7 +141,10 @@ function addMemberToSquad(squad, soldier)
 
         table.insert(squad.members, soldier)
         table.insert(squad.mostRecentUnitGroupRemovalTick, 1)
-        soldier.commandable.set_command{type=defines.command.go_to_location,destination=squad.unitGroup.position}
+
+        if(soldier.commandable and soldier.commandable.valid) then
+            soldier.commandable.set_command{type=defines.command.go_to_location,destination=squad.unitGroup.position}
+        end
 
         squad.unitGroup.add_member(soldier)
         squad.unitGroup.start_moving()
@@ -245,8 +248,11 @@ end
 
 
 function isAttacking(squad)
-    return squad.unitGroup.state == defines.group_state.attacking_target or
-        squad.unitGroup.state == defines.group_state.attacking_distraction
+    if(squad and squad.unitGroup and squad.unitGroup.valid) then
+        return squad.unitGroup.state == defines.group_state.attacking_target or
+            squad.unitGroup.state == defines.group_state.attacking_distraction
+    end
+    return false
 end
 
 
@@ -637,11 +643,14 @@ function validateSquadIntegrity(squad)
     if not squad.unitGroup or not squad.unitGroup.valid then
         return nil, false --give up
     end
-
+    
     -- check each droid individually to confirm that it is part of the unitGroup
     for key, soldier in pairs(squad.members) do
-        if soldier and soldier.valid and (soldier.force ~= squad.unitGroup.force) then
-            soldier.destroy() --destroy the unit if they are in the squad but of the wrong force... maybe this needs more finesse, if a mod has some kind of AOE2 monk team-changing ability?
+        if  soldier and soldier.valid and soldier.commandable 
+            and soldier.commandable.valid 
+            and (soldier.force ~= squad.unitGroup.force) then
+            
+                soldier.destroy() --destroy the unit if they are in the squad but of the wrong force... maybe this needs more finesse, if a mod has some kind of AOE2 monk team-changing ability?
         else
             if not table.contains(squad.unitGroup.members, soldier) then
                 if not recreatedUG then
diff --git a/robolib/SquadControl.lua b/robolib/SquadControl.lua
@@ -67,106 +67,10 @@ function executeGuardAI(squad)
         return
     end
 
-    local areaTopLeft = {x=squad.unitGroup.position.x-32, y=squad.unitGroup.position.y-32}
-    local areaBottomRight = {x=squad.unitGroup.position.x+32, y=squad.unitGroup.position.y+32}
-    local areaCheck = {areaTopLeft, areaBottomRight}
-
-    local poleList = surface.find_entities_filtered{area = {areaTopLeft, areaBottomRight}, squad.unitGroup.position, name = "patrol-pole"}
-    local poleCount = table.countValidElements(poleList)
-    if poleCount > 1 then
-        if not squad.patrolState then
-            --Game.print_all("Making patrolstate table...")
-            squad.patrolState = {}
-
-            squad.patrolState.nextPole = nil
-            squad.patrolState.currentPole = nil
-            squad.patrolState.lastPole = nil
-            squad.patrolState.movingToNext = false
-            squad.patrolState.waypointList = {}
-            squad.patrolState.currentWaypoint = -1
-            squad.patrolState.arrived = false
-            squad.patrolState.waypointDirection = 1
-        end
-
-        if not next(squad.patrolState.waypointList) then
-            --from the squad's current position, build a waypoint list using patrol poles found in sequence.
-            --Game.print_all(string.format("polecount %d", poleCount))
-            buildWaypointList(squad.patrolState.waypointList, surface, areaCheck, squad, force)
-        end
-
-        local waypointCount = table.countNonNil(squad.patrolState.waypointList)
-        --Game.print_all(string.format("Squad's waypoint count: %d", waypointCount))
-        if (waypointCount >= 2) then
-            if (squad.patrolState.currentWaypoint == -1) then
-                --Game.print_all("Setting up initial conditions...")
-                squad.patrolState.currentWaypoint = 0
-                squad.patrolState.movingToNext = false
-                squad.patrolState.arrived = true
-            end
-            --check if we are going to a waypoint, if we are, check if we are close yet
-            if (squad.patrolState.movingToNext == true) then
-                --get distance from squad position to the current waypoint
-                local dist = util.distance(squad.unitGroup.position, squad.patrolState.waypointList[squad.patrolState.currentWaypoint])
-                --Game.print_all("Checking if squad is near waypoint...")
-                if dist < 5 then
-                    squad.patrolState.movingToNext = false
-                    squad.patrolState.arrived = true
-                    --Game.print_all("Squad has arrived at waypoint!")
-                else
-                    local position = squad.patrolState.waypointList[squad.patrolState.currentWaypoint]
-
-                    if validateSquadIntegrity(squad) then
-                        squad.unitGroup.set_command(
-                            {
-                                type = defines.command.go_to_location,
-                                destination = position,
-                                radius = DEFAULT_SQUAD_RADIUS,
-                                distraction = defines.distraction.by_enemy
-                            }
-                        )
-                    end
-                end
-            end
-
-            if (squad.patrolState.movingToNext == false and squad.patrolState.arrived == true) then
-                --Game.print_all("Setting new waypoint and giving orders!")
-                --adjust current waypoint, check for min/max issues, then issue command to move.
-                squad.patrolState.currentWaypoint = squad.patrolState.currentWaypoint + squad.patrolState.waypointDirection
-
-                if squad.patrolState.currentWaypoint > waypointCount then
-                    squad.patrolState.waypointDirection = -1 --reverse the waypoint iteration direction
-                    squad.patrolState.currentWaypoint = squad.patrolState.currentWaypoint - 2  --set it to the second last waypoint
-                end
-
-                --from the direction value being negative
-                if (squad.patrolState.currentWaypoint == 0) then
-
-                    squad.patrolState.waypointDirection = 1 --reverse the waypoint iteration direction
-                    squad.patrolState.currentWaypoint = squad.patrolState.currentWaypoint + 2 --set it to the second waypoint
-
-                end
-
-                squad.patrolState.movingToNext = true
-                squad.patrolState.arrived = false
-
-                local position = squad.patrolState.waypointList[squad.patrolState.currentWaypoint]
-
-                if validateSquadIntegrity(squad) then
-                    squad.unitGroup.set_command(
-                        {
-                            type = defines.command.go_to_location,
-                            destination = position,
-                            radius = DEFAULT_SQUAD_RADIUS,
-                            distraction = defines.distraction.by_enemy
-                        }
-                    )
-                end
-                --squad.unitGroup.start_moving()
-            end
-        end
-    elseif squad.command.tick + SANITY_CHECK_PERIOD_SECONDS * 60 < game.tick then
+    if squad.command.tick + SANITY_CHECK_PERIOD_SECONDS * 60 < game.tick then
         -- validate, but then wait a while before validating again
         squad.command.tick = game.tick
         validateSquadIntegrity(squad)
     end
+    
 end
diff --git a/robolib/eventhandlers.lua b/robolib/eventhandlers.lua
diff --git a/robolib/retreat.lua b/robolib/retreat.lua
diff --git a/robolib/robotarmyhelpers.lua b/robolib/robotarmyhelpers.lua

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "robotarmy",`
`3`		`- "version": "2.4.20",`
	`3`	`+ "version": "2.4.21",`
`4`	`4`	`"title": "Robot Army",`
`5`	`5`	`"author": "Kyranzor",`
`6`	`6`	`"contact": "kyranzor@gmail.com",`