From cb17f01b569e5dcad3f6d01f5d932776fec0ec51 Mon Sep 17 00:00:00 2001 From: vbawol Date: Thu, 28 Sep 2017 12:00:48 -0500 Subject: [PATCH] fix inverted logic --- Sources/epoch_code/compile/EPOCH_unitSpawn.sqf | 2 +- Sources/epoch_code/compile/EPOCH_unitSpawnDecrease.sqf | 2 +- Sources/epoch_code/compile/EPOCH_unitSpawnIncrease.sqf | 2 +- .../compile/environment/EPOCH_client_bitePlayer.sqf | 6 +++--- .../epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf | 2 +- .../epoch_code/compile/functions/EPOCH_fnc_playerFired.sqf | 2 +- .../compile/interface_event_handlers/EPOCH_KeyDown.sqf | 2 +- Sources/epoch_code/compile/setup/EPOCH_clientRevive.sqf | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Sources/epoch_code/compile/EPOCH_unitSpawn.sqf b/Sources/epoch_code/compile/EPOCH_unitSpawn.sqf index 49bcb8d0..dafc2b6a 100644 --- a/Sources/epoch_code/compile/EPOCH_unitSpawn.sqf +++ b/Sources/epoch_code/compile/EPOCH_unitSpawn.sqf @@ -23,7 +23,7 @@ _index = EPOCH_spawnIndex find _unitClass; _spawnLimit = 0; if (_index != -1) then { _playerSpawnArrayKeyFinal = "EPOCH_playerSpawnArray"; - if (isNil "_playerSpawnArrayKey") then {_playerSpawnArrayKeyFinal = _playerSpawnArrayKey}; + if !(isNil "_playerSpawnArrayKey") then {_playerSpawnArrayKeyFinal = _playerSpawnArrayKey}; _playerSpawnArray = missionNamespace getVariable [_playerSpawnArrayKeyFinal,[]]; _spawnLimit = _playerSpawnArray select _index; }; diff --git a/Sources/epoch_code/compile/EPOCH_unitSpawnDecrease.sqf b/Sources/epoch_code/compile/EPOCH_unitSpawnDecrease.sqf index 5634a252..81e6f040 100644 --- a/Sources/epoch_code/compile/EPOCH_unitSpawnDecrease.sqf +++ b/Sources/epoch_code/compile/EPOCH_unitSpawnDecrease.sqf @@ -19,7 +19,7 @@ params ["_spawnName", ["_decrease",1]]; _index = EPOCH_spawnIndex find _spawnName; if (_index != -1) then{ _playerSpawnArrayKeyFinal = "EPOCH_playerSpawnArray"; - if (isNil "_playerSpawnArrayKey") then {_playerSpawnArrayKeyFinal = _playerSpawnArrayKey}; + if !(isNil "_playerSpawnArrayKey") then {_playerSpawnArrayKeyFinal = _playerSpawnArrayKey}; _playerSpawnArray = missionNamespace getVariable [_playerSpawnArrayKeyFinal,[]]; _playerSpawnArray set[_index, ((_playerSpawnArray select _index) - _decrease) max 0]; }; diff --git a/Sources/epoch_code/compile/EPOCH_unitSpawnIncrease.sqf b/Sources/epoch_code/compile/EPOCH_unitSpawnIncrease.sqf index 43d2a99f..96c64c1e 100644 --- a/Sources/epoch_code/compile/EPOCH_unitSpawnIncrease.sqf +++ b/Sources/epoch_code/compile/EPOCH_unitSpawnIncrease.sqf @@ -19,7 +19,7 @@ params ["_spawnName", ["_increase",1]]; _index = EPOCH_spawnIndex find _spawnName; if (_index != -1) then{ _playerSpawnArrayKeyFinal = "EPOCH_playerSpawnArray"; - if (isNil "_playerSpawnArrayKey") then {_playerSpawnArrayKeyFinal = _playerSpawnArrayKey}; + if !(isNil "_playerSpawnArrayKey") then {_playerSpawnArrayKeyFinal = _playerSpawnArrayKey}; _playerSpawnArray = missionNamespace getVariable [_playerSpawnArrayKeyFinal,[]]; _playerSpawnArray set[_index, ((_playerSpawnArray select _index) + _increase) min (EPOCH_spawnLimits select _index)]; }; diff --git a/Sources/epoch_code/compile/environment/EPOCH_client_bitePlayer.sqf b/Sources/epoch_code/compile/environment/EPOCH_client_bitePlayer.sqf index f945d3ce..e4b05d05 100644 --- a/Sources/epoch_code/compile/environment/EPOCH_client_bitePlayer.sqf +++ b/Sources/epoch_code/compile/environment/EPOCH_client_bitePlayer.sqf @@ -115,8 +115,8 @@ if (_doAttack) then { if (random 1 < _toxicChance) then { _playerToxicityKeyFinal = "EPOCH_playerToxicity"; _playerImmunityKeyFinal = "EPOCH_playerImmunity"; - if (isNil "_playerToxicityKey") then {_playerToxicityKeyFinal = _playerToxicityKey}; - if (isNil "_playerImmunityKey") then {_playerImmunityKeyFinal = _playerImmunityKey}; + if !(isNil "_playerToxicityKey") then {_playerToxicityKeyFinal = _playerToxicityKey}; + if !(isNil "_playerImmunityKey") then {_playerImmunityKeyFinal = _playerImmunityKey}; [_playerToxicityKeyFinal,random(_toxicAmount - (missionNamespace getVariable [_playerImmunityKeyFinal, 0])),100,0] call EPOCH_fnc_setVariableLimited; }; if (random 1 < _bleedChance) then { @@ -124,7 +124,7 @@ if (_doAttack) then { }; if (random 1 < _bloodpChance) then { _playerBloodPKeyFinal = "EPOCH_playerBloodP"; - if (isNil "_playerBloodPKey") then {_playerBloodPKeyFinal = _playerBloodPKey}; + if !(isNil "_playerBloodPKey") then {_playerBloodPKeyFinal = _playerBloodPKey}; [_playerBloodPKeyFinal,_bloodpAmount,100,0] call EPOCH_fnc_setVariableLimited; if !(_ppEffect isEqualTo []) then { [_ppEffect] spawn EPOCH_fnc_spawnEffects; diff --git a/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf b/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf index 0dce5005..47166f3c 100644 --- a/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf +++ b/Sources/epoch_code/compile/functions/EPOCH_fnc_playerDeath.sqf @@ -33,7 +33,7 @@ if (_playerDeathScreen isEqualTo "") then {_playerDeathScreen = "TapOut"}; _tapDiag = _playerDeathScreen; _playerAliveTimeKeyFinal = "EPOCH_playerAliveTime"; -if (isNil "_playerAliveTimeKey") then {_playerAliveTimeKeyFinal = _playerAliveTimeKey}; +if !(isNil "_playerAliveTimeKey") then {_playerAliveTimeKeyFinal = _playerAliveTimeKey}; _playerAliveTime = missionNamespace getVariable [_playerAliveTimeKeyFinal,[]]; _doRevenge = ((getNumber(_config >> "playerDisableRevenge") isEqualTo 0) && _playerAliveTime >= _playerRevengeMinAliveTime); diff --git a/Sources/epoch_code/compile/functions/EPOCH_fnc_playerFired.sqf b/Sources/epoch_code/compile/functions/EPOCH_fnc_playerFired.sqf index 2bc0c477..13f70fae 100644 --- a/Sources/epoch_code/compile/functions/EPOCH_fnc_playerFired.sqf +++ b/Sources/epoch_code/compile/functions/EPOCH_fnc_playerFired.sqf @@ -120,7 +120,7 @@ switch true do { // Nuisance System 0.1 (EPOCH_customVarLimits select (EPOCH_customVars find "Nuisance")) params [["_playerLimitMax",100],["_playerLimitMin",0]]; _playerNuisanceKeyFinal = "EPOCH_playerNuisance"; - if (isNil "_playerNuisanceKey") then {_playerNuisanceKeyFinal = _playerNuisanceKey}; + if !(isNil "_playerNuisanceKey") then {_playerNuisanceKeyFinal = _playerNuisanceKey}; [_playerNuisanceKeyFinal,_nuisanceLevel,_playerLimitMax,_playerLimitMin] call EPOCH_fnc_setVariableLimited; }; }; diff --git a/Sources/epoch_code/compile/interface_event_handlers/EPOCH_KeyDown.sqf b/Sources/epoch_code/compile/interface_event_handlers/EPOCH_KeyDown.sqf index a76e97fe..932a4328 100644 --- a/Sources/epoch_code/compile/interface_event_handlers/EPOCH_KeyDown.sqf +++ b/Sources/epoch_code/compile/interface_event_handlers/EPOCH_KeyDown.sqf @@ -31,7 +31,7 @@ private ["_adj","_currentPos","_handled","_playerStaminaKeyFinal","_step"]; params ["_display","_dikCode","_shift","_ctrl","_alt"]; _playerStaminaKeyFinal = "EPOCH_playerStamina"; -if (isNil "_playerStaminaKey") then {_playerStaminaKeyFinal = _playerStaminaKey}; +if !(isNil "_playerStaminaKey") then {_playerStaminaKeyFinal = _playerStaminaKey}; _handled = false; diff --git a/Sources/epoch_code/compile/setup/EPOCH_clientRevive.sqf b/Sources/epoch_code/compile/setup/EPOCH_clientRevive.sqf index 99f6737e..ca5e0830 100644 --- a/Sources/epoch_code/compile/setup/EPOCH_clientRevive.sqf +++ b/Sources/epoch_code/compile/setup/EPOCH_clientRevive.sqf @@ -59,7 +59,7 @@ if !(alive player && alive _playerObject && !isPlayer _playerObject) then { // reset blood Pressure to warning level _playerBloodPKeyFinal = "EPOCH_playerBloodP"; - if (isNil "_playerBloodPKey") then {_playerBloodPKeyFinal = _playerBloodPKey}; + if !(isNil "_playerBloodPKey") then {_playerBloodPKeyFinal = _playerBloodPKey}; missionNamespace setVariable [_playerBloodPKeyFinal, 120]; // restart masterloop