dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Clean some rebase oversights of 832501fc9b

Browse source
This commit is contained in:
Vantha 2026-01-14 11:35:30 +01:00 committed by Vantha
parent f4c52e49a7
commit b93634fb28
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
binaries/data/mods/public/simulation/components/Formation.js
View file

@ -77,9 +77,6 @@ Formation.prototype.Schema =
"<text a:help='example text: &#x201C;1..1,1..-1:animationVariant1;2..2,1..-1;animationVariant2&#x201D;, this will set animationVariant1 for the first row, and animation2 for the second row. The first part of the numbers (1..1 and 2..2) means the row range. Every row between (and including) those values will switch animationvariants. The second part of the numbers (1..-1) denote the columns inside those rows that will be affected. Note that in both cases, you can use -1 for the last row/column, -2 for the second to last, etc.'/>" +
"</element>";
// Distance at which we'll switch between column/box formations.
var g_ColumnDistanceThreshold = 128;
// Distance under which the formation will not try to turn towards the target position.
var g_RotateDistanceThreshold = 1;
@ -90,9 +87,6 @@ Formation.prototype.variablesToSerialize = [
"maxRowsUsed",
"maxColumnsUsed",
"finishedEntities",
"idleEntities",
"columnar",
"rearrange",
"formationMembersWithAura",
"width",
"depth",
@ -148,11 +142,6 @@ Formation.prototype.Init = function(deserialized = false)
this.maxColumnsUsed = [];
// Entities that have finished the original task.
this.finishedEntities = new Set();
this.idleEntities = new Set();
// Whether we're travelling in column (vs box) formation.
this.columnar = false;
// Whether we should rearrange all formation members.
this.rearrange = true;
// Members with a formation aura.
this.formationMembersWithAura = [];
this.width = 0;
@ -962,10 +951,15 @@ Formation.prototype.UpdateTwinFormationsForMerge = function()
if (minDist < dist)
continue;
// Merge the members from the other formation into this one
const otherMembers = cmpOtherFormation.members;
// Merge the members from the other formation into this one
this.AddMembers(otherMembers, true);
// The other formation will get disbanded for having no members
cmpOtherFormation.RemoveMembers(otherMembers);
this.AddMembers(otherMembers);
// Remove the merged formation from twin formations list
this.twinFormations.splice(i, 1);
this.UpdateFormation(true, true);
}
};