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

Optimise cellphone IED function slightly (#6005)

Browse Source 
* Optimise cellphone IED function slightly
* Fix distribution and use CBA function
This commit is contained in:
SilentSpike 2018-01-02 16:18:12 +00:00 committed by GitHub
parent 183fc93c5a
commit 4bb16c043c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
addons/explosives/functions/fnc_addCellphoneIED.sqf
View File

@ -24,7 +24,7 @@ TRACE_4("params",_unit,_explosive,_magazineClass,_extra);
// Config is the last item in the list of passed in items. // Config is the last item in the list of passed in items.
private _config = (_this select 3) select (count (_this select 3) - 1); private _config = (_this select 3) select (count (_this select 3) - 1);
private _requiredItems = getArray(_config >> "requires"); private _requiredItems = getArray (_config >> "requires");
private _hasRequired = true; private _hasRequired = true;
private _detonators = [_unit] call FUNC(getDetonators); private _detonators = [_unit] call FUNC(getDetonators);
@ -35,28 +35,21 @@ private _detonators = [_unit] call FUNC(getDetonators);
} count _requiredItems; } count _requiredItems;
private _code = ""; private _code = "";
private _codeSet = false; while {true} do {
_code = [floor(random 10000), 4] call CBA_fnc_formatNumber;
while {!_codeSet} do { if (([_code] call FUNC(getSpeedDialExplosive)) isEqualTo []) exitWith {};
_code = str(round (random 9999));
_count = 4 - count (toArray _code);
while {_count > 0} do {
_code = "0" + _code;
_count = _count - 1;
};
_codeSet = (count ([_code] call FUNC(getSpeedDialExplosive))) == 0;
}; };
if (isNil QGVAR(CellphoneIEDs)) then { if (isNil QGVAR(CellphoneIEDs)) then {
GVAR(CellphoneIEDs) = []; GVAR(CellphoneIEDs) = [];
}; };
private _count = GVAR(CellphoneIEDs) pushBack [_explosive,_code,GetNumber(ConfigFile >> "CfgMagazines" >> _magazineClass >> "ACE_Triggers" >> "Cellphone" >> "FuseTime")]; private _count = GVAR(CellphoneIEDs) pushBack [_explosive, _code, getNumber (configFile >> "CfgMagazines" >> _magazineClass >> "ACE_Triggers" >> "Cellphone" >> "FuseTime")];
_count = _count + 1; _count = _count + 1;
publicVariable QGVAR(CellphoneIEDs); publicVariable QGVAR(CellphoneIEDs);
//display IED number message: //display IED number message:
[format ["IED %1 code: %2", _count,_code]] call EFUNC(common,displayTextStructured); [format ["IED %1 code: %2", _count, _code]] call EFUNC(common,displayTextStructured);
if !(_hasRequired) exitWith {}; if !(_hasRequired) exitWith {};
[format ["IED %1", _count],_code] call FUNC(addToSpeedDial); [format ["IED %1", _count], _code] call FUNC(addToSpeedDial);