Index: ps/trunk/binaries/data/mods/public/art/variants/biped/formations/anti_cavalry_back.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/formations/anti_cavalry_back.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/formations/anti_cavalry_back.xml
@@ -5,5 +5,6 @@
+
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/formations/anti_cavalry_front.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/formations/anti_cavalry_front.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/formations/anti_cavalry_front.xml
@@ -5,5 +5,6 @@
+
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/formations/line_closed.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/formations/line_closed.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/formations/line_closed.xml
@@ -1,9 +1,10 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/formations/phalanx_back.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/formations/phalanx_back.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/formations/phalanx_back.xml
@@ -4,5 +4,6 @@
+
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/formations/phalanx_front.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/formations/phalanx_front.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/formations/phalanx_front.xml
@@ -4,5 +4,6 @@
+
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/formations/phalanx_mid.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/formations/phalanx_mid.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/formations/phalanx_mid.xml
@@ -4,5 +4,6 @@
+
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/formations/syntagma_01.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/formations/syntagma_01.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/formations/syntagma_01.xml
@@ -4,5 +4,6 @@
+
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/formations/syntagma_02.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/formations/syntagma_02.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/formations/syntagma_02.xml
@@ -4,5 +4,6 @@
+
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/formations/syntagma_03.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/formations/syntagma_03.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/formations/syntagma_03.xml
@@ -4,5 +4,6 @@
+
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/formations/syntagma_04.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/formations/syntagma_04.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/formations/syntagma_04.xml
@@ -4,5 +4,6 @@
+
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/formations/syntagma_back.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/formations/syntagma_back.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/formations/syntagma_back.xml
@@ -4,5 +4,6 @@
+
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/formations/syntagma_front.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/formations/syntagma_front.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/formations/syntagma_front.xml
@@ -4,5 +4,6 @@
+
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/formations/testudo_front.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/formations/testudo_front.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/formations/testudo_front.xml
@@ -5,5 +5,6 @@
+
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/formations/testudo_front_left.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/formations/testudo_front_left.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/formations/testudo_front_left.xml
@@ -5,5 +5,6 @@
+
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/formations/testudo_front_right.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/formations/testudo_front_right.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/formations/testudo_front_right.xml
@@ -5,5 +5,6 @@
+
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/formations/testudo_left.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/formations/testudo_left.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/formations/testudo_left.xml
@@ -5,5 +5,6 @@
+
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/formations/testudo_right.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/formations/testudo_right.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/formations/testudo_right.xml
@@ -5,5 +5,6 @@
+
Index: ps/trunk/binaries/data/mods/public/art/variants/biped/formations/testudo_top.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/variants/biped/formations/testudo_top.xml
+++ ps/trunk/binaries/data/mods/public/art/variants/biped/formations/testudo_top.xml
@@ -5,6 +5,7 @@
+
Index: ps/trunk/binaries/data/mods/public/simulation/components/Formation.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/Formation.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/Formation.js
@@ -936,7 +936,11 @@
cmpOldUnitAI.SetFormationController(INVALID_ENTITY);
if (cmpNewUnitAI)
+ {
cmpNewUnitAI.SetFormationController(this.entity);
+ if (!cmpNewUnitAI.GetOrders().length)
+ cmpNewUnitAI.SetNextState("FORMATIONMEMBER.IDLE");
+ }
// Because the renamed entity might have different characteristics,
// (e.g. packed vs. unpacked siege), we need to recompute motion parameters
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
@@ -248,6 +248,8 @@
// No orders left, we're an individual now
if (this.IsAnimal())
this.SetNextState("ANIMAL.IDLE");
+ else if (this.IsFormationMember())
+ this.SetNextState("FORMATIONMEMBER.IDLE");
else
this.SetNextState("INDIVIDUAL.IDLE");
@@ -637,7 +639,10 @@
},
"Order.Cheering": function(msg) {
- this.SetNextState("INDIVIDUAL.CHEERING");
+ if (this.IsFormationMember())
+ this.SetNextState("FORMATIONMEMBER.CHEERING");
+ else
+ this.SetNextState("INDIVIDUAL.CHEERING");
},
"Order.Pack": function(msg) {
@@ -1301,6 +1306,8 @@
"IDLE": "INDIVIDUAL.IDLE",
+ "CHEERING": "INDIVIDUAL.CHEERING",
+
"WALKING": {
"enter": function() {
this.formationOffset = { "x": this.order.data.x, "z": this.order.data.z };