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

Petra: fix order of event processing in defenseManager

Browse Source 
This was SVN commit r16904.
This commit is contained in:
mimo 2015-07-31 16:55:38 +00:00
parent 217a500d60
commit 2a6eac3bd4
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
binaries/data/mods/public/simulation/ai/petra/defenseManager.js
View File

@ -195,14 +195,11 @@ m.DefenseManager.prototype.checkEnemyUnits = function(gameState)
m.DefenseManager.prototype.checkEnemyArmies = function(gameState, events)
{
for (var i = 0; i < this.armies.length; ++i)
for (let i = 0; i < this.armies.length; ++i)
{
var army = this.armies[i];
army.checkEvents(gameState, events); // must be called every turn for all armies
let army = this.armies[i];
// this returns a list of IDs: the units that broke away from the army for being too far.
var breakaways = army.update(gameState);
let breakaways = army.update(gameState);
for (let breakers of breakaways)
this.makeIntoArmy(gameState, breakers); // assume dangerosity
@ -379,6 +376,10 @@ m.DefenseManager.prototype.abortArmy = function(gameState, army)
// and if a ranged siege unit (not used for defense) is attacked, garrison it in the nearest fortress
m.DefenseManager.prototype.checkEvents = function(gameState, events)
{
// must be called every turn for all armies
for (let army of this.armies)
army.checkEvents(gameState, events);
for (var evt of events["Attacked"])
{
var target = gameState.getEntityById(evt.target);