From 185cae2fe52f377f1f1abedf51866789c5d7a15f Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 25 Nov 2015 11:00:45 -0600 Subject: [PATCH] Remove Old Gestures from interaction --- addons/gestures/CfgVehicles.hpp | 15 +-- addons/gestures/stringtable.xml | 51 ++++++---- addons/interaction/CfgVehicles.hpp | 106 --------------------- addons/interaction/UI/gestures_ca.paa | Bin 22016 -> 0 bytes addons/interaction/stringtable.xml | 132 -------------------------- 5 files changed, 34 insertions(+), 270 deletions(-) delete mode 100644 addons/interaction/UI/gestures_ca.paa diff --git a/addons/gestures/CfgVehicles.hpp b/addons/gestures/CfgVehicles.hpp index cfc4ae0ac7..019cffdb45 100644 --- a/addons/gestures/CfgVehicles.hpp +++ b/addons/gestures/CfgVehicles.hpp @@ -10,6 +10,7 @@ class CfgVehicles { showDisabled = 1; priority = 3.5; icon = PATHTOF(UI\gestures_ca.paa); + class GVAR(Advance) { displayName = CSTRING(BIgestureAdvance); condition = QUOTE(canStand _target); @@ -17,7 +18,6 @@ class CfgVehicles { showDisabled = 1; priority = 1.9; }; - class GVAR(Go) { displayName = CSTRING(BIgestureGo); condition = QUOTE(canStand _target); @@ -25,7 +25,6 @@ class CfgVehicles { showDisabled = 1; priority = 1.8; }; - class GVAR(Follow) { displayName = CSTRING(BIgestureFollow); condition = QUOTE(canStand _target); @@ -33,7 +32,6 @@ class CfgVehicles { showDisabled = 1; priority = 1.7; }; - class GVAR(Up) { displayName = CSTRING(BIgestureUp); condition = QUOTE(canStand _target); @@ -41,7 +39,6 @@ class CfgVehicles { showDisabled = 1; priority = 1.5; }; - class GVAR(CeaseFire) { displayName = CSTRING(BIgestureCeaseFire); condition = QUOTE(canStand _target); @@ -49,7 +46,6 @@ class CfgVehicles { showDisabled = 1; priority = 1.3; }; - class GVAR(Freeze) { displayName = CSTRING(BIgestureFreeze); condition = QUOTE(canStand _target); @@ -57,7 +53,6 @@ class CfgVehicles { showDisabled = 1; priority = 1.2; }; - class GVAR(Forward) { displayName = CSTRING(forward); condition = QUOTE(canStand _target && GVAR(ReloadMutex)); @@ -65,7 +60,6 @@ class CfgVehicles { showDisabled = 1; priority = 1.9; }; - class GVAR(Regroup) { displayName = CSTRING(regroup); condition = QUOTE(canStand _target && GVAR(ReloadMutex)); @@ -73,7 +67,6 @@ class CfgVehicles { showDisabled = 1; priority = 1.8; }; - class GVAR(Stop) { displayName = CSTRING(stop); condition = QUOTE(canStand _target && GVAR(ReloadMutex)); @@ -81,7 +74,6 @@ class CfgVehicles { showDisabled = 1; priority = 1.7; }; - class GVAR(Cover) { displayName = CSTRING(cover); condition = QUOTE(canStand _target && GVAR(ReloadMutex)); @@ -89,7 +81,6 @@ class CfgVehicles { showDisabled = 1; priority = 1.6; }; - class GVAR(Point) { displayName = CSTRING(point); condition = QUOTE(canStand _target && GVAR(ReloadMutex)); @@ -97,7 +88,6 @@ class CfgVehicles { showDisabled = 1; priority = 1.5; }; - class GVAR(Engage) { displayName = CSTRING(engage); condition = QUOTE(canStand _target && GVAR(ReloadMutex)); @@ -105,7 +95,6 @@ class CfgVehicles { showDisabled = 1; priority = 1.4; }; - class GVAR(Hold) { displayName = CSTRING(hold); condition = QUOTE(canStand _target && GVAR(ReloadMutex)); @@ -113,7 +102,6 @@ class CfgVehicles { showDisabled = 1; priority = 1.3; }; - class GVAR(Warning) { displayName = CSTRING(warning); condition = QUOTE(canStand _target && GVAR(ReloadMutex)); @@ -121,7 +109,6 @@ class CfgVehicles { showDisabled = 1; priority = 1.2; }; - /* class class GVAR(Yes) { displayName = ECSTRING(common,Yes); diff --git a/addons/gestures/stringtable.xml b/addons/gestures/stringtable.xml index 1485575915..cc9b776cd1 100644 --- a/addons/gestures/stringtable.xml +++ b/addons/gestures/stringtable.xml @@ -1,12 +1,18 @@ - + ACE Gestures ACE Gesten ACE Gesty + ACE Posunky + ACE Signaux + ACE Kézjelek + ACE Gesti + ACE Gestos + ACE Жесты + ACE Gestos - Gestures Gesten @@ -19,7 +25,6 @@ Gestos Gesti - Advance Vordringen @@ -32,7 +37,6 @@ Avançar Avanzare - Go Los @@ -45,7 +49,6 @@ Mover-se Muoversi - Follow Folgen @@ -58,7 +61,6 @@ Seguir Seguire - Up Aufstehen @@ -71,7 +73,6 @@ Acima Alzarsi - Cease Fire Feuer einstellen @@ -84,7 +85,6 @@ Cessar Fogo Cessare il Fuoco - Point Zeigen @@ -97,7 +97,6 @@ Apontar Puntare a - Freeze Keine Bewegung @@ -110,7 +109,6 @@ Alto Fermi - Stop @@ -118,7 +116,6 @@ Stop Stop - Cover @@ -132,7 +129,6 @@ Proteger-se Copertura - Rally up @@ -140,7 +136,6 @@ Sammeln Zbiórka - Move forward @@ -148,14 +143,12 @@ Vorwärts Bewegen Naprzód - Engage Engager Atak - Point @@ -163,7 +156,6 @@ Zeigen Wskaż - Hold @@ -171,7 +163,6 @@ Anhalten Wstrzymać - Warning @@ -179,5 +170,29 @@ Achtung Uwaga + + Hi + Hallo + Hola + Witaj + Ahoj + Salut + Привет + Helló + Olá + Ciao + + + Attack + Angreifen + Atacar + Do ataku + Zaútočit + Attaquer + Атаковать + Támadás + Atacar + Attaccare + - + \ No newline at end of file diff --git a/addons/interaction/CfgVehicles.hpp b/addons/interaction/CfgVehicles.hpp index dfe4f2025e..66fca6582e 100644 --- a/addons/interaction/CfgVehicles.hpp +++ b/addons/interaction/CfgVehicles.hpp @@ -271,112 +271,6 @@ class CfgVehicles { hotkey = "M"; }; }; - - class ACE_Gestures { - displayName = CSTRING(Gestures); - condition = "canStand _target"; - statement = ""; - showDisabled = 1; - priority = 3.5; - icon = PATHTOF(UI\gestures_ca.paa); - hotkey = "G"; - - /*class ACE_Gesture_Advance { - displayName = CSTRING(Gestures_Attack); - condition = "canStand _target"; - statement = "_target playActionNow 'gestureAttack';"; - showDisabled = 1; - priority = 2.0; - };*/ - class ACE_Gesture_Advance { - displayName = CSTRING(Gestures_Advance); - condition = QUOTE(canStand _target); - statement = QUOTE(_target playActionNow 'gestureAdvance';); - showDisabled = 1; - priority = 1.9; - hotkey = "1"; - }; - class ACE_Gesture_Go { - displayName = CSTRING(Gestures_Go); - condition = QUOTE(canStand _target); - statement = QUOTE(_target playActionNow ([ARR_2('gestureGo','gestureGoB')] select floor random 2);); - showDisabled = 1; - priority = 1.8; - hotkey = "2"; - }; - class ACE_Gesture_Follow { - displayName = CSTRING(Gestures_Follow); - condition = QUOTE(canStand _target); - statement = QUOTE(_target playActionNow 'gestureFollow';); - showDisabled = 1; - priority = 1.7; - hotkey = "3"; - }; - /*class ACE_Gesture_Point { - displayName = CSTRING(Gestures_Point); - condition = QUOTE(canStand _target); - statement = QUOTE(_target playActionNow 'gesturePoint';); - showDisabled = 1; - priority = 1.6; - };*/ - class ACE_Gesture_Up { - displayName = CSTRING(Gestures_Up); - condition = QUOTE(canStand _target); - statement = QUOTE(_target playActionNow 'gestureUp';); - showDisabled = 1; - priority = 1.5; - hotkey = "4"; - }; - class ACE_Gesture_Cover { - displayName = CSTRING(Gestures_Cover); - condition = QUOTE(canStand _target); - statement = QUOTE(_target playActionNow 'gestureCover';); - showDisabled = 1; - priority = 1.4; - hotkey = "5"; - }; - class ACE_Gesture_CeaseFire { - displayName = CSTRING(Gestures_Cease_Fire); - condition = QUOTE(canStand _target); - statement = QUOTE(_target playActionNow 'gestureCeaseFire';); - showDisabled = 1; - priority = 1.3; - hotkey = "6"; - }; - class ACE_Gesture_Freeze { - displayName = CSTRING(Gestures_Freeze); - condition = QUOTE(canStand _target); - statement = QUOTE(_target playActionNow 'gestureFreeze';); - showDisabled = 1; - priority = 1.2; - hotkey = "7"; - }; - class ACE_Gesture_Yes { - displayName = ECSTRING(common,Yes); - condition = QUOTE(canStand _target); - statement = QUOTE(_target playActionNow ([ARR_2('gestureYes','gestureNod')] select floor random 2);); - showDisabled = 1; - priority = 1.1; - hotkey = "8"; - }; - class ACE_Gesture_No { - displayName = ECSTRING(common,No); - condition = QUOTE(canStand _target); - statement = QUOTE(_target playActionNow 'gestureNo';); - showDisabled = 1; - priority = 1.0; - hotkey = "9"; - }; - class ACE_Gesture_Hi { - displayName = CSTRING(Gestures_Hi); - condition = QUOTE(canStand _target); - statement = QUOTE(_target playActionNow ([ARR_3('gestureHi','gestureHiB','gestureHiC')] select floor random 3);); - showDisabled = 1; - priority = 0.9; - hotkey = "0"; - }; - }; - class ACE_Equipment { displayName = CSTRING(Equipment); condition = QUOTE(true); diff --git a/addons/interaction/UI/gestures_ca.paa b/addons/interaction/UI/gestures_ca.paa deleted file mode 100644 index b237d73edf54566f2e1cccb4e41ff414564a6f0d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22016 zcmeHPL1-IC6rFV?oE%b%7#&KRbW2p)qf3G>A@zttWJ5{?)s`Nb;>M6u?U+&mg&J?1 zgKw2Fl=jf#OYe0K6%$xZA=^)HQ(6StKtPGH#oX9pN+}^c&&#q5@71y+SRU;QWO#0e zgRal%pghlES(x&ruFqIsE~qbVCmRle0PtN9Cl?s+Y&xALTq&S|MvekBPu z93BFl_6O+CP!mLc;K1Qx`vd$hC+FB-WwF@#4$9#{dn`3|-XBDUnh^E_$Md+kH!^yt zB%{BoS!bHn|!UzwUYxxfWk}&Zo_&4)AnPRbs zVZcITz8DJ}Ak%sWp8t`M69#|R&5g}Jt(`jI^L&9wrFdLNM(n*l0h4>d{2u7H^Lt%q z{OJnB=O5$;{Db~O=ij0AETfCLr)z1YP9e~1{CCPut2Y_}%YQU3Nx5qIPYTn~c3S?U zaY@Qm%YRasj<(bCAB{^=u3G++!gREqmj7s6l5*AZpA@E}?bQ71{bmjp{O`9uN73Y8 zusXh2eA7AqG{;bRoZW8-oIq^`xwz!@2}VQ&zX2xYJERL%eorr zgZ%*}y|DWMy2h(5_-GK2w8bscD9go}c@;(%jV$RNY1-E9S1XgX%J==$EH=OOH0dcX z1s6x8KF)vYZIj<;{koZjzD6^%_7h*1yi=H zF3+rv)PJYz*u^Y45??M3N+bQs#QMKCaEAO5+oGjEQh%WS;rJ)HpX3kg>$)tr%60jo z%Q(y}Pif{PQaRbS~DIgCeupsA}t zv|U;F&NTe#1c%G7l6o$goB_>JuHcmVBK%eFe< z_fLy{y{+?kuwTeO(7~s+8-GiJ0j{j#VTLX~$(UvG{OZ;xMs6NZyPQX3M)^A>yQDcq zC2(-@O;lx6W%A0$*IuUzc$i+5C~p?FZ|{&Sf#lG_?nZrRo6C2clo;PA&)i?$DNua# zpSQGK9?GKN;voC!oPvvk)$-Naoij{xC)`-AgoYI>p~q^6 zAEPVx9+%bQ+pijX<;v{tpsL@~Xh%IJUVG!_wYyY4<-Z`y zJF82l*gj-$>0O@?C#ZRO<;SzvbHh{HTy0EpUHE+YOl^MVKFKr*@x@wY;$qXJ;NZ`< huGW6Kq}2kK6k1f^`K?$QeC?&dVag`+`8@m&;Xjkjy*K~> diff --git a/addons/interaction/stringtable.xml b/addons/interaction/stringtable.xml index 13383f8088..8309ada07a 100644 --- a/addons/interaction/stringtable.xml +++ b/addons/interaction/stringtable.xml @@ -253,138 +253,6 @@ << Voltar << Indietro - - Gestures - Gesten - Gestos - Gesty - Posunky - Signaux - Жесты - Kézjelek - Gestos - Gesti - - - Attack - Angreifen - Atacar - Do ataku - Zaútočit - Attaquer - Атаковать - Támadás - Atacar - Attaccare - - - Advance - Vordringen - Avanzar - Naprzód - Postoupit - Avancer - Продвигаться - Előre - Avançar - Avanzare - - - Go - Los - Adelante - Szybko - Jít - Aller - Идти - Mozgás - Mover-se - Muoversi - - - Follow - Folgen - Seguirme - Za mną - Následovat - Suivre - Следовать - Utánam - Seguir - Seguire - - - Point - Zeigen - Señalar - Wskazać - Ukázat - Pointer - Точка - Mutat - Apontar - Puntare a - - - Up - Aufstehen - Arriba - Do góry - Vztyk - Debout - Вверх - Fel - Acima - Alzarsi - - - Cover - Deckung - Cubrirse - Do osłony - Krýt se - A couvert - Укрыться - Fedezékbe - Proteger-se - Copertura - - - Cease Fire - Feuer einstellen - Alto el fuego - Wstrzymać ogień - Zastavit palbu - Halte au feu - Прекратить огонь - Tüzet szüntess - Cessar Fogo - Cessare il Fuoco - - - Freeze - Keine Bewegung - Alto - Stać - Stát - Halte - Замереть - Állj - Alto - Fermi - - - Hi - Hallo - Hola - Witaj - Ahoj - Salut - Привет - Helló - Olá - Ciao - Put weapon on back Waffe wegstecken