real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

fix petra training of support units, fixes #3864

Browse Source 
This was SVN commit r17967.
This commit is contained in:
mimo 2016-04-02 14:23:14 +00:00
parent 42b93c45b8
commit 18960ddcf8
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
binaries/data/mods/public/simulation/ai/petra/headquarters.js
View File

@ -427,7 +427,7 @@ m.HQ.prototype.trainMoreWorkers = function(gameState, queues)
if (item.metadata && item.metadata.role && item.metadata.role == "worker" && item.metadata.plan == undefined)
{
numberOfWorkers += item.count;
if (ent.hasClass("Support"))
if (item.metadata.support)
numberOfSupports += item.count;
}
});
@ -465,9 +465,11 @@ m.HQ.prototype.trainMoreWorkers = function(gameState, queues)
return;
// Choose whether we want soldiers instead.
let supportRatio = (gameState.isDisabledTemplates(gameState.applyCiv("structures/{civ}_field")) ? Math.min(this.supportRatio, 0.2) : this.supportRatio);
let supportRatio = gameState.isDisabledTemplates(gameState.applyCiv("structures/{civ}_field")) ? Math.min(this.supportRatio, 0.2) : this.supportRatio;
let supportMin = gameState.isDisabledTemplates(gameState.applyCiv("structures/{civ}_field")) ? 4 : 8;
supportMin = Math.max(supportMin, supportRatio * numberTotal);
let template;
if ((numberOfSupports + numberOfQueuedSupports) > 8 && (numberOfSupports + numberOfQueuedSupports)/numberTotal > supportRatio)
if (numberOfSupports + numberOfQueuedSupports > supportMin)
{
let requirements;
if (numberTotal < 45)
@ -489,7 +491,7 @@ m.HQ.prototype.trainMoreWorkers = function(gameState, queues)
// If the template variable is empty, the default unit (Support unit) will be used
// base "0" means automatic choice of base
if (!template && templateDef)
queues.villager.addPlan(new m.TrainingPlan(gameState, templateDef, { "role": "worker", "base": 0 }, size, size));
queues.villager.addPlan(new m.TrainingPlan(gameState, templateDef, { "role": "worker", "base": 0, "support": true }, size, size));
else if (template)
queues.citizenSoldier.addPlan(new m.TrainingPlan(gameState, template, { "role": "worker", "base": 0 }, size, size));
};