Fix inverted Stop and Freeze - prone Stop will still be freeze due to BI animation being wrong

This commit is contained in:
jonpas 2016-03-29 15:39:32 +02:00
parent 4e3b342a7f
commit c24c1b9dc0
6 changed files with 28 additions and 28 deletions

View File

@ -46,10 +46,10 @@ class CfgVehicles {
showDisabled = 1; showDisabled = 1;
priority = 1.3; priority = 1.3;
}; };
class GVAR(Freeze) { class GVAR(Stop) {
displayName = CSTRING(BIgestureFreeze); displayName = CSTRING(stop);
condition = QUOTE(canStand _target); 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; showDisabled = 1;
priority = 1.2; priority = 1.2;
}; };
@ -67,10 +67,10 @@ class CfgVehicles {
showDisabled = 1; showDisabled = 1;
priority = 1.8; priority = 1.8;
}; };
class GVAR(Stop) { class GVAR(Freeze) {
displayName = CSTRING(stop); displayName = CSTRING(freeze);
condition = QUOTE(canStand _target && GVAR(ReloadMutex)); condition = QUOTE(canStand _target && GVAR(ReloadMutex));
statement = QUOTE(QUOTE(QGVAR(stop)) call FUNC(playSignal)); statement = QUOTE(QUOTE(QGVAR(freeze)) call FUNC(playSignal));
showDisabled = 1; showDisabled = 1;
priority = 1.7; priority = 1.7;
}; };

View File

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

View File

@ -25,7 +25,7 @@
false false
} count [ } count [
["stop", DIK_NUMPAD2], ["freeze", DIK_NUMPAD2],
["cover", DIK_NUMPAD3], ["cover", DIK_NUMPAD3],
["forward", DIK_NUMPAD4], ["forward", DIK_NUMPAD4],
["regroup", DIK_NUMPAD5], ["regroup", DIK_NUMPAD5],

View File

@ -97,19 +97,6 @@
<Portuguese>Apontar</Portuguese> <Portuguese>Apontar</Portuguese>
<Italian>Puntare a</Italian> <Italian>Puntare a</Italian>
</Key> </Key>
<Key ID="STR_ACE_Gestures_BIgestureFreeze">
<English>Freeze</English>
<German>Keine Bewegung</German>
<Spanish>Alto</Spanish>
<Polish>Stać</Polish>
<Czech>Stát</Czech>
<French>Halte</French>
<Russian>Замереть</Russian>
<Hungarian>Állj</Hungarian>
<Portuguese>Alto</Portuguese>
<Italian>Fermi</Italian>
</Key>
<!-- STOP -->
<Key ID="STR_ACE_Gestures_stop"> <Key ID="STR_ACE_Gestures_stop">
<English>Stop</English> <English>Stop</English>
<French>Stop</French> <French>Stop</French>
@ -121,6 +108,19 @@
<Italian>Stop</Italian> <Italian>Stop</Italian>
<Spanish>Detenerse</Spanish> <Spanish>Detenerse</Spanish>
</Key> </Key>
<!-- STOP -->
<Key ID="STR_ACE_Gestures_freeze">
<English>Freeze</English>
<German>Keine Bewegung</German>
<Spanish>Alto</Spanish>
<Polish>Stać</Polish>
<Czech>Stát</Czech>
<French>Halte</French>
<Russian>Замереть</Russian>
<Hungarian>Állj</Hungarian>
<Portuguese>Alto</Portuguese>
<Italian>Fermi</Italian>
</Key>
<!-- COVER --> <!-- COVER -->
<Key ID="STR_ACE_Gestures_cover"> <Key ID="STR_ACE_Gestures_cover">
<English>Cover</English> <English>Cover</English>