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

Merge pull request #3635 from acemod/fixInvertedGestureStopFreeze

Browse Source 
Fix inverted gestures Stop and Freeze and minor gestures cleanup
This commit is contained in:
jonpas 2016-04-01 19:30:48 +00:00
commit 31953c5d52
10 changed files with 109 additions and 171 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";
isClientSettable = 1;
category = ECSTRING(interact_menu,Category_InteractionMenu);
displayName = CSTRING(showOnInteractionMenu_displayName);
description = CSTRING(showOnInteractionMenu_description);
values[] = {"$STR_A3_OPTIONS_DISABLED", CSTRING(justKeybinds), CSTRING(keysAndInteractionMenu)};
displayName = CSTRING(ShowOnInteractionMenu_displayName);
description = CSTRING(ShowOnInteractionMenu_description);
values[] = {"$STR_A3_OPTIONS_DISABLED", CSTRING(JustKeybinds), CSTRING(KeysAndInteractionMenu)};
};
};

63
addons/gestures/CfgVehicles.hpp
View File

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

11
addons/gestures/README.md Normal file
View File

@ -0,0 +1,11 @@
ace_gestures
========
Gestures system in interaction menu and keybinds.
## Maintainers
The people responsible for merging changes to this component or answering potential questions.
- [jokoho48](https://github.com/jokoho48)

42
addons/gestures/XEH_postInit.sqf
View File

@ -5,4 +5,44 @@ if (!hasInterface) exitWith {};
// reload mutex, you can't play signal while reloading
GVAR(ReloadMutex) = true;
#include "key.sqf"
// Add keybinds
{
_x params ["_currentName", "_key", ["_vanillaKey", false] ];
// Don't add "ace_gestures_" prefix to BI gestures
private _signalName = _currentName;
if (!_vanillaKey) then {
_signalName = format [QGVAR(%1), _currentName];
};
private _code = compile format [QUOTE('%1' call FUNC(playSignal)), _signalName];
TRACE_4("Adding KeyBind",_currentName,_signalName,_code,_key);
[
"ACE3 Gestures",
_currentName,
localize format [LSTRING(%1), _currentName],
_code,
{false},
[_key, [false, (_key != -1), false]],
false
] call CBA_fnc_addKeybind;
false
} count [
["Freeze", 80], // Numpad 2
["Cover", 81], // Numpad 3
["Forward", 75], // Numpad 4
["Regroup", 76], // Numpad 5
["Engage", 77], // Numpad 6
["Point", 71], // Numpad 7
["Hold", 72], // Numpad 8
["Warning", 73], // Numpad 9
["Go", -1, true],
["Advance", -1, true],
["Follow", -1, true],
["Up", -1, true],
["Stop", -1, true],
["CeaseFire", -1, true]
];

0
addons/gestures/anim/ace_stop.rtm → addons/gestures/anim/ace_freeze.rtm
View File

0
addons/gestures/anim/ace_stop_stand_lowered.rtm → addons/gestures/anim/ace_freeze_stand_lowered.rtm
View File

16
addons/gestures/cfgMovesBasic.hpp
View File

@ -1,7 +1,7 @@
class CfgMovesBasic {
class ManActions {
GVAR(forward) = QGVAR(forward);
GVAR(stop) = QGVAR(stop);
GVAR(freeze) = QGVAR(freeze);
GVAR(cover) = QGVAR(cover);
GVAR(regroup) = QGVAR(regroup);
GVAR(engage) = QGVAR(engage);
@ -10,7 +10,7 @@ class CfgMovesBasic {
GVAR(warning) = QGVAR(warningS);
GVAR(forwardStandLowered) = QGVAR(forwardStandLowered);
GVAR(stopStandLowered) = QGVAR(stopStandLowered);
GVAR(freezeStandLowered) = QGVAR(freezeStandLowered);
GVAR(coverStandLowered) = QGVAR(coverStandLowered);
GVAR(regroupStandLowered) = QGVAR(regroupStandLowered);
GVAR(engageStandLowered) = QGVAR(engageStandLowered);
@ -22,7 +22,7 @@ class CfgMovesBasic {
class Actions {
class NoActions: ManActions {
GVAR(forward)[] = {QGVAR(forward), "Gesture"};
GVAR(stop)[] = {QGVAR(stop), "Gesture"};
GVAR(freeze)[] = {QGVAR(freeze), "Gesture"};
GVAR(cover)[] = {QGVAR(cover), "Gesture"};
GVAR(regroup)[] = {QGVAR(regroup), "Gesture"};
GVAR(engage)[] = {QGVAR(engage), "Gesture"};
@ -31,7 +31,7 @@ class CfgMovesBasic {
GVAR(warning)[] = {QGVAR(warning), "Gesture"};
GVAR(forwardStandLowered)[] = {QGVAR(forwardStandLowered), "Gesture"};
GVAR(stopStandLowered)[] = {QGVAR(stopStandLowered), "Gesture"};
GVAR(freezeStandLowered)[] = {QGVAR(freezeStandLowered), "Gesture"};
GVAR(coverStandLowered)[] = {QGVAR(coverStandLowered), "Gesture"};
GVAR(regroupStandLowered)[] = {QGVAR(regroupStandLowered), "Gesture"};
GVAR(engageStandLowered)[] = {QGVAR(engageStandLowered), "Gesture"};
@ -134,13 +134,13 @@ class CfgGesturesMale {
file = QUOTE(PATHTOF(anim\ace_forward_stand_lowered.rtm));
};
class GVAR(stop): GVAR(forward) {
file = QUOTE(PATHTOF(anim\ace_stop.rtm));
class GVAR(freeze): GVAR(forward) {
file = QUOTE(PATHTOF(anim\ace_freeze.rtm));
speed = 0.6;
};
class GVAR(stopStandLowered): GVAR(stop) {
file = QUOTE(PATHTOF(anim\ace_stop_stand_lowered.rtm));
class GVAR(freezeStandLowered): GVAR(freeze) {
file = QUOTE(PATHTOF(anim\ace_freeze_stand_lowered.rtm));
};
class GVAR(cover): GVAR(forward) {

2
addons/gestures/config.cpp
View File

@ -7,7 +7,7 @@ class CfgPatches {
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_interact_menu"};
author[] = {"joko // Jonas", "Emperias", "Zigomarvin"};
authorUrl = "https://github.com/commy2/";
authorUrl = "https://github.com/jokoho48";
VERSION_CONFIG;
};
};

42
addons/gestures/key.sqf
View File

@ -1,42 +0,0 @@
#include "\a3\editor_f\Data\Scripts\dikCodes.h"
{
_x params ["_currentName","_key"];
private _signalName = format [QGVAR(%1), _currentName];
if (_currentName select [0,2] == "BI") then {
//Don't add "ace_gestures_" prefix to BI gestures
_signalName = _currentName;
};
private _code = (compile format [QUOTE('%1' call FUNC(playSignal);), _signalName]);
TRACE_4("Adding KeyBind",_currentName,_signalName,_code,_key);
[
"ACE3 Gestures",
_currentName,
localize format[LSTRING(%1), _currentName],
_code,
{false},
[_key, [false, (_key != -1), false]],
false
] call CBA_fnc_addKeybind;
false
} count [
["stop", DIK_NUMPAD2],
["cover", DIK_NUMPAD3],
["forward", DIK_NUMPAD4],
["regroup", DIK_NUMPAD5],
["engage", DIK_NUMPAD6],
["point", DIK_NUMPAD7],
["hold", DIK_NUMPAD8],
["warning", DIK_NUMPAD9],
["BIgestureGo", -1],
["BIgestureAdvance", -1],
["BIgestureFollow", -1],
["BIgestureUp", -1],
["BIgestureFreeze", -1],
["BIgestureCeaseFire", -1]
];

98
addons/gestures/stringtable.xml
View File

@ -25,7 +25,7 @@
<Portuguese>Gestos</Portuguese>
<Italian>Gesti</Italian>
</Key>
<Key ID="STR_ACE_Gestures_BIgestureAdvance">
<Key ID="STR_ACE_Gestures_Advance">
<English>Advance</English>
<German>Vordringen</German>
<Spanish>Avanzar</Spanish>
@ -37,7 +37,7 @@
<Portuguese>Avançar</Portuguese>
<Italian>Avanzare</Italian>
</Key>
<Key ID="STR_ACE_Gestures_BIgestureGo">
<Key ID="STR_ACE_Gestures_Go">
<English>Go</English>
<German>Los</German>
<Spanish>Adelante</Spanish>
@ -49,7 +49,7 @@
<Portuguese>Mover-se</Portuguese>
<Italian>Muoversi</Italian>
</Key>
<Key ID="STR_ACE_Gestures_BIgestureFollow">
<Key ID="STR_ACE_Gestures_Follow">
<English>Follow</English>
<German>Folgen</German>
<Spanish>Seguirme</Spanish>
@ -61,7 +61,7 @@
<Portuguese>Seguir</Portuguese>
<Italian>Seguire</Italian>
</Key>
<Key ID="STR_ACE_Gestures_BIgestureUp">
<Key ID="STR_ACE_Gestures_Up">
<English>Up</English>
<German>Aufstehen</German>
<Spanish>Arriba</Spanish>
@ -73,7 +73,7 @@
<Portuguese>Acima</Portuguese>
<Italian>Alzarsi</Italian>
</Key>
<Key ID="STR_ACE_Gestures_BIgestureCeaseFire">
<Key ID="STR_ACE_Gestures_CeaseFire">
<English>Cease Fire</English>
<German>Feuer einstellen</German>
<Spanish>Alto el fuego</Spanish>
@ -85,19 +85,18 @@
<Portuguese>Cessar Fogo</Portuguese>
<Italian>Cessare il Fuoco</Italian>
</Key>
<Key ID="STR_ACE_Gestures_BIGesturesPoint">
<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 ID="STR_ACE_Gestures_Stop">
<English>Stop</English>
<French>Stop</French>
<German>Halt</German>
<Polish>Stop</Polish>
<Russian>Стоп</Russian>
<Portuguese>Parar</Portuguese>
<Czech>Stop</Czech>
<Italian>Stop</Italian>
<Spanish>Detenerse</Spanish>
</Key>
<Key ID="STR_ACE_Gestures_BIgestureFreeze">
<Key ID="STR_ACE_Gestures_Freeze">
<English>Freeze</English>
<German>Keine Bewegung</German>
<Spanish>Alto</Spanish>
@ -109,20 +108,7 @@
<Portuguese>Alto</Portuguese>
<Italian>Fermi</Italian>
</Key>
<!-- STOP -->
<Key ID="STR_ACE_Gestures_stop">
<English>Stop</English>
<French>Stop</French>
<German>Halt</German>
<Polish>Stop</Polish>
<Russian>Стоп</Russian>
<Portuguese>Parar</Portuguese>
<Czech>Stop</Czech>
<Italian>Stop</Italian>
<Spanish>Detenerse</Spanish>
</Key>
<!-- COVER -->
<Key ID="STR_ACE_Gestures_cover">
<Key ID="STR_ACE_Gestures_Cover">
<English>Cover</English>
<German>Deckung</German>
<Spanish>Cubrirse</Spanish>
@ -134,8 +120,7 @@
<Portuguese>Proteger-se</Portuguese>
<Italian>Copertura</Italian>
</Key>
<!-- REGROUP -->
<Key ID="STR_ACE_Gestures_regroup">
<Key ID="STR_ACE_Gestures_Regroup">
<English>Rally up</English>
<French>Regroupement</French>
<German>Sammeln</German>
@ -146,8 +131,7 @@
<Italian>Raggruppare</Italian>
<Spanish>Reunirse</Spanish>
</Key>
<!-- FORWARD -->
<Key ID="STR_ACE_Gestures_forward">
<Key ID="STR_ACE_Gestures_Forward">
<English>Move forward</English>
<French>En avant</French>
<German>Vorwärts Bewegen</German>
@ -158,8 +142,7 @@
<Italian>Muovere avanti</Italian>
<Spanish>Avanzar</Spanish>
</Key>
<!-- ENGAGE -->
<Key ID="STR_ACE_Gestures_engage">
<Key ID="STR_ACE_Gestures_Engage">
<English>Engage</English>
<German>Angriff</German>
<French>Engager</French>
@ -170,8 +153,7 @@
<Italian>Ingaggiare</Italian>
<Spanish>Atacar</Spanish>
</Key>
<!-- POINT -->
<Key ID="STR_ACE_Gestures_point">
<Key ID="STR_ACE_Gestures_Point">
<English>Point</English>
<French>Pointer</French>
<German>Zeigen</German>
@ -182,8 +164,7 @@
<Italian>Puntare</Italian>
<Spanish>Señalar</Spanish>
</Key>
<!-- HOLD -->
<Key ID="STR_ACE_Gestures_hold">
<Key ID="STR_ACE_Gestures_Hold">
<English>Hold</English>
<French>Tenir</French>
<German>Anhalten</German>
@ -194,8 +175,7 @@
<Italian>Mantenere</Italian>
<Spanish>Esperar</Spanish>
</Key>
<!-- WARNING -->
<Key ID="STR_ACE_Gestures_warning">
<Key ID="STR_ACE_Gestures_Warning">
<English>Warning</English>
<French>Attention</French>
<German>Achtung</German>
@ -206,31 +186,7 @@
<Italian>Attenzione</Italian>
<Spanish>Atención</Spanish>
</Key>
<Key ID="STR_ACE_Gestures_Hi">
<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">
<Key ID="STR_ACE_Gestures_ShowOnInteractionMenu_displayName">
<English>Show Gestures On Interaction Menu</English>
<German>Zeige Gesten im Interaktionsmenü</German>
<Czech>Zobrazit posunky v interakčním menu</Czech>
@ -239,7 +195,7 @@
<Spanish>Mostrar gestos en el menú de interacción</Spanish>
<French>Afficher les gestes au menu d'interaction.</French>
</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>
<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>
@ -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>
<French>Afficher les gestes dans le menu d'interaction personnel, ou seulement utiliser les touches, ou desactiver complètement.</French>
</Key>
<Key ID="STR_ACE_Gestures_justKeybinds">
<Key ID="STR_ACE_Gestures_JustKeybinds">
<English>Just Keybinds</English>
<German>Nur Schnelltasten</German>
<Czech>Pouze klávesové zkratky</Czech>
@ -257,7 +213,7 @@
<Spanish>Solo mediante teclas</Spanish>
<French>Seulement les touches</French>
</Key>
<Key ID="STR_ACE_Gestures_keysAndInteractionMenu">
<Key ID="STR_ACE_Gestures_KeysAndInteractionMenu">
<English>Keybinds + Interaction Menu</English>
<German>Schnelltasten+ Interaktionsmenü</German>
<Czech>Klávesové zkratky + interakční menu</Czech>