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

Disable zeus settings by default

Browse Source 
Fixed newline characters
This commit is contained in:
SilentSpike
2015-05-11 18:06:01 +01:00
parent b09ebc9c79
commit 7cf52d13ca
11 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,4 +24,4 @@ if (isNil {_logic getVariable _moduleVariable}) exitWith {
}; };
// Set the setting globally and force it // Set the setting globally and force it
[_settingName, _logic getVariable _moduleVariable, true, true] call FUNC(setSetting); [_settingName, _logic getVariable _moduleVariable, true, true] call FUNC(setSetting);

10
addons/zeus/ACE_Settings.hpp
View File

@ -1,23 +1,23 @@
class ACE_Settings { class ACE_Settings {
class GVAR(zeusAscension) { class GVAR(zeusAscension) {
typeName = "BOOL"; typeName = "BOOL";
value = 1; value = 0;
}; };
class GVAR(zeusBird) { class GVAR(zeusBird) {
typeName = "BOOL"; typeName = "BOOL";
value = 1; value = 0;
}; };
class GVAR(remoteWind) { class GVAR(remoteWind) {
typeName = "BOOL"; typeName = "BOOL";
value = 1; value = 0;
}; };
class GVAR(radioOrdnance) { class GVAR(radioOrdnance) {
typeName = "BOOL"; typeName = "BOOL";
value = 1; value = 0;
}; };
class GVAR(revealMines) { class GVAR(revealMines) {
typeName = "SCALAR"; typeName = "SCALAR";
value = 2; value = 0;
values[] = {"Disabled", "Partially", "Fully"}; values[] = {"Disabled", "Partially", "Fully"};
}; };
}; };

2
addons/zeus/CfgFactionClasses.hpp
View File

@ -3,4 +3,4 @@ class CfgFactionClasses {
class ADDON: NO_CATEGORY { class ADDON: NO_CATEGORY {
displayName = "ACE Zeus"; displayName = "ACE Zeus";
}; };
}; };

2
addons/zeus/CfgVehicles.hpp
View File

@ -77,4 +77,4 @@ class CfgVehicles {
class ModuleRemoteControl_F: Module_F { class ModuleRemoteControl_F: Module_F {
function = QUOTE(DFUNC(bi_moduleRemoteControl)); function = QUOTE(DFUNC(bi_moduleRemoteControl));
}; };
}; };

2
addons/zeus/config.cpp
View File

@ -15,4 +15,4 @@ class CfgPatches {
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
#include "CfgFactionClasses.hpp" #include "CfgFactionClasses.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "ACE_Settings.hpp" #include "ACE_Settings.hpp"

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

@ -153,7 +153,7 @@ if (_activated) then {
} foreach (_logic getvariable ["channels",[]]); } foreach (_logic getvariable ["channels",[]]);
// Added by ACE_zeus to toggle ascension messages // Added by ACE_zeus to toggle ascension messages
if (GETMVAR(GVAR(zeusAscension),true)) then { if GVAR(zeusAscension) then {
//--- Sent notification to all assigned players //--- Sent notification to all assigned players
{ {
if (isplayer _x) then { if (isplayer _x) then {
@ -193,7 +193,7 @@ if (_activated) then {
}; };
// Added by ACE_zeus to toggle eagle // Added by ACE_zeus to toggle eagle
if (GETMVAR(GVAR(zeusBird),true)) then { if GVAR(zeusBird) then {
//--- Create bird //--- Create bird
_birdType = _logic getvariable ["birdType","eagle_f"]; _birdType = _logic getvariable ["birdType","eagle_f"];
if (_birdType != "") then { if (_birdType != "") then {
@ -218,7 +218,7 @@ if (_activated) then {
_addons call bis_fnc_activateaddons; _addons call bis_fnc_activateaddons;
// Added by ACE_zeus to toggle eagle // Added by ACE_zeus to toggle eagle
if (GETMVAR(GVAR(zeusBird),true)) then { if GVAR(zeusBird) then {
//--- Locality changed //--- Locality changed
_logic addeventhandler [ _logic addeventhandler [
"local", "local",
@ -330,4 +330,4 @@ if (_activated) then {
player call bis_fnc_curatorRespawn; player call bis_fnc_curatorRespawn;
}; };
}; };

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

@ -25,15 +25,14 @@ if (_activated) then {
_explosive attachto [_logic]; _explosive attachto [_logic];
// Added by ACE_zeus to control if mines are revealed // Added by ACE_zeus to control if mines are revealed
_revealMines = GETMVAR(GVAR(revealMines),2); if (GVAR(revealMines) > 0) then {
if (_revealMines > 0) then {
//--- Reveal the mine to curator's side //--- Reveal the mine to curator's side
{ {
_side = (getassignedcuratorunit _x) call bis_fnc_objectSide; _side = (getassignedcuratorunit _x) call bis_fnc_objectSide;
_side revealmine _explosive; _side revealmine _explosive;
} foreach (objectcurators _logic); } foreach (objectcurators _logic);
if (_revealMines > 1) then { if (GVAR(revealMines) > 1) then {
//--- Mark minefields in the map //--- Mark minefields in the map
[] spawn bis_fnc_drawMinefields; [] spawn bis_fnc_drawMinefields;
}; };
@ -46,4 +45,4 @@ if (_activated) then {
if (isnull _logic) then {deletevehicle _explosive;} else {_explosive setdamage 1;}; if (isnull _logic) then {deletevehicle _explosive;} else {_explosive setdamage 1;};
deletevehicle _logic; deletevehicle _logic;
}; };
}; };

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

@ -137,7 +137,7 @@ if (_activated) then {
_soundSource = if (_soundSourceClass != "") then {createSoundSource [_soundSourceClass,_pos,[],0]} else {objnull}; _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 (GETMVAR(GVAR(radioOrdnance),true)) then { if GVAR(radioOrdnance) then {
//--- Play radio warning //--- Play radio warning
[] call _fnc_playRadio; [] call _fnc_playRadio;
}; };
@ -194,4 +194,4 @@ if (_activated) then {
} else { } else {
["Cannot create projectile, 'ammo' config attribute is missing in %1",typeof _logic] call bis_fnc_error; ["Cannot create projectile, 'ammo' config attribute is missing in %1",typeof _logic] call bis_fnc_error;
}; };
}; };

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

@ -48,7 +48,7 @@ if (_activated && local _logic && !isnull curatorcamera) then {
_unit setvariable ["bis_fnc_moduleRemoteControl_owner",player,true]; _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 (GETMVAR(GVAR(remoteWind),true)) then { if GVAR(remoteWind) then {
//--- Play wind cue to all players //--- Play wind cue to all players
[format ["wind%1",ceil random 5],"bis_fnc_playsound"] call bis_fnc_mp; [format ["wind%1",ceil random 5],"bis_fnc_playsound"] call bis_fnc_mp;
}; };
@ -168,4 +168,4 @@ if (_activated && local _logic && !isnull curatorcamera) then {
[objnull,_error] call bis_fnc_showCuratorFeedbackMessage; [objnull,_error] call bis_fnc_showCuratorFeedbackMessage;
}; };
deletevehicle _logic; deletevehicle _logic;
}; };

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

@ -26,4 +26,4 @@ if !(_activated) exitWith {};
[_logic, QGVAR(zeusBird), "zeusBird"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(zeusBird), "zeusBird"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(radioOrdnance), "radioOrdnance"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(radioOrdnance), "radioOrdnance"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(revealMines), "revealMines"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(revealMines), "revealMines"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(remoteWind), "remoteWind"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(remoteWind), "remoteWind"] call EFUNC(common,readSettingFromModule);

2
addons/zeus/script_component.hpp
View File

@ -9,4 +9,4 @@
#define DEBUG_SETTINGS DEBUG_SETTINGS_ZEUS #define DEBUG_SETTINGS DEBUG_SETTINGS_ZEUS
#endif #endif
#include "\z\ace\addons\main\script_macros.hpp" #include "\z\ace\addons\main\script_macros.hpp"