From bbadc9242b08ee681ca89898bdcea40ffcac4a09 Mon Sep 17 00:00:00 2001
From: SilentSpike <silentspike100+Github@gmail.com>
Date: Fri, 3 Jul 2015 14:21:21 +0100
Subject: [PATCH] Further zeus actions cleanup

---
 addons/interaction/ACE_ZeusActions.hpp | 50 +++++++-------------------
 addons/interaction/stringtable.xml     | 12 -------
 2 files changed, 13 insertions(+), 49 deletions(-)

diff --git a/addons/interaction/ACE_ZeusActions.hpp b/addons/interaction/ACE_ZeusActions.hpp
index 80626f6d43..195a979955 100644
--- a/addons/interaction/ACE_ZeusActions.hpp
+++ b/addons/interaction/ACE_ZeusActions.hpp
@@ -8,23 +8,23 @@ class ACE_ZeusActions {
         class stance {
             displayName = "$STR_A3_RscAttributeUnitPos_Title";
 
-            class limited {
-                displayName = "$STR_A3_RscAttributeUnitPos_Down_tooltip";
+            class prone {
+                displayName = "$STR_Pos_Down";
                 icon = "\A3\UI_F\Data\IGUI\RscIngameUI\RscUnitInfo\SI_prone_ca.paa";
                 statement = "{_x setUnitPos 'DOWN';} forEach (curatorSelected select 0);";
             };
-            class normal {
-                displayName = "$STR_A3_RscAttributeUnitPos_Crouch_tooltip";
+            class crouch {
+                displayName = "$STR_Pos_Crouch";
                 icon = "\A3\UI_F\Data\IGUI\RscIngameUI\RscUnitInfo\SI_crouch_ca.paa";
                 statement = "{_x setUnitPos 'MIDDLE';} forEach (curatorSelected select 0);";
             };
-            class full {
-                displayName = "$STR_A3_RscAttributeUnitPos_Up_tooltip";
+            class stand {
+                displayName = "$STR_Pos_Up";
                 icon = "\A3\UI_F\Data\IGUI\RscIngameUI\RscUnitInfo\SI_stand_ca.paa";
                 statement = "{_x setUnitPos 'UP';} forEach (curatorSelected select 0);";
             };
             class auto {
-                displayName = "$STR_A3_RscAttributeUnitPos_Auto_tooltip";
+                displayName = "$STR_Pos_Automatic";
                 icon = "\A3\UI_F_Curator\Data\default_ca.paa";
                 statement = "{_x setUnitPos 'AUTO';} forEach (curatorSelected select 0);";
             };
@@ -40,7 +40,7 @@ class ACE_ZeusActions {
         icon = "\A3\UI_F_Curator\Data\Displays\RscDisplayCurator\modeGroups_ca.paa";
 
         class behaviour {
-            displayName = CSTRING(Zeus_Behaviour);
+            displayName = "$STR_Combat_Mode";
 
             class careless {
                 displayName = "$STR_Combat_Careless";
@@ -68,7 +68,7 @@ class ACE_ZeusActions {
             };
         };
         class speed {
-            displayName = CSTRING(Zeus_Speed);
+            displayName = "$STR_HC_Menu_Speed";
 
             class limited {
                 displayName = "$STR_Speed_Limited";
@@ -86,32 +86,8 @@ class ACE_ZeusActions {
                 statement = "{_x setSpeedMode 'FULL';} forEach (curatorSelected select 1);";
             };
         };
-        class stance {
-            displayName = "$STR_A3_RscAttributeUnitPos_Title";
-
-            class limited {
-                displayName = "$STR_A3_RscAttributeUnitPos_Down_tooltip";
-                icon = "\A3\UI_F\Data\IGUI\RscIngameUI\RscUnitInfo\SI_prone_ca.paa";
-                statement = "{ {_x setUnitPos 'DOWN'} forEach (units _x); } forEach (curatorSelected select 1);";
-            };
-            class normal {
-                displayName = "$STR_A3_RscAttributeUnitPos_Crouch_tooltip";
-                icon = "\A3\UI_F\Data\IGUI\RscIngameUI\RscUnitInfo\SI_crouch_ca.paa";
-                statement = "{ {_x setUnitPos 'MIDDLE'} forEach (units _x); } forEach (curatorSelected select 1);";
-            };
-            class full {
-                displayName = "$STR_A3_RscAttributeUnitPos_Up_tooltip";
-                icon = "\A3\UI_F\Data\IGUI\RscIngameUI\RscUnitInfo\SI_stand_ca.paa";
-                statement = "{ {_x setUnitPos 'UP'} forEach (units _x); } forEach (curatorSelected select 1);";
-            };
-            class auto {
-                displayName = "$STR_A3_RscAttributeUnitPos_Auto_tooltip";
-                icon = "\A3\UI_F_Curator\Data\default_ca.paa";
-                statement = "{ {_x setUnitPos 'AUTO'} forEach (units _x); } forEach (curatorSelected select 1);";
-            };
-        };
         class formation {
-            displayName = CSTRING(Zeus_Formation);
+            displayName = "$STR_Formation";
 
             class wedge {
                 displayName = "$STR_Wedge";
@@ -165,7 +141,7 @@ class ACE_ZeusActions {
         icon = "\A3\UI_F_Curator\Data\CfgCurator\waypoint_ca.paa";
 
         class behaviour {
-            displayName = CSTRING(Zeus_Behaviour);
+            displayName = "$STR_Combat_Mode";
 
             class careless {
                 displayName = "$STR_Combat_Careless";
@@ -193,7 +169,7 @@ class ACE_ZeusActions {
             };
         };
         class speed {
-            displayName = CSTRING(Zeus_Speed);
+            displayName = "$STR_HC_Menu_Speed";
 
             class limited {
                 displayName = "$STR_Speed_Limited";
@@ -212,7 +188,7 @@ class ACE_ZeusActions {
             };
         };
         class formation {
-            displayName = CSTRING(Zeus_Formation);
+            displayName = "$STR_Formation";
 
             class wedge {
                 displayName = "$STR_Wedge";
diff --git a/addons/interaction/stringtable.xml b/addons/interaction/stringtable.xml
index d173029444..962d55eca9 100644
--- a/addons/interaction/stringtable.xml
+++ b/addons/interaction/stringtable.xml
@@ -828,17 +828,5 @@
             <Czech>Správa týmu se skládá z: přidělení barev pro členy týmu, převzetí velení, připojení/odpojení. </Czech>
             <Russian>O módulo de gestão de equipe é composto por: a atribuição de cores para os membros da equipe, comando das equipes, juntando-se / deixando equipes.</Russian>
         </Key>
-        <Key ID="STR_ACE_Interaction_Zeus_Behaviour">
-            <English>Behaviour</English>
-            <Polish>Zachowanie</Polish>
-        </Key>
-        <Key ID="STR_ACE_Interaction_Zeus_Formation">
-            <English>Formation</English>
-            <Polish>Formacja</Polish>
-        </Key>
-        <Key ID="STR_ACE_Interaction_Zeus_Speed">
-            <English>Speed Mode</English>
-            <Polish>Prędkość</Polish>
-        </Key>
     </Package>
 </Project>