diff --git a/a3_vemf_reloaded/fn/fn_checkSide.sqf b/a3_vemf_reloaded/fn/fn_checkSide.sqf index 2e6fc78..b61ca27 100644 --- a/a3_vemf_reloaded/fn/fn_checkSide.sqf +++ b/a3_vemf_reloaded/fn/fn_checkSide.sqf @@ -21,4 +21,4 @@ if not(_f isEqualTo "") then if (_f isEqualTo "OPF_G_F") then { _r = EAST }; } else { [("fn_checkSide"),(0),(format["Failed to find faction of %1", _this])] ExecVM ("log" call VEMFr_fnc_scriptPath) }; -if not(isNil"_r") then { _r }; +_r diff --git a/a3_vemf_reloaded/fn/fn_config.sqf b/a3_vemf_reloaded/fn/fn_config.sqf index 359d28e..d7cfd7d 100644 --- a/a3_vemf_reloaded/fn/fn_config.sqf +++ b/a3_vemf_reloaded/fn/fn_config.sqf @@ -79,4 +79,4 @@ if (_this isEqualType []) then }; }; -if not(isNil"_r") then { _r }; +_r diff --git a/a3_vemf_reloaded/fn/fn_giveAmmo.sqf b/a3_vemf_reloaded/fn/fn_giveAmmo.sqf index 52201b2..9454cc0 100644 --- a/a3_vemf_reloaded/fn/fn_giveAmmo.sqf +++ b/a3_vemf_reloaded/fn/fn_giveAmmo.sqf @@ -60,4 +60,5 @@ if not(_this3 isEqualTo "") then _r pushBack true; }; -if ((count _r) > 0) then { _r = true; _r } else { _r = nil }; +if ((count _r) > 0) then { _r = true } else { _r = nil }; +_r diff --git a/a3_vemf_reloaded/fn/fn_giveWeaponItems.sqf b/a3_vemf_reloaded/fn/fn_giveWeaponItems.sqf index 241c8ca..865c74a 100644 --- a/a3_vemf_reloaded/fn/fn_giveWeaponItems.sqf +++ b/a3_vemf_reloaded/fn/fn_giveWeaponItems.sqf @@ -61,5 +61,4 @@ if not (isNull _u) then }; _r = true; }; - -if not(isNil"_r") then { _r }; +_r diff --git a/a3_vemf_reloaded/fn/fn_mines.sqf b/a3_vemf_reloaded/fn/fn_mines.sqf index a1d0417..d981320 100644 --- a/a3_vemf_reloaded/fn/fn_mines.sqf +++ b/a3_vemf_reloaded/fn/fn_mines.sqf @@ -39,4 +39,4 @@ if ((_this3 in ("missionList" call VEMFr_fnc_config)) AND ((count _this0) isEqua }; }; -if not(isNil"_r") then { _r }; +_r diff --git a/a3_vemf_reloaded/fn/fn_modAppID.sqf b/a3_vemf_reloaded/fn/fn_modAppID.sqf index 3003afd..abd3d12 100644 --- a/a3_vemf_reloaded/fn/fn_modAppID.sqf +++ b/a3_vemf_reloaded/fn/fn_modAppID.sqf @@ -13,4 +13,4 @@ private "_r"; _r = getNumber (configFile >> "CfgAppIDs" >> _this); -if not(isNil"_r") then { _r }; +_r diff --git a/a3_vemf_reloaded/fn/fn_playerNear.sqf b/a3_vemf_reloaded/fn/fn_playerNear.sqf index 5a74652..60d8833 100644 --- a/a3_vemf_reloaded/fn/fn_playerNear.sqf +++ b/a3_vemf_reloaded/fn/fn_playerNear.sqf @@ -30,4 +30,4 @@ if (((count _this0) isEqualTo 3) AND (_this1 > -1)) then } forEach allPlayers; }; -if not(isNil"_r") then { _r }; +_r diff --git a/a3_vemf_reloaded/fn/fn_scriptPath.sqf b/a3_vemf_reloaded/fn/fn_scriptPath.sqf index bbfa2be..fe18e11 100644 --- a/a3_vemf_reloaded/fn/fn_scriptPath.sqf +++ b/a3_vemf_reloaded/fn/fn_scriptPath.sqf @@ -10,4 +10,4 @@ private "_r"; _r = getText (configFile >> "CfgVemfrScripts" >> _this); -if not(isNil"_r") then { _r }; +_r diff --git a/a3_vemf_reloaded/fn/fn_spawnInvasionAI.sqf b/a3_vemf_reloaded/fn/fn_spawnInvasionAI.sqf index 27bbb09..6c60138 100644 --- a/a3_vemf_reloaded/fn/fn_spawnInvasionAI.sqf +++ b/a3_vemf_reloaded/fn/fn_spawnInvasionAI.sqf @@ -157,4 +157,4 @@ if (_this2 in ("missionList" call VEMFr_fnc_config)) then [("fn_spawnInvasionAI"),(0),(format[("'%1' is not in missionList"),(_this2)])] ExecVM ("log" call VEMFr_fnc_scriptPath); }; -if not(isNil"_r") then { _r }; +_r diff --git a/a3_vemf_reloaded/fn/fn_spawnVEMFrAI.sqf b/a3_vemf_reloaded/fn/fn_spawnVEMFrAI.sqf index eeb274f..12efb78 100644 --- a/a3_vemf_reloaded/fn/fn_spawnVEMFrAI.sqf +++ b/a3_vemf_reloaded/fn/fn_spawnVEMFrAI.sqf @@ -87,4 +87,4 @@ if ((_this4 in ("missionList" call VEMFr_fnc_config)) OR (_this4 isEqualTo "Stat [("fn_spawnVEMFrAI"),(0),(format["'%1' is not in missionList or is not equal to 'Static'", _this4])] ExecVM ("log" call VEMFr_fnc_scriptPath); }; -if not(isNil"_r") then { _r }; +_r diff --git a/a3_vemf_reloaded/fn/fn_waitForPlayers.sqf b/a3_vemf_reloaded/fn/fn_waitForPlayers.sqf index a9d767b..4a616ca 100644 --- a/a3_vemf_reloaded/fn/fn_waitForPlayers.sqf +++ b/a3_vemf_reloaded/fn/fn_waitForPlayers.sqf @@ -28,4 +28,4 @@ if ([(_this0),(_this1)] call VEMFr_fnc_playerNear) then { _r = true } waitUntil { if (([(_this0),(_this1)] call VEMFr_fnc_playerNear) OR (round time - _t > _tot)) then {true} else {uiSleep 4; false} }; if ([(_this0),(_this1)] call VEMFr_fnc_playerNear) then { _r = true }; }; -if not(isNil"_r") then { _r }; +_r diff --git a/a3_vemf_reloaded/fn/fn_whichMod.sqf b/a3_vemf_reloaded/fn/fn_whichMod.sqf index e22b806..14eb338 100644 --- a/a3_vemf_reloaded/fn/fn_whichMod.sqf +++ b/a3_vemf_reloaded/fn/fn_whichMod.sqf @@ -13,4 +13,4 @@ private "_r"; if not(isNull(configFile >> "CfgPatches" >> "exile_server")) then { _r = "Exile" }; if not(isNull(configFile >> "CfgPatches" >> "a3_epoch_server")) then { _r = "Epoch" }; -if not(isNil"_r") then { _r }; +_r diff --git a/a3_vemf_reloaded/missions/BaseAttack.sqf b/a3_vemf_reloaded/missions/BaseAttack.sqf index 79551a6..ad4ffba 100644 --- a/a3_vemf_reloaded/missions/BaseAttack.sqf +++ b/a3_vemf_reloaded/missions/BaseAttack.sqf @@ -43,7 +43,7 @@ if (VEMFrAttackCount <= _s0) then private "_c"; if (_mod isEqualTo "Epoch") then { _c = [("Epoch_Male_F"),("Epoch_Female_F"),("Epoch_Female_Camo_F"),("Epoch_Female_CamoBlue_F"),("Epoch_Female_CamoBrn_F"),("Epoch_Female_CamoRed_F"),("Epoch_Female_Ghillie3_F"),("Epoch_Female_Ghillie2_F"),("Epoch_Female_Ghillie1_F"),("Epoch_Female_Wetsuit_F"),("Epoch_Female_WetsuitB_F"),("Epoch_Female_WetsuitC_F"),("Epoch_Female_WetsuitP_F"),("Epoch_Female_WetsuitW_F")] }; if (_mod isEqualTo "Exile") then { _c = ["Exile_Unit_Player"] }; - _nrPlyr = selectRandom (nearestObjects [(_pos),(_c),(_base getVariable [("ExileTerritorySize"),(200)])]); + _nrPlyr = selectRandom (nearestObjects [_pos, _c,(_base getVariable "ExileTerritorySize")]); if not(isNil "_nrPlyr") then { _baseNm = "a base";