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

#2045 - Push SDV sub, cleanup push

Browse Source
This commit is contained in:
PabstMirror 2015-08-10 22:08:13 -05:00
parent e5eaefafdb
commit 4cce799ace
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/interaction/CfgVehicles.hpp
View File

@ -501,8 +501,8 @@ class CfgVehicles {
class ACE_Push {
displayName = CSTRING(Push);
distance = 6;
condition = QUOTE(getMass _target < 1000 && {alive _target});
statement = QUOTE([ARR_2(_target, [ARR_3(2 * (vectorDir _player select 0), 2 * (vectorDir _player select 1), 0.5)])] call DFUNC(push););
condition = QUOTE(((getMass _target) <= 2600) && {alive _target} && {(vectorMagnitude (velocity _target)) < 3});
statement = QUOTE(_this call FUNC(push));
showDisabled = 0;
priority = -1;
};

7
addons/interaction/XEH_postInit.sqf
View File

@ -10,6 +10,13 @@ ACE_Modifier = 0;
_group selectLeader _leader;
}] call EFUNC(common,addEventHandler);
//Pushing boats from FUNC(push)
[QGVAR(pushBoat), {
params ["_boat", "_newVelocity"];
_boat setVelocity _newVelocity;
}] call EFUNC(common,addEventHandler);
if (!hasInterface) exitWith {};
GVAR(isOpeningDoor) = false;

14
addons/interaction/functions/fnc_push.sqf
View File

@ -4,23 +4,23 @@
*
* Arguments:
* 0: Boat <OBJECT>
* 1: Velocity <ARRAY>
* 1: Player <OBJECT>
*
* Return Value:
* None
*
* Example:
* [target, [vector]] call ace_interaction_fnc_push
* [Boats, Jose] call ace_interaction_fnc_push
*
* Public: No
*/
#include "script_component.hpp"
PARAMS_2(_boat,_velocity);
params ["_boat", "_player"];
if !(local _boat) exitWith {
[_this, QUOTE(FUNC(push)), _boat] call EFUNC(common,execRemoteFnc);
};
private ["_newVelocity"];
_boat setVelocity _velocity;
_newVelocity = [2 * (vectorDir _player select 0), 2 * (vectorDir _player select 1), 0.5];
[QGVAR(pushBoat), [_boat], [_boat, _newVelocity]] call EFUNC(common,targetEvent);