dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-07-04 05:55:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove duplication in AttackPlan [Petra]

Browse source 
Move duplicating code to functions.
Cleaner, nicer, easier to extend.

Differential Revision: https://code.wildfiregames.com/D2655
This was SVN commit r23536.
This commit is contained in:
Angen 2020-03-17 19:30:15 +00:00
parent b6cb89bf8c
commit ba8acb1bf2
1 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
binaries/data/mods/public/simulation/ai/petra/attackPlan.js
View file

@ -319,6 +319,20 @@ PETRA.AttackPlan.prototype.forceStart = function()
this.forced = true;
};
PETRA.AttackPlan.prototype.emptyQueues = function()
{
this.queue.empty();
this.queueChamp.empty();
this.queueSiege.empty();
};
PETRA.AttackPlan.prototype.removeQueues = function(gameState)
{
gameState.ai.queueManager.removeQueue("plan_" + this.name);
gameState.ai.queueManager.removeQueue("plan_" + this.name + "_champ");
gameState.ai.queueManager.removeQueue("plan_" + this.name + "_siege");
};
/** Adds a build order. If resetQueue is true, this will reset the queue. */
PETRA.AttackPlan.prototype.addBuildOrder = function(gameState, name, unitStats, resetQueue)
{
@ -331,11 +345,7 @@ PETRA.AttackPlan.prototype.addBuildOrder = function(gameState, name, unitStats,
this.unit[name].registerUpdates();
this.buildOrders.push([0, Unit.classes, this.unit[name], Unit, name]);
if (resetQueue)
{
this.queue.empty();
this.queueChamp.empty();
this.queueSiege.empty();
}
this.emptyQueues();
}
};
@ -451,9 +461,7 @@ PETRA.AttackPlan.prototype.updatePreparation = function(gameState)
lengthMin -= Math.floor(8 * (300 - gameState.getPopulationMax()) / 300);
if (this.canStart() || this.unitCollection.length > lengthMin)
{
this.queue.empty();
this.queueChamp.empty();
this.queueSiege.empty();
this.emptyQueues();
}
else // Abort the plan so that its units will be reassigned to other plans.
{
@ -477,9 +485,7 @@ PETRA.AttackPlan.prototype.updatePreparation = function(gameState)
if (gameState.countOwnQueuedEntitiesWithMetadata("plan", +this.name) > 0)
{
// keep on while the units finish being trained, then we'll start
this.queue.empty();
this.queueChamp.empty();
this.queueSiege.empty();
this.emptyQueues();
return 1;
}
}
@ -556,14 +562,10 @@ PETRA.AttackPlan.prototype.updatePreparation = function(gameState)
}
// reset all queued units
let plan = this.name;
gameState.ai.queueManager.removeQueue("plan_" + plan);
gameState.ai.queueManager.removeQueue("plan_" + plan + "_champ");
gameState.ai.queueManager.removeQueue("plan_" + plan + "_siege");
this.removeQueues(gameState);
return 1;
};
PETRA.AttackPlan.prototype.trainMoreUnits = function(gameState)
{
// let's sort by training advancement, ie 'current size / target size'
@ -1216,9 +1218,7 @@ PETRA.AttackPlan.prototype.StartAttack = function(gameState)
return false;
// erase our queue. This will stop any leftover unit from being trained.
gameState.ai.queueManager.removeQueue("plan_" + this.name);
gameState.ai.queueManager.removeQueue("plan_" + this.name + "_champ");
gameState.ai.queueManager.removeQueue("plan_" + this.name + "_siege");
this.removeQueues(gameState);
for (let ent of this.unitCollection.values())
{
@ -1999,9 +1999,7 @@ PETRA.AttackPlan.prototype.Abort = function(gameState)
for (let unitCat in this.unitStat)
this.unit[unitCat].unregister();
gameState.ai.queueManager.removeQueue("plan_" + this.name);
gameState.ai.queueManager.removeQueue("plan_" + this.name + "_champ");
gameState.ai.queueManager.removeQueue("plan_" + this.name + "_siege");
this.removeQueues(gameState);
};
PETRA.AttackPlan.prototype.removeUnit = function(ent, update)