x

Author: speed2CZ

lua/AI/OpAI/BaseManager.lua

@@ -1936,68 +1936,28 @@ BaseManager = ClassSimple {
         }
         self.AIBrain:PBMAddPlatoon(defaultBuilder)
 
-        -- T1 Air Scouts
-        defaultBuilder = {
-            BuilderName = 'BaseManager_T1AirScout_' .. self.BaseName,
-            PlatoonTemplate = self:CreateAirScoutPlatoon(1),
-            Priority = 500,
-            PlatoonAIFunction = { '/lua/ai/opai/BaseManagerPlatoonThreads.lua', 'BaseManagerScoutingAI' },
-            BuildConditions = {
-                { BMBC, 'HighestFactoryLevelType', { 1, self.BaseName, 'Air' } },
-                { BMBC, 'AirScoutingEnabled', { self.BaseName, } },
-                { BMBC, 'BaseActive', { self.BaseName } },
-            },
-            PlatoonData = {
-                BaseName = self.BaseName,
-            },
-            PlatoonType = 'Air',
-            RequiresConstruction = true,
-            LocationType = self.BaseName,
-            InstanceCount = 1,
-        }
-        self.AIBrain:PBMAddPlatoon(defaultBuilder)
-
-        -- T2 Air Scouts
-        defaultBuilder = {
-            BuilderName = 'BaseManager_T2AirScout_' .. self.BaseName,
-            PlatoonTemplate = self:CreateAirScoutPlatoon(2),
-            Priority = 750,
-            PlatoonAIFunction = { '/lua/ai/opai/BaseManagerPlatoonThreads.lua', 'BaseManagerScoutingAI' },
-            BuildConditions = {
-                { BMBC, 'HighestFactoryLevelType', { 2, self.BaseName, 'Air' } },
-                { BMBC, 'AirScoutingEnabled', { self.BaseName, } },
-                { BMBC, 'BaseActive', { self.BaseName } },
-            },
-            PlatoonData = {
-                BaseName = self.BaseName,
-            },
-            PlatoonType = 'Air',
-            RequiresConstruction = true,
-            LocationType = self.BaseName,
-            InstanceCount = 1,
-        }
-        self.AIBrain:PBMAddPlatoon(defaultBuilder)
-
-        -- T3 Air Scouts
-        defaultBuilder = {
-            BuilderName = 'BaseManager_T3AirScout_' .. self.BaseName,
-            PlatoonTemplate = self:CreateAirScoutPlatoon(3),
-            Priority = 1000,
-            PlatoonAIFunction = { '/lua/ai/opai/BaseManagerPlatoonThreads.lua', 'BaseManagerScoutingAI' },
-            BuildConditions = {
-                { BMBC, 'HighestFactoryLevelType', { 3, self.BaseName, 'Air' } },
-                { BMBC, 'AirScoutingEnabled', { self.BaseName, } },
-                { BMBC, 'BaseActive', { self.BaseName } },
-            },
-            PlatoonData = {
-                BaseName = self.BaseName,
-            },
-            PlatoonType = 'Air',
-            RequiresConstruction = true,
-            LocationType = self.BaseName,
-            InstanceCount = 1,
-        }
-        self.AIBrain:PBMAddPlatoon(defaultBuilder)
+        -- T1-T3 Air Scouts
+        for i = 1, 3 do
+            defaultBuilder = {
+                BuilderName = 'BaseManager_T' .. i ..'AirScout_' .. self.BaseName,
+                PlatoonTemplate = self:CreateAirScoutPlatoon(i),
+                Priority = 250 + (i * 250), -- 500, 750, 1000
+                PlatoonAIFunction = { '/lua/ai/opai/BaseManagerPlatoonThreads.lua', 'BaseManagerScoutingAI' },
+                BuildConditions = {
+                    { BMBC, 'HighestFactoryLevelType', { i, self.BaseName, 'Air' } },
+                    { BMBC, 'AirScoutingEnabled', { self.BaseName, } },
+                    { BMBC, 'BaseActive', { self.BaseName } },
+                },
+                PlatoonData = {
+                    BaseName = self.BaseName,
+                },
+                PlatoonType = 'Air',
+                RequiresConstruction = true,
+                LocationType = self.BaseName,
+                InstanceCount = 1,
+            }
+            self.AIBrain:PBMAddPlatoon(defaultBuilder)
+        end
     end,
 
     ---@param self BaseManager
@@ -2097,6 +2057,7 @@ BaseManager = ClassSimple {
 
         if techLevel == 3 then
             template[3][1] = template[3][1] .. '0302'
+            table.insert(template, { 'uea0101', 1, 0, 'Scout', 'None' })
         else
             template[3][1] = template[3][1] .. '0101'
         end

lua/AI/OpAI/BaseManagerPlatoonThreads.lua

@@ -1230,8 +1230,9 @@ function GetScoutingPath(bManager, unit)
             currX = currX + 48
         end
         -- Determine which poitnts the unit can actually path to
+        local unitPosition = unit:GetPosition()
         for k, v in possiblePoints do
-            if AIUtils.CheckUnitPathingEx(v, unit:GetPosition(), unit) then
+            if AIUtils.CheckUnitPathingEx(v, unitPosition, unit) then
                 TableInsert(pathablePoints, v)
             end
         end
@@ -1252,10 +1253,8 @@ function BaseManagerScoutingAI(platoon)
         local numPoints = TableGetn(pathablePoints)
         if numPoints > 0 then
             platoon:Stop()
-        end
 
-        local count = 0
-        if numPoints > 0 then
+            local count = 0
             while count < 10 do
                 local pickNum = Random(1, numPoints)
                 platoon:MoveToLocation(pathablePoints[pickNum], false)