diff --git a/changelog/snippets/fix.6602.md b/changelog/snippets/fix.6602.md new file mode 100644 index 0000000000..63d2731a94 --- /dev/null +++ b/changelog/snippets/fix.6602.md @@ -0,0 +1 @@ +- (#6602) Removed unused personalty function calls in default AI factory manager and platoon former manager. \ No newline at end of file diff --git a/engine/Sim/CPlatoon.lua b/engine/Sim/CPlatoon.lua index af900edc74..f449595283 100644 --- a/engine/Sim/CPlatoon.lua +++ b/engine/Sim/CPlatoon.lua @@ -53,11 +53,11 @@ end --- TODO. -- Example: local formIt = poolPlatoon:CanFormPlatoon(template, personality:GetPlatoonSize(), self.Location, radius) ----@param template table ----@param size number ----@param location Vector ----@param radius number -function CPlatoon:CanFormPlatoon(template, size, location, radius) +---@param template table The template table for the faction, see platoontemplates for more details. +---@param multiplier number Multiplies the squad max size in the template by this number. +---@param location Vector The position vector to search for units from. +---@param radius number The radius to search for units. +function CPlatoon:CanFormPlatoon(template, multiplier, location, radius) end --- Destroys the platoon including all its units. @@ -121,8 +121,12 @@ end --- TODO. -- Example: local hndl = poolPlatoon:FormPlatoon(template, personality:GetPlatoonSize(), self.Location, radius) +---@param template table The template table for the faction, see platoontemplates for more details. +---@param multiplier number Multiplies the squad max size in the template by this number. +---@param position Vector The position vector to search for units from. +---@param radius number The radius to search for units. -- @return Formed platoon -function CPlatoon:FormPlatoon() +function CPlatoon:FormPlatoon(template, multiplier, position, radius) end --- TODO. diff --git a/lua/sim/FactoryBuilderManager.lua b/lua/sim/FactoryBuilderManager.lua index fee5d59043..68082e23f0 100644 --- a/lua/sim/FactoryBuilderManager.lua +++ b/lua/sim/FactoryBuilderManager.lua @@ -497,9 +497,6 @@ FactoryBuilderManager = Class(BuilderManager) { return false end - local personality = self.Brain:GetPersonality() - local ptnSize = personality:GetPlatoonSize() - -- This function takes a table of factories to determine if it can build return self.Brain:CanBuildPlatoon(template, params) end, diff --git a/lua/sim/PlatoonFormManager.lua b/lua/sim/PlatoonFormManager.lua index e22ea313c4..d6101e8eb7 100644 --- a/lua/sim/PlatoonFormManager.lua +++ b/lua/sim/PlatoonFormManager.lua @@ -125,7 +125,6 @@ PlatoonFormManager = Class(BuilderManager) { BuilderManager.ManagerLoopBody(self,builder,bType) -- Try to form all builders that pass if self.Brain.BuilderManagers[self.LocationType] and builder.Priority >= 1 and builder:CheckInstanceCount() then - local personality = self.Brain:GetPersonality() local poolPlatoon = self.Brain:GetPlatoonUniquelyNamed('ArmyPool') local template = self:GetPlatoonTemplate(builder:GetPlatoonTemplate()) builder:FormDebug() @@ -139,9 +138,9 @@ PlatoonFormManager = Class(BuilderManager) { WARN('*Platoon Form: Could not find template named: ' .. builder:GetPlatoonTemplate()) return end - local formIt = poolPlatoon:CanFormPlatoon(template, personality:GetPlatoonSize(), self.Location, radius) + local formIt = poolPlatoon:CanFormPlatoon(template, 1, self.Location, radius) if formIt and builder:GetBuilderStatus() then - local hndl = poolPlatoon:FormPlatoon(template, personality:GetPlatoonSize(), self.Location, radius) + local hndl = poolPlatoon:FormPlatoon(template, 1, self.Location, radius) --LOG('*AI DEBUG: ARMY ', repr(self.Brain:GetArmyIndex()),': Platoon Form Manager Forming - ',repr(builder.BuilderName),': Location = ',self.LocationType) --LOG('*AI DEBUG: ARMY ', repr(self.Brain:GetArmyIndex()),': Platoon Form Manager - Platoon Size = ', table.getn(hndl:GetPlatoonUnits()))