From df6f91ba63038848caee9a307b059feb6064d281 Mon Sep 17 00:00:00 2001 From: shukari Date: Tue, 26 Oct 2021 18:35:07 +0200 Subject: [PATCH] Revert "Anpassungen (#652)" This reverts commit 0ac38aa5b586b5e375e693475183a0dd58ba0df1. --- addons/advSlingload/XEH_postClientInit.sqf | 2 +- addons/advSlingload/functions/fnc_attach.sqf | 2 +- .../functions/fnc_dropRopefromChopper.sqf | 2 +- .../advSlingload/functions/fnc_pickupRope.sqf | 4 ++-- addons/arsenal/XEH_postClientInit.sqf | 2 +- addons/arsenal/configs/CfgVehicles.hpp | 10 +++++----- addons/arsenal/functions/fnc_actionMain.sqf | 4 ++-- addons/arsenal/functions/fnc_changeRolle.sqf | 2 +- addons/arsenal/functions/fnc_isArsenalType.sqf | 2 +- .../functions/fnc_modifierMainAction.sqf | 2 +- addons/arsenal/functions/fnc_setArsenal.sqf | 4 ++-- .../building/functions/fnc_getVehicleType.sqf | 4 ++-- .../functions/fnc_modifierShowVehicleType.sqf | 2 +- .../functions/fnc_placePlaceablesBig.sqf | 18 +++++++----------- addons/eden/configs/Cfg3DEN.hpp | 2 +- addons/eden/functions/fnc_inkognitoSystem.sqf | 6 +++--- .../functions/fnc_moduleAtmoMortarSupport.sqf | 2 +- .../eden/functions/fnc_moduleFrontverlauf.sqf | 2 +- addons/eden/functions/fnc_moduleLockDoors.sqf | 2 +- addons/eden/functions/fnc_sitAI.sqf | 6 +++--- addons/eos/core/fnc_bastionCore.sqf | 8 ++++---- addons/eos/core/fnc_core.sqf | 8 ++++---- addons/eos/functions/fnc_findSafePos.sqf | 10 +++++----- addons/main/XEH_preInit.sqf | 2 +- .../main/functions/fnc_crashHelferClient.sqf | 4 ++-- addons/main/functions/fnc_doorBreach.sqf | 2 +- addons/main/functions/fnc_fastRope.sqf | 6 +++--- addons/main/functions/fnc_initFOB.sqf | 2 +- addons/main/functions/fnc_miscStuff.sqf | 2 +- addons/main/functions/fnc_modifierFOBs.sqf | 2 +- addons/main/replacement/init.sqf | 12 ++++++------ addons/nachschub/configs/CfgVehicles.hpp | 16 ++++++++-------- .../functions/fnc_persistenceEDEN.sqf | 2 +- .../functions/fnc_persistenceMarkers.sqf | 2 +- .../functions/fnc_persistencePlayers.sqf | 4 ++-- .../functions/fnc_persistenceVehicles.sqf | 2 +- addons/vz99/functions/fnc_doReload.sqf | 4 ++-- addons/vz99/functions/fnc_handleFired.sqf | 2 +- addons/zeus/functions/fnc_moduleDefineAmmo.sqf | 2 +- 39 files changed, 84 insertions(+), 88 deletions(-) diff --git a/addons/advSlingload/XEH_postClientInit.sqf b/addons/advSlingload/XEH_postClientInit.sqf index ea09f8a74..47e845679 100644 --- a/addons/advSlingload/XEH_postClientInit.sqf +++ b/addons/advSlingload/XEH_postClientInit.sqf @@ -44,7 +44,7 @@ "Lastenseil abtrennen", "", {_target call FUNC(detach)}, - {(ropes _target) isNotEqualTo []} + {!((ropes _target) isEqualTo [])} ] call ace_interact_menu_fnc_createAction ], [ diff --git a/addons/advSlingload/functions/fnc_attach.sqf b/addons/advSlingload/functions/fnc_attach.sqf index 45e94a7f8..1cb644f17 100644 --- a/addons/advSlingload/functions/fnc_attach.sqf +++ b/addons/advSlingload/functions/fnc_attach.sqf @@ -32,7 +32,7 @@ if (_source == _target) exitWith {systemChat "Warum versuchst du das?"}; private _attachedVehicle = _source getVariable [QGVAR(attachedVehicle), objNull]; if (!isNull _attachedVehicle && _attachedVehicle != _target) exitWith {systemChat "Es kann nur ein Fahrzeug verbunden werden"}; -private _selection = getText (configOf _source >> "slingLoadMemoryPoint"); +private _selection = getText (configfile >> "CfgVehicles" >> typeOf _source >> "slingLoadMemoryPoint"); if (_selection == "") exitWith {ERROR_MSG_1("no Slingloadposition found on _source: %1", _source)}; private _posToAttach = ASLToAGL ([ACE_player, _ray] call FUNC(calculateAttachPoint)); diff --git a/addons/advSlingload/functions/fnc_dropRopefromChopper.sqf b/addons/advSlingload/functions/fnc_dropRopefromChopper.sqf index 64258c89a..a2ea7293b 100644 --- a/addons/advSlingload/functions/fnc_dropRopefromChopper.sqf +++ b/addons/advSlingload/functions/fnc_dropRopefromChopper.sqf @@ -18,7 +18,7 @@ params ["_target"]; if (isNull _target) exitWith {systemChat format ["ERROR(dropRopefromChopper): no Target"]}; if (!alive _target) exitWith {systemChat "Was zerstört ist sollte nicht benutzt werden"}; -private _selection = getText (configOf _target >> "slingLoadMemoryPoint"); +private _selection = getText (configfile >> "CfgVehicles" >> typeOf _target >> "slingLoadMemoryPoint"); if (_selection == "") exitWith {systemChat format ["ERROR(dropRopefromChopper): no Slingloadposition found on _target %1", _target]}; private _posSlingload = _target modelToWorld (_target selectionPosition _selection); diff --git a/addons/advSlingload/functions/fnc_pickupRope.sqf b/addons/advSlingload/functions/fnc_pickupRope.sqf index e6e4716e8..4f615e297 100644 --- a/addons/advSlingload/functions/fnc_pickupRope.sqf +++ b/addons/advSlingload/functions/fnc_pickupRope.sqf @@ -23,7 +23,7 @@ if (_fromGround) then //_target = helper { private _rope = _target getVariable [QGVAR(ropeObj), objNull]; private _source = _rope getVariable [QGVAR(ropeSource), objNull]; - private _selection = getText (configOf _source >> "slingLoadMemoryPoint"); + private _selection = getText (configfile >> "CfgVehicles" >> typeOf _source >> "slingLoadMemoryPoint"); if (_selection == "") exitWith {systemChat format ["ERROR(pickupRope): no Slingloadposition found on _source %1", _source]}; _target attachTo [ACE_player, [-0.02, -0.04, -0.0], "righthandmiddle1"]; @@ -36,7 +36,7 @@ else //_target = helicopter { private _helper = createVehicle [QGVAR(ropeInvisibleObject), position ACE_player, [], 0, "CAN_COLLIDE"]; - private _selection = getText (configOf _target >> "slingLoadMemoryPoint"); + private _selection = getText (configfile >> "CfgVehicles" >> typeOf _target >> "slingLoadMemoryPoint"); if (_selection == "") exitWith {systemChat format ["ERROR(pickupRope): no Slingloadposition found on _target %1", _target]}; [QGVAR(addPickupActionEvent), [_helper]] call CBA_fnc_globalEvent; diff --git a/addons/arsenal/XEH_postClientInit.sqf b/addons/arsenal/XEH_postClientInit.sqf index ddb8ee1b1..fad23c6a9 100644 --- a/addons/arsenal/XEH_postClientInit.sqf +++ b/addons/arsenal/XEH_postClientInit.sqf @@ -28,7 +28,7 @@ if (isNil "TB_blacklistRollen_themen") then {TB_blacklistRollen_themen = []}; { params ["_unit", "_container", "_item"]; - if (local _unit && {(_unit nearEntities ["TB_arsenal_base", 6]) isNotEqualTo []}) then + if (local _unit && {!((_unit nearEntities ["TB_arsenal_base", 6]) isEqualTo [])}) then { if (typeOf _container == "GroundWeaponHolder") then {deleteVehicle _container}; }; diff --git a/addons/arsenal/configs/CfgVehicles.hpp b/addons/arsenal/configs/CfgVehicles.hpp index 258f8c93e..a8b36c32a 100644 --- a/addons/arsenal/configs/CfgVehicles.hpp +++ b/addons/arsenal/configs/CfgVehicles.hpp @@ -48,8 +48,8 @@ class CfgVehicles class changeArsenalType { displayName = "Wechsel zu..."; - modifierFunction = QUOTE([_this, getText (configOf _target >> 'arsenalType')] call FUNC(modifierChangeArsenalType)); - statement = QUOTE(_player setVariable ['TB_arsenalType', getText (configOf _target >> 'arsenalType'), true]; _player setVariable ['TB_rolle', nil, true]; _player setVariable [QQGVAR(arsenalCargo), nil]); + modifierFunction = QUOTE([_this, getText (configFile >> 'CfgVehicles' >> typeOf _target >> 'arsenalType')] call FUNC(modifierChangeArsenalType)); + statement = QUOTE(_player setVariable ['TB_arsenalType', getText (configFile >> 'CfgVehicles' >> typeOf _target >> 'arsenalType'), true]; _player setVariable ['TB_rolle', nil, true]; _player setVariable [QQGVAR(arsenalCargo), nil]); condition = QUOTE(!([_target] call FUNC(isArsenalType))); exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; priority = 1; @@ -77,7 +77,7 @@ class CfgVehicles displayName = ""; \ condition = QUOTE(!('ROLLEN_NAME' in TB_blacklistRollen)); \ modifierFunction = QUOTE([_this, 'ROLLEN_NAME'] call FUNC(modifierRollenname)); \ - statement = QUOTE(['ROLLEN_NAME', getText (configOf _target >> 'arsenalType'), _target] call FUNC(changeRolle); [_target, _player] call ace_arsenal_fnc_openBox;); \ + statement = QUOTE(['ROLLEN_NAME', getText (configFile >> 'CfgVehicles' >> typeOf _target >> 'arsenalType'), _target] call FUNC(changeRolle); [_target, _player] call ace_arsenal_fnc_openBox;); \ exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; \ } @@ -150,7 +150,7 @@ class CfgVehicles displayName = ""; \ condition = QUOTE(!('ROLLEN_NAME' in TB_blacklistRollen_themen)); \ modifierFunction = QUOTE([_this, 'ROLLEN_NAME'] call FUNC(modifierRollenname)); \ - statement = QUOTE(['ROLLEN_NAME', getText (configOf _target >> 'arsenalType'), _target] call FUNC(changeRolle); [_target, _player] call ace_arsenal_fnc_openBox;); \ + statement = QUOTE(['ROLLEN_NAME', getText (configFile >> 'CfgVehicles' >> typeOf _target >> 'arsenalType'), _target] call FUNC(changeRolle); [_target, _player] call ace_arsenal_fnc_openBox;); \ exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; \ } @@ -191,7 +191,7 @@ class CfgVehicles displayName = ""; \ condition = QUOTE(!('ROLLEN_NAME' in TB_blacklistRollen_custom)); \ modifierFunction = QUOTE([_this, 'ROLLEN_NAME'] call FUNC(modifierRollenname)); \ - statement = QUOTE(['ROLLEN_NAME', getText (configOf _target >> 'arsenalType'), _target] call FUNC(changeRolle)); \ + statement = QUOTE(['ROLLEN_NAME', getText (configFile >> 'CfgVehicles' >> typeOf _target >> 'arsenalType'), _target] call FUNC(changeRolle)); \ exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; \ } diff --git a/addons/arsenal/functions/fnc_actionMain.sqf b/addons/arsenal/functions/fnc_actionMain.sqf index d2f2d094a..ee0593c39 100644 --- a/addons/arsenal/functions/fnc_actionMain.sqf +++ b/addons/arsenal/functions/fnc_actionMain.sqf @@ -9,12 +9,12 @@ _args params ["_target", "_player", "_params", "_actionData"]; if !([_target] call FUNC(isArsenalType)) exitWith {}; private _tbCargo = ACE_player getVariable [QGVAR(arsenalCargo), []]; -if (_tbCargo isNotEqualTo [] && {_tbCargo isNotEqualTo (_target getVariable ["ace_arsenal_virtualItems", []])}) then +if (!(_tbCargo isEqualTo []) && {!(_tbCargo isEqualTo (_target getVariable ["ace_arsenal_virtualItems", []]))}) then { _target setVariable ["ace_arsenal_virtualItems", _tbCargo]; { - if (_x isNotEqualTo _target && [_x] call FUNC(isArsenalType) && {_tbCargo isNotEqualTo (_x getVariable ["ace_arsenal_virtualItems", []])}) then + if (!(_x isEqualTo _target) && [_x] call FUNC(isArsenalType) && {!(_tbCargo isEqualTo (_x getVariable ["ace_arsenal_virtualItems", []]))}) then { _x setVariable ["ace_arsenal_virtualItems", _tbCargo]; }; diff --git a/addons/arsenal/functions/fnc_changeRolle.sqf b/addons/arsenal/functions/fnc_changeRolle.sqf index d3de62424..872239a11 100644 --- a/addons/arsenal/functions/fnc_changeRolle.sqf +++ b/addons/arsenal/functions/fnc_changeRolle.sqf @@ -13,7 +13,7 @@ if (isNull _target) then { if (_arsenalType in ["", "CUSTOM"]) exitWith {}; { - if (_arsenalType isEqualTo getText (configOf _x >> "arsenalType")) exitWith + if (_arsenalType isEqualTo getText (configFile >> "CfgVehicles" >> typeOf _x >> "arsenalType")) exitWith { _target = _x; }; diff --git a/addons/arsenal/functions/fnc_isArsenalType.sqf b/addons/arsenal/functions/fnc_isArsenalType.sqf index ae8ac3edd..f7d7b18db 100644 --- a/addons/arsenal/functions/fnc_isArsenalType.sqf +++ b/addons/arsenal/functions/fnc_isArsenalType.sqf @@ -5,4 +5,4 @@ */ params ["_target"]; -ACE_player getVariable ["TB_arsenalType", ""] == getText (configOf _target >> "arsenalType"); +ACE_player getVariable ["TB_arsenalType", ""] == getText (configFile >> "CfgVehicles" >> typeOf _target >> "arsenalType"); diff --git a/addons/arsenal/functions/fnc_modifierMainAction.sqf b/addons/arsenal/functions/fnc_modifierMainAction.sqf index c6f7232f5..20f73c3fa 100644 --- a/addons/arsenal/functions/fnc_modifierMainAction.sqf +++ b/addons/arsenal/functions/fnc_modifierMainAction.sqf @@ -61,5 +61,5 @@ if (_arsenalType == "Themen") then }; private _rolle = _player getVariable ["TB_rolle", ""]; -private _condition = (_rolle != "") && ((getText (configOf _target >> "arsenalType")) == _player getVariable ["TB_arsenalType", ""]); +private _condition = (_rolle != "") && ((getText (configFile >> "CfgVehicles" >> typeOf _target >> "arsenalType")) == _player getVariable ["TB_arsenalType", ""]); _actionData set [1, ["TB-Arsenal", [_rolle] call FUNC(getRollenName)] select _condition]; diff --git a/addons/arsenal/functions/fnc_setArsenal.sqf b/addons/arsenal/functions/fnc_setArsenal.sqf index f15f62132..34c84f62f 100644 --- a/addons/arsenal/functions/fnc_setArsenal.sqf +++ b/addons/arsenal/functions/fnc_setArsenal.sqf @@ -8,7 +8,7 @@ params ["_ammoBox", ["_rolle", ""]]; if (isNull _ammoBox) exitWith {}; // Check zum Überspringen -private _type = getText (configOf _ammoBox >> "arsenalType"); +private _type = getText (configFile >> "CfgVehicles" >> typeOf _ammoBox >> "arsenalType"); if (_type in ["", "CUSTOM"]) exitWith {}; // Arsenalitems laden @@ -83,7 +83,7 @@ ACE_player setVariable [QGVAR(arsenalCargo), _tbCargo]; // Arsenale syncen { - if ([_x] call FUNC(isArsenalType) && {_tbCargo isNotEqualTo (_x getVariable ["ace_arsenal_virtualItems", []])}) then + if ([_x] call FUNC(isArsenalType) && {!(_tbCargo isEqualTo (_x getVariable ["ace_arsenal_virtualItems", []]))}) then { _x setVariable ["ace_arsenal_virtualItems", _tbCargo]; }; diff --git a/addons/building/functions/fnc_getVehicleType.sqf b/addons/building/functions/fnc_getVehicleType.sqf index 4b1c7e9c0..45c9a02cb 100644 --- a/addons/building/functions/fnc_getVehicleType.sqf +++ b/addons/building/functions/fnc_getVehicleType.sqf @@ -11,6 +11,6 @@ if ([_target] call ace_medical_treatment_fnc_isMedicalVehicle) then {_info pushB if ([_target] call ace_repair_fnc_isRepairVehicle) then {_info pushBack "Reparaturfahrzeug"}; if ([_target] call ace_refuel_fnc_getFuel > 0) then {_info pushBack "Tankwagen"}; if (_target getVariable ["ace_rearm_isSupplyVehicle", false] || - getNumber (configOf _target >> "ace_rearm_defaultSupply") > 0) then {_info pushBack "Munitionswagen"}; + getNumber (configFile >> "CfgVehicles" >> typeOf _target >> "ace_rearm_defaultSupply") > 0) then {_info pushBack "Munitionswagen"}; -if (_info isNotEqualTo []) then {hint (_info joinString "\n")}; +if !(_info isEqualTo []) then {hint (_info joinString "\n")}; diff --git a/addons/building/functions/fnc_modifierShowVehicleType.sqf b/addons/building/functions/fnc_modifierShowVehicleType.sqf index fba7a30e1..4f453b46b 100644 --- a/addons/building/functions/fnc_modifierShowVehicleType.sqf +++ b/addons/building/functions/fnc_modifierShowVehicleType.sqf @@ -14,7 +14,7 @@ if ([_target] call ace_medical_treatment_fnc_isMedicalVehicle) then {_newActionN if ([_target] call ace_repair_fnc_isRepairVehicle) then {_newActionName pushBack "Rep"}; if ([_target] call ace_refuel_fnc_getFuel > 0) then {_newActionName pushBack "Tan"}; if (_target getVariable ["ace_rearm_isSupplyVehicle", false] || - getNumber (configOf _target >> "ace_rearm_defaultSupply") > 0) then {_newActionName pushBack "Mun"}; + getNumber (configFile >> "CfgVehicles" >> typeOf _target >> "ace_rearm_defaultSupply") > 0) then {_newActionName pushBack "Mun"}; if (count _newActionName > 2) then {_newActionName = ["Utils"]}; diff --git a/addons/building/functions/fnc_placePlaceablesBig.sqf b/addons/building/functions/fnc_placePlaceablesBig.sqf index fd028a555..fd34cc282 100644 --- a/addons/building/functions/fnc_placePlaceablesBig.sqf +++ b/addons/building/functions/fnc_placePlaceablesBig.sqf @@ -11,19 +11,15 @@ params [ ]; _zusatz params ["_zeit", "_resourcen"]; -if (_buildingName isEqualTo "") exitWith {systemChat "Schwerer Fehler in "+ QFUNC(placePlaceablesBig)}; +if (_buildingName isEqualTo "") exitWith {systemChat "Schwerer Fehler (TB_building_fnc_placePlaceablesBig)"}; -private _kranTruck = objNull; -if (_kran) then {_kranTruck = ((nearestObjects [ACE_player, [], 20]) select {_x getVariable [QGVAR(kranWagen), false]}) param [0, objNull]}; -if (_kran && {isNull _kranTruck}) exitWith {systemChat "Kein Kranwagen in der Nähe von 20m"}; +if (_kran && {((nearestObjects [ACE_player, [], 15]) select {_x getVariable ["TBMod_Building_kranWagen", false]}) isEqualTo []}) exitWith {systemChat "Kein Kranwagen in der Nähe"}; -private _truck = objNull; -if (!isNull _kranTruck) then {_truck = ((nearestObjects [_kranTruck, [], 25]) select {(_x getVariable [QGVAR(resourcenCargo), -1]) >= _resourcen}) param [0, objNull]}; -if (isNull _truck) then {_truck = ((nearestObjects [ACE_player, [], 25]) select {(_x getVariable [QGVAR(resourcenCargo), -1]) >= _resourcen}) param [0, objNull]}; -if (isNull _truck) exitWith {systemChat "Kein Resourcentruck mit genügend Resourcen in der Nähe von 25m"}; +((nearestObjects [ACE_player, [], 20]) select {(_x getVariable ["TBMod_Building_resourcenCargo", -1]) >= _resourcen}) params [["_truck", objNull]]; +if (isNull _truck) exitWith {systemChat "Kein Resourcentruck mit genügend Resourcen in der Nähe"}; -private _resc = _truck getVariable [QGVAR(resourcenCargo), -1]; -_truck setVariable [QGVAR(resourcenCargo), _resc - _resourcen, true]; +private _resc = _truck getVariable ["TBMod_Building_resourcenCargo", -1]; +_truck setVariable ["TBMod_Building_resourcenCargo", _resc - _resourcen, true]; private _building = createVehicle [_buildingName, ACE_player modelToWorld [0, 5, 0], [], 0, "CAN_COLLIDE"]; private _specialDir = [0, 180] select _spiegeln; @@ -97,7 +93,7 @@ _building setPosASL (AGLToASL _pos); { (_this # 0) params ["_building", "", "", "_resourcen", "_truck"]; - _truck setVariable [QGVAR(resourcenCargo), (_truck getVariable [QGVAR(resourcenCargo), 0]) + _resourcen, true]; + _truck setVariable ["TBMod_Building_resourcenCargo", (_truck getVariable ["TBMod_Building_resourcenCargo", 0]) + _resourcen, true]; [ACE_player, "", 1] call ace_common_fnc_doAnimation; deleteVehicle _building; diff --git a/addons/eden/configs/Cfg3DEN.hpp b/addons/eden/configs/Cfg3DEN.hpp index 0f0d2cead..e238fe69e 100644 --- a/addons/eden/configs/Cfg3DEN.hpp +++ b/addons/eden/configs/Cfg3DEN.hpp @@ -154,7 +154,7 @@ class Cfg3DEN property = QEGVAR(main,defineAmmo); control = "Edit"; - expression = "private _compValue = call compile _value; if (!is3DEN && _value != '[]' && _value != '' && (magazines _this) isNotEqualTo _compValue) then {_this setVehicleAmmoDef 0; {_x params ['_ammo', ['_amount', 999999]]; _this addMagazine [_ammo, _amount]} forEach _compValue; reload _this}"; + expression = "private _compValue = call compile _value; if (!is3DEN && _value != '[]' && _value != '' && !((magazines _this) isEqualTo _compValue)) then {_this setVehicleAmmoDef 0; {_x params ['_ammo', ['_amount', 999999]]; _this addMagazine [_ammo, _amount]} forEach _compValue; reload _this}"; defaultValue = "magazines _this"; diff --git a/addons/eden/functions/fnc_inkognitoSystem.sqf b/addons/eden/functions/fnc_inkognitoSystem.sqf index c97db197c..337160a7f 100644 --- a/addons/eden/functions/fnc_inkognitoSystem.sqf +++ b/addons/eden/functions/fnc_inkognitoSystem.sqf @@ -83,8 +83,8 @@ TB_umziehenFNC = { TB_condLaden = { params ["_mode"]; (profileNamespace getVariable ["TB_umziehen", []]) params ["", "", ["_currentMode", ""]]; - (nearestObjects [ACE_player, TB_inkognitoSystem_station, 7]) isNotEqualTo [] && - _currentMode != "" && _currentMode isNotEqualTo _mode + !((nearestObjects [ACE_player, TB_inkognitoSystem_station, 7]) isEqualTo []) && + _currentMode != "" && !(_currentMode isEqualTo _mode) }; private _actionLadenMil = ["Laden Militär", "Laden Militär", "", {["mil", false] call TB_umziehenFNC}, {["mil"] call TB_condLaden}] call ace_interact_menu_fnc_createAction; [player, 1, ["ACE_SelfActions", "Anziehsachen"], _actionLadenMil] call ace_interact_menu_fnc_addActionToObject; @@ -92,7 +92,7 @@ private _actionLadenZivil = ["Laden Zivil", "Laden Zivil", "", {["zivil", false] [player, 1, ["ACE_SelfActions", "Anziehsachen"], _actionLadenZivil] call ace_interact_menu_fnc_addActionToObject; // Speichern -private _condSpeichern = {(nearestObjects [ACE_player, ["TB_arsenal_base"], 15]) isNotEqualTo []}; +private _condSpeichern = {!((nearestObjects [ACE_player, ["TB_arsenal_base"], 15]) isEqualTo [])}; private _actionSpeichernMil = ["Speichern Militär", "Speichern Militär", "", {["mil", true] call TB_umziehenFNC}, _condSpeichern] call ace_interact_menu_fnc_createAction; [player, 1, ["ACE_SelfActions", "Anziehsachen"], _actionSpeichernMil] call ace_interact_menu_fnc_addActionToObject; private _actionSpeichernZivil = ["Speichern Zivil", "Speichern Zivil", "", {["zivil", true] call TB_umziehenFNC}, _condSpeichern] call ace_interact_menu_fnc_createAction; diff --git a/addons/eden/functions/fnc_moduleAtmoMortarSupport.sqf b/addons/eden/functions/fnc_moduleAtmoMortarSupport.sqf index cb38ea73f..de4c76d0c 100644 --- a/addons/eden/functions/fnc_moduleAtmoMortarSupport.sqf +++ b/addons/eden/functions/fnc_moduleAtmoMortarSupport.sqf @@ -16,7 +16,7 @@ _input params [ if (!is3DEN && {_mode == "init"} && {_isActivated}) then { // Check for Mortars - private _syncObjs = (synchronizedObjects _logic) select {_x isKindOf "Mortar_01_base_F"}; //"Artillery" in (getArray (configOf _x >> "availableForSupportTypes")) + private _syncObjs = (synchronizedObjects _logic) select {_x isKindOf "Mortar_01_base_F"}; //"Artillery" in (getArray (configfile >> "CfgVehicles" >> typeOf _x >> "availableForSupportTypes")) if (_syncObjs isEqualTo []) exitWith {systemChat "AtmoMortarSupport braucht gesyncte Mortars!"}; { diff --git a/addons/eden/functions/fnc_moduleFrontverlauf.sqf b/addons/eden/functions/fnc_moduleFrontverlauf.sqf index bff38e193..cc0bf70a7 100644 --- a/addons/eden/functions/fnc_moduleFrontverlauf.sqf +++ b/addons/eden/functions/fnc_moduleFrontverlauf.sqf @@ -70,7 +70,7 @@ if (!is3DEN && {_mode == "init"} && {_isActivated}) then private _mostFactionColor = 'empty'; private _player = (call CBA_fnc_players) param [0, objNull]; - if (_list isNotEqualTo [] && !isNull _player) then + if (!(_list isEqualTo []) && !isNull _player) then { "; diff --git a/addons/eden/functions/fnc_moduleLockDoors.sqf b/addons/eden/functions/fnc_moduleLockDoors.sqf index 5953dffe5..ebf64f3b4 100644 --- a/addons/eden/functions/fnc_moduleLockDoors.sqf +++ b/addons/eden/functions/fnc_moduleLockDoors.sqf @@ -41,7 +41,7 @@ if (!is3DEN && {_mode == "init"} && {_isActivated}) then #endif }; } - forEach ([configOf _building >> "AnimationSources", 0] call BIS_fnc_returnChildren); + forEach ([configFile >> "CfgVehicles" >> typeOf _building >> "AnimationSources", 0] call BIS_fnc_returnChildren); } forEach ((nearestObjects [_logic, ["House", "Building"], _width max _height]) inAreaArray _area); }; diff --git a/addons/eden/functions/fnc_sitAI.sqf b/addons/eden/functions/fnc_sitAI.sqf index 9d59292b4..77e59541f 100644 --- a/addons/eden/functions/fnc_sitAI.sqf +++ b/addons/eden/functions/fnc_sitAI.sqf @@ -9,8 +9,8 @@ if (!alive _unit || !local _unit) exitWith {}; _unit setVariable ["acex_headless_blacklist", true, true]; -private _objs = (nearestObjects [_unit, [], 2]) select {getNumber (configOf _x >> "acex_sitting_canSit") == 1}; -if (_objs isEqualTo []) then {(nearestTerrainObjects [_unit, [], 2]) select {getNumber (configOf _x >> "acex_sitting_canSit") == 1}}; +private _objs = (nearestObjects [_unit, [], 2]) select {getNumber (configFile >> "CfgVehicles" >> typeOf _x >> "acex_sitting_canSit") == 1}; +if (_objs isEqualTo []) then {(nearestTerrainObjects [_unit, [], 2]) select {getNumber (configFile >> "CfgVehicles" >> typeOf _x >> "acex_sitting_canSit") == 1}}; private _stuhl = objNull; private _canBeDamaged = isDamageAllowed _unit; @@ -20,7 +20,7 @@ if (_objs isEqualTo []) then { private _typeOf = selectRandom ["Land_ChairWood_F", "Land_CampingChair_V1_F", "Land_CampingChair_V2_F"]; _stuhl = createVehicle [_typeOf, [0,0,0], [], 0, "CAN_COLLIDE"]; - _stuhl setDir ((getDir _unit) - getNumber (configOf _stuhl >> "acex_sitting_sitDirection")); + _stuhl setDir ((getDir _unit) - getNumber (configFile >> "CfgVehicles" >> _typeOf >> "acex_sitting_sitDirection")); _stuhl setPosASL (getPosASL _unit); [_stuhl, false] remoteExec ["enableSimulationGlobal", [0, 2] select isMultiplayer]; } diff --git a/addons/eos/core/fnc_bastionCore.sqf b/addons/eos/core/fnc_bastionCore.sqf index f03ee4a83..dcdaeed1f 100644 --- a/addons/eos/core/fnc_bastionCore.sqf +++ b/addons/eos/core/fnc_bastionCore.sqf @@ -184,7 +184,7 @@ for "_i" from 1 to _lvGroups do private _lvGroup = [_pos, _side, _faction, _vehType, _lockVehicle, _keyVehicle] call FUNC(spawnVehicle); - if (_lvGroup isNotEqualTo []) then + if !(_lvGroup isEqualTo []) then { if (_lvSize > 0) then { @@ -217,7 +217,7 @@ for "_i" from 1 to _avGroups do private _vehType = if (surfaceiswater _pos) then {8} else {2}; private _avGroup = [_pos, _side, _faction, _vehType, _lockVehicle, _keyVehicle] call FUNC(spawnVehicle); - if (_avGroup isNotEqualTo []) then {_avZoneGroups pushBack _avGroup}; + if !(_avGroup isEqualTo []) then {_avZoneGroups pushBack _avGroup}; }; uiSleep 1; // TODO: temp solution @@ -242,7 +242,7 @@ for "_i" from 1 to _hGroups do private _vehType = if (_hSize > 0) then {4} else {3}; private _hGroup = [_pos, _side, _faction, _vehType, _lockVehicle, _keyVehicle] call FUNC(spawnVehicle); - if (_hGroup isNotEqualTo []) then + if !(_hGroup isEqualTo []) then { if (_hSize > 0) then { @@ -369,7 +369,7 @@ else if (_waves >= 1) then { if (_hints) then {hint "Feindliche Verstärkung ist auf dem Weg"}; - // Updates waves in the settings before sending next wave + // Updates waves in the settings before sending next wave _basSettings set [1, _waves]; [ _mkr, diff --git a/addons/eos/core/fnc_core.sqf b/addons/eos/core/fnc_core.sqf index 88e2002f5..4adb305c8 100644 --- a/addons/eos/core/fnc_core.sqf +++ b/addons/eos/core/fnc_core.sqf @@ -201,7 +201,7 @@ if (getMarkerColor _mkr != "ColorBlack") then }; private _lvGroup = [_pos, _side, _faction, _vehType, _lockVehicle, _keyVehicle] call FUNC(spawnVehicle); - if (_lvGroup isNotEqualTo []) then + if !(_lvGroup isEqualTo []) then { if (_lvSize > 0) then { @@ -236,7 +236,7 @@ if (getMarkerColor _mkr != "ColorBlack") then private _vehType = if (surfaceiswater _pos) then {8} else {2}; private _avGroup = [_pos, _side, _faction, _vehType, _lockVehicle, _keyVehicle] call FUNC(spawnVehicle); - if (_avGroup isNotEqualTo []) then + if !(_avGroup isEqualTo []) then { [_avGroup select 2, _mkr] call FUNC(shk_patrol); _avZoneGroups pushBack _avGroup; @@ -266,7 +266,7 @@ if (getMarkerColor _mkr != "ColorBlack") then private _stGroup = [_pos, _side, _faction, 5, _lockVehicle, _keyVehicle] call FUNC(spawnVehicle); - if (_stGroup isNotEqualTo []) then {_stZoneGroups pushBack _stGroup}; + if !(_stGroup isEqualTo []) then {_stZoneGroups pushBack _stGroup}; }; uiSleep 1; // TODO: temp solution @@ -287,7 +287,7 @@ if (getMarkerColor _mkr != "ColorBlack") then private _pos = [_mPos, 3000 + ((random 500) - 250), _baseDirHeli + ((random _randomDirHeli) - (_randomDirHeli / 2))] call BIS_fnc_relPos; private _hGroup = [_pos, _side, _faction, _vehType, _lockVehicle, _keyVehicle] call FUNC(spawnVehicle); - if (_hGroup isNotEqualTo []) then + if !(_hGroup isEqualTo []) then { if (_hSize > 0) then { diff --git a/addons/eos/functions/fnc_findSafePos.sqf b/addons/eos/functions/fnc_findSafePos.sqf index f5ca2bb93..76e5c9a72 100644 --- a/addons/eos/functions/fnc_findSafePos.sqf +++ b/addons/eos/functions/fnc_findSafePos.sqf @@ -77,13 +77,13 @@ private _defaultCenterPos = [_defaultMaxDistance, _defaultMaxDistance, 0]; private _fnc_defaultPos = { _defaultPos = _defaultPos param [parseNumber _this, []]; - if (_defaultPos isNotEqualTo []) exitWith {_defaultPos}; + if !(_defaultPos isEqualTo []) exitWith {_defaultPos}; _defaultPos = getArray (configFile >> "CfgWorlds" >> worldName >> "Armory" >> ["positionStart", "positionStartWater"] select _this); - if (_defaultPos isNotEqualTo []) exitWith {_defaultPos}; + if !(_defaultPos isEqualTo []) exitWith {_defaultPos}; _defaultPos = getArray (configFile >> "CfgWorlds" >> worldName >> "centerPosition"); - if (_defaultPos isNotEqualTo []) exitWith {_defaultPos}; + if !(_defaultPos isEqualTo []) exitWith {_defaultPos}; _defaultCenterPos }; @@ -101,7 +101,7 @@ if (_maxDistance < 0) then }; private _checkProximity = _objectProximity > 0; -private _checkBlacklist = _posBlacklist isNotEqualTo []; +private _checkBlacklist = !(_posBlacklist isEqualTo []); _shoreMode = _shoreMode != 0; @@ -144,7 +144,7 @@ for "_i" from 1 to MAX_TRIES do if (_checkProximity && {!(nearestTerrainObjects [_this, [], _objectProximity, false, true] isEqualTo [])}) exitWith {}; // not inside something - if (lineIntersectsSurfaces [AGLtoASL _this, AGLtoASL _this vectorAdd [0, 0, 50], objNull, objNull, false, 1, "GEOM", "NONE"] isNotEqualTo []) exitWith {}; + if !(lineIntersectsSurfaces [AGLtoASL _this, AGLtoASL _this vectorAdd [0, 0, 50], objNull, objNull, false, 1, "GEOM", "NONE"] isEqualTo []) exitWith {}; // not in blacklist if (_checkBlacklist && {{if (_this inArea _x) exitWith {true}; false} forEach _posBlacklist}) exitWith {}; diff --git a/addons/main/XEH_preInit.sqf b/addons/main/XEH_preInit.sqf index ca5bf75f9..90eb85360 100644 --- a/addons/main/XEH_preInit.sqf +++ b/addons/main/XEH_preInit.sqf @@ -49,7 +49,7 @@ if (isNil QEGVAR(medical,coef)) then {EGVAR(medical,coef) = 1}; private _time = time + 4; waitUntil { - if ((getPos _projectile) isNotEqualTo [0,0,0]) then {_pos = getPos _projectile}; + if !((getPos _projectile) isEqualTo [0,0,0]) then {_pos = getPos _projectile}; TRACE_3("Smoke waitUntil",alive _projectile,_pos,_vehicle distance _projectile); !alive _projectile }; diff --git a/addons/main/functions/fnc_crashHelferClient.sqf b/addons/main/functions/fnc_crashHelferClient.sqf index 2bc441292..39cb0deda 100644 --- a/addons/main/functions/fnc_crashHelferClient.sqf +++ b/addons/main/functions/fnc_crashHelferClient.sqf @@ -12,13 +12,13 @@ if (!GVAR(crashHelfer)) exitWith {}; {!isNil "TB_disconnectCache"}, { private _find = [TB_disconnectCache, getPlayerUID player] call BIS_fnc_findNestedElement; - if (_find isNotEqualTo []) then + if !(_find isEqualTo []) then { (TB_disconnectCache select (_find select 0)) params ["_uid", "_gear", "_pos", "_dir", "_arsenalType", "_rolle", "_group", "_team"]; [player] joinSilent _group; - if (_rolle isNotEqualTo "" && _arsenalType isNotEqualTo "") then { + if !(_rolle isEqualTo "" || _arsenalType isEqualTo "") then { player setVariable ["TB_arsenalType", _arsenalType, true]; [_rolle, _arsenalType, objNull, false] call EFUNC(arsenal,changeRolle); }; diff --git a/addons/main/functions/fnc_doorBreach.sqf b/addons/main/functions/fnc_doorBreach.sqf index 307df209b..764cd792e 100644 --- a/addons/main/functions/fnc_doorBreach.sqf +++ b/addons/main/functions/fnc_doorBreach.sqf @@ -17,7 +17,7 @@ player addEventHandler ["FIRED", { { private _objs = [cursorObject, "GEOM"] intersect [ASLToAGL (eyePos player), screenToWorld [0.5, 0.5]]; - if (_objs isNotEqualTo []) then + if !(_objs isEqualTo []) then { (_objs select 0) params ["_door", "_distance"]; diff --git a/addons/main/functions/fnc_fastRope.sqf b/addons/main/functions/fnc_fastRope.sqf index f395d4ee5..eca5f5844 100644 --- a/addons/main/functions/fnc_fastRope.sqf +++ b/addons/main/functions/fnc_fastRope.sqf @@ -78,7 +78,7 @@ switch (_mode) do if (_group isEqualType objNull) then {_group = group _group}; - [_vehicle, "SSS_fastropeUnits", _ropeUnits select {(group _x) isNotEqualTo _group}] call CBA_fnc_setVarNet; + [_vehicle, "SSS_fastropeUnits", _ropeUnits select {!((group _x) isEqualTo _group)}] call CBA_fnc_setVarNet; systemChat format ["Die Gruppe '%1' wurde vom Abseilen entfernt!", groupId _group]; }; @@ -94,7 +94,7 @@ switch (_mode) do private _ropes = _vehicle getVariable [QGVAR(ropes), []]; _ropes = _ropes select {count _x == 3 && alive (_x # 0) && alive (_x # 1) && alive (_x # 2)}; - if (_ropes isNotEqualTo []) exitWith {true}; + if !(_ropes isEqualTo []) exitWith {true}; private _centerOfMass = getCenterOfMass _vehicle; @@ -130,7 +130,7 @@ switch (_mode) do private _copilots = _copilotTurrets apply {_vehicle turretUnit _x}; (driver _vehicle == _player || currentPilot _vehicle == _player || gunner _vehicle == _player || commander _vehicle == _player && _player in _copilots) - && _ropeUnits isNotEqualTo [] && _height < 50 && _height > 5 && speed _vehicle < 10 + && !(_ropeUnits isEqualTo []) && _height < 50 && _height > 5 && speed _vehicle < 10 }; case "checkUnits": diff --git a/addons/main/functions/fnc_initFOB.sqf b/addons/main/functions/fnc_initFOB.sqf index 92bb7e817..c1796bab0 100644 --- a/addons/main/functions/fnc_initFOB.sqf +++ b/addons/main/functions/fnc_initFOB.sqf @@ -7,7 +7,7 @@ params ["_fob"]; // bereits gesetzte löschen { - if (_x isNotEqualTo _fob) then {deleteVehicle _x}; + if !(_x isEqualTo _fob) then {deleteVehicle _x}; } forEach (entities (typeOf _fob)); if (isNil "TB_main_fobs") then {TB_main_fobs = []}; diff --git a/addons/main/functions/fnc_miscStuff.sqf b/addons/main/functions/fnc_miscStuff.sqf index 826e466c1..37bcacb9c 100644 --- a/addons/main/functions/fnc_miscStuff.sqf +++ b/addons/main/functions/fnc_miscStuff.sqf @@ -258,7 +258,7 @@ GVAR(vehicleTransport) = ["Car", "Tank", "Motorcycle", "Helicopter", "Plane", "S { private _car = _this # 0; - if (isClass (configOf _car >> "VehicleTransport" >> "Carrier")) then + if (isClass (configFile >> "CfgVehicles" >> typeOf _car >> "VehicleTransport" >> "Carrier")) then { private _action = ["VehicleTransport", "VehicleTransport", "", {}, {vehicleCargoEnabled _target}] call ace_interact_menu_fnc_createAction; [_car, 0, ["ACE_MainActions"], _action] call ace_interact_menu_fnc_addActionToObject; diff --git a/addons/main/functions/fnc_modifierFOBs.sqf b/addons/main/functions/fnc_modifierFOBs.sqf index 7feb52bb1..e4d9f4808 100644 --- a/addons/main/functions/fnc_modifierFOBs.sqf +++ b/addons/main/functions/fnc_modifierFOBs.sqf @@ -6,4 +6,4 @@ params ["_args", ""]; _args params ["_target", "_player", "_params", "_actionData"]; -_actionData set [1, getText (configOf _target >> "displayName")]; +_actionData set [1, getText (configFile >> "CfgVehicles" >> typeOf _target >> "displayName")]; diff --git a/addons/main/replacement/init.sqf b/addons/main/replacement/init.sqf index ceaf3a88c..2c7079d3d 100644 --- a/addons/main/replacement/init.sqf +++ b/addons/main/replacement/init.sqf @@ -201,8 +201,8 @@ switch _mode do if (_value in [STATE_DAMAGED1,STATE_DAMAGED2,STATE_DAMAGED3]) then { - private _noHitzone1 = !isClass(configOf _building >> "HitPoints" >> "Hitzone_1_hitpoint"); - private _noHitzone2 = !isClass(configOf _building >> "HitPoints" >> "Hitzone_2_hitpoint"); + private _noHitzone1 = !isClass(configfile >> "CfgVehicles" >> typeOf _building >> "HitPoints" >> "Hitzone_1_hitpoint"); + private _noHitzone2 = !isClass(configfile >> "CfgVehicles" >> typeOf _building >> "HitPoints" >> "Hitzone_2_hitpoint"); switch (_value) do { @@ -531,7 +531,7 @@ switch _mode do if (isNull _building) exitWith {[]}; //configfile >> "CfgVehicles" >> "Land_i_House_Small_01_b_blue_F" >> "UserActions" >> "OpenDoor_1" - private _cfg = configOf _building >> "UserActions"; + private _cfg = configfile >> "CfgVehicles" >> typeOf _building >> "UserActions"; if !(isClass _cfg) exitWith {[]}; @@ -702,7 +702,7 @@ switch _mode do } else { - getNumber(configOf _building >> "numberOfDoors") + getNumber(configfile >> "CfgVehicles" >> typeOf _building >> "numberOfDoors") }; _available = _available min DOOR_INDEX_MAX; @@ -783,8 +783,8 @@ switch _mode do private _building = ["getBuilding",[_module]] call bis_fnc_moduleEditTerrainObject; - private _noHitzone1 = !isClass(configOf _building >> "HitPoints" >> "Hitzone_1_hitpoint"); - private _noHitzone2 = !isClass(configOf _building >> "HitPoints" >> "Hitzone_2_hitpoint"); + private _noHitzone1 = !isClass(configfile >> "CfgVehicles" >> typeOf _building >> "HitPoints" >> "Hitzone_1_hitpoint"); + private _noHitzone2 = !isClass(configfile >> "CfgVehicles" >> typeOf _building >> "HitPoints" >> "Hitzone_2_hitpoint"); if (_noHitzone1) then { diff --git a/addons/nachschub/configs/CfgVehicles.hpp b/addons/nachschub/configs/CfgVehicles.hpp index ec67841ae..a772d5111 100644 --- a/addons/nachschub/configs/CfgVehicles.hpp +++ b/addons/nachschub/configs/CfgVehicles.hpp @@ -156,7 +156,7 @@ class CfgVehicles { displayName = "USA"; exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - condition = "(entities [['TB_arsenal_usa', 'TB_arsenal_predefined_custom'], []]) isNotEqualTo []"; + condition = "!((entities [['TB_arsenal_usa', 'TB_arsenal_predefined_custom'], []]) isEqualTo [])"; ADD_SUPPLY("Airdrop",TB_supply_usa_airdrop); ADD_SUPPLY("Notfall",TB_supply_usa_notfall); @@ -195,7 +195,7 @@ class CfgVehicles { displayName = "UK"; exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - condition = "(entities [['TB_arsenal_uk', 'TB_arsenal_predefined_custom'], []]) isNotEqualTo []"; + condition = "!((entities [['TB_arsenal_uk', 'TB_arsenal_predefined_custom'], []]) isEqualTo [])"; ADD_SUPPLY("Notfall",TB_supply_uk_notfall); ADD_SUPPLY("Nacht Kiste",TB_supply_uk_night); @@ -242,7 +242,7 @@ class CfgVehicles { displayName = "BW"; exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - condition = "(entities [['TB_arsenal_bw', 'TB_arsenal_predefined_custom'], []]) isNotEqualTo [] && isClass (configFile >> 'CfgPatches' >> 'bwa3_common')"; + condition = "!((entities [['TB_arsenal_bw', 'TB_arsenal_predefined_custom'], []]) isEqualTo []) && isClass (configFile >> 'CfgPatches' >> 'bwa3_common')"; ADD_SUPPLY("Munition",TB_supply_bw_ammo); ADD_SUPPLY("KleinMunition",TB_supply_bw_ammoSmall); @@ -259,7 +259,7 @@ class CfgVehicles { displayName = "NATO"; exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - condition = "(entities [['TB_arsenal_vanilla', 'TB_arsenal_predefined_custom'], []]) isNotEqualTo []"; + condition = "!((entities [['TB_arsenal_vanilla', 'TB_arsenal_predefined_custom'], []]) isEqualTo [])"; ADD_SUPPLY("Munition",TB_supply_nato_ammo); ADD_SUPPLY("Granaten",TB_supply_nato_grena); @@ -273,7 +273,7 @@ class CfgVehicles { displayName = "LDF"; exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - condition = "(entities [['TB_arsenal_themen', 'TB_arsenal_predefined_custom'], []]) isNotEqualTo []"; + condition = "!((entities [['TB_arsenal_themen', 'TB_arsenal_predefined_custom'], []]) isEqualTo [])"; class LDFMunition { @@ -309,7 +309,7 @@ class CfgVehicles { displayName = "BRD"; exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - condition = "(entities [['TB_arsenal_themen', 'TB_arsenal_predefined_custom'], []]) isNotEqualTo []"; + condition = "!((entities [['TB_arsenal_themen', 'TB_arsenal_predefined_custom'], []]) isEqualTo [])"; ADD_SUPPLY("Munition",TB_supply_brd_ammo); ADD_SUPPLY("Granaten",TB_supply_brd_grena); @@ -322,7 +322,7 @@ class CfgVehicles { displayName = "SOG"; exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - condition = "(entities [['TB_arsenal_themen', 'TB_arsenal_predefined_custom'], []]) isNotEqualTo []"; + condition = "!((entities [['TB_arsenal_themen', 'TB_arsenal_predefined_custom'], []]) isEqualTo [])"; ADD_SUPPLY("Munition",TB_supply_sog_ammo); ADD_SUPPLY("Granaten",TB_supply_sog_grena); @@ -339,7 +339,7 @@ class CfgVehicles { displayName = "RUSS"; exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; - condition = "(entities [['TB_arsenal_russ', 'TB_arsenal_predefined_custom'], []]) isNotEqualTo []"; + condition = "!((entities [['TB_arsenal_russ', 'TB_arsenal_predefined_custom'], []]) isEqualTo [])"; ADD_SUPPLY("Munition",TB_supply_russ_ammo); ADD_SUPPLY("KleinMunition",TB_supply_russ_ammoSmall); diff --git a/addons/persistence/functions/fnc_persistenceEDEN.sqf b/addons/persistence/functions/fnc_persistenceEDEN.sqf index af611e9a0..4a1a2640f 100644 --- a/addons/persistence/functions/fnc_persistenceEDEN.sqf +++ b/addons/persistence/functions/fnc_persistenceEDEN.sqf @@ -70,7 +70,7 @@ private _vehicle = nil; _vehicle set3DENAttribute ["fuel", _fuel]; _vehicle set3DENAttribute ["enableSimulation", _sim]; - if (_dmg isNotEqualTo []) then + if !(_dmg isEqualTo []) then { _dmg params ["_hitNames", "_dmgValues"]; diff --git a/addons/persistence/functions/fnc_persistenceMarkers.sqf b/addons/persistence/functions/fnc_persistenceMarkers.sqf index a3bacb280..9f03b0577 100644 --- a/addons/persistence/functions/fnc_persistenceMarkers.sqf +++ b/addons/persistence/functions/fnc_persistenceMarkers.sqf @@ -42,7 +42,7 @@ else // load private _newMarker = createMarker [_marker, _pos]; _newMarker setMarkerColor _color; _newMarker setMarkerSize _size; - if (_type isNotEqualTo "") then {_newMarker setMarkerType _type}; + if !(_type isEqualTo "") then {_newMarker setMarkerType _type}; _newMarker setMarkerAlpha _alpha; _newMarker setMarkerBrush _brush; _newMarker setMarkerDir _dir; diff --git a/addons/persistence/functions/fnc_persistencePlayers.sqf b/addons/persistence/functions/fnc_persistencePlayers.sqf index d3ac05571..ef797f5c1 100644 --- a/addons/persistence/functions/fnc_persistencePlayers.sqf +++ b/addons/persistence/functions/fnc_persistencePlayers.sqf @@ -51,13 +51,13 @@ else // load { private _find = [TB_disconnectCache, getPlayerUID _x] call BIS_fnc_findNestedElement; - if (_find isNotEqualTo []) then + if !(_find isEqualTo []) then { (TB_disconnectCache select (_find select 0)) params ["_uid", "_gear", "_pos", "_dir", "_arsenalType", "_rolle", "_group", "_team"]; [_x] joinSilent _group; - if (_rolle isNotEqualTo "" && _arsenalType isNotEqualTo "") then + if !(_rolle isEqualTo "" || _arsenalType isEqualTo "") then { _x setVariable ["TB_arsenalType", _arsenalType, true]; [_rolle, _arsenalType, objNull, false] remoteExec [QEFUNC(arsenal,changeRolle), _x]; diff --git a/addons/persistence/functions/fnc_persistenceVehicles.sqf b/addons/persistence/functions/fnc_persistenceVehicles.sqf index ed7d7987e..aa3ad22e1 100644 --- a/addons/persistence/functions/fnc_persistenceVehicles.sqf +++ b/addons/persistence/functions/fnc_persistenceVehicles.sqf @@ -84,7 +84,7 @@ else // load } forEach _aceCargo; - if (_dmg isNotEqualTo []) then + if !(_dmg isEqualTo []) then { { _vehicle setHitPointDamage [_x, (_dmg select 1) select _forEachIndex]; diff --git a/addons/vz99/functions/fnc_doReload.sqf b/addons/vz99/functions/fnc_doReload.sqf index 6db7481ca..cd9bde549 100644 --- a/addons/vz99/functions/fnc_doReload.sqf +++ b/addons/vz99/functions/fnc_doReload.sqf @@ -7,11 +7,11 @@ params ["_mortarVeh", "_player"]; // If we have a round loaded, exit -if ((magazinesAmmoFull _mortarVeh) isNotEqualTo []) exitWith {}; +if (!((magazinesAmmoFull _mortarVeh) isEqualTo [])) exitWith {}; // Make sure empty mag is removed so it "autoloads" private _loadedEmpty = _mortarVeh magazinesTurret [0]; -if (_loadedEmpty isNotEqualTo []) then +if !(_loadedEmpty isEqualTo []) then { _mortarVeh removeMagazinesTurret [_loadedEmpty select 0, [0]]; }; diff --git a/addons/vz99/functions/fnc_handleFired.sqf b/addons/vz99/functions/fnc_handleFired.sqf index 16581ef0f..80b43e9dc 100644 --- a/addons/vz99/functions/fnc_handleFired.sqf +++ b/addons/vz99/functions/fnc_handleFired.sqf @@ -10,7 +10,7 @@ if (!local _mortarVeh) exitWith {}; // Remove the empty magazine, so a new one will load correctly private _loadedEmpty = _mortarVeh magazinesTurret [0]; -if (_loadedEmpty isNotEqualTo []) then +if !(_loadedEmpty isEqualTo []) then { _mortarVeh removeMagazinesTurret [_loadedEmpty select 0, [0]]; }; diff --git a/addons/zeus/functions/fnc_moduleDefineAmmo.sqf b/addons/zeus/functions/fnc_moduleDefineAmmo.sqf index 2a5c762e9..ec72d6f88 100644 --- a/addons/zeus/functions/fnc_moduleDefineAmmo.sqf +++ b/addons/zeus/functions/fnc_moduleDefineAmmo.sqf @@ -30,7 +30,7 @@ if (_mags isEqualTo []) exitWith {true}; _args params ["_unit", "_mags"]; private _compValue = call compile _value; - if (_value != '[]' && _value != '' && _mags isNotEqualTo _compValue) then + if (_value != '[]' && _value != '' && !(_mags isEqualTo _compValue)) then { _unit setVehicleAmmoDef 0;