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

Overheating - Fix jamming sound (#7463)

Browse Source 
* This sound was heard all over the map

* secondaryWeapon changed to handgunWeapon

* add jamming sound

* add yourself to AUTHORS.txt
This commit is contained in:
Panisher 2020-01-18 20:40:41 +03:00 committed by PabstMirror
parent 71da4360b8
commit d9054e1c52
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS.txt
View File

@ -120,6 +120,7 @@ nomisum <nomisum@gmail.com>
OnkelDisMaster <onkeldismaster@gmail.com> OnkelDisMaster <onkeldismaster@gmail.com>
Orbis2358 <mgkid3310@naver.com> Orbis2358 <mgkid3310@naver.com>
oscarmolinadev oscarmolinadev
Panisher (Tushino Serious Games) <panisher333@gmail.com>
PaxJaromeMalues <seemax1991@gmail.com> PaxJaromeMalues <seemax1991@gmail.com>
PiZZADOX <509thParachuteInfantry@gmail.com> PiZZADOX <509thParachuteInfantry@gmail.com>
Phyma <sethramstrom@gmail.com> Phyma <sethramstrom@gmail.com>

2
addons/overheating/functions/fnc_clearJam.sqf
View File

@ -36,7 +36,7 @@ if (_weapon in _jammedWeapons) then {
if (_weapon == primaryWeapon _unit) then { if (_weapon == primaryWeapon _unit) then {
playSound QGVAR(fixing_rifle); playSound QGVAR(fixing_rifle);
} else { } else {
if (_weapon == secondaryWeapon _unit) then { if (_weapon == handgunWeapon _unit) then {
playSound QGVAR(fixing_pistol); playSound QGVAR(fixing_pistol);
}; };
}; };

10
addons/overheating/functions/fnc_jamWeapon.sqf
View File

@ -40,6 +40,14 @@ if (_ammo > 0) then {
}, [_unit, _weapon, _ammo]] call CBA_fnc_execNextFrame; }, [_unit, _weapon, _ammo]] call CBA_fnc_execNextFrame;
}; };
if (_weapon == primaryWeapon _unit) then {
playSound QGVAR(jamming_rifle);
} else {
if (_weapon == handgunWeapon _unit) then {
playSound QGVAR(jamming_pistol);
};
};
// only display the hint once, after you try to shoot an already jammed weapon // only display the hint once, after you try to shoot an already jammed weapon
GVAR(knowAboutJam) = false; GVAR(knowAboutJam) = false;
@ -55,7 +63,7 @@ if (_unit getVariable [QGVAR(JammingActionID), -1] == -1) then {
}; };
private _statement = { private _statement = {
playSound3D ["a3\sounds_f\weapons\Other\dry9.wss", _this select 0]; playSound3D ["a3\sounds_f\weapons\Other\dry9.wss", _this select 0, false, eyePos (_this select 0), 1, 1, 15];
if (!(missionNamespace getVariable [QGVAR(knowAboutJam), false]) && {(_this select 1) ammo currentWeapon (_this select 1) > 0} && {GVAR(DisplayTextOnJam)}) then { if (!(missionNamespace getVariable [QGVAR(knowAboutJam), false]) && {(_this select 1) ammo currentWeapon (_this select 1) > 0} && {GVAR(DisplayTextOnJam)}) then {
[localize LSTRING(WeaponJammed)] call EFUNC(common,displayTextStructured); [localize LSTRING(WeaponJammed)] call EFUNC(common,displayTextStructured);