Anpassungen

addons/advSlingload/XEH_postClientInit.sqf

@@ -44,7 +44,7 @@
                     "Lastenseil abtrennen",
                     "",
                     {_target call FUNC(detach)},
-                    {!((ropes _target) isEqualTo [])}
+                    {(ropes _target) isNotEqualTo []}
                 ] call ace_interact_menu_fnc_createAction
             ],
             [

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 (configfile >> "CfgVehicles" >> typeOf _source >> "slingLoadMemoryPoint");
+private _selection = getText (configOf _source >> "slingLoadMemoryPoint");
 if (_selection == "") exitWith {ERROR_MSG_1("no Slingloadposition found on _source: %1", _source)};
 
 private _posToAttach = ASLToAGL ([ACE_player, _ray] call FUNC(calculateAttachPoint));

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 (configfile >> "CfgVehicles" >> typeOf _target >> "slingLoadMemoryPoint");
+private _selection = getText (configOf _target >> "slingLoadMemoryPoint");
 if (_selection == "") exitWith {systemChat format ["ERROR(dropRopefromChopper): no Slingloadposition found on _target %1", _target]};
 
 private _posSlingload = _target modelToWorld (_target selectionPosition _selection);

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 (configfile >> "CfgVehicles" >> typeOf _source >> "slingLoadMemoryPoint");
+    private _selection = getText (configOf _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 (configfile >> "CfgVehicles" >> typeOf _target >> "slingLoadMemoryPoint");
+    private _selection = getText (configOf _target >> "slingLoadMemoryPoint");
     if (_selection == "") exitWith {systemChat format ["ERROR(pickupRope): no Slingloadposition found on _target %1", _target]};
 
     [QGVAR(addPickupActionEvent), [_helper]] call CBA_fnc_globalEvent;

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]) isEqualTo [])}) then
+        if (local _unit && {(_unit nearEntities ["TB_arsenal_base", 6]) isNotEqualTo []}) then
         {
             if (typeOf _container == "GroundWeaponHolder") then {deleteVehicle _container};
         };

addons/arsenal/configs/CfgVehicles.hpp

@@ -48,8 +48,8 @@ class CfgVehicles
                 class changeArsenalType
                 {
                     displayName = "Wechsel zu...";
-                    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]);
+                    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]);
                     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 (configFile >> 'CfgVehicles' >> typeOf _target >> 'arsenalType'), _target] call FUNC(changeRolle); [_target, _player] call ace_arsenal_fnc_openBox;); \
+                            statement = QUOTE(['ROLLEN_NAME', getText (configOf _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 (configFile >> 'CfgVehicles' >> typeOf _target >> 'arsenalType'), _target] call FUNC(changeRolle); [_target, _player] call ace_arsenal_fnc_openBox;); \
+                            statement = QUOTE(['ROLLEN_NAME', getText (configOf _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 (configFile >> 'CfgVehicles' >> typeOf _target >> 'arsenalType'), _target] call FUNC(changeRolle)); \
+                            statement = QUOTE(['ROLLEN_NAME', getText (configOf _target >> 'arsenalType'), _target] call FUNC(changeRolle)); \
                             exceptions[] = {"isNotSwimming", "isNotInside", "notOnMap", "isNotSitting"}; \
                         }
 

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 isEqualTo []) && {!(_tbCargo isEqualTo (_target getVariable ["ace_arsenal_virtualItems", []]))}) then
+if (_tbCargo isNotEqualTo [] && {_tbCargo isNotEqualTo (_target getVariable ["ace_arsenal_virtualItems", []])}) then
 {
     _target setVariable ["ace_arsenal_virtualItems", _tbCargo];
 
     {
-        if (!(_x isEqualTo _target) && [_x] call FUNC(isArsenalType) && {!(_tbCargo isEqualTo (_x getVariable ["ace_arsenal_virtualItems", []]))}) then
+        if (_x isNotEqualTo _target && [_x] call FUNC(isArsenalType) && {_tbCargo isNotEqualTo (_x getVariable ["ace_arsenal_virtualItems", []])}) then
         {
             _x setVariable ["ace_arsenal_virtualItems", _tbCargo];
         };

addons/arsenal/functions/fnc_changeRolle.sqf

@@ -13,7 +13,7 @@ if (isNull _target) then {
     if (_arsenalType in ["", "CUSTOM"]) exitWith {};
 
     {
-        if (_arsenalType isEqualTo getText (configFile >> "CfgVehicles" >> typeOf _x >> "arsenalType")) exitWith
+        if (_arsenalType isEqualTo getText (configOf _x >> "arsenalType")) exitWith
         {
             _target = _x;
         };

addons/arsenal/functions/fnc_isArsenalType.sqf

@@ -5,4 +5,4 @@
 */
 params ["_target"];
 
-ACE_player getVariable ["TB_arsenalType", ""] == getText (configFile >> "CfgVehicles" >> typeOf _target >> "arsenalType");
+ACE_player getVariable ["TB_arsenalType", ""] == getText (configOf _target >> "arsenalType");

addons/arsenal/functions/fnc_modifierMainAction.sqf

@@ -61,5 +61,5 @@ if (_arsenalType == "Themen") then
 };
 
 private _rolle = _player getVariable ["TB_rolle", ""];
-private _condition = (_rolle != "") && ((getText (configFile >> "CfgVehicles" >> typeOf _target >> "arsenalType")) == _player getVariable ["TB_arsenalType", ""]);
+private _condition = (_rolle != "") && ((getText (configOf _target >> "arsenalType")) == _player getVariable ["TB_arsenalType", ""]);
 _actionData set [1, ["TB-Arsenal", [_rolle] call FUNC(getRollenName)] select _condition];

addons/arsenal/functions/fnc_setArsenal.sqf

@@ -8,7 +8,7 @@ params ["_ammoBox", ["_rolle", ""]];
 if (isNull _ammoBox) exitWith {};
 
 // Check zum Überspringen
-private _type = getText (configFile >> "CfgVehicles" >> typeOf _ammoBox >> "arsenalType");
+private _type = getText (configOf _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 isEqualTo (_x getVariable ["ace_arsenal_virtualItems", []]))}) then
+    if ([_x] call FUNC(isArsenalType) && {_tbCargo isNotEqualTo (_x getVariable ["ace_arsenal_virtualItems", []])}) then
     {
         _x setVariable ["ace_arsenal_virtualItems", _tbCargo];
     };

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 (configFile >> "CfgVehicles" >> typeOf _target >> "ace_rearm_defaultSupply") > 0) then {_info pushBack "Munitionswagen"};
+    getNumber (configOf _target >> "ace_rearm_defaultSupply") > 0) then {_info pushBack "Munitionswagen"};
 
-if !(_info isEqualTo []) then {hint (_info joinString "\n")};
+if (_info isNotEqualTo []) then {hint (_info joinString "\n")};

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 (configFile >> "CfgVehicles" >> typeOf _target >> "ace_rearm_defaultSupply") > 0) then {_newActionName pushBack "Mun"};
+    getNumber (configOf _target >> "ace_rearm_defaultSupply") > 0) then {_newActionName pushBack "Mun"};
 
 if (count _newActionName > 2) then {_newActionName = ["Utils"]};
 

addons/building/functions/fnc_placePlaceablesBig.sqf

@@ -11,15 +11,19 @@ params [
 ];
 _zusatz params ["_zeit", "_resourcen"];
 
-if (_buildingName isEqualTo "") exitWith {systemChat "Schwerer Fehler (TB_building_fnc_placePlaceablesBig)"};
+if (_buildingName isEqualTo "") exitWith {systemChat "Schwerer Fehler in "+ QFUNC(placePlaceablesBig)};
 
-if (_kran && {((nearestObjects [ACE_player, [], 15]) select {_x getVariable ["TBMod_Building_kranWagen", false]}) isEqualTo []}) exitWith {systemChat "Kein Kranwagen in der Nähe"};
+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"};
 
-((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 _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"};
 
-private _resc = _truck getVariable ["TBMod_Building_resourcenCargo", -1];
-_truck setVariable ["TBMod_Building_resourcenCargo", _resc - _resourcen, true];
+private _resc = _truck getVariable [QGVAR(resourcenCargo), -1];
+_truck setVariable [QGVAR(resourcenCargo), _resc - _resourcen, true];
 
 private _building = createVehicle [_buildingName, ACE_player modelToWorld [0, 5, 0], [], 0, "CAN_COLLIDE"];
 private _specialDir = [0, 180] select _spiegeln;
@@ -93,7 +97,7 @@ _building setPosASL (AGLToASL _pos);
                 {
                     (_this # 0) params ["_building", "", "", "_resourcen", "_truck"];
 
-                    _truck setVariable ["TBMod_Building_resourcenCargo", (_truck getVariable ["TBMod_Building_resourcenCargo", 0]) + _resourcen, true];
+                    _truck setVariable [QGVAR(resourcenCargo), (_truck getVariable [QGVAR(resourcenCargo), 0]) + _resourcen, true];
 
                     [ACE_player, "", 1] call ace_common_fnc_doAnimation;
                     deleteVehicle _building;

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) isEqualTo _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) isNotEqualTo _compValue) then {_this setVehicleAmmoDef 0; {_x params ['_ammo', ['_amount', 999999]]; _this addMagazine [_ammo, _amount]} forEach _compValue; reload _this}";
 
                         defaultValue = "magazines _this";
 

addons/eden/functions/fnc_inkognitoSystem.sqf

@@ -83,16 +83,16 @@ TB_umziehenFNC = {
 TB_condLaden = {
     params ["_mode"];
     (profileNamespace getVariable ["TB_umziehen", []]) params ["", "", ["_currentMode", ""]];
-    !((nearestObjects [ACE_player, TB_inkognitoSystem_station, 7]) isEqualTo []) &&
-        _currentMode != "" && !(_currentMode isEqualTo _mode)
+    (nearestObjects [ACE_player, TB_inkognitoSystem_station, 7]) isNotEqualTo [] &&
+        _currentMode != "" && _currentMode isNotEqualTo _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;
 private _actionLadenZivil = ["Laden Zivil", "Laden Zivil", "", {["zivil", false] call TB_umziehenFNC}, {["zivil"] call TB_condLaden}] call ace_interact_menu_fnc_createAction;
 [player, 1, ["ACE_SelfActions", "Anziehsachen"], _actionLadenZivil] call ace_interact_menu_fnc_addActionToObject;
 
 // Speichern
-private _condSpeichern = {!((nearestObjects [ACE_player, ["TB_arsenal_base"], 15]) isEqualTo [])};
+private _condSpeichern = {(nearestObjects [ACE_player, ["TB_arsenal_base"], 15]) isNotEqualTo []};
 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;

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 (configfile >> "CfgVehicles" >> typeOf _x >> "availableForSupportTypes"))
+    private _syncObjs = (synchronizedObjects _logic) select {_x isKindOf "Mortar_01_base_F"}; //"Artillery" in (getArray (configOf _x >> "availableForSupportTypes"))
     if (_syncObjs isEqualTo []) exitWith {systemChat "AtmoMortarSupport braucht gesyncte Mortars!"};
 
     {

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 isEqualTo []) && !isNull _player) then
+        if (_list isNotEqualTo [] && !isNull _player) then
         {
     ";
 

addons/eden/functions/fnc_moduleLockDoors.sqf

@@ -41,7 +41,7 @@ if (!is3DEN && {_mode == "init"} && {_isActivated}) then
                 #endif
             };
         }
-        forEach ([configFile >> "CfgVehicles" >> typeOf _building >> "AnimationSources", 0] call BIS_fnc_returnChildren);
+        forEach ([configOf _building >> "AnimationSources", 0] call BIS_fnc_returnChildren);
     }
     forEach ((nearestObjects [_logic, ["House", "Building"], _width max _height]) inAreaArray _area);
 };

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 (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 _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 _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 (configFile >> "CfgVehicles" >> _typeOf >> "acex_sitting_sitDirection"));
+    _stuhl setDir ((getDir _unit) - getNumber (configOf _stuhl >> "acex_sitting_sitDirection"));
     _stuhl setPosASL (getPosASL _unit);
     [_stuhl, false] remoteExec ["enableSimulationGlobal", [0, 2] select isMultiplayer];
 }

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 isEqualTo []) then
+    if (_lvGroup isNotEqualTo []) 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 isEqualTo []) then {_avZoneGroups pushBack _avGroup};
+    if (_avGroup isNotEqualTo []) 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 isEqualTo []) then
+    if (_hGroup isNotEqualTo []) 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,