dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-08-15 14:43:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Rename the formation field to formationController

Browse source 
This patch renames the `unitAI.formation` field in entity states to
`unitAI.formationController` for clarity (there's `unitAI.formations`
as well, which was confusing)
This commit is contained in:
Vantha 2026-08-06 19:37:28 +02:00
parent 072ad01816
commit 60970320e3
No known key found for this signature in database
GPG key ID: 3F5D02FA4D3E8E74
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
binaries/data/mods/public/gui/session/selection.js
View file

@ -35,9 +35,9 @@ function _setMotionOverlay(ents, enabled, motionDebugOverlay, force = false)
{
resultSet.add(ent);
const entState = GetEntityState(ent);
if (entState?.unitAI?.formation)
if (entState?.unitAI?.formationController)
{
resultSet.add(entState.unitAI.formation);
resultSet.add(entState.unitAI.formationController);
}
}
@ -519,8 +519,8 @@ EntitySelection.prototype.addFormationMembers = function(entities)
for (const entity of entities)
{
const entState = GetEntityState(+entity);
if (entState?.unitAI?.formation)
for (const member of GetEntityState(+entState.unitAI.formation).formation.members)
if (entState?.unitAI?.formationController)
for (const member of GetEntityState(+entState.unitAI.formationController).formation.members)
result.add(member);
}

4
binaries/data/mods/public/simulation/components/tests/test_EntityStates.js
View file

@ -599,7 +599,7 @@ const expectedDynamicStates = {
"hasWorkOrders": true,
"isGuarding": false,
"isIdle": true,
"formation": FORMATION_CONTROLLER_ENT_ID
"formationController": FORMATION_CONTROLLER_ENT_ID
},
"visibility": "visible"
},
@ -622,7 +622,7 @@ const expectedDynamicStates = {
"hasWorkOrders": true,
"isGuarding": false,
"isIdle": true,
"formation": FORMATION_CONTROLLER_ENT_ID
"formationController": FORMATION_CONTROLLER_ENT_ID
},
"visibility": "visible"
}

2
binaries/data/mods/public/simulation/helpers/EntityStateRetriever.js
View file

@ -318,7 +318,7 @@ class EntityStateRetriever
"hasWorkOrders": cmpUnitAI.HasWorkOrders(),
"isGuarding": cmpUnitAI.IsGuardOf(),
"isIdle": cmpUnitAI.IsIdle(),
"formation": cmpUnitAI.GetFormationController()
"formationController": cmpUnitAI.GetFormationController()
};
const cmpUpgrade = Engine.QueryInterface(ent, IID_Upgrade);