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 'fixmodules' into release

Browse Source
This commit is contained in:
SilentSpike 2015-08-01 12:55:43 +01:00
commit 07845d5a89
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/zeus/CfgVehicles.hpp
View File

@ -79,6 +79,10 @@ class CfgVehicles {
class GVAR(moduleBase): Module_F { class GVAR(moduleBase): Module_F {
author = "SilentSpike"; author = "SilentSpike";
category = "ACE"; category = "ACE";
functionPriority = 1;
isGlobal = 1;
isTriggerActivated = 0;
scope = 1;
scopeCurator = 2; scopeCurator = 2;
}; };
class GVAR(moduleCaptive): GVAR(moduleBase) { class GVAR(moduleCaptive): GVAR(moduleBase) {

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

@ -18,7 +18,7 @@
PARAMS_3(_logic,_units,_activated); PARAMS_3(_logic,_units,_activated);
private ["_mouseOver","_unit","_captive"]; private ["_mouseOver","_unit","_captive"];
if (!_activated) exitWith {}; if !(_activated && local _logic) exitWith {};
if (isNil QEFUNC(captives,setHandcuffed)) then { if (isNil QEFUNC(captives,setHandcuffed)) then {
[LSTRING(RequiresAddon)] call EFUNC(common,displayTextStructured); [LSTRING(RequiresAddon)] call EFUNC(common,displayTextStructured);

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

@ -18,7 +18,7 @@
PARAMS_3(_logic,_units,_activated); PARAMS_3(_logic,_units,_activated);
private ["_mouseOver","_unit","_surrendering"]; private ["_mouseOver","_unit","_surrendering"];
if (!_activated) exitWith {}; if !(_activated && local _logic) exitWith {};
if (isNil QEFUNC(captives,setSurrendered)) then { if (isNil QEFUNC(captives,setSurrendered)) then {
[LSTRING(RequiresAddon)] call EFUNC(common,displayTextStructured); [LSTRING(RequiresAddon)] call EFUNC(common,displayTextStructured);

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

@ -18,7 +18,7 @@
PARAMS_3(_logic,_units,_activated); PARAMS_3(_logic,_units,_activated);
private ["_mouseOver","_unit","_conscious"]; private ["_mouseOver","_unit","_conscious"];
if (!_activated) exitWith {}; if !(_activated && local _logic) exitWith {};
if (isNil QEFUNC(medical,setUnconscious)) then { if (isNil QEFUNC(medical,setUnconscious)) then {
[LSTRING(RequiresAddon)] call EFUNC(common,displayTextStructured); [LSTRING(RequiresAddon)] call EFUNC(common,displayTextStructured);
@ -38,7 +38,7 @@ if (isNil QEFUNC(medical,setUnconscious)) then {
} else { } else {
_conscious = GETVAR(_unit,ACE_isUnconscious,false); _conscious = GETVAR(_unit,ACE_isUnconscious,false);
// Function handles locality for me // Function handles locality for me
[_unit, !_conscious, round(random(10)+5), true] call EFUNC(medical,setUnconscious); [_unit, !_conscious, 10e10, true] call EFUNC(medical,setUnconscious);
}; };
}; };
}; };