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 #3776 from acemod/cleanupFastRopeSounds

Browse Source 
FastRope Sounds - Fix Config, Merge PFEH, Add CC Attribution
This commit is contained in:
PabstMirror 2016-05-11 22:29:28 -05:00
commit 09371bce96
7 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS.txt
View File

@ -112,6 +112,7 @@ Sniperwolf572 <tenga6@gmail.com>
System98
SzwedzikPL <szwedzikpl@gmail.com>
Tachi <zaveruha007@gmail.com>
Tessa Elieff <Fastroping Sound - CreativeCommons Attributions 3.0>
Toaster <jonathan.pereira@gmail.com>
Tonic
Tourorist <tourorist@gmail.com>

2
LICENSE
View File

@ -26,6 +26,8 @@ Some folders of this project may contain a separate LICENSE file. Should
that be the case, everything in that folder and all subfolders is subject
to that license instead.
- ARMA PUBLIC LICENSE (\addons\apl)
- CreativeCommons Attributions 3.0 (\addons\fastroping\data\sounds)
============================================================================
Full GNU General Public License Text

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

@ -0,0 +1,11 @@
ace_fastroping
==========
Introducing the ability to fastrope out of heliocopters.
## Maintainers
The people responsible for merging changes to this component or answering potential questions.
- [BaerMitUmlaut](https://github.com/BaerMitUmlaut)
- [KoffeinFlummi](https://github.com/KoffeinFlummi)

1
addons/fastroping/config.cpp
View File

@ -14,5 +14,6 @@ class CfgPatches {
#include "CfgEventHandlers.hpp"
#include "CfgMoves.hpp"
#include "CfgSounds.hpp"
#include "CfgVehicles.hpp"
#include "CfgWaypoints.hpp"

BIN
addons/fastroping/data/sounds/fastroping_thud.ogg
View File

Binary file not shown.

2
addons/fastroping/functions/fnc_fastRope.sqf
View File

@ -37,4 +37,4 @@ _vehicle setVariable [QGVAR(deployedRopes), _deployedRopes, true];
//Start server PFH asap
[QGVAR(startFastRope), [_unit, _vehicle, _usableRope, _usableRopeIndex, false]] call EFUNC(common,serverEvent);
moveOut _unit;
[FUNC(fastRopeLocalPFH), 0, [_unit, _vehicle, _usableRope, _usableRopeIndex]] call CBA_fnc_addPerFrameHandler;
[FUNC(fastRopeLocalPFH), 0, [_unit, _vehicle, _usableRope, _usableRopeIndex, ACE_diagTime]] call CBA_fnc_addPerFrameHandler;

19
addons/fastroping/functions/fnc_fastRopeLocalPFH.sqf
View File

@ -17,7 +17,7 @@
#include "script_component.hpp"
params ["_arguments", "_pfhHandle"];
_arguments params ["_unit", "_vehicle", "_rope", "_ropeIndex"];
_arguments params ["_unit", "_vehicle", "_rope", "_ropeIndex", "_timeToPlayRopeSound"];
_rope params ["_attachmentPoint", "_ropeTop", "_ropeBottom", "_dummy", "_hook", "_occupied"];
private ["_vectorUp", "_vectorDir", "_origin"];
@ -29,22 +29,12 @@ if (animationState _unit != "ACE_FastRoping") exitWith {
_unit disableCollisionWith _dummy;
_unit attachTo [_dummy, [0, 0, -1.45]];
[_unit, "ACE_FastRoping", 2] call EFUNC(common,doAnimation);
[{
params ["_args", "_idPFH"];
_args params ["_unit"];
if (isNull (attachedTo _unit)) exitWith {
[_idPFH] call CBA_fnc_removePerFrameHandler;
};
playSound QGVAR(Rope);
}, 1, [_unit]] call CBA_fnc_addPerFrameHandler;
};
//End of fast rope
if (isNull attachedTo _unit) exitWith {
TRACE_1("exit pfeh",_unit);
[_unit, "", 2] call EFUNC(common,doAnimation);
_unit setVectorUp [0, 0, 1];
@ -52,3 +42,8 @@ if (isNull attachedTo _unit) exitWith {
[_pfhHandle] call CBA_fnc_removePerFrameHandler;
};
if (ACE_diagTime > _timeToPlayRopeSound) then {
_arguments set [4, (_timeToPlayRopeSound + 1)];
playSound QGVAR(Rope);
};