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

Fix tests + fix classes Ashoka. Fixes #2362

Browse Source 
This was SVN commit r14533.
This commit is contained in:
sanderd17 2014-01-07 09:23:59 +00:00
parent 8226d75715
commit 94907897a7
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
binaries/data/mods/public/simulation/components/Formation.js
View File

@ -527,11 +527,12 @@ Formation.prototype.ComputeFormationOffsets = function(active, positions)
if (this.columnar)
var sortingClasses = ["Cavalry","Infantry"];
else
var sortingClasses = this.sortingClasses;
var sortingClasses = this.sortingClasses.slice();
sortingClasses.push("Unknown");
// the entities will be assigned to positions in the formation in
// the same order as the types list is ordered
var types = {"Unknown": []};
var types = {};
for (var i = 0; i < sortingClasses.length; ++i)
types[sortingClasses[i]] = [];

4
binaries/data/mods/public/simulation/components/tests/test_UnitAI.js
View File

@ -113,7 +113,7 @@ function TestFormationExiting(mode)
GetHitpoints: function() { return 0; },
});
var controllerFormation = ConstructComponent(controller, "Formation");
var controllerFormation = ConstructComponent(controller, "Formation", {"FormationShape": "square", "ShiftRows": "false", "SortingClasses": "", "WidthDepthRatio": 1, "UnitSeparationWidthMultiplier": 1, "UnitSeparationDepthMultiplier": 1, "SpeedMultiplier": 1});
var controllerAI = ConstructComponent(controller, "UnitAI", { "FormationController": "true", "DefaultStance": "aggressive" });
AddMock(controller, IID_Position, {
@ -245,7 +245,7 @@ function TestMoveIntoFormationWhileAttacking()
GetHitpoints: function() { return 40; },
});
var controllerFormation = ConstructComponent(controller, "Formation");
var controllerFormation = ConstructComponent(controller, "Formation", {"FormationShape": "square", "ShiftRows": "false", "SortingClasses": "", "WidthDepthRatio": 1, "UnitSeparationWidthMultiplier": 1, "UnitSeparationDepthMultiplier": 1, "SpeedMultiplier": 1});
var controllerAI = ConstructComponent(controller, "UnitAI", { "FormationController": "true", "DefaultStance": "aggressive" });
AddMock(controller, IID_Position, {

2
binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml
View File

@ -31,7 +31,7 @@
<Civ>maur</Civ>
<GenericName>Ashoka the Great</GenericName>
<SpecificName>Aśoka Devānāmpriya</SpecificName>
<Classes>Ashoka</Classes>
<Classes datatype="tokens">Ashoka</Classes>
<Icon>units/maur_hero_ashoka.png</Icon>
<Tooltip>Hero Chariot Archer.
Hero Aura: TBD.