acemod · LinkIsGrim · Sep 11, 2024 · Sep 9, 2024
diff --git a/addons/common/functions/fnc_claim.sqf b/addons/common/functions/fnc_claim.sqf
@@ -30,10 +30,10 @@ _target setVariable [QGVAR(owner), _unit, true];
 
 // lock target object
 if (_lockTarget) then {
-    if (!isNull _unit) then {
-        [QGVAR(lockVehicle), _target, _target] call CBA_fnc_targetEvent;
-    } else {
+    if (isNull _unit) then {
         [QGVAR(unlockVehicle), _target, _target] call CBA_fnc_targetEvent;
+    } else {
+        [QGVAR(lockVehicle), _target, _target] call CBA_fnc_targetEvent;
     };
 };
 

diff --git a/addons/common/functions/fnc_getDeathAnim.sqf b/addons/common/functions/fnc_getDeathAnim.sqf
@@ -29,7 +29,9 @@ private _unitActionsCfg = configFile >> "CfgMovesBasic" >> "Actions" >> getText
 
 TRACE_2("Animation/Action",configName _unitAnimationCfg,configName _unitActionsCfg);
 
-if (!isNull objectParent _unit) then {
+if (isNull objectParent _unit) then {
+    _returnAnimation = getText (_unitActionsCfg >> "die");
+} else {
     private _interpolateArray = getArray (_unitAnimationCfg >> "interpolateTo");
 
     for "_index" from 0 to (count _interpolateArray - 1) step 2 do {
@@ -42,8 +44,6 @@ if (!isNull objectParent _unit) then {
             _returnAnimation = _indexAnimation;
         };
     };
-} else {
-    _returnAnimation = getText (_unitActionsCfg >> "die");
 };
 
 //Fallback if nothing valid found:

diff --git a/addons/field_rations/functions/fnc_getActionOffset.sqf b/addons/field_rations/functions/fnc_getActionOffset.sqf
@@ -18,11 +18,11 @@
 params ["_object"];
 
 private _configOf = configOf _object;
-if !(isNull _configOf) then {
+if (isNull _configOf) then {
+    // Check for offset corresponding to p3d list
+    GVAR(waterSourceOffsets) param [GVAR(waterSourceP3ds) find (getModelInfo _object select 0), [0, 0, 0], [[]]];
+} else {
     // Check for offset in config since we have valid typeOf
     private _offset = getArray (_configOf >> QXGVAR(offset));
     if (_offset isEqualTo []) then {[0, 0, 0]} else {_offset};
-} else {
-    // Check for offset corresponding to p3d list
-    GVAR(waterSourceOffsets) param [GVAR(waterSourceP3ds) find (getModelInfo _object select 0), [0, 0, 0], [[]]];
 };
diff --git a/addons/field_rations/functions/fnc_getRemainingWater.sqf b/addons/field_rations/functions/fnc_getRemainingWater.sqf
@@ -23,7 +23,10 @@ private _water = _source getVariable QGVAR(currentWaterSupply);
 
 if (isNil "_water") then {
     private _configOf = configOf _source;
-    if !(isNull _configOf) then {
+    if (isNull _configOf) then {
+        // Check the p3d name against list
+        _water = if ((getModelInfo _source select 0) in GVAR(waterSourceP3ds)) then {REFILL_WATER_INFINITE} else {REFILL_WATER_DISABLED};
+    } else {
         // Check for waterSupply entry since we have valid typeOf
         _water = getNumber (_configOf >> QXGVAR(waterSupply));
         if (_water == 0) then {_water = REFILL_WATER_DISABLED};
@@ -35,9 +38,6 @@ if (isNil "_water") then {
                 _source setVariable [QGVAR(currentWaterSupply), _water, true];
             };
         };
-    } else {
-        // Check the p3d name against list
-        _water = if ((getModelInfo _source select 0) in GVAR(waterSourceP3ds)) then {REFILL_WATER_INFINITE} else {REFILL_WATER_DISABLED};
     };
 };
 

diff --git a/addons/goggles/functions/fnc_applyRotorWashEffect.sqf b/addons/goggles/functions/fnc_applyRotorWashEffect.sqf
@@ -64,14 +64,14 @@ if !(_safe) then {
     if !([_unit] call FUNC(isGogglesVisible)) exitWith {};
 
     if (GETDUSTT(DAMOUNT) < 2) then {
-        if !(GETDUSTT(DACTIVE)) then {
-            SETDUST(DACTIVE,true);
-
-            call FUNC(applyDustEffect);
-        } else {
+        if (GETDUSTT(DACTIVE)) then {
             if (_rotorWash select 1 > 0.5) then {
                 call FUNC(applyDustEffect);
             };
+        } else {
+            SETDUST(DACTIVE,true);
+
+            call FUNC(applyDustEffect);
         };
     };
 

diff --git a/addons/interact_menu/functions/fnc_keyDown.sqf b/addons/interact_menu/functions/fnc_keyDown.sqf
@@ -116,20 +116,20 @@ GVAR(selfMenuOffset) = (AGLToASL (positionCameraToWorld [0, 0, 2])) vectorDiff (
 //Auto expand the first level when self, mounted vehicle or zeus (skips the first animation as there is only one choice)
 if (GVAR(openedMenuType) == 0) then {
     if (isNull curatorCamera) then {
-        if !(isNull (ACE_controlledUAV select 0)) then {
-            GVAR(menuDepthPath) = [["ACE_SelfActions", (ACE_controlledUAV select 0)]];
-            GVAR(expanded) = true;
-            GVAR(expandedTime) = diag_tickTime;
-            GVAR(lastPath) = +GVAR(menuDepthPath);
-            GVAR(startHoverTime) = -1000;
-        } else {
+        if (isNull (ACE_controlledUAV select 0)) then {
             if (vehicle ACE_player != ACE_player) then {
                 GVAR(menuDepthPath) = [["ACE_SelfActions", (vehicle ACE_player)]];
                 GVAR(expanded) = true;
                 GVAR(expandedTime) = diag_tickTime;
                 GVAR(lastPath) = +GVAR(menuDepthPath);
                 GVAR(startHoverTime) = -1000;
             };
+        } else {
+            GVAR(menuDepthPath) = [["ACE_SelfActions", (ACE_controlledUAV select 0)]];
+            GVAR(expanded) = true;
+            GVAR(expandedTime) = diag_tickTime;
+            GVAR(lastPath) = +GVAR(menuDepthPath);
+            GVAR(startHoverTime) = -1000;
         };
     } else {
         GVAR(menuDepthPath) = [["ACE_ZeusActions", (getAssignedCuratorLogic player)]];

diff --git a/addons/interact_menu/functions/fnc_renderActionPoints.sqf b/addons/interact_menu/functions/fnc_renderActionPoints.sqf
@@ -97,11 +97,11 @@ private _fnc_renderSelfActions = {
     // Iterate through base level class actions and render them if appropiate
     private _classActions = GVAR(ActSelfNamespace) get typeOf _target;
 
-    private _pos = if !(GVAR(useCursorMenu)) then {
+    private _pos = if (GVAR(useCursorMenu)) then {
+        [0.5, 0.5]
+    } else {
         //Convert to ASL, add offset and then convert back to AGL (handles waves when over water)
         ASLToAGL ((AGLToASL (positionCameraToWorld [0, 0, 0])) vectorAdd GVAR(selfMenuOffset));
-    } else {
-        [0.5, 0.5]
     };
 
     {
@@ -123,10 +123,7 @@ GVAR(collectedActionPoints) resize 0;
 // Render nearby actions, unit self actions or vehicle self actions as appropiate
 if (GVAR(openedMenuType) == 0) then {
     if (isNull curatorCamera) then {
-        if !(isNull (ACE_controlledUAV select 0)) then {
-            // Render UAV self actions when in control of UAV AI
-            (ACE_controlledUAV select 0) call _fnc_renderSelfActions;
-        } else {
+        if (isNull (ACE_controlledUAV select 0)) then {
             if (vehicle ACE_player == ACE_player) then {
                 if (diag_tickTime > GVAR(lastTimeSearchedActions) + 0.20) then {
                     // Once every 0.2 secs, collect nearby objects active and visible action points and render them
@@ -139,6 +136,10 @@ if (GVAR(openedMenuType) == 0) then {
                 // Render vehicle self actions when in vehicle
                 (vehicle ACE_player) call _fnc_renderSelfActions;
             };
+        } else {
+            // Render UAV self actions when in control of UAV AI
+            (ACE_controlledUAV select 0) call _fnc_renderSelfActions;
+
         };
     } else {
         // Render zeus actions when zeus open

diff --git a/addons/laser/XEH_postInit.sqf b/addons/laser/XEH_postInit.sqf
@@ -21,10 +21,10 @@ if (hasInterface) then {
         ["ACE_controlledUAV", {
             params ["_UAV", "_seatAI", "_turret", "_position"];
             TRACE_4("ACE_controlledUAV EH",_UAV,_seatAI,_turret,_position);
-            if (!isNull _seatAI) then {
-                [_seatAI] call FUNC(showVehicleHud);
-            } else {
+            if (isNull _seatAI) then {
                 [ace_player] call FUNC(showVehicleHud);
+            } else {
+                [_seatAI] call FUNC(showVehicleHud);
             };
         }] call CBA_fnc_addEventHandler;
     }] call CBA_fnc_addEventHandler;

diff --git a/addons/medical_engine/functions/fnc_handleDamage.sqf b/addons/medical_engine/functions/fnc_handleDamage.sqf
@@ -165,7 +165,11 @@ if (_context == 2) then {
     if (_environmentDamage) then {
         // Any collision with terrain/vehicle/object has a shooter
         // Check this first because burning can happen at any velocity
-        if !(isNull _shooter) then {
+        if (isNull _shooter) then {
+            // Anything else is almost guaranteed to be fire damage
+            _ammo = "fire";
+            TRACE_5("Fire Damage",_unit,_shooter,_instigator,_damage,_allDamages);
+        } else {
             /*
               If shooter != unit then they hit unit, otherwise it could be:
                - Unit hitting anything at speed
@@ -180,10 +184,6 @@ if (_context == 2) then {
                 _ammo = "collision";
                 TRACE_5("Collision",_unit,_shooter,_instigator,_damage,_allDamages);
             };
-        } else {
-            // Anything else is almost guaranteed to be fire damage
-            _ammo = "fire";
-            TRACE_5("Fire Damage",_unit,_shooter,_instigator,_damage,_allDamages);
         };
     };
 

diff --git a/addons/microdagr/functions/fnc_showApplicationPage.sqf b/addons/microdagr/functions/fnc_showApplicationPage.sqf
@@ -57,7 +57,7 @@ if (GVAR(currentApplicationPage) == APP_MODE_INFODISPLAY) then {
 (_display displayCtrl IDC_MAPDETAILS) ctrlShow ((GVAR(currentApplicationPage) == APP_MODE_MAP) && {GVAR(mapShowTexture)});
 
 if (GVAR(currentApplicationPage) == APP_MODE_MAP) then {
-    _theMap = if (!GVAR(mapShowTexture)) then {_display displayCtrl IDC_MAPPLAIN} else {_display displayCtrl IDC_MAPDETAILS};
+    _theMap = if (GVAR(mapShowTexture)) then {_display displayCtrl IDC_MAPDETAILS} else {_display displayCtrl IDC_MAPPLAIN};
     _mapSize = (ctrlPosition _theMap) select 3;
     _theMap ctrlMapAnimAdd [0, (GVAR(mapZoom) / _mapSize), GVAR(mapPosition)];
     ctrlMapAnimCommit _theMap;

diff --git a/addons/missileguidance/functions/fnc_checkLos.sqf b/addons/missileguidance/functions/fnc_checkLos.sqf
@@ -34,12 +34,12 @@ private _targetAimPos = aimPos _target;
 private _seekerPos = getPosASL _seeker;
 private _return = true;
 
-if (!((terrainIntersectASL [_seekerPos, _targetPos]) && {terrainIntersectASL [_seekerPos, _targetAimPos]})) then {
+if ((terrainIntersectASL [_seekerPos, _targetPos]) && {terrainIntersectASL [_seekerPos, _targetAimPos]}) then {
+    _return = false;
+} else {
     if (lineIntersects [_seekerPos, _targetPos, _seeker, _target]) then {
         _return = false;
     };
-} else {
-    _return = false;
 };
 
 _return
diff --git a/addons/missileguidance/functions/fnc_seekerType_SACLOS.sqf b/addons/missileguidance/functions/fnc_seekerType_SACLOS.sqf
@@ -25,7 +25,10 @@ _seekerStateParams params ["_memoryPointGunnerOptics", "_animationSourceBody", "
 private _shooterPos = AGLToASL (_shooter modelToWorldVisual (_shooter selectionPosition _memoryPointGunnerOptics));
 private _projPos = getPosASL _projectile;
 
-private _lookDirection = if !(_shooter isKindOf "CAManBase" || {_shooter isKindOf "StaticWeapon"}) then {
+private _lookDirection = if (_shooter isKindOf "CAManBase" || {_shooter isKindOf "StaticWeapon"}) then {
+    _shooterPos = eyePos _shooter;
+    _shooter weaponDirection _weapon
+} else {
     private _finalLookDirection = if (_usePilotCamera) then {
         _shooterPos = _shooter modelToWorldVisualWorld getPilotCameraPosition _shooter;
         private _trackingTarget = getPilotCameraTarget _shooter;
@@ -43,9 +46,6 @@ private _lookDirection = if !(_shooter isKindOf "CAManBase" || {_shooter isKindO
         _shooter vectorModelToWorldVisual ([1, _gBody, _gGun] call CBA_fnc_polar2vect);
     };
     _finalLookDirection
-} else {
-    _shooterPos = eyePos _shooter;
-    _shooter weaponDirection _weapon
 };
 
 private _distanceToProj = _shooterPos vectorDistance _projPos;

diff --git a/addons/nametags/functions/fnc_drawNameTagIcon.sqf b/addons/nametags/functions/fnc_drawNameTagIcon.sqf
@@ -44,11 +44,11 @@ _fnc_parameters = {
             private _targetFaction = _target getVariable [QGVAR(faction), faction _target];
             private _customRankIcons = GVAR(factionRanks) get _targetFaction;
 
-            if (!isNil "_customRankIcons") then {
-                _customRankIcons param [ALL_RANKS find rank _target, ""] // return
-            } else {
+            if (isNil "_customRankIcons") then {
                 // default rank icons
                 format ["\A3\Ui_f\data\GUI\Cfg\Ranks\%1_gs.paa", rank _target] // return
+            } else {
+                _customRankIcons param [ALL_RANKS find rank _target, ""] // return
             };
         };
     };

diff --git a/addons/nametags/functions/fnc_onDraw3d.sqf b/addons/nametags/functions/fnc_onDraw3d.sqf
@@ -44,10 +44,10 @@ if (_enabledTagsCursor) then {
     private _target = cursorTarget;
     if !(_target isKindOf "CAManBase") then {
         // When cursorTarget is on a vehicle show the nametag for the commander.
-        if !(_target in allUnitsUAV) then {
-            _target = effectiveCommander _target;
-        } else {
+        if (_target in allUnitsUAV) then {
             _target = objNull;
+        } else {
+            _target = effectiveCommander _target;
         };
     };
     if (isNull _target) exitWith {};

diff --git a/addons/quickmount/functions/fnc_addFreeSeatsActions.sqf b/addons/quickmount/functions/fnc_addFreeSeatsActions.sqf
@@ -202,15 +202,15 @@ private _cargoNumber = -1;
                 if (_vehicle lockedTurret _turretPath) then {breakTo "crewLoop"};
                 if (_role == "gunner" && {unitIsUAV _vehicle}) then {breakTo "crewLoop"};
                 private _turretConfig = [_vehicleConfig, _turretPath] call CBA_fnc_getTurret;
-                if (!_isInVehicle) then {
-                    _params = ["GetInTurret", _vehicle, _turretPath];
-                    _statement = {_player action (_this select 2)};
-                } else {
+                if (_isInVehicle) then {
                     private _gunnerCompartments = (_turretConfig >> "gunnerCompartments") call BIS_fnc_getCfgData;
                     TO_COMPARTMENT_STRING(_gunnerCompartments);
                     if (_compartment != _gunnerCompartments) then {breakTo "crewLoop"};
                     _params = [{MOVE_IN_CODE(moveInTurret)}, [_vehicle, _turretPath], _currentTurret, _moveBackCode, _moveBackParams];
                     _statement = _fnc_move;
+                } else {
+                    _params = ["GetInTurret", _vehicle, _turretPath];
+                    _statement = {_player action (_this select 2)};
                 };
                 _name = getText (_turretConfig >> "gunnerName");
                 _icon = switch true do {

diff --git a/addons/scopes/functions/fnc_calculateZeroAngleCorrection.sqf b/addons/scopes/functions/fnc_calculateZeroAngleCorrection.sqf
@@ -42,9 +42,7 @@ private _vanillaZero = parseNumber (("ace" callExtension ["ballistics:replicate_
     _vanillaZero = 0;
 #endif
 
-private _trueZero = if (!_advancedBallistics) then {
-    parseNumber (("ace" callExtension ["ballistics:zero_vanilla", [_newZeroRange, _initSpeed, _airFriction, _boreHeight]]) select 0)
-} else {
+private _trueZero = if (_advancedBallistics) then {
     // Get Weapon and Ammo Configurations
     private _AmmoCacheEntry = uiNamespace getVariable format[QEGVAR(advanced_ballistics,%1), _ammo];
     if (isNil "_AmmoCacheEntry") then {
@@ -81,6 +79,8 @@ private _trueZero = if (!_advancedBallistics) then {
             _atmosphereModel
         ]]) select 0
     )
+} else {
+    parseNumber (("ace" callExtension ["ballistics:zero_vanilla", [_newZeroRange, _initSpeed, _airFriction, _boreHeight]]) select 0)
 };
 
 private _zeroAngleCorrection = _trueZero - _vanillaZero;

diff --git a/addons/spectator/functions/fnc_cam_tick.sqf b/addons/spectator/functions/fnc_cam_tick.sqf
@@ -58,7 +58,9 @@ if (_cameraMode != MODE_FREE) then {
 _camTarget = GVAR(camFocus);
 
 // Focus get in / out of vehicle state
-if !(isNull _camTarget) then {
+if (isNull _camTarget) then {
+    GVAR(camTargetInVehicle) = false;
+} else {
     private _targetInVeh = GVAR(camTargetInVehicle);
 
     if (GVAR(camHasTarget)) then {
@@ -72,8 +74,6 @@ if !(isNull _camTarget) then {
             GVAR(camTargetInVehicle) = false;
         };
     };
-} else {
-    GVAR(camTargetInVehicle) = false;
 };
 
 // Camera lights

diff --git a/addons/vehicle_damage/functions/fnc_handleVehicleDamage.sqf b/addons/vehicle_damage/functions/fnc_handleVehicleDamage.sqf
@@ -75,14 +75,14 @@ if (isNil "_multHit") then {
         _ignoreHit = true;
     } else {
         // If the hitpoint isnt in the old array then that means that the time expired and a new array should be generated
-        if (!_hitPointInOldArray) then {
+        if (_hitPointInOldArray) then {
+            _vehicle setVariable [QGVAR(hitTime), [CBA_missionTime, _source, [_hitPoint]]];
+        } else {
             private _oldHitPoints = _multHit select 2;
             _oldHitPoints pushBack _hitPoint;
             _vehicle setVariable [QGVAR(hitTime), [CBA_missionTime, _source, _oldHitPoints]];
 
             _ignoreBailCheck = true;
-        } else {
-            _vehicle setVariable [QGVAR(hitTime), [CBA_missionTime, _source, [_hitPoint]]];
         };
     };
 };

diff --git a/addons/volume/XEH_postInitClient.sqf b/addons/volume/XEH_postInitClient.sqf
@@ -23,10 +23,10 @@ if (!hasInterface) exitWith {};
 
     if (!XGVAR(lowerInVehicles)) exitWith {};
 
-    if (!isNull objectParent _unit) then {
-        call FUNC(lowerVolume);
-    } else {
+    if (isNull objectParent _unit) then {
         call FUNC(restoreVolume);
+    } else {
+        call FUNC(lowerVolume);
     };
 }] call CBA_fnc_addPlayerEventHandler;