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 branch 'master' of https://github.com/KoffeinFlummi/ACE3

Browse Source
This commit is contained in:
ulteq 2015-05-15 21:12:02 +02:00
commit 8120cef964
7 changed files with 49 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/common/functions/fnc_hashGet.sqf
View File

@ -23,4 +23,6 @@ try {
} catch {
HANDLECATCH;
};
_val
if (isNil "_val") exitWith { nil };
_val;

2
addons/common/functions/fnc_hashListSelect.sqf
View File

@ -23,4 +23,6 @@ try {
} catch {
HANDLECATCH;
};
if (isNil "_hash") exitWith { nil };
_hash;

2
addons/interaction/XEH_postInit.sqf
View File

@ -51,7 +51,7 @@ private ["_team"];
if !([ACE_player, cursorTarget] call FUNC(canTapShoulder)) exitWith {false};
// Statement
[ACE_player, cursorTarget] call FUNC(tapShoulder);
[ACE_player, cursorTarget, 0] call FUNC(tapShoulder);
true
},
{false},

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

@ -5,6 +5,7 @@
* Arguments:
* 0: Player <OBJECT>
* 1: Target <OBJECT>
* 2: Shoulder which was tapped <NUMBER>
*
* Return value:
* None
@ -16,7 +17,7 @@
*/
#include "script_component.hpp"
EXPLODE_3_PVT(_this,_tapper,_target,_shoulderNum);
PARAMS_3(_tapper,_target,_shoulderNum);
if (_target != ACE_player) exitWith {
addCamShake [4, 0.5, 5];

2
addons/zeus/CfgVehicles.hpp
View File

@ -66,7 +66,7 @@ class CfgVehicles {
};
class ModuleCurator_F: Module_F {
function = QUOTE(DFUNC(moduleCuratorDelay));
function = QUOTE(DFUNC(bi_moduleCurator));
};
class ModuleMine_F: ModuleEmpty_F {
function = QUOTE(DFUNC(bi_moduleMine));

34
addons/zeus/functions/fnc_bi_moduleCurator.sqf
View File

@ -152,16 +152,6 @@ if (_activated) then {
_x radiochanneladd [_player];
} foreach (_logic getvariable ["channels",[]]);
// Added by ACE_zeus to toggle ascension messages
if (GVAR(zeusAscension)) then {
//--- Sent notification to all assigned players
{
if (isplayer _x) then {
[["CuratorAssign",[_name,name _player]],"bis_fnc_showNotification",_x] call bis_fnc_mp;
};
} foreach (curatoreditableobjects _logic);
};
[_logic,"curatorUnitAssigned",[_logic,_player]] call bis_fnc_callscriptedeventhandler;
//--- Forced interface
@ -192,16 +182,6 @@ if (_activated) then {
};
};
// Added by ACE_zeus to toggle eagle
if (GVAR(zeusBird)) then {
//--- Create bird
_birdType = _logic getvariable ["birdType","eagle_f"];
if (_birdType != "") then {
_bird = createvehicle [_birdType,[100,100,100],[],0,"none"];
_logic setvariable ["bird",_bird,true];
};
};
//--- Activated all future addons
_addons = [];
{
@ -217,18 +197,8 @@ if (_activated) then {
} foreach (synchronizedobjects _logic);
_addons call bis_fnc_activateaddons;
// Added by ACE_zeus to toggle eagle
if (GVAR(zeusBird)) then {
//--- Locality changed
_logic addeventhandler [
"local",
{
_logic = _this select 0;
_bird = _logic getvariable ["bird",objnull];
_bird setowner owner _logic;
}
];
};
// Added by ACE_zeus to delay ascension messages and bird code (so that settings can be changed)
[{_this spawn DFUNC(moduleCuratorDelay);},[_logic,_player]] call EFUNC(common,execNextFrame);
};
//--- Player

42
addons/zeus/functions/fnc_moduleCuratorDelay.sqf
View File

@ -1,12 +1,11 @@
/*
* Author: SilentSpike
* Function that delays the execution of the curator module function
* Function executed at a delay to allow curator settings module to run first
* Allows ascension and bird settings to be set by module beforehand
*
* Arguments:
* 0: The module logic <LOGIC>
* 1: units <ARRAY>
* 2: activated <BOOL>
* 1: Zeus player <OBJECT>
*
* Return Value:
* None <NIL>
@ -16,4 +15,39 @@
#include "script_component.hpp"
[{_this spawn DFUNC(bi_moduleCurator);},_this] call EFUNC(common,execNextFrame);
if (isServer) then {
private ["_logic","_player","_birdType","_bird"];
_logic = _this select 0;
_player = _this select 1;
// Extracted from moduleCurator to toggle ascension messages
if (GVAR(zeusAscension)) then {
//--- Sent notification to all assigned players
{
if (isplayer _x) then {
[["CuratorAssign",[_name,name _player]],"bis_fnc_showNotification",_x] call bis_fnc_mp;
};
} foreach (curatoreditableobjects _logic);
};
// Extracted from moduleCurator to toggle eagle
if (GVAR(zeusBird)) then {
//--- Create bird
_birdType = _logic getvariable ["birdType","eagle_f"];
if (_birdType != "") then {
_bird = createvehicle [_birdType,[100,100,100],[],0,"none"];
_logic setvariable ["bird",_bird,true];
};
//--- Locality changed
_logic addeventhandler [
"local",
{
_logic = _this select 0;
_bird = _logic getvariable ["bird",objnull];
_bird setowner owner _logic;
}
];
};
};