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 #1546 from SilentSpike/zeusUpdate

Browse Source 
Update ace_zeus with 1.46 changes
This commit is contained in:
Nicolás Badano 2015-06-08 14:44:12 -03:00
commit 1def1ee7e4
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,13 +126,14 @@ if (_activated) then {
case (_ownerUID > 0): {
waituntil {
sleep 0.01;
{getplayeruid _x == _ownerVar} count playableunits > 0
{getplayeruid _x == _ownerVar} count playableunits > 0 || isnull _logic
};
};
default {
waituntil {isplayer (missionnamespace getvariable [_ownerVar,objnull])};
waituntil {isplayer (missionnamespace getvariable [_ownerVar,objnull]) || isnull _logic};
};
};
if (isnull _logic) exitwith {};
//--- Assign
_player = objnull;
@ -147,21 +148,22 @@ if (_activated) then {
};
};
waituntil {unassigncurator _logic; isnull (getassignedcuratorunit _logic)};
waituntil {_player assignCurator _logic; getassignedcuratorunit _logic == _player};
waituntil {unassigncurator _logic; isnull (getassignedcuratorunit _logic) || isnull _logic};
waituntil {_player assignCurator _logic; getassignedcuratorunit _logic == _player || isnull _logic};
if (isnull _logic) exitwith {};
//--- Add radio channels
{
_x radiochanneladd [_player];
} foreach (_logic getvariable ["channels",[]]);
// Added by ACE_zeus to delay ascension message at mission start
// Added by ace_zeus to delay ascension message at mission start
[{
_logic = _this select 0;
_player = _this select 1;
if (GVAR(zeusAscension)) then {
//--- Sent notification to all assigned players
//--- Sent notification to all assigned players
if ((_logic getvariable ["showNotification",true]) && GVAR(zeusAscension)) then {
{
if (isplayer _x) then {
[["CuratorAssign",[_name,name _player]],"bis_fnc_showNotification",_x] call bis_fnc_mp;
@ -172,7 +174,7 @@ if (_activated) then {
[_logic,"curatorUnitAssigned",[_logic,_player]] call bis_fnc_callscriptedeventhandler;
// Added by ACE_zeus
// Added by ace_zeus
["zeusUnitAssigned", [_logic,_player]] call EFUNC(common,globalEvent);
//--- Forced interface
@ -185,13 +187,14 @@ if (_activated) then {
case (_ownerUID > 0): {
waituntil {
sleep 0.01;
{getplayeruid _x == _ownerVar} count playableunits == 0
{getplayeruid _x == _ownerVar} count playableunits == 0 || isnull _logic
};
};
default {
waituntil {_player != missionnamespace getvariable [_ownerVar,objnull]};
waituntil {_player != missionnamespace getvariable [_ownerVar,objnull] || isnull _logic};
};
};
if (isnull _logic) exitwith {};
//--- Add radio channels
{
@ -199,7 +202,8 @@ if (_activated) then {
} foreach (_logic getvariable ["channels",[]]);
//--- Unassign
waituntil {unassigncurator _logic; isnull (getassignedcuratorunit _logic)};
waituntil {unassigncurator _logic; isnull (getassignedcuratorunit _logic) || isnull _logic};
if (isnull _logic) exitwith {};
};
};
@ -218,7 +222,7 @@ if (_activated) then {
} foreach (synchronizedobjects _logic);
_addons call bis_fnc_activateaddons;
// Added by ACE_zeus to delay bird code
// Added by ace_zeus to delay bird code
[{
_logic = _this select 0;

2
addons/zeus/functions/fnc_bi_moduleMine.sqf
View File

@ -26,7 +26,7 @@ if (_activated) then {
_explosive = createvehicle [_explosive,position _logic,[],0,"none"];
_explosive attachto [_logic];
// Added by ACE_zeus to control if mines are revealed
// Added by ace_zeus to control if mines are revealed
if (GVAR(revealMines) > 0) then {
//--- Reveal the mine to curator's side
{

4
addons/zeus/functions/fnc_bi_moduleProjectile.sqf
View File

@ -127,7 +127,7 @@ if (_activated) then {
_projectile setvelocity _velocity;
if (_attach) then {_projectile attachto [_logic,[0,0,_altitude]];};
// This is our addition to this function
// Added by ace_zeus for ace_frag compatibility
if (!isnil "ace_frag_fnc_addManualTrack") then {
[_projectile] call ace_frag_fnc_addManualTrack
};
@ -138,7 +138,7 @@ if (_activated) then {
//--- Create sound source
_soundSource = if (_soundSourceClass != "") then {createSoundSource [_soundSourceClass,_pos,[],0]} else {objnull};
// Added by ACE_zeus to toggle ordnance radio message
// Added by ace_zeus to toggle ordnance radio message
if (GVAR(radioOrdnance)) then {
//--- Play radio warning
[] call _fnc_playRadio;

2
addons/zeus/functions/fnc_bi_moduleRemoteControl.sqf
View File

@ -49,7 +49,7 @@ if (_activated && local _logic && !isnull curatorcamera) then {
bis_fnc_moduleRemoteControl_unit = _unit;
_unit setvariable ["bis_fnc_moduleRemoteControl_owner",player,true];
// Added by ACE_zeus to toggle remote control wind sound
// Added by ace_zeus to toggle remote control wind sound
if (GVAR(remoteWind)) then {
//--- Play wind cue to all players
[format ["wind%1",ceil random 5],"bis_fnc_playsound"] call bis_fnc_mp;