Index: ps/trunk/binaries/data/mods/public/maps/random/danubius_triggers.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/danubius_triggers.js
+++ ps/trunk/binaries/data/mods/public/maps/random/danubius_triggers.js
@@ -653,7 +653,7 @@
ProcessCommand(gaulPlayer, {
"type": "formation",
"entities": others,
- "name": "formations/" + pickRandom(unitFormations)
+ "name": "special/formations/" + pickRandom(unitFormations)
});
this.AttackAndPatrol(siegeEngines, siegeTargetClass, this.shipTarget[ship].landPointRef, "Siege");
Index: ps/trunk/binaries/data/mods/public/simulation/components/UnitAI.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/UnitAI.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/UnitAI.js
@@ -3324,7 +3324,7 @@
this.isGarrisoned = false;
this.isIdle = false;
// For A19, keep no formations as a default to help pathfinding.
- this.lastFormationTemplate = "formations/null";
+ this.lastFormationTemplate = "special/formations/null";
this.finishedOrder = false; // used to find if all formation members finished the order
this.heldPosition = undefined;
Index: ps/trunk/binaries/data/mods/public/simulation/components/tests/test_Identity.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/tests/test_Identity.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/tests/test_Identity.js
@@ -13,7 +13,7 @@
TS_ASSERT_UNEVAL_EQUALS(cmpIdentity.GetVisibleClassesList(), []);
TS_ASSERT_EQUALS(cmpIdentity.HasClass("CitizenSoldier"), false);
TS_ASSERT_UNEVAL_EQUALS(cmpIdentity.GetFormationsList(), []);
-TS_ASSERT_EQUALS(cmpIdentity.CanUseFormation("formations/skirmish"), false);
+TS_ASSERT_EQUALS(cmpIdentity.CanUseFormation("special/formations/skirmish"), false);
TS_ASSERT_EQUALS(cmpIdentity.GetSelectionGroupName(), "");
TS_ASSERT_EQUALS(cmpIdentity.GetGenericName(), "Iberian Skirmisher");
@@ -32,7 +32,7 @@
"Rank": "Basic",
"Classes": { "_string": "CitizenSoldier Human Organic" },
"VisibleClasses": { "_string": "Javelin" },
- "Formations": { "_string": "formations/skirmish" },
+ "Formations": { "_string": "special/formations/skirmish" },
"Icon": "units/iber_infantry_javelinist.png",
"RequiredTechnology": "phase_town"
});
@@ -45,8 +45,8 @@
TS_ASSERT_UNEVAL_EQUALS(cmpIdentity.GetVisibleClassesList(), ["Javelin"]);
TS_ASSERT_EQUALS(cmpIdentity.HasClass("CitizenSoldier"), true);
TS_ASSERT_EQUALS(cmpIdentity.HasClass("Female"), false);
-TS_ASSERT_UNEVAL_EQUALS(cmpIdentity.GetFormationsList(), ["formations/skirmish"]);
-TS_ASSERT_EQUALS(cmpIdentity.CanUseFormation("formations/skirmish"), true);
-TS_ASSERT_EQUALS(cmpIdentity.CanUseFormation("formations/line"), false);
+TS_ASSERT_UNEVAL_EQUALS(cmpIdentity.GetFormationsList(), ["special/formations/skirmish"]);
+TS_ASSERT_EQUALS(cmpIdentity.CanUseFormation("special/formations/skirmish"), true);
+TS_ASSERT_EQUALS(cmpIdentity.CanUseFormation("special/formations/line"), false);
TS_ASSERT_EQUALS(cmpIdentity.GetSelectionGroupName(), "units/iber_infantry_javelinist_b");
TS_ASSERT_EQUALS(cmpIdentity.GetGenericName(), "Iberian Skirmisher");
Index: ps/trunk/binaries/data/mods/public/simulation/components/tests/test_UnitAI.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/tests/test_UnitAI.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/tests/test_UnitAI.js
@@ -49,7 +49,7 @@
});
AddMock(SYSTEM_ENTITY, IID_TemplateManager, {
- GetCurrentTemplateName: function(ent) { return "formations/line_closed"; },
+ GetCurrentTemplateName: function(ent) { return "special/formations/line_closed"; },
});
AddMock(SYSTEM_ENTITY, IID_PlayerManager, {
@@ -196,7 +196,7 @@
});
AddMock(SYSTEM_ENTITY, IID_TemplateManager, {
- GetCurrentTemplateName: function(ent) { return "formations/line_closed"; },
+ GetCurrentTemplateName: function(ent) { return "special/formations/line_closed"; },
});
AddMock(SYSTEM_ENTITY, IID_PlayerManager, {
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/athen.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/athen.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/athen.json
@@ -133,17 +133,17 @@
],
"Formations":
[
- "formations/null",
- "formations/box",
- "formations/column_closed",
- "formations/line_closed",
- "formations/column_open",
- "formations/line_open",
- "formations/flank",
- "formations/skirmish",
- "formations/wedge",
- "formations/battle_line",
- "formations/phalanx"
+ "special/formations/null",
+ "special/formations/box",
+ "special/formations/column_closed",
+ "special/formations/line_closed",
+ "special/formations/column_open",
+ "special/formations/line_open",
+ "special/formations/flank",
+ "special/formations/skirmish",
+ "special/formations/wedge",
+ "special/formations/battle_line",
+ "special/formations/phalanx"
],
"AINames":
[
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/brit.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/brit.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/brit.json
@@ -115,16 +115,16 @@
],
"Formations":
[
- "formations/null",
- "formations/box",
- "formations/column_closed",
- "formations/line_closed",
- "formations/column_open",
- "formations/line_open",
- "formations/flank",
- "formations/skirmish",
- "formations/wedge",
- "formations/battle_line"
+ "special/formations/null",
+ "special/formations/box",
+ "special/formations/column_closed",
+ "special/formations/line_closed",
+ "special/formations/column_open",
+ "special/formations/line_open",
+ "special/formations/flank",
+ "special/formations/skirmish",
+ "special/formations/wedge",
+ "special/formations/battle_line"
],
"AINames":
[
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/cart.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/cart.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/cart.json
@@ -136,16 +136,16 @@
],
"Formations":
[
- "formations/null",
- "formations/box",
- "formations/column_closed",
- "formations/line_closed",
- "formations/column_open",
- "formations/line_open",
- "formations/flank",
- "formations/skirmish",
- "formations/wedge",
- "formations/battle_line"
+ "special/formations/null",
+ "special/formations/box",
+ "special/formations/column_closed",
+ "special/formations/line_closed",
+ "special/formations/column_open",
+ "special/formations/line_open",
+ "special/formations/flank",
+ "special/formations/skirmish",
+ "special/formations/wedge",
+ "special/formations/battle_line"
],
"AINames":
[
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/gaul.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/gaul.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/gaul.json
@@ -111,16 +111,16 @@
],
"Formations":
[
- "formations/null",
- "formations/box",
- "formations/column_closed",
- "formations/line_closed",
- "formations/column_open",
- "formations/line_open",
- "formations/flank",
- "formations/skirmish",
- "formations/wedge",
- "formations/battle_line"
+ "special/formations/null",
+ "special/formations/box",
+ "special/formations/column_closed",
+ "special/formations/line_closed",
+ "special/formations/column_open",
+ "special/formations/line_open",
+ "special/formations/flank",
+ "special/formations/skirmish",
+ "special/formations/wedge",
+ "special/formations/battle_line"
],
"AINames":
[
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/iber.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/iber.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/iber.json
@@ -109,16 +109,16 @@
],
"Formations":
[
- "formations/null",
- "formations/box",
- "formations/column_closed",
- "formations/line_closed",
- "formations/column_open",
- "formations/line_open",
- "formations/flank",
- "formations/skirmish",
- "formations/wedge",
- "formations/battle_line"
+ "special/formations/null",
+ "special/formations/box",
+ "special/formations/column_closed",
+ "special/formations/line_closed",
+ "special/formations/column_open",
+ "special/formations/line_open",
+ "special/formations/flank",
+ "special/formations/skirmish",
+ "special/formations/wedge",
+ "special/formations/battle_line"
],
"AINames":
[
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/mace.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/mace.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/mace.json
@@ -138,18 +138,18 @@
],
"Formations":
[
- "formations/null",
- "formations/box",
- "formations/column_closed",
- "formations/line_closed",
- "formations/column_open",
- "formations/line_open",
- "formations/flank",
- "formations/skirmish",
- "formations/wedge",
- "formations/battle_line",
- "formations/phalanx",
- "formations/syntagma"
+ "special/formations/null",
+ "special/formations/box",
+ "special/formations/column_closed",
+ "special/formations/line_closed",
+ "special/formations/column_open",
+ "special/formations/line_open",
+ "special/formations/flank",
+ "special/formations/skirmish",
+ "special/formations/wedge",
+ "special/formations/battle_line",
+ "special/formations/phalanx",
+ "special/formations/syntagma"
],
"AINames":
[
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/maur.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/maur.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/maur.json
@@ -124,16 +124,16 @@
],
"Formations":
[
- "formations/null",
- "formations/box",
- "formations/column_closed",
- "formations/line_closed",
- "formations/column_open",
- "formations/line_open",
- "formations/flank",
- "formations/skirmish",
- "formations/wedge",
- "formations/battle_line"
+ "special/formations/null",
+ "special/formations/box",
+ "special/formations/column_closed",
+ "special/formations/line_closed",
+ "special/formations/column_open",
+ "special/formations/line_open",
+ "special/formations/flank",
+ "special/formations/skirmish",
+ "special/formations/wedge",
+ "special/formations/battle_line"
],
"AINames":
[
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/pers.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/pers.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/pers.json
@@ -129,16 +129,16 @@
],
"Formations":
[
- "formations/null",
- "formations/box",
- "formations/column_closed",
- "formations/line_closed",
- "formations/column_open",
- "formations/line_open",
- "formations/flank",
- "formations/skirmish",
- "formations/wedge",
- "formations/battle_line"
+ "special/formations/null",
+ "special/formations/box",
+ "special/formations/column_closed",
+ "special/formations/line_closed",
+ "special/formations/column_open",
+ "special/formations/line_open",
+ "special/formations/flank",
+ "special/formations/skirmish",
+ "special/formations/wedge",
+ "special/formations/battle_line"
],
"AINames":
[
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/ptol.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/ptol.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/ptol.json
@@ -138,18 +138,18 @@
],
"Formations":
[
- "formations/null",
- "formations/box",
- "formations/column_closed",
- "formations/line_closed",
- "formations/column_open",
- "formations/line_open",
- "formations/flank",
- "formations/skirmish",
- "formations/wedge",
- "formations/battle_line",
- "formations/phalanx",
- "formations/syntagma"
+ "special/formations/null",
+ "special/formations/box",
+ "special/formations/column_closed",
+ "special/formations/line_closed",
+ "special/formations/column_open",
+ "special/formations/line_open",
+ "special/formations/flank",
+ "special/formations/skirmish",
+ "special/formations/wedge",
+ "special/formations/battle_line",
+ "special/formations/phalanx",
+ "special/formations/syntagma"
],
"AINames":
[
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/rome.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/rome.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/rome.json
@@ -113,17 +113,17 @@
],
"Formations":
[
- "formations/null",
- "formations/box",
- "formations/column_closed",
- "formations/line_closed",
- "formations/column_open",
- "formations/line_open",
- "formations/flank",
- "formations/skirmish",
- "formations/wedge",
- "formations/battle_line",
- "formations/testudo"
+ "special/formations/null",
+ "special/formations/box",
+ "special/formations/column_closed",
+ "special/formations/line_closed",
+ "special/formations/column_open",
+ "special/formations/line_open",
+ "special/formations/flank",
+ "special/formations/skirmish",
+ "special/formations/wedge",
+ "special/formations/battle_line",
+ "special/formations/testudo"
],
"AINames":
[
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/sele.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/sele.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/sele.json
@@ -137,18 +137,18 @@
],
"Formations":
[
- "formations/null",
- "formations/box",
- "formations/column_closed",
- "formations/line_closed",
- "formations/column_open",
- "formations/line_open",
- "formations/flank",
- "formations/skirmish",
- "formations/wedge",
- "formations/battle_line",
- "formations/phalanx",
- "formations/syntagma"
+ "special/formations/null",
+ "special/formations/box",
+ "special/formations/column_closed",
+ "special/formations/line_closed",
+ "special/formations/column_open",
+ "special/formations/line_open",
+ "special/formations/flank",
+ "special/formations/skirmish",
+ "special/formations/wedge",
+ "special/formations/battle_line",
+ "special/formations/phalanx",
+ "special/formations/syntagma"
],
"AINames":
[
Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/spart.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/civs/spart.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/civs/spart.json
@@ -129,17 +129,17 @@
],
"Formations":
[
- "formations/null",
- "formations/box",
- "formations/column_closed",
- "formations/line_closed",
- "formations/column_open",
- "formations/line_open",
- "formations/flank",
- "formations/skirmish",
- "formations/wedge",
- "formations/battle_line",
- "formations/phalanx"
+ "special/formations/null",
+ "special/formations/box",
+ "special/formations/column_closed",
+ "special/formations/line_closed",
+ "special/formations/column_open",
+ "special/formations/line_open",
+ "special/formations/flank",
+ "special/formations/skirmish",
+ "special/formations/wedge",
+ "special/formations/battle_line",
+ "special/formations/phalanx"
],
"AINames":
[
Index: ps/trunk/binaries/data/mods/public/simulation/helpers/Commands.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/helpers/Commands.js
+++ ps/trunk/binaries/data/mods/public/simulation/helpers/Commands.js
@@ -1433,7 +1433,7 @@
return [];
RemoveFromFormation(ents);
- cmpUnitAI.SetLastFormationTemplate("formations/null");
+ cmpUnitAI.SetLastFormationTemplate("special/formations/null");
return [ cmpUnitAI ];
}
@@ -1453,15 +1453,15 @@
// TODO: We only check if the formation is usable by some units
// if we move them to it. We should check if we can use formations
// for the other cases.
- var nullFormation = (formationTemplate || cmpUnitAI.GetLastFormationTemplate()) == "formations/null";
- if (!nullFormation && cmpIdentity && cmpIdentity.CanUseFormation(formationTemplate || "formations/null"))
+ var nullFormation = (formationTemplate || cmpUnitAI.GetLastFormationTemplate()) == "special/formations/null";
+ if (!nullFormation && cmpIdentity && cmpIdentity.CanUseFormation(formationTemplate || "special/formations/null"))
formedEnts.push(ent);
else
{
if (nullFormation)
{
RemoveFromFormation([ent]);
- cmpUnitAI.SetLastFormationTemplate("formations/null");
+ cmpUnitAI.SetLastFormationTemplate("special/formations/null");
}
nonformedUnitAIs.push(cmpUnitAI);
}
@@ -1536,7 +1536,7 @@
if (lastFormationTemplate && CanMoveEntsIntoFormation(cluster, lastFormationTemplate))
formationTemplate = lastFormationTemplate;
else
- formationTemplate = "formations/null";
+ formationTemplate = "special/formations/null";
}
// Create the new controller
Index: ps/trunk/binaries/data/mods/public/simulation/templates/formations/battle_line.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/formations/battle_line.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/formations/battle_line.xml
@@ -1,14 +0,0 @@
-
-
-
- formations/battle_line.png
- Battle Line
- Cavalry Melee Ranged
- fillFromTheSides
- true
- 5
- 8
- 4
- 2
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/formations/box.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/formations/box.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/formations/box.xml
@@ -1,12 +0,0 @@
-
-
-
- formations/box.png
- 4
- 4 units required
- Box
- square
- Melee Ranged
- fillToTheCenter
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/formations/column_closed.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/formations/column_closed.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/formations/column_closed.xml
@@ -1,12 +0,0 @@
-
-
-
- formations/column_closed.png
- Forced March
- 0.75
- 1.0
- 1.20
- 3
- 3
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/formations/column_open.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/formations/column_open.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/formations/column_open.xml
@@ -1,11 +0,0 @@
-
-
-
- formations/column_open.png
- Column Open
- true
- 2
- 2
- 2
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/formations/flank.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/formations/flank.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/formations/flank.xml
@@ -1,12 +0,0 @@
-
-
-
- formations/flank.png
- 8
- 8 units required
- Flank
- square
- true
- 12
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/formations/line_closed.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/formations/line_closed.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/formations/line_closed.xml
@@ -1,10 +0,0 @@
-
-
-
- formations/line_closed.png
- Close Order
- 3
- 4
- 0.25
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/formations/line_open.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/formations/line_open.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/formations/line_open.xml
@@ -1,12 +0,0 @@
-
-
-
- formations/line_open.png
- Open Order
- 1.5
- 1.5
- 4
- 3
- 0.5
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/formations/null.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/formations/null.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/formations/null.xml
@@ -1,7 +0,0 @@
-
-
-
- formations/null.png
- None
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/formations/phalanx.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/formations/phalanx.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/formations/phalanx.xml
@@ -1,19 +0,0 @@
-
-
-
- formations/phalanx.png
- 10
- 10 hoplite infantry required
- Phalanx
- 0.6
- 0.6
- 4
- 5
- 20
- 8
- 0.9
-
-
- true
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/formations/scatter.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/formations/scatter.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/formations/scatter.xml
@@ -1,8 +0,0 @@
-
-
-
- formations/scatter.png
- Scatter
- special
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/formations/skirmish.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/formations/skirmish.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/formations/skirmish.xml
@@ -1,15 +0,0 @@
-
-
-
- formations/skirmish.png
- Only ranged units allowed
- Skirmish
- true
- 2
- 2
- 3
-
-
- true
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/formations/syntagma.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/formations/syntagma.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/formations/syntagma.xml
@@ -1,38 +0,0 @@
-
-
-
- formations/syntagma.png
- 16
- 16 pike infantry units required
- Hero Champion Elite Advanced Basic
- Syntagma
- 0.65
- 0.75
- 1
- 4
- 8
- 8
-
-
- 1..2,1..-1: syntagma_front_idle;
- 3..4,1..-1: syntagma_med_idle;
- 4..8,1..-1: syntagma_back_idle
-
-
- 1..2,1..-1: syntagma_front_walk;
- 3..4,1..-1: syntagma_med_walk;
- 4..8,1..-1: syntagma_back_walk
-
-
- 1..2,1..-1: syntagma_front_run;
- 3..4,1..-1: syntagma_med_run;
- 4..8,1..-1: syntagma_back_run
-
-
- 0.85
- 0.15
-
-
- true
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/formations/testudo.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/formations/testudo.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/formations/testudo.xml
@@ -1,25 +0,0 @@
-
-
-
- formations/testudo.png
- 9
- 9 melee infantry units required
- Testudo
- 0.5
- 0.7
- 1.5
-
-
- 1..1,1..-1: idle_testudo_front;
- 2..-1,1..-1: idle_testudo_top
-
-
- 1..1,1..-1: walk_testudo_front;
- 2..-1,1..-1: walk_testudo_top
-
-
-
-
- true
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/formations/wedge.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/formations/wedge.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/formations/wedge.xml
@@ -1,18 +0,0 @@
-
-
-
- formations/wedge.png
- 6
- 6 cavalry units required
- Wedge
- triangle
- true
- 1.25
- 0.25
- 1.1
- 1.1
-
-
- true
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/battle_line.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/battle_line.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/battle_line.xml
@@ -0,0 +1,14 @@
+
+
+
+ formations/battle_line.png
+ Battle Line
+ Cavalry Melee Ranged
+ fillFromTheSides
+ true
+ 5
+ 8
+ 4
+ 2
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/box.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/box.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/box.xml
@@ -0,0 +1,12 @@
+
+
+
+ formations/box.png
+ 4
+ 4 units required
+ Box
+ square
+ Melee Ranged
+ fillToTheCenter
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/column_closed.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/column_closed.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/column_closed.xml
@@ -0,0 +1,12 @@
+
+
+
+ formations/column_closed.png
+ Forced March
+ 0.75
+ 1.0
+ 1.20
+ 3
+ 3
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/column_open.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/column_open.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/column_open.xml
@@ -0,0 +1,11 @@
+
+
+
+ formations/column_open.png
+ Column Open
+ true
+ 2
+ 2
+ 2
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/flank.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/flank.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/flank.xml
@@ -0,0 +1,12 @@
+
+
+
+ formations/flank.png
+ 8
+ 8 units required
+ Flank
+ square
+ true
+ 12
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/line_closed.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/line_closed.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/line_closed.xml
@@ -0,0 +1,10 @@
+
+
+
+ formations/line_closed.png
+ Close Order
+ 3
+ 4
+ 0.25
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/line_open.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/line_open.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/line_open.xml
@@ -0,0 +1,12 @@
+
+
+
+ formations/line_open.png
+ Open Order
+ 1.5
+ 1.5
+ 4
+ 3
+ 0.5
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/null.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/null.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/null.xml
@@ -0,0 +1,7 @@
+
+
+
+ formations/null.png
+ None
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/phalanx.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/phalanx.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/phalanx.xml
@@ -0,0 +1,19 @@
+
+
+
+ formations/phalanx.png
+ 10
+ 10 hoplite infantry required
+ Phalanx
+ 0.6
+ 0.6
+ 4
+ 5
+ 20
+ 8
+ 0.9
+
+
+ true
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/scatter.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/scatter.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/scatter.xml
@@ -0,0 +1,8 @@
+
+
+
+ formations/scatter.png
+ Scatter
+ special
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/skirmish.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/skirmish.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/skirmish.xml
@@ -0,0 +1,15 @@
+
+
+
+ formations/skirmish.png
+ Only ranged units allowed
+ Skirmish
+ true
+ 2
+ 2
+ 3
+
+
+ true
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/syntagma.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/syntagma.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/syntagma.xml
@@ -0,0 +1,38 @@
+
+
+
+ formations/syntagma.png
+ 16
+ 16 pike infantry units required
+ Hero Champion Elite Advanced Basic
+ Syntagma
+ 0.65
+ 0.75
+ 1
+ 4
+ 8
+ 8
+
+
+ 1..2,1..-1: syntagma_front_idle;
+ 3..4,1..-1: syntagma_med_idle;
+ 4..8,1..-1: syntagma_back_idle
+
+
+ 1..2,1..-1: syntagma_front_walk;
+ 3..4,1..-1: syntagma_med_walk;
+ 4..8,1..-1: syntagma_back_walk
+
+
+ 1..2,1..-1: syntagma_front_run;
+ 3..4,1..-1: syntagma_med_run;
+ 4..8,1..-1: syntagma_back_run
+
+
+ 0.85
+ 0.15
+
+
+ true
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/testudo.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/testudo.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/testudo.xml
@@ -0,0 +1,25 @@
+
+
+
+ formations/testudo.png
+ 9
+ 9 melee infantry units required
+ Testudo
+ 0.5
+ 0.7
+ 1.5
+
+
+ 1..1,1..-1: idle_testudo_front;
+ 2..-1,1..-1: idle_testudo_top
+
+
+ 1..1,1..-1: walk_testudo_front;
+ 2..-1,1..-1: walk_testudo_top
+
+
+
+
+ true
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/wedge.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/wedge.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/formations/wedge.xml
@@ -0,0 +1,18 @@
+
+
+
+ formations/wedge.png
+ 6
+ 6 cavalry units required
+ Wedge
+ triangle
+ true
+ 1.25
+ 0.25
+ 1.1
+ 1.1
+
+
+ true
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit.xml
@@ -41,14 +41,14 @@
Unit
Unit ConquestCritical
- formations/null
- formations/box
- formations/column_closed
- formations/line_closed
- formations/column_open
- formations/line_open
- formations/flank
- formations/battle_line
+ special/formations/null
+ special/formations/box
+ special/formations/column_closed
+ special/formations/line_closed
+ special/formations/column_open
+ special/formations/line_open
+ special/formations/flank
+ special/formations/battle_line
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
@@ -39,7 +39,7 @@
Cavalry
Basic
- formations/wedge
+ special/formations/wedge
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
@@ -23,7 +23,7 @@
Ranged Cavalry
Ranged
- formations/skirmish
+ special/formations/skirmish
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
@@ -26,7 +26,7 @@
Champion Cavalry
Cavalry
- formations/wedge
+ special/formations/wedge
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
@@ -25,7 +25,7 @@
Ranged Archer
Champion Cavalry Archer.
- formations/skirmish
+ special/formations/skirmish
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
@@ -25,7 +25,7 @@
Ranged Javelin
Champion Cavalry Skirmisher
- formations/skirmish
+ special/formations/skirmish
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
@@ -28,7 +28,7 @@
Ranged Archer
Champion Archer
- formations/skirmish
+ special/formations/skirmish
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
@@ -28,7 +28,7 @@
Ranged Javelin
Champion Skirmisher
- formations/skirmish
+ special/formations/skirmish
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
@@ -35,9 +35,9 @@
Champion Pikeman
Counters: 3x vs. Cavalry.
- formations/phalanx
- formations/syntagma
- formations/testudo
+ special/formations/phalanx
+ special/formations/syntagma
+ special/formations/testudo
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
@@ -34,8 +34,8 @@
Melee Spear
Counters: 3x vs. Cavalry.
- formations/phalanx
- formations/testudo
+ special/formations/phalanx
+ special/formations/testudo
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
@@ -28,8 +28,8 @@
Melee Sword
Champion Swordsman
- formations/phalanx
- formations/testudo
+ special/formations/phalanx
+ special/formations/testudo
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
@@ -24,7 +24,7 @@
Hero Cavalry
Cavalry
- formations/wedge
+ special/formations/wedge
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
@@ -20,7 +20,7 @@
Ranged Archer
Hero Cavalry Archer
- formations/skirmish
+ special/formations/skirmish
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
@@ -25,7 +25,7 @@
- formations/skirmish
+ special/formations/skirmish
Hero Cavalry Skirmisher
Javelin Ranged
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
@@ -20,7 +20,7 @@
Hero Archer
Ranged Archer
- formations/skirmish
+ special/formations/skirmish
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
@@ -20,7 +20,7 @@
Ranged Javelin
Hero Skirmisher
- formations/skirmish
+ special/formations/skirmish
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
@@ -26,8 +26,8 @@
Hero Pikeman
Counters: 3x vs. Cavalry.
- formations/phalanx
- formations/testudo
+ special/formations/phalanx
+ special/formations/testudo
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
@@ -26,8 +26,8 @@
Hero Spearman
Counters: 3x vs. Cavalry.
- formations/phalanx
- formations/testudo
+ special/formations/phalanx
+ special/formations/testudo
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee.xml
@@ -18,8 +18,8 @@
Melee Infantry
Melee
- formations/phalanx
- formations/testudo
+ special/formations/phalanx
+ special/formations/testudo
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
@@ -28,7 +28,7 @@
Pikeman
Counters: 3x vs. Cavalry.
- formations/syntagma
+ special/formations/syntagma
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
@@ -28,7 +28,7 @@
Ranged
Ranged
- formations/skirmish
+ special/formations/skirmish