Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Add pushFront logic to the entity collection of the AI.

Browse Source 
Not done in afd1eaee0d.
Also remove references to `queued` and `pushFront` in the `setStance`
functions, since they (currently) have no meaning.

Reported by: @bb
Differential revision: https://code.wildfiregames.com/D4261
Reviewed by: @bb
This was SVN commit r25902.
This commit is contained in:
Freagarach 2021-09-08 06:05:22 +00:00
parent b90066a69b
commit 9552a9720c
2 changed files with 71 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
binaries/data/mods/public/simulation/ai/common-api/entity.js
View File

@ -814,10 +814,10 @@ m.Entity = m.Class({
},
// violent, aggressive, defensive, passive, standground
"setStance": function(stance, queued = false, pushFront = false) {
"setStance": function(stance) {
if (this.getStance() === undefined)
return undefined;
Engine.PostCommand(PlayerID, { "type": "stance", "entities": [this.id()], "name": stance, "queued": queued, "pushFront": pushFront });
Engine.PostCommand(PlayerID, { "type": "stance", "entities": [this.id()], "name": stance});
return this;
},

86
binaries/data/mods/public/simulation/ai/common-api/entitycollection.js
View File

@ -142,42 +142,84 @@ m.EntityCollection.prototype.hasEntities = function()
return this._entities.size !== 0;
};
m.EntityCollection.prototype.move = function(x, z, queued = false)
m.EntityCollection.prototype.move = function(x, z, queued = false, pushFront = false)
{
Engine.PostCommand(PlayerID, { "type": "walk", "entities": this.toIdArray(), "x": x, "z": z, "queued": queued });
Engine.PostCommand(PlayerID, {
"type": "walk",
"entities": this.toIdArray(),
"x": x,
"z": z,
"queued": queued,
"pushFront": pushFront
});
return this;
};
m.EntityCollection.prototype.moveToRange = function(x, z, min, max, queued = false)
m.EntityCollection.prototype.moveToRange = function(x, z, min, max, queued = false, pushFront = false)
{
Engine.PostCommand(PlayerID, { "type": "walk-to-range", "entities": this.toIdArray(), "x": x, "z": z,
"min": min, "max": max, "queued": queued });
Engine.PostCommand(PlayerID, {
"type": "walk-to-range",
"entities": this.toIdArray(),
"x": x,
"z": z,
"min": min,
"max": max,
"queued": queued,
"pushFront": pushFront
});
return this;
};
m.EntityCollection.prototype.attackMove = function(x, z, targetClasses, allowCapture = true, queued = false)
m.EntityCollection.prototype.attackMove = function(x, z, targetClasses, allowCapture = true, queued = false, pushFront = false)
{
Engine.PostCommand(PlayerID, { "type": "attack-walk", "entities": this.toIdArray(), "x": x, "z": z,
"targetClasses": targetClasses, "allowCapture": allowCapture, "queued": queued });
Engine.PostCommand(PlayerID, {
"type": "attack-walk",
"entities": this.toIdArray(),
"x": x,
"z": z,
"targetClasses": targetClasses,
"allowCapture": allowCapture,
"queued": queued,
"pushFront": pushFront
});
return this;
};
m.EntityCollection.prototype.moveIndiv = function(x, z, queued = false)
m.EntityCollection.prototype.moveIndiv = function(x, z, queued = false, pushFront = false)
{
for (let id of this._entities.keys())
Engine.PostCommand(PlayerID, { "type": "walk", "entities": [id], "x": x, "z": z, "queued": queued });
Engine.PostCommand(PlayerID, {
"type": "walk",
"entities": [id],
"x": x,
"z": z,
"queued": queued,
"pushFront": pushFront
});
return this;
};
m.EntityCollection.prototype.garrison = function(target, queued = false)
m.EntityCollection.prototype.garrison = function(target, queued = false, pushFront = false)
{
Engine.PostCommand(PlayerID, { "type": "garrison", "entities": this.toIdArray(), "target": target.id(), "queued": queued });
Engine.PostCommand(PlayerID, {
"type": "garrison",
"entities": this.toIdArray(),
"target": target.id(),
"queued": queued,
"pushFront": pushFront
});
return this;
};
m.EntityCollection.prototype.occupyTurret = function(target, queued = false)
m.EntityCollection.prototype.occupyTurret = function(target, queued = false, pushFront = false)
{
Engine.PostCommand(PlayerID, { "type": "occupy-turret", "entities": this.toIdArray(), "target": target.id(), "queued": queued });
Engine.PostCommand(PlayerID, {
"type": "occupy-turret",
"entities": this.toIdArray(),
"target": target.id(),
"queued": queued,
"pushFront": pushFront
});
return this;
};
@ -187,16 +229,26 @@ m.EntityCollection.prototype.destroy = function()
return this;
};
m.EntityCollection.prototype.attack = function(unitId, queued = false)
m.EntityCollection.prototype.attack = function(unitId, queued = false, pushFront = false)
{
Engine.PostCommand(PlayerID, { "type": "attack", "entities": this.toIdArray(), "target": unitId, "queued": queued });
Engine.PostCommand(PlayerID, {
"type": "attack",
"entities": this.toIdArray(),
"target": unitId,
"queued": queued,
"pushFront": pushFront
});
return this;
};
/** violent, aggressive, defensive, passive, standground */
m.EntityCollection.prototype.setStance = function(stance)
{
Engine.PostCommand(PlayerID, { "type": "stance", "entities": this.toIdArray(), "name": stance, "queued": false });
Engine.PostCommand(PlayerID, {
"type": "stance",
"entities": this.toIdArray(),
"name": stance
});
return this;
};