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

Tap on either shoulder. "Tap" animation

Browse Source
This commit is contained in:
Nicolás Badano
2015-02-19 19:45:46 -03:00
parent bc3a226c64
commit dd92c5e845
3 changed files with 48 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
addons/interaction/CfgVehicles.hpp
View File

@ -146,12 +146,23 @@ class CfgVehicles {
}; };
}; };
class ACE_TapShoulder { class ACE_TapShoulderRight {
displayName = "$STR_ACE_Interaction_TapShoulder"; displayName = "$STR_ACE_Interaction_TapShoulder";
selection = "rightshoulder"; selection = "rightshoulder";
distance = 4; distance = 2.0;
condition = QUOTE([ARR_2(_player, _target)] call DFUNC(canTapShoulder)); condition = QUOTE([ARR_2(_player, _target)] call DFUNC(canTapShoulder));
statement = QUOTE([ARR_2(_player, _target)] call DFUNC(tapShoulder)); statement = QUOTE([ARR_3(_player, _target, 0)] call DFUNC(tapShoulder));
showDisabled = 0;
priority = 2.8;
hotkey = "Q";
enableInside = 1;
};
class ACE_TapShoulderLeft {
displayName = "$STR_ACE_Interaction_TapShoulder";
selection = "leftshoulder";
distance = 2.0;
condition = QUOTE([ARR_2(_player, _target)] call DFUNC(canTapShoulder));
statement = QUOTE([ARR_3(_player, _target, 1)] call DFUNC(tapShoulder));
showDisabled = 0; showDisabled = 0;
priority = 2.8; priority = 2.8;
hotkey = "Q"; hotkey = "Q";

21
addons/interaction/functions/fnc_tapShoulder.sqf
View File

@ -1,21 +1,22 @@
// by commy2 // by commy2
#include "script_component.hpp" #include "script_component.hpp"
private ["_unit", "_message"]; EXPLODE_3_PVT(_this,_tapper,_target,_shoulderNum);
_tapper = _this select 0;
_target = _this select 1;
if (_target != ACE_player) exitWith { if (_target != ACE_player) exitWith {
addCamShake [4, 0.5, 5]; addCamShake [4, 0.5, 5];
if !(local _target) then { ACE_player playActionNow 'gestureAdvance';
[[_tapper, _target], QUOTE(DFUNC(tapShoulder)), _target] call EFUNC(common,execRemoteFnc); if !(local _target) then {
}; [[_tapper, _target, _shoulderNum], QUOTE(DFUNC(tapShoulder)), _target] call EFUNC(common,execRemoteFnc);
};
}; };
addCamShake [4, 0.5, 5]; addCamShake [4, 0.5, 5];
//_message = format ["%1 tapped you on your shoulder.", [_unit] call EFUNC(common,getName)]; if (_shoulderNum == 0) then {
_message = localize "STR_ACE_Interaction_YouWereTapped"; _message = localize "STR_ACE_Interaction_YouWereTappedRight";
} else {
_message = localize "STR_ACE_Interaction_YouWereTappedLeft";
};
[_message] call EFUNC(common,displayTextStructured); [_message] call EFUNC(common,displayTextStructured);

34
addons/interaction/stringtable.xml
View File

@ -341,17 +341,29 @@
<Portuguese>Tocar ombro</Portuguese> <Portuguese>Tocar ombro</Portuguese>
<Italian>Dai un colpetto</Italian> <Italian>Dai un colpetto</Italian>
</Key> </Key>
<Key ID="STR_ACE_Interaction_YouWereTapped"> <Key ID="STR_ACE_Interaction_YouWereTappedRight">
<English>You were tapped on the shoulder.</English> <English>You were tapped on the RIGHT shoulder &gt;</English>
<German>Dir wurde auf die Schulter geklopft</German> <Spanish>Te tocaron el hombro DERECHO &gt;</Spanish>
<Spanish>Te tocaron el hombro.</Spanish> <German>Dir wurde auf die Schulter geklopft &gt;</German>
<French>On te tape sur l'épaule.</French> <French>On te tape sur l'épaule &gt;</French>
<Polish>Zostałeś klepnięty po ramieniu</Polish> <Polish>Zostałeś klepnięty po ramieniu &gt;</Polish>
<Hungarian>Vállonveregettek</Hungarian> <Hungarian>Vállonveregettek &gt;</Hungarian>
<Czech>Někdo tě poklepal na rameno.</Czech> <Czech>Někdo tě poklepal na rameno &gt;</Czech>
<Russian>Вас похлопали по плечу</Russian> <Russian>Вас похлопали по плечу &gt;</Russian>
<Portuguese>Você foi tocado no ombro.</Portuguese> <Portuguese>Você foi tocado no ombro &gt;</Portuguese>
<Italian>Ti è stato dato un colpetto sulla spalla</Italian> <Italian>Ti è stato dato un colpetto sulla spalla &gt;</Italian>
</Key>
<Key ID="STR_ACE_Interaction_YouWereTappedLeft">
<English>&lt; You were tapped on the LEFT shoulder.</English>
<Spanish>&lt; Te tocaron el hombro IZQUIERDO.</Spanish>
<German>&lt; Dir wurde auf die Schulter geklopft</German>
<French>&lt; On te tape sur l'épaule.</French>
<Polish>&lt; Zostałeś klepnięty po ramieniu</Polish>
<Hungarian>&lt; Vállonveregettek</Hungarian>
<Czech>&lt; Někdo tě poklepal na rameno.</Czech>
<Russian>&lt; Вас похлопали по плечу</Russian>
<Portuguese>&lt; Você foi tocado no ombro.</Portuguese>
<Italian>&lt; Ti è stato dato un colpetto sulla spalla</Italian>
</Key> </Key>
<Key ID="STR_ACE_Interaction_CancelSelection"> <Key ID="STR_ACE_Interaction_CancelSelection">
<English>Cancel</English> <English>Cancel</English>