Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused gestures, Improve stringtabling and remove duplicate

Browse Source
This commit is contained in:
jonpas 2016-03-29 15:51:51 +02:00
parent c24c1b9dc0
commit 3489dd48bb
4 changed files with 54 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/gestures/ACE_Settings.hpp
View File

@ -4,8 +4,8 @@ class ACE_Settings {
typeName = "SCALAR"; typeName = "SCALAR";
isClientSettable = 1; isClientSettable = 1;
category = ECSTRING(interact_menu,Category_InteractionMenu); category = ECSTRING(interact_menu,Category_InteractionMenu);
displayName = CSTRING(showOnInteractionMenu_displayName); displayName = CSTRING(ShowOnInteractionMenu_displayName);
description = CSTRING(showOnInteractionMenu_description); description = CSTRING(ShowOnInteractionMenu_description);
values[] = {"$STR_A3_OPTIONS_DISABLED", CSTRING(justKeybinds), CSTRING(keysAndInteractionMenu)}; values[] = {"$STR_A3_OPTIONS_DISABLED", CSTRING(JustKeybinds), CSTRING(KeysAndInteractionMenu)};
}; };
}; };

57
addons/gestures/CfgVehicles.hpp
View File

@ -12,131 +12,104 @@ class CfgVehicles {
icon = PATHTOF(UI\gestures_ca.paa); icon = PATHTOF(UI\gestures_ca.paa);
class GVAR(Advance) { class GVAR(Advance) {
displayName = CSTRING(BIgestureAdvance); displayName = CSTRING(Advance);
condition = QUOTE(canStand _target); condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow 'gestureAdvance';); statement = QUOTE(_target playActionNow 'gestureAdvance';);
showDisabled = 1; showDisabled = 1;
priority = 1.9; priority = 1.9;
}; };
class GVAR(Go) { class GVAR(Go) {
displayName = CSTRING(BIgestureGo); displayName = CSTRING(Go);
condition = QUOTE(canStand _target); condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow ([ARR_2('gestureGo','gestureGoB')] select floor random 2);); statement = QUOTE(_target playActionNow ([ARR_2('gestureGo','gestureGoB')] select floor random 2););
showDisabled = 1; showDisabled = 1;
priority = 1.8; priority = 1.8;
}; };
class GVAR(Follow) { class GVAR(Follow) {
displayName = CSTRING(BIgestureFollow); displayName = CSTRING(Follow);
condition = QUOTE(canStand _target); condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow 'gestureFollow';); statement = QUOTE(_target playActionNow 'gestureFollow';);
showDisabled = 1; showDisabled = 1;
priority = 1.7; priority = 1.7;
}; };
class GVAR(Up) { class GVAR(Up) {
displayName = CSTRING(BIgestureUp); displayName = CSTRING(Up);
condition = QUOTE(canStand _target); condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow 'gestureUp';); statement = QUOTE(_target playActionNow 'gestureUp';);
showDisabled = 1; showDisabled = 1;
priority = 1.5; priority = 1.5;
}; };
class GVAR(CeaseFire) { class GVAR(CeaseFire) {
displayName = CSTRING(BIgestureCeaseFire); displayName = CSTRING(CeaseFire);
condition = QUOTE(canStand _target); condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow 'gestureCeaseFire';); statement = QUOTE(_target playActionNow 'gestureCeaseFire';);
showDisabled = 1; showDisabled = 1;
priority = 1.3; priority = 1.3;
}; };
class GVAR(Stop) { class GVAR(Stop) {
displayName = CSTRING(stop); displayName = CSTRING(Stop);
condition = QUOTE(canStand _target); condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow 'gestureFreeze';); // BI animation - is actualls "stop" in all stances but prone statement = QUOTE(_target playActionNow 'gestureFreeze';); // BI animation - is actualls "stop" in all stances but prone
showDisabled = 1; showDisabled = 1;
priority = 1.2; priority = 1.2;
}; };
class GVAR(Forward) { class GVAR(Forward) {
displayName = CSTRING(forward); displayName = CSTRING(Forward);
condition = QUOTE(canStand _target && GVAR(ReloadMutex)); condition = QUOTE(canStand _target && GVAR(ReloadMutex));
statement = QUOTE(QUOTE(QGVAR(forward)) call FUNC(playSignal)); statement = QUOTE(QUOTE(QGVAR(forward)) call FUNC(playSignal));
showDisabled = 1; showDisabled = 1;
priority = 1.9; priority = 1.9;
}; };
class GVAR(Regroup) { class GVAR(Regroup) {
displayName = CSTRING(regroup); displayName = CSTRING(Regroup);
condition = QUOTE(canStand _target && GVAR(ReloadMutex)); condition = QUOTE(canStand _target && GVAR(ReloadMutex));
statement = QUOTE(QUOTE(QGVAR(regroup)) call FUNC(playSignal)); statement = QUOTE(QUOTE(QGVAR(regroup)) call FUNC(playSignal));
showDisabled = 1; showDisabled = 1;
priority = 1.8; priority = 1.8;
}; };
class GVAR(Freeze) { class GVAR(Freeze) {
displayName = CSTRING(freeze); displayName = CSTRING(Freeze);
condition = QUOTE(canStand _target && GVAR(ReloadMutex)); condition = QUOTE(canStand _target && GVAR(ReloadMutex));
statement = QUOTE(QUOTE(QGVAR(freeze)) call FUNC(playSignal)); statement = QUOTE(QUOTE(QGVAR(freeze)) call FUNC(playSignal));
showDisabled = 1; showDisabled = 1;
priority = 1.7; priority = 1.7;
}; };
class GVAR(Cover) { class GVAR(Cover) {
displayName = CSTRING(cover); displayName = CSTRING(Cover);
condition = QUOTE(canStand _target && GVAR(ReloadMutex)); condition = QUOTE(canStand _target && GVAR(ReloadMutex));
statement = QUOTE(QUOTE(QGVAR(cover)) call FUNC(playSignal)); statement = QUOTE(QUOTE(QGVAR(cover)) call FUNC(playSignal));
showDisabled = 1; showDisabled = 1;
priority = 1.6; priority = 1.6;
}; };
class GVAR(Point) { class GVAR(Point) {
displayName = CSTRING(point); displayName = CSTRING(Point);
condition = QUOTE(canStand _target && GVAR(ReloadMutex)); condition = QUOTE(canStand _target && GVAR(ReloadMutex));
statement = QUOTE(QUOTE(QGVAR(point)) call FUNC(playSignal)); statement = QUOTE(QUOTE(QGVAR(point)) call FUNC(playSignal));
showDisabled = 1; showDisabled = 1;
priority = 1.5; priority = 1.5;
}; };
class GVAR(Engage) { class GVAR(Engage) {
displayName = CSTRING(engage); displayName = CSTRING(Engage);
condition = QUOTE(canStand _target && GVAR(ReloadMutex)); condition = QUOTE(canStand _target && GVAR(ReloadMutex));
statement = QUOTE(QUOTE(QGVAR(engage)) call FUNC(playSignal)); statement = QUOTE(QUOTE(QGVAR(engage)) call FUNC(playSignal));
showDisabled = 1; showDisabled = 1;
priority = 1.4; priority = 1.4;
}; };
class GVAR(Hold) { class GVAR(Hold) {
displayName = CSTRING(hold); displayName = CSTRING(Hold);
condition = QUOTE(canStand _target && GVAR(ReloadMutex)); condition = QUOTE(canStand _target && GVAR(ReloadMutex));
statement = QUOTE(QUOTE(QGVAR(hold)) call FUNC(playSignal)); statement = QUOTE(QUOTE(QGVAR(hold)) call FUNC(playSignal));
showDisabled = 1; showDisabled = 1;
priority = 1.3; priority = 1.3;
}; };
class GVAR(Warning) { class GVAR(Warning) {
displayName = CSTRING(warning); displayName = CSTRING(Warning);
condition = QUOTE(canStand _target && GVAR(ReloadMutex)); condition = QUOTE(canStand _target && GVAR(ReloadMutex));
statement = QUOTE(QUOTE(QGVAR(warning)) call FUNC(playSignal)); statement = QUOTE(QUOTE(QGVAR(warning)) call FUNC(playSignal));
showDisabled = 1; showDisabled = 1;
priority = 1.2; priority = 1.2;
}; };
/* };
class class GVAR(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;
};
class class GVAR(No) {
displayName = ECSTRING(common,No);
condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow 'gestureNo';);
showDisabled = 1;
priority = 1.0;
};
class class GVAR(Hi) {
displayName = CSTRING(Hi);
condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow ([ARR_3('gestureHi','gestureHiB','gestureHiC')] select floor random 3););
showDisabled = 1;
priority = 0.9;
};
*/
};
}; };
}; };
}; };

33
addons/gestures/key.sqf
View File

@ -4,12 +4,13 @@
_x params ["_currentName","_key"]; _x params ["_currentName","_key"];
private _signalName = format [QGVAR(%1), _currentName]; private _signalName = format [QGVAR(%1), _currentName];
if (_currentName select [0,2] == "BI") then {
//Don't add "ace_gestures_" prefix to BI gestures //Don't add "ace_gestures_" prefix to BI gestures
if (_key == -1) then {
_signalName = _currentName; _signalName = _currentName;
}; };
private _code = (compile format [QUOTE('%1' call FUNC(playSignal);), _signalName]); private _code = compile format [QUOTE('%1' call FUNC(playSignal)), _signalName];
TRACE_4("Adding KeyBind",_currentName,_signalName,_code,_key); TRACE_4("Adding KeyBind",_currentName,_signalName,_code,_key);
@ -25,18 +26,18 @@
false false
} count [ } count [
["freeze", DIK_NUMPAD2], ["Freeze", DIK_NUMPAD2],
["cover", DIK_NUMPAD3], ["Cover", DIK_NUMPAD3],
["forward", DIK_NUMPAD4], ["Forward", DIK_NUMPAD4],
["regroup", DIK_NUMPAD5], ["Regroup", DIK_NUMPAD5],
["engage", DIK_NUMPAD6], ["Engage", DIK_NUMPAD6],
["point", DIK_NUMPAD7], ["Point", DIK_NUMPAD7],
["hold", DIK_NUMPAD8], ["Hold", DIK_NUMPAD8],
["warning", DIK_NUMPAD9], ["Warning", DIK_NUMPAD9],
["BIgestureGo", -1], ["Go", -1],
["BIgestureAdvance", -1], ["Advance", -1],
["BIgestureFollow", -1], ["Follow", -1],
["BIgestureUp", -1], ["Up", -1],
["BIgestureFreeze", -1], ["Stop", -1],
["BIgestureCeaseFire", -1] ["CeaseFire", -1]
]; ];

80
addons/gestures/stringtable.xml
View File

@ -25,7 +25,7 @@
<Portuguese>Gestos</Portuguese> <Portuguese>Gestos</Portuguese>
<Italian>Gesti</Italian> <Italian>Gesti</Italian>
</Key> </Key>
<Key ID="STR_ACE_Gestures_BIgestureAdvance"> <Key ID="STR_ACE_Gestures_Advance">
<English>Advance</English> <English>Advance</English>
<German>Vordringen</German> <German>Vordringen</German>
<Spanish>Avanzar</Spanish> <Spanish>Avanzar</Spanish>
@ -37,7 +37,7 @@
<Portuguese>Avançar</Portuguese> <Portuguese>Avançar</Portuguese>
<Italian>Avanzare</Italian> <Italian>Avanzare</Italian>
</Key> </Key>
<Key ID="STR_ACE_Gestures_BIgestureGo"> <Key ID="STR_ACE_Gestures_Go">
<English>Go</English> <English>Go</English>
<German>Los</German> <German>Los</German>
<Spanish>Adelante</Spanish> <Spanish>Adelante</Spanish>
@ -49,7 +49,7 @@
<Portuguese>Mover-se</Portuguese> <Portuguese>Mover-se</Portuguese>
<Italian>Muoversi</Italian> <Italian>Muoversi</Italian>
</Key> </Key>
<Key ID="STR_ACE_Gestures_BIgestureFollow"> <Key ID="STR_ACE_Gestures_Follow">
<English>Follow</English> <English>Follow</English>
<German>Folgen</German> <German>Folgen</German>
<Spanish>Seguirme</Spanish> <Spanish>Seguirme</Spanish>
@ -61,7 +61,7 @@
<Portuguese>Seguir</Portuguese> <Portuguese>Seguir</Portuguese>
<Italian>Seguire</Italian> <Italian>Seguire</Italian>
</Key> </Key>
<Key ID="STR_ACE_Gestures_BIgestureUp"> <Key ID="STR_ACE_Gestures_Up">
<English>Up</English> <English>Up</English>
<German>Aufstehen</German> <German>Aufstehen</German>
<Spanish>Arriba</Spanish> <Spanish>Arriba</Spanish>
@ -73,7 +73,7 @@
<Portuguese>Acima</Portuguese> <Portuguese>Acima</Portuguese>
<Italian>Alzarsi</Italian> <Italian>Alzarsi</Italian>
</Key> </Key>
<Key ID="STR_ACE_Gestures_BIgestureCeaseFire"> <Key ID="STR_ACE_Gestures_CeaseFire">
<English>Cease Fire</English> <English>Cease Fire</English>
<German>Feuer einstellen</German> <German>Feuer einstellen</German>
<Spanish>Alto el fuego</Spanish> <Spanish>Alto el fuego</Spanish>
@ -85,19 +85,7 @@
<Portuguese>Cessar Fogo</Portuguese> <Portuguese>Cessar Fogo</Portuguese>
<Italian>Cessare il Fuoco</Italian> <Italian>Cessare il Fuoco</Italian>
</Key> </Key>
<Key ID="STR_ACE_Gestures_BIGesturesPoint"> <Key ID="STR_ACE_Gestures_Stop">
<English>Point</English>
<German>Zeigen</German>
<Spanish>Señalar</Spanish>
<Polish>Wskazać</Polish>
<Czech>Ukázat</Czech>
<French>Pointer</French>
<Russian>Показать направление</Russian>
<Hungarian>Mutat</Hungarian>
<Portuguese>Apontar</Portuguese>
<Italian>Puntare a</Italian>
</Key>
<Key ID="STR_ACE_Gestures_stop">
<English>Stop</English> <English>Stop</English>
<French>Stop</French> <French>Stop</French>
<German>Halt</German> <German>Halt</German>
@ -108,8 +96,7 @@
<Italian>Stop</Italian> <Italian>Stop</Italian>
<Spanish>Detenerse</Spanish> <Spanish>Detenerse</Spanish>
</Key> </Key>
<!-- STOP --> <Key ID="STR_ACE_Gestures_Freeze">
<Key ID="STR_ACE_Gestures_freeze">
<English>Freeze</English> <English>Freeze</English>
<German>Keine Bewegung</German> <German>Keine Bewegung</German>
<Spanish>Alto</Spanish> <Spanish>Alto</Spanish>
@ -121,8 +108,7 @@
<Portuguese>Alto</Portuguese> <Portuguese>Alto</Portuguese>
<Italian>Fermi</Italian> <Italian>Fermi</Italian>
</Key> </Key>
<!-- COVER --> <Key ID="STR_ACE_Gestures_Cover">
<Key ID="STR_ACE_Gestures_cover">
<English>Cover</English> <English>Cover</English>
<German>Deckung</German> <German>Deckung</German>
<Spanish>Cubrirse</Spanish> <Spanish>Cubrirse</Spanish>
@ -134,8 +120,7 @@
<Portuguese>Proteger-se</Portuguese> <Portuguese>Proteger-se</Portuguese>
<Italian>Copertura</Italian> <Italian>Copertura</Italian>
</Key> </Key>
<!-- REGROUP --> <Key ID="STR_ACE_Gestures_Regroup">
<Key ID="STR_ACE_Gestures_regroup">
<English>Rally up</English> <English>Rally up</English>
<French>Regroupement</French> <French>Regroupement</French>
<German>Sammeln</German> <German>Sammeln</German>
@ -146,8 +131,7 @@
<Italian>Raggruppare</Italian> <Italian>Raggruppare</Italian>
<Spanish>Reunirse</Spanish> <Spanish>Reunirse</Spanish>
</Key> </Key>
<!-- FORWARD --> <Key ID="STR_ACE_Gestures_Forward">
<Key ID="STR_ACE_Gestures_forward">
<English>Move forward</English> <English>Move forward</English>
<French>En avant</French> <French>En avant</French>
<German>Vorwärts Bewegen</German> <German>Vorwärts Bewegen</German>
@ -158,8 +142,7 @@
<Italian>Muovere avanti</Italian> <Italian>Muovere avanti</Italian>
<Spanish>Avanzar</Spanish> <Spanish>Avanzar</Spanish>
</Key> </Key>
<!-- ENGAGE --> <Key ID="STR_ACE_Gestures_Engage">
<Key ID="STR_ACE_Gestures_engage">
<English>Engage</English> <English>Engage</English>
<German>Angriff</German> <German>Angriff</German>
<French>Engager</French> <French>Engager</French>
@ -170,8 +153,7 @@
<Italian>Ingaggiare</Italian> <Italian>Ingaggiare</Italian>
<Spanish>Atacar</Spanish> <Spanish>Atacar</Spanish>
</Key> </Key>
<!-- POINT --> <Key ID="STR_ACE_Gestures_Point">
<Key ID="STR_ACE_Gestures_point">
<English>Point</English> <English>Point</English>
<French>Pointer</French> <French>Pointer</French>
<German>Zeigen</German> <German>Zeigen</German>
@ -182,8 +164,7 @@
<Italian>Puntare</Italian> <Italian>Puntare</Italian>
<Spanish>Señalar</Spanish> <Spanish>Señalar</Spanish>
</Key> </Key>
<!-- HOLD --> <Key ID="STR_ACE_Gestures_Hold">
<Key ID="STR_ACE_Gestures_hold">
<English>Hold</English> <English>Hold</English>
<French>Tenir</French> <French>Tenir</French>
<German>Anhalten</German> <German>Anhalten</German>
@ -194,8 +175,7 @@
<Italian>Mantenere</Italian> <Italian>Mantenere</Italian>
<Spanish>Esperar</Spanish> <Spanish>Esperar</Spanish>
</Key> </Key>
<!-- WARNING --> <Key ID="STR_ACE_Gestures_Warning">
<Key ID="STR_ACE_Gestures_warning">
<English>Warning</English> <English>Warning</English>
<French>Attention</French> <French>Attention</French>
<German>Achtung</German> <German>Achtung</German>
@ -206,31 +186,7 @@
<Italian>Attenzione</Italian> <Italian>Attenzione</Italian>
<Spanish>Atención</Spanish> <Spanish>Atención</Spanish>
</Key> </Key>
<Key ID="STR_ACE_Gestures_Hi"> <Key ID="STR_ACE_Gestures_ShowOnInteractionMenu_displayName">
<English>Hi</English>
<German>Hallo</German>
<Spanish>Hola</Spanish>
<Polish>Witaj</Polish>
<Czech>Ahoj</Czech>
<French>Salut</French>
<Russian>Привет</Russian>
<Hungarian>Helló</Hungarian>
<Portuguese>Olá</Portuguese>
<Italian>Ciao</Italian>
</Key>
<Key ID="STR_ACE_Gestures_Attack">
<English>Attack</English>
<German>Angreifen</German>
<Spanish>Atacar</Spanish>
<Polish>Do ataku</Polish>
<Czech>Zaútočit</Czech>
<French>Attaquer</French>
<Russian>Атаковать</Russian>
<Hungarian>Támadás</Hungarian>
<Portuguese>Atacar</Portuguese>
<Italian>Attaccare</Italian>
</Key>
<Key ID="STR_ACE_Gestures_showOnInteractionMenu_displayName">
<English>Show Gestures On Interaction Menu</English> <English>Show Gestures On Interaction Menu</English>
<German>Zeige Gesten im Interaktionsmenü</German> <German>Zeige Gesten im Interaktionsmenü</German>
<Czech>Zobrazit posunky v interakčním menu</Czech> <Czech>Zobrazit posunky v interakčním menu</Czech>
@ -239,7 +195,7 @@
<Spanish>Mostrar gestos en el menú de interacción</Spanish> <Spanish>Mostrar gestos en el menú de interacción</Spanish>
<French>Afficher les gestes au menu d'interaction.</French> <French>Afficher les gestes au menu d'interaction.</French>
</Key> </Key>
<Key ID="STR_ACE_Gestures_showOnInteractionMenu_description"> <Key ID="STR_ACE_Gestures_ShowOnInteractionMenu_description">
<English>Show gestures on the self interaction menu, or just use keybinds, or disable completely</English> <English>Show gestures on the self interaction menu, or just use keybinds, or disable completely</English>
<German>Zeige Gesten im Selbst-Interkationsmenü, lege sie auf Schnelltasten, oder deaktiviere sie vollständig.</German> <German>Zeige Gesten im Selbst-Interkationsmenü, lege sie auf Schnelltasten, oder deaktiviere sie vollständig.</German>
<Czech>Zobrazit posunky pro vlastní interakční menu, nebo prostě použít klávesové zkratky, nebo to zakázat úplně</Czech> <Czech>Zobrazit posunky pro vlastní interakční menu, nebo prostě použít klávesové zkratky, nebo to zakázat úplně</Czech>
@ -248,7 +204,7 @@
<Spanish>Muestror los gestos en el menú de interacción propia, utilizar solo combinación de teclas o desactivarlos completamente</Spanish> <Spanish>Muestror los gestos en el menú de interacción propia, utilizar solo combinación de teclas o desactivarlos completamente</Spanish>
<French>Afficher les gestes dans le menu d'interaction personnel, ou seulement utiliser les touches, ou desactiver complètement.</French> <French>Afficher les gestes dans le menu d'interaction personnel, ou seulement utiliser les touches, ou desactiver complètement.</French>
</Key> </Key>
<Key ID="STR_ACE_Gestures_justKeybinds"> <Key ID="STR_ACE_Gestures_JustKeybinds">
<English>Just Keybinds</English> <English>Just Keybinds</English>
<German>Nur Schnelltasten</German> <German>Nur Schnelltasten</German>
<Czech>Pouze klávesové zkratky</Czech> <Czech>Pouze klávesové zkratky</Czech>
@ -257,7 +213,7 @@
<Spanish>Solo mediante teclas</Spanish> <Spanish>Solo mediante teclas</Spanish>
<French>Seulement les touches</French> <French>Seulement les touches</French>
</Key> </Key>
<Key ID="STR_ACE_Gestures_keysAndInteractionMenu"> <Key ID="STR_ACE_Gestures_KeysAndInteractionMenu">
<English>Keybinds + Interaction Menu</English> <English>Keybinds + Interaction Menu</English>
<German>Schnelltasten+ Interaktionsmenü</German> <German>Schnelltasten+ Interaktionsmenü</German>
<Czech>Klávesové zkratky + interakční menu</Czech> <Czech>Klávesové zkratky + interakční menu</Czech>