Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix : Remove unused personality calls in default skirmish AI code #6602

Merged
merged 4 commits into from
Jan 25, 2025
Merged

Fix : Remove unused personality calls in default skirmish AI code #6602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
49646ae
Remove unused personality calls in default skirmish AI code
relent0r Dec 28, 2024
c6cb844
add snippet.
relent0r Dec 28, 2024
2dfed02
Update documentation to remove any confusion for.
relent0r Dec 28, 2024
c967c45
updated parameter documentation for squad multiplier after discussion…
relent0r Dec 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/snippets/fix.6602.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- (#6602) Removed unused personalty function calls in default AI factory manager and platoon former manager.
16 changes: 10 additions & 6 deletions engine/Sim/CPlatoon.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
3 changes: 0 additions & 3 deletions lua/sim/FactoryBuilderManager.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 2 additions & 3 deletions lua/sim/PlatoonFormManager.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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()))
Expand Down
Loading