From 95a9ecf99e3ed94d36c22bcbe71f480924e88831 Mon Sep 17 00:00:00 2001
From: Alexandermb <alexandermb@wildfiregames.com>
Date: Tue, 20 Aug 2019 15:34:23 +0000
Subject: [PATCH] Special formations

Following the fixes of #4460

Thread:
https://wildfiregames.com/forum/index.php?/topic/26012-task-animations-re-export-and-unit-meshes-fix/page/10/#comments

This was SVN commit r22725.
---
 .../templates/special/formations/phalanx.xml  |  7 +--
 .../templates/special/formations/syntagma.xml | 15 ++++--
 .../templates/special/formations/testudo.xml  | 51 +++++++++++++++++--
 3 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/binaries/data/mods/public/simulation/templates/special/formations/phalanx.xml b/binaries/data/mods/public/simulation/templates/special/formations/phalanx.xml
index ed620919ab..12f5178056 100644
--- a/binaries/data/mods/public/simulation/templates/special/formations/phalanx.xml
+++ b/binaries/data/mods/public/simulation/templates/special/formations/phalanx.xml
@@ -8,13 +8,14 @@
     <UnitSeparationWidthMultiplier>0.6</UnitSeparationWidthMultiplier>
     <UnitSeparationDepthMultiplier>0.6</UnitSeparationDepthMultiplier>
     <WidthDepthRatio>4</WidthDepthRatio>
+    <ShiftRows>true</ShiftRows>
     <MinColumns>5</MinColumns>
     <MaxColumns>20</MaxColumns>
     <MaxRows>8</MaxRows>
     <Animations>
-      1..2,1..-1: phalanx_front;
-      3..4,1..-1: phalanx_center;
-      5..6,1..-1: phalanx_back
+      1..1,1..-1: phalanx_front;
+      2..2,1..-1: phalanx_mid;
+      3..-1,1..-1: phalanx_back
     </Animations>
   </Formation>
   <FormationAttack>
diff --git a/binaries/data/mods/public/simulation/templates/special/formations/syntagma.xml b/binaries/data/mods/public/simulation/templates/special/formations/syntagma.xml
index 20a2b4d488..b06867e110 100644
--- a/binaries/data/mods/public/simulation/templates/special/formations/syntagma.xml
+++ b/binaries/data/mods/public/simulation/templates/special/formations/syntagma.xml
@@ -6,16 +6,21 @@
     <DisabledTooltip>Requires at least 16 Infantry Pikemen.</DisabledTooltip>
     <SortingClasses>Hero Champion Elite Advanced Basic</SortingClasses>
     <FormationName>Syntagma</FormationName>
-    <UnitSeparationWidthMultiplier>0.65</UnitSeparationWidthMultiplier>
-    <UnitSeparationDepthMultiplier>0.75</UnitSeparationDepthMultiplier>
+    <FormationShape>square</FormationShape>
+    <UnitSeparationWidthMultiplier>0.86</UnitSeparationWidthMultiplier>
+    <UnitSeparationDepthMultiplier>0.55</UnitSeparationDepthMultiplier>
     <WidthDepthRatio>1</WidthDepthRatio>
+    <ShiftRows>true</ShiftRows>
     <MinColumns>4</MinColumns>
     <MaxColumns>8</MaxColumns>
-    <MaxRows>8</MaxRows>
+    <MaxRows>9</MaxRows>
     <Animations>
       1..2,1..-1: syntagma_front;
-      3..4,1..-1: syntagma_center;
-      5..8,1..-1: syntagma_back
+      3..3,1..-1: syntagma_01;
+      4..4,1..-1: syntagma_02;
+      5..5,1..-1: syntagma_03;
+      6..6,1..-1: syntagma_04;
+      7...-1,1..-1: syntagma_back
     </Animations>  
     <Sloppyness>0.15</Sloppyness>
   </Formation>
diff --git a/binaries/data/mods/public/simulation/templates/special/formations/testudo.xml b/binaries/data/mods/public/simulation/templates/special/formations/testudo.xml
index 0e4ce6e1b2..7e799524ca 100644
--- a/binaries/data/mods/public/simulation/templates/special/formations/testudo.xml
+++ b/binaries/data/mods/public/simulation/templates/special/formations/testudo.xml
@@ -8,7 +8,8 @@
     <FormationName>Testudo</FormationName>
     <FormationShape>square</FormationShape>
     <UnitSeparationWidthMultiplier>0.50</UnitSeparationWidthMultiplier>
-    <UnitSeparationDepthMultiplier>0.50</UnitSeparationDepthMultiplier>
+    <UnitSeparationDepthMultiplier>0.35</UnitSeparationDepthMultiplier>
+    <SortingOrder>fillFromTheSides</SortingOrder>
     <WidthDepthRatio>0.8</WidthDepthRatio>
     <MinColumns>8</MinColumns>
     <MaxColumns>8</MaxColumns>
@@ -16,9 +17,51 @@
       1..1,2..7: testudo_front;
       1..1,1..1: testudo_front_left;
       1..1,8..8: testudo_front_right;
-      2..-1,8..8: testudo_right;
-      2..-1,2..-1: testudo_top;
-      2..-1,1..1: testudo_left
+      2..2,2..7: testudo_top;
+      2..2,8..8: testudo_right;
+      2..2,1..1: testudo_left;
+      3..3,1..1: testudo_top;
+      3..3,8..8: testudo_top;
+      3..3,2..7: testudo_front;
+      4..4,8..8: testudo_right;
+      4..4,2..7: testudo_top;
+      4..4,1..1: testudo_left;
+      5..5,1..1: testudo_top;
+      5..5,8..8: testudo_top;
+      5..5,2..7: testudo_front;
+      6..6,8..8: testudo_right;
+      6..6,2..7: testudo_top;
+      6..6,1..1: testudo_left;
+      7..7,1..1: testudo_top;
+      7..7,8..8: testudo_top;
+      7..7,2..7: testudo_front;
+      8..8,8..8: testudo_right;
+      8..8,2..7: testudo_top;
+      8..8,1..1: testudo_left;
+      9..9,1..1: testudo_top;
+      9..9,8..8: testudo_top;
+      9..9,2..7: testudo_front;
+      10..10,8..8: testudo_right;
+      10..10,2..7: testudo_top;
+      10..10,1..1: testudo_left;
+      11..11,1..1: testudo_top;
+      11..11,8..8: testudo_top;
+      11..11,2..7: testudo_front;
+      12..12,8..8: testudo_right;
+      12..12,2..7: testudo_top;
+      12..12,1..1: testudo_left;
+      13..13,1..1: testudo_top;
+      13..13,8..8: testudo_top;
+      13..13,2..7: testudo_front;
+      14..14,8..8: testudo_right;
+      14..14,2..7: testudo_top;
+      14..14,1..1: testudo_left:
+      15..15,1..1: testudo_top;
+      15..15,8..8: testudo_top;
+      15..15,2..7: testudo_front;
+      16..16,8..8: testudo_right;
+      16..16,2..7: testudo_top;
+      16..16,1..1: testudo_left
     </Animations>
     <SpeedMultiplier>0.25</SpeedMultiplier>
   </Formation>