QGVAR was meant to be GVAR

Improved module text
Forgot about script_component
This commit is contained in:
SilentSpike 2015-05-11 17:08:25 +01:00
parent e16ea007e4
commit b09ebc9c79
6 changed files with 30 additions and 22 deletions

View File

@ -7,6 +7,10 @@ class ACE_Settings {
typeName = "BOOL";
value = 1;
};
class GVAR(remoteWind) {
typeName = "BOOL";
value = 1;
};
class GVAR(radioOrdnance) {
typeName = "BOOL";
value = 1;
@ -16,8 +20,4 @@ class ACE_Settings {
value = 2;
values[] = {"Disabled", "Partially", "Fully"};
};
class GVAR(remoteWind) {
typeName = "BOOL";
value = 1;
};
};

View File

@ -15,17 +15,23 @@ class CfgVehicles {
author = "SilentSpike";
class Arguments {
class zeusAscension {
displayName = "Enable Ascension Messages";
description = "Display a global popup message when a player is assigned as Zeus.";
displayName = "Ascension Messages";
description = "Display global popup messages when a player is assigned as Zeus.";
typeName = "BOOL";
defaultValue = 1;
};
class zeusBird {
displayName = "Enable Eagle";
displayName = "Zeus Eagle";
description = "Spawn an eagle that follows the Zeus camera.";
typeName = "BOOL";
defaultValue = 1;
};
class remoteWind {
displayName = "Wind Sounds";
description = "Play wind sounds when Zeus remote controls a unit.";
typeName = "BOOL";
defaultValue = 1;
};
class radioOrdnance {
displayName = "Ordnance Radio Warning";
description = "Play a radio warning when Zeus uses ordnance.";
@ -34,7 +40,7 @@ class CfgVehicles {
};
class revealMines {
displayName = "Reveal Mines";
description = "Do you want to reveal mines placed by Zeus?";
description = "Reveal mines to allies and/or place map markers.";
typeName = "NUMBER";
class values {
class disable {
@ -42,22 +48,16 @@ class CfgVehicles {
value = 0;
};
class partial {
name = "Reveal to sides friendly with Zeus unit";
name = "Reveal to Allies";
value = 1;
};
class full {
name = "Add map markers and reveal to sides friendly with Zeus unit";
name = "Allies + Map Markers";
value = 2;
default = 1;
};
};
};
class remoteWind {
displayName = "Reveal Remote Control";
description = "Play a wind sound when Zeus remote controls a unit.";
typeName = "BOOL";
defaultValue = 1;
};
};
class ModuleDescription {
description = "Provides control over various aspects of Zeus.";

View File

@ -12,6 +12,8 @@
* Public: No
*/
#include "script_component.hpp"
_logic = _this select 0;
_units = _this select 1;
_activated = _this select 2;
@ -151,7 +153,7 @@ if (_activated) then {
} foreach (_logic getvariable ["channels",[]]);
// Added by ACE_zeus to toggle ascension messages
if (GETMVAR(QGVAR(zeusAscension),true)) then {
if (GETMVAR(GVAR(zeusAscension),true)) then {
//--- Sent notification to all assigned players
{
if (isplayer _x) then {
@ -191,7 +193,7 @@ if (_activated) then {
};
// Added by ACE_zeus to toggle eagle
if (GETMVAR(QGVAR(zeusBird),true)) then {
if (GETMVAR(GVAR(zeusBird),true)) then {
//--- Create bird
_birdType = _logic getvariable ["birdType","eagle_f"];
if (_birdType != "") then {
@ -216,7 +218,7 @@ if (_activated) then {
_addons call bis_fnc_activateaddons;
// Added by ACE_zeus to toggle eagle
if (GETMVAR(QGVAR(zeusBird),true)) then {
if (GETMVAR(GVAR(zeusBird),true)) then {
//--- Locality changed
_logic addeventhandler [
"local",

View File

@ -12,6 +12,8 @@
* Public: No
*/
#include "script_component.hpp"
_logic = _this select 0;
_units = _this select 1;
_activated = _this select 2;
@ -23,7 +25,7 @@ if (_activated) then {
_explosive attachto [_logic];
// Added by ACE_zeus to control if mines are revealed
_revealMines = GETMVAR(QGVAR(revealMines),2);
_revealMines = GETMVAR(GVAR(revealMines),2);
if (_revealMines > 0) then {
//--- Reveal the mine to curator's side
{

View File

@ -13,6 +13,8 @@
* Public: No
*/
#include "script_component.hpp"
_fnc_scriptNameParentTemp = if !(isnil '_fnc_scriptName') then {_fnc_scriptName} else {'BIS_fnc_moduleProjectile'};
private ['_fnc_scriptNameParent'];
_fnc_scriptNameParent = _fnc_scriptNameParentTemp;
@ -135,7 +137,7 @@ if (_activated) then {
_soundSource = if (_soundSourceClass != "") then {createSoundSource [_soundSourceClass,_pos,[],0]} else {objnull};
// Added by ACE_zeus to toggle ordnance radio message
if (GETMVAR(QGVAR(radioOrdnance),true)) then {
if (GETMVAR(GVAR(radioOrdnance),true)) then {
//--- Play radio warning
[] call _fnc_playRadio;
};

View File

@ -12,6 +12,8 @@
* Public: No
*/
#include "script_component.hpp"
_logic = _this select 0;
_units = _this select 1;
_activated = _this select 2;
@ -46,7 +48,7 @@ if (_activated && local _logic && !isnull curatorcamera) then {
_unit setvariable ["bis_fnc_moduleRemoteControl_owner",player,true];
// Added by ACE_zeus to toggle remote control wind sound
if (GETMVAR(QGVAR(remoteWind),true)) then {
if (GETMVAR(GVAR(remoteWind),true)) then {
//--- Play wind cue to all players
[format ["wind%1",ceil random 5],"bis_fnc_playsound"] call bis_fnc_mp;
};