From 7bc6fdfa667b2168c7a79593df19a56eaaf8e68d Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sat, 30 Oct 2021 16:42:03 -0500 Subject: [PATCH] Cleanup - Trim all trailing whitespace (#8651) --- addons/advanced_ballistics/ACE_Settings.hpp | 2 +- addons/advanced_ballistics/RscTitles.hpp | 2 +- .../functions/fnc_diagnoseWeapons.sqf | 2 +- .../functions/script_component.hpp | 2 +- .../functions/fnc_handleStaminaBar.sqf | 2 +- addons/ai/functions/fnc_garrisonMove.sqf | 6 +- addons/aircraft/CfgMagazines.hpp | 4 +- .../functions/fnc_addRightPanelButton.sqf | 4 +- addons/arsenal/functions/fnc_buttonImport.sqf | 6 +- .../functions/fnc_fillLoadoutsList.sqf | 2 +- .../fnc_onSelChangedRightListnBox.sqf | 2 +- .../functions/fnc_statTextStatement_mass.sqf | 2 +- .../fnc_statTextStatement_scopeVisionMode.sqf | 2 +- addons/arsenal/functions/script_component.hpp | 2 +- addons/arsenal/ui/script_component.hpp | 2 +- addons/atragmx/functions/script_component.hpp | 2 +- addons/attach/functions/fnc_handleKilled.sqf | 2 +- addons/attach/functions/script_component.hpp | 2 +- .../backpacks/functions/script_component.hpp | 2 +- addons/ballistics/CfgAmmo.hpp | 2 +- .../ballistics/scripts/script_component.hpp | 2 +- .../captives/functions/script_component.hpp | 2 +- addons/cargo/functions/fnc_unloadItem.sqf | 2 +- addons/chemlights/CfgAmmo.hpp | 28 ++--- addons/chemlights/CfgLights.hpp | 2 +- addons/common/functions/fnc_cachedCall.sqf | 2 +- .../common/functions/fnc_getTurretIndex.sqf | 2 +- .../fnc_readSettingsFromParamsArray.sqf | 2 +- addons/common/scripts/script_component.hpp | 2 +- .../functions/script_component.hpp | 2 +- addons/cookoff/XEH_postInit.sqf | 2 +- .../cookoff/functions/fnc_cookOffEffect.sqf | 110 +++++++++--------- addons/cookoff/functions/fnc_smoke.sqf | 2 +- addons/csw/CfgMagazineGroups.hpp | 2 +- addons/csw/CfgMagazines.hpp | 2 +- addons/dagr/CfgEventHandlers.hpp | 2 +- addons/dagr/functions/script_component.hpp | 2 +- .../disarming/functions/script_component.hpp | 2 +- addons/dogtags/XEH_preInit.sqf | 2 +- addons/dragging/CfgMovesBasic.hpp | 4 +- .../dragging/functions/script_component.hpp | 2 +- addons/dragon/CfgAmmo.hpp | 2 +- addons/dragon/functions/script_component.hpp | 2 +- addons/fastroping/CfgSounds.hpp | 2 +- addons/fcs/functions/script_component.hpp | 2 +- addons/finger/functions/script_component.hpp | 2 +- addons/fire/CfgSounds.hpp | 2 +- addons/fire/RscTitles.hpp | 6 +- addons/fire/XEH_postInit.sqf | 2 +- addons/fire/functions/fnc_fireManagerPFH.sqf | 2 +- addons/flashlights/XEH_postInitClient.sqf | 2 +- addons/gforces/CfgWeapons.hpp | 2 +- addons/gforces/functions/script_component.hpp | 2 +- addons/grenades/functions/fnc_nextMode.sqf | 2 +- .../grenades/functions/script_component.hpp | 2 +- addons/hearing/functions/script_component.hpp | 2 +- addons/hellfire/CfgMagazines.hpp | 4 +- addons/hellfire/CfgWeapons.hpp | 2 +- .../hellfire/functions/fnc_setupVehicle.sqf | 4 +- .../functions/script_component.hpp | 2 +- addons/hot/CfgWeapons.hpp | 6 +- addons/huntir/CfgMagazineWells.hpp | 2 +- addons/huntir/functions/script_component.hpp | 2 +- .../functions/fnc_findActionNode.sqf | 2 +- .../functions/script_component.hpp | 2 +- addons/interaction/XEH_postInit.sqf | 2 +- .../functions/fnc_addPassengersActions.sqf | 2 +- .../functions/fnc_renameGroupUI.sqf | 4 +- .../functions/script_component.hpp | 2 +- addons/interaction/groupRename_GUI.hpp | 2 +- .../inventory/functions/script_component.hpp | 2 +- addons/javelin/RscInGameUI.hpp | 8 +- addons/javelin/functions/fnc_onOpticDraw.sqf | 6 +- addons/javelin/functions/script_component.hpp | 2 +- addons/kestrel4500/RscTitles.hpp | 2 +- addons/kestrel4500/XEH_postInit.sqf | 2 +- addons/kestrel4500/config.cpp | 2 +- addons/killtracker/XEH_postInit.sqf | 2 +- addons/laser/config.cpp | 2 +- addons/laser/functions/script_component.hpp | 2 +- .../functions/script_component.hpp | 2 +- addons/logistics_rope/CfgWeapons.hpp | 2 +- .../functions/script_component.hpp | 2 +- .../functions/script_component.hpp | 2 +- .../functions/script_component.hpp | 2 +- addons/map/CfgAmmo.hpp | 18 +-- addons/map/CfgMarkers.hpp | 2 +- addons/map/Effects.hpp | 2 +- addons/map/XEH_postInitServer.sqf | 2 +- addons/map/initSettings.sqf | 2 +- .../markers/functions/fnc_removeTimestamp.sqf | 4 +- addons/maverick/ACE_GuidanceConfig.hpp | 2 +- addons/maverick/CfgMagazines.hpp | 10 +- addons/maverick/CfgWeapons.hpp | 2 +- addons/medical/ACE_Settings.hpp | 2 +- addons/medical/functions/script_component.hpp | 2 +- addons/medical_damage/CfgAmmo.hpp | 2 +- .../functions/script_component.hpp | 2 +- .../functions/fnc_updateDamageEffects.sqf | 4 +- addons/medical_gui/initSettings.sqf | 2 +- .../functions/fnc_canTreat.sqf | 2 +- .../functions/script_component.hpp | 2 +- .../microdagr/functions/script_component.hpp | 2 +- addons/missileguidance/ACE_GuidanceConfig.hpp | 2 +- addons/missileguidance/XEH_pre_init.sqf | 2 +- .../functions/fnc_seekerType_ARH.sqf | 4 +- .../functions/script_component.hpp | 2 +- addons/missionmodules/CfgFactionClasses.hpp | 2 +- addons/missionmodules/CfgVehicles.hpp | 2 +- .../functions/script_component.hpp | 2 +- .../mk6mortar/functions/script_component.hpp | 2 +- .../movement/functions/script_component.hpp | 2 +- .../nametags/functions/fnc_getVehicleData.sqf | 4 +- addons/nightvision/RscTitles.hpp | 2 +- .../functions/script_component.hpp | 2 +- addons/nlaw/functions/fnc_keyDown.sqf | 2 +- addons/optics/functions/script_component.hpp | 2 +- .../functions/script_component.hpp | 2 +- .../functions/fnc_coolWeaponWithItem.sqf | 2 +- .../functions/fnc_updateAmmoTemperature.sqf | 2 +- .../functions/script_component.hpp | 2 +- .../functions/fnc_cacheOverPressureValues.sqf | 2 +- .../functions/script_component.hpp | 2 +- addons/pylons/XEH_postInit.sqf | 2 +- addons/rearm/functions/fnc_canStoreAmmo.sqf | 2 +- .../functions/fnc_getNeedRearmMagazines.sqf | 2 +- addons/rearm/functions/fnc_isSource.sqf | 2 +- addons/rearm/functions/fnc_makeSource.sqf | 2 +- addons/recoil/functions/script_component.hpp | 2 +- addons/reload/functions/script_component.hpp | 2 +- .../functions/script_component.hpp | 2 +- addons/repair/dev/draw_showRepairInfo.sqf | 2 +- .../functions/fnc_modifyInteraction.sqf | 2 +- addons/repair/functions/fnc_repair.sqf | 2 +- addons/respawn/functions/script_component.hpp | 2 +- .../safemode/functions/script_component.hpp | 2 +- addons/sandbag/functions/script_component.hpp | 2 +- addons/scopes/ACE_Settings.hpp | 8 +- addons/scopes/CfgWeapons.hpp | 38 +++--- addons/scopes/XEH_PREP.hpp | 2 +- addons/scopes/functions/fnc_firedEH.sqf | 2 +- addons/scopes/functions/fnc_getBaseAngle.sqf | 6 +- addons/scopes/functions/fnc_getBoreHeight.sqf | 6 +- .../spectator/functions/script_component.hpp | 2 +- .../functions/script_component.hpp | 2 +- .../functions/script_component.hpp | 2 +- addons/tagging/functions/script_component.hpp | 2 +- addons/towing/functions/fnc_attachRopePFH.sqf | 2 +- addons/towing/functions/script_component.hpp | 2 +- .../trenches/functions/script_component.hpp | 2 +- addons/trenches/initSettings.sqf | 24 ++-- addons/tripod/functions/script_component.hpp | 2 +- addons/vector/functions/script_component.hpp | 2 +- addons/vehicle_damage/CfgAmmo.hpp | 36 +++--- addons/vehicle_damage/CfgVehicles.hpp | 12 +- addons/vehicle_damage/XEH_postInit.sqf | 2 +- .../functions/fnc_addEventHandler.sqf | 8 +- .../fnc_calculatePenetrationInfo.sqf | 20 ++-- .../functions/fnc_handleCookoff.sqf | 4 +- .../functions/fnc_handleDamage.sqf | 6 +- .../functions/fnc_handleVehicleDamage.sqf | 2 +- .../functions/fnc_injureOccupants.sqf | 6 +- .../functions/fnc_processHit.sqf | 58 ++++----- .../functions/script_component.hpp | 2 +- addons/vehicles/CfgVehicles.hpp | 10 +- addons/vehicles/XEH_PREP.hpp | 2 +- .../functions/fnc_setVehicleStartDelay.sqf | 2 +- .../vehicles/functions/script_component.hpp | 2 +- addons/weaponselect/XEH_postInit.sqf | 2 +- .../functions/script_component.hpp | 2 +- addons/weather/functions/script_component.hpp | 2 +- .../yardage450/functions/script_component.hpp | 2 +- addons/zeus/functions/script_component.hpp | 2 +- optionals/compat_rh_m4/CfgAmmo.hpp | 4 +- optionals/compat_rhs_afrf3/CfgAmmo.hpp | 8 +- optionals/compat_rhs_afrf3/CfgVehicles.hpp | 14 +-- optionals/compat_rhs_afrf3/CfgWeapons.hpp | 4 +- optionals/compat_rhs_gref3/CfgAmmo.hpp | 4 +- optionals/compat_rhs_usf3/CfgAmmo.hpp | 24 ++-- optionals/compat_rhs_usf3/CfgVehicles.hpp | 18 +-- optionals/compat_sma3_iansky/CfgWeapons.hpp | 2 +- 181 files changed, 421 insertions(+), 421 deletions(-) diff --git a/addons/advanced_ballistics/ACE_Settings.hpp b/addons/advanced_ballistics/ACE_Settings.hpp index d90a4e748f..a34547249c 100644 --- a/addons/advanced_ballistics/ACE_Settings.hpp +++ b/addons/advanced_ballistics/ACE_Settings.hpp @@ -4,7 +4,7 @@ class ACE_Settings { }; class GVAR(muzzleVelocityVariationEnabled) { movedToSQF = 1; - }; + }; class GVAR(ammoTemperatureEnabled) { movedToSQF = 1; }; diff --git a/addons/advanced_ballistics/RscTitles.hpp b/addons/advanced_ballistics/RscTitles.hpp index 1e29db268b..8cf3b3b034 100644 --- a/addons/advanced_ballistics/RscTitles.hpp +++ b/addons/advanced_ballistics/RscTitles.hpp @@ -52,4 +52,4 @@ class RscTitles { }; }; }; -}; \ No newline at end of file +}; diff --git a/addons/advanced_ballistics/functions/fnc_diagnoseWeapons.sqf b/addons/advanced_ballistics/functions/fnc_diagnoseWeapons.sqf index d2f5cba98f..0bae282cc2 100644 --- a/addons/advanced_ballistics/functions/fnc_diagnoseWeapons.sqf +++ b/addons/advanced_ballistics/functions/fnc_diagnoseWeapons.sqf @@ -68,7 +68,7 @@ for "_i" from 0 to (count _cfgWeapons)-1 do { private _barrelVelocityShift = [_barrelLength, _muzzleVelocityTable, _barrelLengthTable, _vanillaInitialSpeed] call FUNC(calculateBarrelLengthVelocityShift); private _abInitialSpeed = _vanillaInitialSpeed + _barrelVelocityShift; // -------------------------------------------------- - + if (_weapon find "_base" == -1 && _weapon find "_Base" == -1) then { #ifdef DEBUG_INIT_SPEEDS _data pushBack [-_forEachIndex, _abInitialSpeed, _magazine, _weapon]; diff --git a/addons/advanced_ballistics/functions/script_component.hpp b/addons/advanced_ballistics/functions/script_component.hpp index 2c718bf9db..4790cc80be 100644 --- a/addons/advanced_ballistics/functions/script_component.hpp +++ b/addons/advanced_ballistics/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\advanced_ballistics\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\advanced_ballistics\script_component.hpp" diff --git a/addons/advanced_fatigue/functions/fnc_handleStaminaBar.sqf b/addons/advanced_fatigue/functions/fnc_handleStaminaBar.sqf index d73a6deb0d..0f4c5d0fa6 100644 --- a/addons/advanced_fatigue/functions/fnc_handleStaminaBar.sqf +++ b/addons/advanced_fatigue/functions/fnc_handleStaminaBar.sqf @@ -25,7 +25,7 @@ _posAndSize set [2, _stamina * GVAR(staminaBarWidth)]; _staminaBarContainer ctrlSetPosition _posAndSize; // - Opacity ------------------------------------------------------------------ -if (GVAR(fadeStaminaBar)) then { +if (GVAR(fadeStaminaBar)) then { if (_stamina >= 0.8) then { _staminaBarContainer ctrlSetFade (0.9 + 0.1 * (_stamina - 0.8) / 0.2); } else { diff --git a/addons/ai/functions/fnc_garrisonMove.sqf b/addons/ai/functions/fnc_garrisonMove.sqf index 6bba35fbc3..25296293a4 100644 --- a/addons/ai/functions/fnc_garrisonMove.sqf +++ b/addons/ai/functions/fnc_garrisonMove.sqf @@ -33,7 +33,7 @@ private _unitMoveListUnits = (_unitMoveList apply {_x select 0}); _x setVariable [QGVAR(garrisonMove_unitPosMemory), nil, true]; } foreach _unitMoveListUnits; -// Avoid duplicate PFHs +// Avoid duplicate PFHs if (isNil QGVAR(garrison_moveUnitPFH)) then { missionNameSpace setVariable [QGVAR(garrison_moveUnitPFH), true, true]; @@ -114,7 +114,7 @@ if (isNil QGVAR(garrison_moveUnitPFH)) then { (_unit getVariable [QGVAR(garrisonMove_unitPosMemory), [CBA_missionTime, [0,0,0]]]) params ["_unitPosTimer", "_unitOldPos"]; // AI may sometimes not be able to report unitReady, this is to avoid the PFH running forever - switch true do { + switch true do { case ((_unitPos distance _pos) < 1.5) : { call _fnc_attemptSuccessful; }; @@ -127,7 +127,7 @@ if (isNil QGVAR(garrison_moveUnitPFH)) then { default { _unit setVariable [QGVAR(garrisonMove_unitPosMemory), [CBA_missionTime, _unitPos]]; - }; + }; }; }; }; diff --git a/addons/aircraft/CfgMagazines.hpp b/addons/aircraft/CfgMagazines.hpp index d08a460bb8..e8ae200cd9 100644 --- a/addons/aircraft/CfgMagazines.hpp +++ b/addons/aircraft/CfgMagazines.hpp @@ -19,13 +19,13 @@ class CfgMagazines { displayName = CSTRING(GatlingDescriptionAP); displayNameShort = CSTRING(GatlingDescriptionShortAP); }; - + class ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM41: 1000Rnd_Gatling_30mm_Plane_CAS_01_F { ammo = "ACE_Gatling_30mm_Sub_CM41"; displayName = CSTRING(GatlingDescriptionCM41); displayNameShort = CSTRING(GatlingDescriptionShortCM41); }; - + class ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM51: 1000Rnd_Gatling_30mm_Plane_CAS_01_F { ammo = "ACE_Gatling_30mm_Sub_CM51"; displayName = CSTRING(GatlingDescriptionCM51); diff --git a/addons/arsenal/functions/fnc_addRightPanelButton.sqf b/addons/arsenal/functions/fnc_addRightPanelButton.sqf index b906c13c4f..e09aef4c9e 100644 --- a/addons/arsenal/functions/fnc_addRightPanelButton.sqf +++ b/addons/arsenal/functions/fnc_addRightPanelButton.sqf @@ -42,12 +42,12 @@ if (_position >= 0 && _position <= 9) then { private _cfgWeapons = configFile >> "CfgWeapons"; _items = _items select { private _configItemInfo = _cfgWeapons >> _x >> "ItemInfo"; - + _x isKindOf ["CBA_MiscItem", _cfgWeapons] && {getNumber (_configItemInfo >> "type") in [TYPE_MUZZLE, TYPE_OPTICS, TYPE_FLASHLIGHT, TYPE_BIPOD]} || {getNumber (_configItemInfo >> "type") in [TYPE_FIRST_AID_KIT, TYPE_MEDIKIT, TYPE_TOOLKIT]} || {getText (_cfgWeapons >> _x >> "simulation") == "ItemMineDetector"} }; - + _return = _position; GVAR(customRightPanelButtons) set [_position, [_items apply {toLower _x}, _picture, _tooltip]]; }; diff --git a/addons/arsenal/functions/fnc_buttonImport.sqf b/addons/arsenal/functions/fnc_buttonImport.sqf index 3eefba41a4..4a06f3edeb 100644 --- a/addons/arsenal/functions/fnc_buttonImport.sqf +++ b/addons/arsenal/functions/fnc_buttonImport.sqf @@ -25,10 +25,10 @@ if (GVAR(shiftState) && {is3DEN}) then { { if ( - count _x == 2 && - {_x select 0 isEqualType ""} && + count _x == 2 && + {_x select 0 isEqualType ""} && {_x select 0 != ""} && - {_x select 1 isEqualType []} && + {_x select 1 isEqualType []} && {count (_x select 1) == 10} ) then { _x call FUNC(addDefaultLoadout); diff --git a/addons/arsenal/functions/fnc_fillLoadoutsList.sqf b/addons/arsenal/functions/fnc_fillLoadoutsList.sqf index 433f0304df..7cdec585e7 100644 --- a/addons/arsenal/functions/fnc_fillLoadoutsList.sqf +++ b/addons/arsenal/functions/fnc_fillLoadoutsList.sqf @@ -38,7 +38,7 @@ if (GVAR(currentLoadoutsTab) != IDC_buttonSharedLoadouts) then { { _x params ["_loadoutName", "_loadoutData"]; - private _loadoutCachedInfo = _contentPanelCtrl getVariable (_loadoutName + str GVAR(currentLoadoutsTab)); + private _loadoutCachedInfo = _contentPanelCtrl getVariable (_loadoutName + str GVAR(currentLoadoutsTab)); if (isNil "_loadoutCachedInfo") then { [_loadoutData] call FUNC(verifyLoadout) diff --git a/addons/arsenal/functions/fnc_onSelChangedRightListnBox.sqf b/addons/arsenal/functions/fnc_onSelChangedRightListnBox.sqf index c2b14c6462..0c535c8d37 100644 --- a/addons/arsenal/functions/fnc_onSelChangedRightListnBox.sqf +++ b/addons/arsenal/functions/fnc_onSelChangedRightListnBox.sqf @@ -45,7 +45,7 @@ private _fnc_selectRight = { if (GVAR(currentLeftPanel) in [IDC_buttonUniform, IDC_buttonVest, IDC_buttonBackpack]) then { [ - _item, + _item, ["CfgWeapons", "CfgMagazines"] select (GVAR(currentRightPanel) in [IDC_buttonMag, IDC_buttonMagALL, IDC_buttonThrow, IDC_buttonPut]) ] call _fnc_selectRight; }; diff --git a/addons/arsenal/functions/fnc_statTextStatement_mass.sqf b/addons/arsenal/functions/fnc_statTextStatement_mass.sqf index 9c2a0501a6..187c5b74c2 100644 --- a/addons/arsenal/functions/fnc_statTextStatement_mass.sqf +++ b/addons/arsenal/functions/fnc_statTextStatement_mass.sqf @@ -8,7 +8,7 @@ * 1: item config path (CONFIG) * * Return Value: - * String to display + * String to display * * Public: No */ diff --git a/addons/arsenal/functions/fnc_statTextStatement_scopeVisionMode.sqf b/addons/arsenal/functions/fnc_statTextStatement_scopeVisionMode.sqf index f5a29f1996..9d6350e2b6 100644 --- a/addons/arsenal/functions/fnc_statTextStatement_scopeVisionMode.sqf +++ b/addons/arsenal/functions/fnc_statTextStatement_scopeVisionMode.sqf @@ -20,7 +20,7 @@ private _opticsModes = ("true" configClasses (_config >> "ItemInfo" >> "OpticsMo private _visionMode = getArray (_x >> "visionMode"); [ getNumber (_x >> "useModelOptics") == 1, //is in optics - _visionMode isEqualTo [], //optional NVG + _visionMode isEqualTo [], //optional NVG "NVG" in _visionMode, //Integrated NVG "Ti" in _visionMode //Integrated Thermal ] diff --git a/addons/arsenal/functions/script_component.hpp b/addons/arsenal/functions/script_component.hpp index 523addf768..45c75ef68b 100644 --- a/addons/arsenal/functions/script_component.hpp +++ b/addons/arsenal/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\arsenal\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\arsenal\script_component.hpp" diff --git a/addons/arsenal/ui/script_component.hpp b/addons/arsenal/ui/script_component.hpp index 523addf768..45c75ef68b 100644 --- a/addons/arsenal/ui/script_component.hpp +++ b/addons/arsenal/ui/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\arsenal\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\arsenal\script_component.hpp" diff --git a/addons/atragmx/functions/script_component.hpp b/addons/atragmx/functions/script_component.hpp index 6e49f39695..7178dcf6f2 100644 --- a/addons/atragmx/functions/script_component.hpp +++ b/addons/atragmx/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\atragmx\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\atragmx\script_component.hpp" diff --git a/addons/attach/functions/fnc_handleKilled.sqf b/addons/attach/functions/fnc_handleKilled.sqf index 0aaf0b03cb..fb62cc90d6 100644 --- a/addons/attach/functions/fnc_handleKilled.sqf +++ b/addons/attach/functions/fnc_handleKilled.sqf @@ -1,7 +1,7 @@ #include "script_component.hpp" /* * Author: PabstMirror - * Handles when vehicle or man is killed. + * Handles when vehicle or man is killed. * Note: Runs where unit is local. * * Arguments: diff --git a/addons/attach/functions/script_component.hpp b/addons/attach/functions/script_component.hpp index b28de85182..cbc2a0f3b9 100644 --- a/addons/attach/functions/script_component.hpp +++ b/addons/attach/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\attach\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\attach\script_component.hpp" diff --git a/addons/backpacks/functions/script_component.hpp b/addons/backpacks/functions/script_component.hpp index b6bb78fff5..747400a571 100644 --- a/addons/backpacks/functions/script_component.hpp +++ b/addons/backpacks/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\backpacks\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\backpacks\script_component.hpp" diff --git a/addons/ballistics/CfgAmmo.hpp b/addons/ballistics/CfgAmmo.hpp index 0c7a1348a0..55354f088e 100644 --- a/addons/ballistics/CfgAmmo.hpp +++ b/addons/ballistics/CfgAmmo.hpp @@ -280,7 +280,7 @@ class CfgAmmo { class B_762x51_Ball: BulletBase { airFriction=-0.00103711; tracerScale = 1.2; //0.6; - tracerStartTime=0.073; // Based on the British L5A1 which burns out to 1000m + tracerStartTime=0.073; // Based on the British L5A1 which burns out to 1000m tracerEndTime=2.15957; // Time in seconds calculated with ballistics calculator ACE_caliber=7.823; ACE_bulletLength=28.956; diff --git a/addons/ballistics/scripts/script_component.hpp b/addons/ballistics/scripts/script_component.hpp index 998ced0210..a257e3d384 100644 --- a/addons/ballistics/scripts/script_component.hpp +++ b/addons/ballistics/scripts/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\ballistics\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\ballistics\script_component.hpp" diff --git a/addons/captives/functions/script_component.hpp b/addons/captives/functions/script_component.hpp index e91d5c843b..7d50228a46 100644 --- a/addons/captives/functions/script_component.hpp +++ b/addons/captives/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\captives\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\captives\script_component.hpp" diff --git a/addons/cargo/functions/fnc_unloadItem.sqf b/addons/cargo/functions/fnc_unloadItem.sqf index 94d94276ff..791141c535 100644 --- a/addons/cargo/functions/fnc_unloadItem.sqf +++ b/addons/cargo/functions/fnc_unloadItem.sqf @@ -56,7 +56,7 @@ if (_object isEqualType objNull) then { } else { _object = createVehicle [_item, _emptyPosAGL, [], 0, "NONE"]; _object setPosASL (AGLtoASL _emptyPosAGL); - + [QEGVAR(common,fixCollision), _object] call CBA_fnc_localEvent; [QEGVAR(common,fixPosition), _object] call CBA_fnc_localEvent; }; diff --git a/addons/chemlights/CfgAmmo.hpp b/addons/chemlights/CfgAmmo.hpp index 696c39e724..8c2b9a43ae 100644 --- a/addons/chemlights/CfgAmmo.hpp +++ b/addons/chemlights/CfgAmmo.hpp @@ -2,57 +2,57 @@ class CfgAmmo { class Chemlight_base; - + class Chemlight_Blue: Chemlight_base { timeToLive = 28800; // 8h as per cyalume website }; - + class Chemlight_Red: Chemlight_base { timeToLive = 43200; // 12h as per cyalume website }; - + class Chemlight_Green: Chemlight_base { timeToLive = 43200; }; - + class Chemlight_Yellow: Chemlight_base { timeToLive = 43200; }; - + class ACE_G_Chemlight_Orange: Chemlight_base { timeToLive = 43200; effectsSmoke = "ACE_ChemlightEffect_Orange"; model = "\A3\Weapons_f\chemlight\chemlight_yellow_lit"; }; - + class ACE_G_Chemlight_Orange_Infinite: ACE_G_Chemlight_Orange { timeToLive = 1e10; }; - + class ACE_G_Chemlight_White: Chemlight_base { timeToLive = 28800; effectsSmoke = "ACE_ChemlightEffect_White"; model = "\A3\Weapons_f\chemlight\chemlight_yellow_lit"; }; - + class ACE_G_Chemlight_White_Infinite: ACE_G_Chemlight_White { timeToLive = 1e10; }; - - class ACE_G_Chemlight_HiRed: Chemlight_Red { + + class ACE_G_Chemlight_HiRed: Chemlight_Red { effectsSmoke = "ACE_ChemlightEffect_HiRed"; timeToLive = 1800; }; - + class ACE_G_Chemlight_HiRed_Infinite: ACE_G_Chemlight_HiRed { timeToLive = 1e10; }; - + class ACE_G_Chemlight_HiYellow: Chemlight_Yellow { effectsSmoke = "ACE_ChemlightEffect_HiYellow"; timeToLive = 1800; }; - + class ACE_G_Chemlight_HiYellow_Infinite: ACE_G_Chemlight_HiYellow { timeToLive = 1e10; }; @@ -88,7 +88,7 @@ class CfgAmmo { effectsSmoke = "ACE_ChemlightEffect_UltraHiOrange"; timeToLive = 300; }; - + class ACE_G_Chemlight_UltraHiOrange_Infinite: ACE_G_Chemlight_UltraHiOrange { timeToLive = 1e10; }; diff --git a/addons/chemlights/CfgLights.hpp b/addons/chemlights/CfgLights.hpp index 1b9d445f30..005cc26460 100644 --- a/addons/chemlights/CfgLights.hpp +++ b/addons/chemlights/CfgLights.hpp @@ -99,7 +99,7 @@ class CfgLights { class ACE_ChemlightLight_UltraHiOrange: ACE_ChemlightLight_Orange { intensity = 12000; - + ULTRA_HI_ATTENUATION }; diff --git a/addons/common/functions/fnc_cachedCall.sqf b/addons/common/functions/fnc_cachedCall.sqf index 728303d6cd..0e2dd4b83e 100644 --- a/addons/common/functions/fnc_cachedCall.sqf +++ b/addons/common/functions/fnc_cachedCall.sqf @@ -40,7 +40,7 @@ if ((_namespace getVariable [_uid, [-99999]]) select 0 < diag_tickTime) then { INFO_1("Clear cached variables on event: %1",_eventName); #endif // Get the list of caches to clear - //IGNORE_PRIVATE_WARNING ["_eventName"]; + //IGNORE_PRIVATE_WARNING ["_eventName"]; // _eventName is defined on the function that calls the event private _varName = format [QGVAR(clearCache_%1), _eventName]; private _cacheList = missionNamespace getVariable [_varName, []]; diff --git a/addons/common/functions/fnc_getTurretIndex.sqf b/addons/common/functions/fnc_getTurretIndex.sqf index 423f2e6289..f114cdb4a7 100644 --- a/addons/common/functions/fnc_getTurretIndex.sqf +++ b/addons/common/functions/fnc_getTurretIndex.sqf @@ -20,7 +20,7 @@ params [["_unit", objNull, [objNull]]]; private _vehicle = vehicle _unit; if (_unit == _vehicle) exitWith {[]}; -scopeName "main"; +scopeName "main"; { if (_unit == (_vehicle turretUnit _x)) then {_x breakOut "main"}; diff --git a/addons/common/functions/fnc_readSettingsFromParamsArray.sqf b/addons/common/functions/fnc_readSettingsFromParamsArray.sqf index e205fb15bf..e3690ab0d3 100644 --- a/addons/common/functions/fnc_readSettingsFromParamsArray.sqf +++ b/addons/common/functions/fnc_readSettingsFromParamsArray.sqf @@ -47,7 +47,7 @@ TRACE_1("Reading missionConfigFile params",_paramsArray); case (_settingType == "CHECKBOX"): { _settingValue = _settingValue > 0; _validValue = [_settingName, _settingValue] call CBA_settings_fnc_check; - }; + }; // Will not Handle ARRAY,COLOR,STRING??? (bool/scalar covers most important settings) }; diff --git a/addons/common/scripts/script_component.hpp b/addons/common/scripts/script_component.hpp index 23da62b05c..6a1bf9154d 100644 --- a/addons/common/scripts/script_component.hpp +++ b/addons/common/scripts/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\common\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\common\script_component.hpp" diff --git a/addons/concertina_wire/functions/script_component.hpp b/addons/concertina_wire/functions/script_component.hpp index 5ec20093ef..4df0fa4c49 100644 --- a/addons/concertina_wire/functions/script_component.hpp +++ b/addons/concertina_wire/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\concertina_wire\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\concertina_wire\script_component.hpp" diff --git a/addons/cookoff/XEH_postInit.sqf b/addons/cookoff/XEH_postInit.sqf index 889e252d90..f143273d04 100644 --- a/addons/cookoff/XEH_postInit.sqf +++ b/addons/cookoff/XEH_postInit.sqf @@ -13,7 +13,7 @@ [QGVAR(cleanupEffects), { params ["_vehicle", ["_effects", []]]; - + _effects = _effects + (_vehicle getVariable [QGVAR(effects), []]); if !(_effects isEqualTo []) then { { deleteVehicle _x } count _effects; diff --git a/addons/cookoff/functions/fnc_cookOffEffect.sqf b/addons/cookoff/functions/fnc_cookOffEffect.sqf index 4c32c8713d..96db943592 100644 --- a/addons/cookoff/functions/fnc_cookOffEffect.sqf +++ b/addons/cookoff/functions/fnc_cookOffEffect.sqf @@ -33,7 +33,7 @@ if (isServer) then { // I dont think there is an alternative that takes into effect distance and whatever, but if you find one please fix! private _soundName = selectRandomWeighted [QGVAR(Sound_low), 0.1, QGVAR(Sound_mid), 0.25, QGVAR(Sound_high), 0.65]; _sound = createSoundSource [_soundName, position _obj, [], 0]; - + if (_ring) then { private _intensity = 6; private _radius = 1.5 * ((boundingBoxReal _obj) select 2); @@ -53,30 +53,30 @@ if (isServer) then { }; private _factor = (1 + (_elapsedTime / 2) min 2); private _flameSize = 1.5; - + if (_elapsedTime > (_time * (3 / 4))) then { _factor = _factor * linearConversion [_time * (3 / 4), _time, _elapsedTime, 1, 0.5]; }; - + _light setLightBrightness 5 * (_factor / 5); - + if (_jet) then { private _particlePosition = (_obj selectionPosition _fireSelection) vectorAdd [-0.1 + random 0.2, -0.1 + random 0.2, 0]; - + drop [ ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 2, 32], "", "Billboard", 1, - (0.1 + (random 0.2)) * _factor, + (0.1 + (random 0.2)) * _factor, _particlePosition, - [0, 0, 15 * (_factor / 2)], + [0, 0, 15 * (_factor / 2)], 0, 10, 7.9, - 0.075, - [1.25 * _factor, 2.5 * _factor], - [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], + 0.075, + [1.25 * _factor, 2.5 * _factor], + [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], [2 + random 1], 1, 0, @@ -84,102 +84,102 @@ if (isServer) then { "", _obj ]; - + // make flame push object into ground to make effect seem more "alive" if (!isGamePaused && { local _obj }) then { private _force = [0, 0, _factor * -(0.5 min random 1.5) * (0.3 min random 1)] vectorMultiply getMass _obj; _obj addForce [_force, vectorUpVisual _obj]; }; }; - + if (_ring) then { private _ringOrigin = (_obj selectionPosition _fireSelection) vectorAdd [-0.1 + random 0.2, -0.1 + random 0.2, -1]; drop [ ["\A3\data_f\ParticleEffects\Universal\Universal",16,2,32], - "", "Billboard", 1, (0.1 + (random 0.2)) * _factor, + "", "Billboard", 1, (0.1 + (random 0.2)) * _factor, _ringOrigin, - [0, 20 * (_factor / 2), 0], - 0, 10, 7.9, 0.075, - [1.25 * _factor, _flameSize * _factor], - [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], + [0, 20 * (_factor / 2), 0], + 0, 10, 7.9, 0.075, + [1.25 * _factor, _flameSize * _factor], + [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], [2 + random 1], 1, 0, "", "", _obj ]; drop [ ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 2, 32], - "", "Billboard", 1, (0.1 + (random 0.2)) * _factor, + "", "Billboard", 1, (0.1 + (random 0.2)) * _factor, _ringOrigin, - [0, -20 * (_factor / 2), 0], - 0, 10, 7.9, 0.075, - [1.25 * _factor, _flameSize * _factor], - [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], + [0, -20 * (_factor / 2), 0], + 0, 10, 7.9, 0.075, + [1.25 * _factor, _flameSize * _factor], + [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], [2 + random 1], 1, 0, "", "", _obj ]; drop [ ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 2, 32], - "", "Billboard", 1, (0.1 + (random 0.2)) * _factor, + "", "Billboard", 1, (0.1 + (random 0.2)) * _factor, _ringOrigin, - [20 * (_factor / 2), 0, 0], - 0, 10, 7.9, 0.075, - [1.25 * _factor, _flameSize * _factor], - [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], + [20 * (_factor / 2), 0, 0], + 0, 10, 7.9, 0.075, + [1.25 * _factor, _flameSize * _factor], + [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], [2 + random 1], 1, 0, "", "", _obj ]; drop [ ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 2, 32], - "", "Billboard", 1, (0.1 + (random 0.2)) * _factor, + "", "Billboard", 1, (0.1 + (random 0.2)) * _factor, [-0.1 + random 0.2, -0.1 + random 0.2, -1], - [-20 * (_factor / 2), 0, 0], - 0, 10, 7.9, 0.075, - [1.25 * _factor, _flameSize * _factor], - [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], + [-20 * (_factor / 2), 0, 0], + 0, 10, 7.9, 0.075, + [1.25 * _factor, _flameSize * _factor], + [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], [2 + random 1], 1, 0, "", "", _obj ]; private _dir = 20 * (_factor / 2); drop [ ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 2, 32], - "", "Billboard", 1, (0.1 + (random 0.2)) * _factor, + "", "Billboard", 1, (0.1 + (random 0.2)) * _factor, _ringOrigin, - [_dir, _dir, 0], - 0, 10, 7.9, 0.075, - [1.25 * _factor, _flameSize * _factor], - [[1, 1, 1, -2],[1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], + [_dir, _dir, 0], + 0, 10, 7.9, 0.075, + [1.25 * _factor, _flameSize * _factor], + [[1, 1, 1, -2],[1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], [2 + random 1], 1, 0, "", "", _obj ]; - + _dir = -20 * (_factor / 2); drop [ ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 2, 32], - "", "Billboard", 1, (0.1 + (random 0.2)) * _factor, + "", "Billboard", 1, (0.1 + (random 0.2)) * _factor, _ringOrigin, - [_dir, _dir, 0], - 0, 10, 7.9, 0.075, - [1.25 * _factor, _flameSize * _factor], - [[1, 1, 1, -2],[1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], + [_dir, _dir, 0], + 0, 10, 7.9, 0.075, + [1.25 * _factor, _flameSize * _factor], + [[1, 1, 1, -2],[1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], [2 + random 1], 1, 0, "", "", _obj ]; - + _dir = 20 * (_factor / 2); drop [ ["\A3\data_f\ParticleEffects\Universal\Universal",16,2,32], - "", "Billboard", 1, (0.1 + (random 0.2)) * _factor, + "", "Billboard", 1, (0.1 + (random 0.2)) * _factor, _ringOrigin, - [_dir, -_dir, 0], - 0, 10, 7.9, 0.075, - [1.25 * _factor, _flameSize * _factor], - [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], + [_dir, -_dir, 0], + 0, 10, 7.9, 0.075, + [1.25 * _factor, _flameSize * _factor], + [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], [2 + random 1], 1, 0, "", "", _obj ]; - + _dir = 20 * (_factor / 2); drop [ ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 2, 32], - "", "Billboard", 1, (0.1 + (random 0.2)) * _factor, + "", "Billboard", 1, (0.1 + (random 0.2)) * _factor, _ringOrigin, - [-_dir, _dir, 0], - 0, 10, 7.9, 0.075, - [1.25 * _factor, _flameSize * _factor], - [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], + [-_dir, _dir, 0], + 0, 10, 7.9, 0.075, + [1.25 * _factor, _flameSize * _factor], + [[1, 1, 1, -2], [1, 1, 1, -2], [1, 1, 1, -1], [1, 1, 1, -0]], [2 + random 1], 1, 0, "", "", _obj ]; }; diff --git a/addons/cookoff/functions/fnc_smoke.sqf b/addons/cookoff/functions/fnc_smoke.sqf index 93a9b9a0cb..de9e4c5d37 100644 --- a/addons/cookoff/functions/fnc_smoke.sqf +++ b/addons/cookoff/functions/fnc_smoke.sqf @@ -17,7 +17,7 @@ */ params ["_vehicle", ["_positions", []]]; - + private _turretConfig = [_vehicle, [0]] call CBA_fnc_getTurret; private _positionBarrelEnd = getText (_turretConfig >> "gunBeg"); diff --git a/addons/csw/CfgMagazineGroups.hpp b/addons/csw/CfgMagazineGroups.hpp index 2093253d04..b3995210a2 100644 --- a/addons/csw/CfgMagazineGroups.hpp +++ b/addons/csw/CfgMagazineGroups.hpp @@ -74,7 +74,7 @@ class GVAR(groups) { ACE_1Rnd_82mm_Mo_HE_LaserGuided = 1; 8Rnd_82mm_Mo_LG = 1; }; - + // A3 Titans (Spike) - just use handheld magazines class Titan_AT { 1Rnd_GAT_missiles = 1; diff --git a/addons/csw/CfgMagazines.hpp b/addons/csw/CfgMagazines.hpp index dc972a5a92..86ad73c58f 100644 --- a/addons/csw/CfgMagazines.hpp +++ b/addons/csw/CfgMagazines.hpp @@ -53,7 +53,7 @@ class CfgMagazines { mass = 50; ACE_isBelt = 1; }; - + class 40Rnd_20mm_G_belt; class GVAR(20Rnd_20mm_G_belt): 40Rnd_20mm_G_belt { author = ECSTRING(common,ACETeam); diff --git a/addons/dagr/CfgEventHandlers.hpp b/addons/dagr/CfgEventHandlers.hpp index 0612f3abed..851e58197c 100644 --- a/addons/dagr/CfgEventHandlers.hpp +++ b/addons/dagr/CfgEventHandlers.hpp @@ -15,4 +15,4 @@ class Extended_PostInit_EventHandlers { class ADDON { init = QUOTE(call COMPILE_SCRIPT(XEH_postInit)); }; -}; \ No newline at end of file +}; diff --git a/addons/dagr/functions/script_component.hpp b/addons/dagr/functions/script_component.hpp index 18b02deaee..1aea0f5c56 100644 --- a/addons/dagr/functions/script_component.hpp +++ b/addons/dagr/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\dagr\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\dagr\script_component.hpp" diff --git a/addons/disarming/functions/script_component.hpp b/addons/disarming/functions/script_component.hpp index 38e082ee0e..2bcfb4d9e4 100644 --- a/addons/disarming/functions/script_component.hpp +++ b/addons/disarming/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\disarming\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\disarming\script_component.hpp" diff --git a/addons/dogtags/XEH_preInit.sqf b/addons/dogtags/XEH_preInit.sqf index a7a080b91e..5ad43b0229 100644 --- a/addons/dogtags/XEH_preInit.sqf +++ b/addons/dogtags/XEH_preInit.sqf @@ -7,5 +7,5 @@ PREP_RECOMPILE_START; PREP_RECOMPILE_END; GVAR(disabledFactions) = [] call CBA_fnc_createNamespace; - + ADDON = true; diff --git a/addons/dragging/CfgMovesBasic.hpp b/addons/dragging/CfgMovesBasic.hpp index 6b55e82c2d..e6420915ea 100644 --- a/addons/dragging/CfgMovesBasic.hpp +++ b/addons/dragging/CfgMovesBasic.hpp @@ -3,13 +3,13 @@ class CfgMovesBasic { ACE_dragWithPistol = "ace_dragging"; ACE_dragWithRifle = "AmovPercMstpSlowWrflDnon_AcinPknlMwlkSlowWrflDb_2"; }; - + class Actions { class MoveWithInjuredManDragger; class MoveWithInjuredManDraggerRfl: MoveWithInjuredManDragger { Up = "amovpercmstpsraswrfldnon"; }; - + class MoveWithInjuredManDraggerPst; class ACE_MoveWithInjuredManDraggerPst: MoveWithInjuredManDraggerPst { Default = "ace_dragging_static"; diff --git a/addons/dragging/functions/script_component.hpp b/addons/dragging/functions/script_component.hpp index 9d257a69d3..f77cfe8b3c 100644 --- a/addons/dragging/functions/script_component.hpp +++ b/addons/dragging/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\dragging\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\dragging\script_component.hpp" diff --git a/addons/dragon/CfgAmmo.hpp b/addons/dragon/CfgAmmo.hpp index 09858b4fff..f736e8451b 100644 --- a/addons/dragon/CfgAmmo.hpp +++ b/addons/dragon/CfgAmmo.hpp @@ -34,7 +34,7 @@ class CfgAmmo { cost = 500; simulationStep = 0.005; maxControlRange = 1500; - + EGVAR(vehicle_damage,incendiary) = 1.0; class ace_missileguidance { diff --git a/addons/dragon/functions/script_component.hpp b/addons/dragon/functions/script_component.hpp index 386679ecf6..1590d769e8 100644 --- a/addons/dragon/functions/script_component.hpp +++ b/addons/dragon/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\dragon\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\dragon\script_component.hpp" diff --git a/addons/fastroping/CfgSounds.hpp b/addons/fastroping/CfgSounds.hpp index 97479ecafb..a93c4ba032 100644 --- a/addons/fastroping/CfgSounds.hpp +++ b/addons/fastroping/CfgSounds.hpp @@ -9,4 +9,4 @@ class CfgSounds { sound[] = {QUOTE(PATHTOF(data\sounds\fastroping_thud.ogg)), 10, 1.0}; titles[] = {}; }; -}; \ No newline at end of file +}; diff --git a/addons/fcs/functions/script_component.hpp b/addons/fcs/functions/script_component.hpp index 179c66c15e..161e764a9a 100644 --- a/addons/fcs/functions/script_component.hpp +++ b/addons/fcs/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\fcs\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\fcs\script_component.hpp" diff --git a/addons/finger/functions/script_component.hpp b/addons/finger/functions/script_component.hpp index 4d3625f072..b16e0f3c01 100644 --- a/addons/finger/functions/script_component.hpp +++ b/addons/finger/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\finger\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\finger\script_component.hpp" diff --git a/addons/fire/CfgSounds.hpp b/addons/fire/CfgSounds.hpp index c4b821144a..fd4899eaca 100644 --- a/addons/fire/CfgSounds.hpp +++ b/addons/fire/CfgSounds.hpp @@ -6,7 +6,7 @@ class GVAR(DOUBLES(scream,no)) { \ sound[] = {QUOTE(PATHTOF(CONCAT(sounds\scream,no).ogg)), db + 8, 1};\ titles[] = {}; \ } - + class CfgSounds { CREATE_SCREAM(1); CREATE_SCREAM(2); diff --git a/addons/fire/RscTitles.hpp b/addons/fire/RscTitles.hpp index 3ccb8c349f..e50715d94a 100644 --- a/addons/fire/RscTitles.hpp +++ b/addons/fire/RscTitles.hpp @@ -8,7 +8,7 @@ class RscTitles { fadeout = 0.75; name = QGVAR(onFire1); onload = QUOTE(with uiNamespace do {GVAR(onFireIndicator1) = _this select 0}); - + class controls { class GVAR(indicator): RscPicture { idc = -1; @@ -26,12 +26,12 @@ class RscTitles { }; }; }; - + class GVAR(onFire2): GVAR(onFire1) { idd = -1; name = QGVAR(onFire2); onload = QUOTE(with uiNamespace do {GVAR(onFireIndicator2) = _this select 0}); - + class controls: controls { class GVAR(indicator): GVAR(indicator) { text = PATHTOF(data\overlay_burn_2.paa); diff --git a/addons/fire/XEH_postInit.sqf b/addons/fire/XEH_postInit.sqf index f89a062eff..abda6c6578 100644 --- a/addons/fire/XEH_postInit.sqf +++ b/addons/fire/XEH_postInit.sqf @@ -22,7 +22,7 @@ [GVAR(fireSources), _key, [_fireLogic, _radius, _intensity, _condition, _conditionArgs]] call CBA_fnc_hashSet; }] call CBA_fnc_addEventHandler; - + [QGVAR(removeFireSource), { params ["_key"]; [GVAR(fireSources), _key] call CBA_fnc_hashRem; diff --git a/addons/fire/functions/fnc_fireManagerPFH.sqf b/addons/fire/functions/fnc_fireManagerPFH.sqf index 8f75091190..f52d5f31d5 100644 --- a/addons/fire/functions/fnc_fireManagerPFH.sqf +++ b/addons/fire/functions/fnc_fireManagerPFH.sqf @@ -31,7 +31,7 @@ params ["_args", "_handle"]; if !(_attachedObject isEqualTo objNull) then { _sourcePos = getPosATL _attachedObject; }; - + private _nearEntities = _sourcePos nearEntities ["Man", _radius]; { private _burning = [_x] call FUNC(isBurning); diff --git a/addons/flashlights/XEH_postInitClient.sqf b/addons/flashlights/XEH_postInitClient.sqf index 53e7d041a8..15cd1372b4 100644 --- a/addons/flashlights/XEH_postInitClient.sqf +++ b/addons/flashlights/XEH_postInitClient.sqf @@ -5,4 +5,4 @@ if (!hasInterface) exitWith {}; LOG(MSG_INIT); -//todo: make flashlights attachable to players \ No newline at end of file +//todo: make flashlights attachable to players diff --git a/addons/gforces/CfgWeapons.hpp b/addons/gforces/CfgWeapons.hpp index 94dbc71c0e..35b0ec9792 100644 --- a/addons/gforces/CfgWeapons.hpp +++ b/addons/gforces/CfgWeapons.hpp @@ -22,4 +22,4 @@ class CfgWeapons { class U_I_E_Uniform_01_coveralls_F: Uniform_Base { ACE_GForceCoef = 0.8; }; -}; \ No newline at end of file +}; diff --git a/addons/gforces/functions/script_component.hpp b/addons/gforces/functions/script_component.hpp index 4d0ee63e05..70ff0c4225 100644 --- a/addons/gforces/functions/script_component.hpp +++ b/addons/gforces/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\gforces\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\gforces\script_component.hpp" diff --git a/addons/grenades/functions/fnc_nextMode.sqf b/addons/grenades/functions/fnc_nextMode.sqf index 839fbd5786..b8b963afb3 100644 --- a/addons/grenades/functions/fnc_nextMode.sqf +++ b/addons/grenades/functions/fnc_nextMode.sqf @@ -33,7 +33,7 @@ private _hint = localize ([ LSTRING(HighThrow), LSTRING(PreciseThrow), LSTRING(RollGrenade), - LSTRING(DropGrenade) + LSTRING(DropGrenade) ] select _mode); [_hint] call EFUNC(common,displayTextStructured); diff --git a/addons/grenades/functions/script_component.hpp b/addons/grenades/functions/script_component.hpp index e6a44b8a20..a6a1784c85 100644 --- a/addons/grenades/functions/script_component.hpp +++ b/addons/grenades/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\grenades\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\grenades\script_component.hpp" diff --git a/addons/hearing/functions/script_component.hpp b/addons/hearing/functions/script_component.hpp index 18305605c4..68af962cdc 100644 --- a/addons/hearing/functions/script_component.hpp +++ b/addons/hearing/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\hearing\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\hearing\script_component.hpp" diff --git a/addons/hellfire/CfgMagazines.hpp b/addons/hellfire/CfgMagazines.hpp index 6d1651604f..eaee714f88 100644 --- a/addons/hellfire/CfgMagazines.hpp +++ b/addons/hellfire/CfgMagazines.hpp @@ -1,6 +1,6 @@ class CfgMagazines { class 12Rnd_PG_missiles; - + // Kilo - tandem shaped charge HEAT (anti-tank) class 6Rnd_ACE_Hellfire_AGM114K: 12Rnd_PG_missiles { // Old style vehicle magazine count = 6; @@ -84,7 +84,7 @@ class CfgMagazines { ammo = "ACE_Hellfire_AGM114N"; pylonWeapon = QGVAR(launcher_N); }; - + // Lima - tandem shaped charge HEAT (anti-tank) Fire and Forget Active Radar Homing class 6Rnd_ACE_Hellfire_AGM114L: 6Rnd_ACE_Hellfire_AGM114K { // Old style vehicle magazine count = 6; diff --git a/addons/hellfire/CfgWeapons.hpp b/addons/hellfire/CfgWeapons.hpp index a09c642696..fd9bdce044 100644 --- a/addons/hellfire/CfgWeapons.hpp +++ b/addons/hellfire/CfgWeapons.hpp @@ -44,7 +44,7 @@ class CfgWeapons { cursor = "EmptyCursor"; cursorAim = "missile"; showAimCursorInternal = 0; - + // vanilla weapon lock systems weaponLockSystem = 8; cmImmunity = 0.9; diff --git a/addons/hellfire/functions/fnc_setupVehicle.sqf b/addons/hellfire/functions/fnc_setupVehicle.sqf index cf0a17a2e7..9fcd5d8376 100644 --- a/addons/hellfire/functions/fnc_setupVehicle.sqf +++ b/addons/hellfire/functions/fnc_setupVehicle.sqf @@ -41,7 +41,7 @@ if (!_enabled) exitWith {TRACE_3("Not enabled",_enabled,_vehicle,_turretPath);}; // Add laser if vehicle is configured for one: -if ((getNumber (configOf _vehicle >> QGVAR(addLaserDesignator))) == 1) then { +if ((getNumber (configOf _vehicle >> QGVAR(addLaserDesignator))) == 1) then { [{ params ["_vehicle", "_turretPath"]; TRACE_3("checking for laser",_vehicle,_turretPath,_vehicle turretLocal _turretPath); @@ -78,7 +78,7 @@ private _fnc_statement = { }; private _fnc_condition = { params ["_target", "_player", "_attackProfile"]; - + private _turretPath = if (ACE_player == (driver _target)) then {[-1]} else {ACE_player call CBA_fnc_turretPath}; private _hasWeapon = ({(isNumber (configFile >> "CfgWeapons" >> _x >> QGVAR(enabled))) && {getNumber (configFile >> "CfgWeapons" >> _x >> QGVAR(enabled)) > 0}} count (_target weaponsTurret _turretPath)) > 0; diff --git a/addons/hitreactions/functions/script_component.hpp b/addons/hitreactions/functions/script_component.hpp index ba26402e2b..d87ce4811a 100644 --- a/addons/hitreactions/functions/script_component.hpp +++ b/addons/hitreactions/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\hitreactions\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\hitreactions\script_component.hpp" diff --git a/addons/hot/CfgWeapons.hpp b/addons/hot/CfgWeapons.hpp index 1263ef8dea..d172de7fa1 100644 --- a/addons/hot/CfgWeapons.hpp +++ b/addons/hot/CfgWeapons.hpp @@ -12,7 +12,7 @@ class CfgWeapons { lockedTargetSound[] = {"",0,1}; soundFly[] = {"A3\Sounds_F\weapons\Rockets\rocket_fly_1",1,1.1,700}; nameSound = "MissileLauncher"; - sounds[] = {"StandardSound"}; + sounds[] = {"StandardSound"}; class StandardSound { begin1[] = {"A3\Sounds_F\weapons\Rockets\missile_1",1.12202,1.3,1000}; soundBegin[] = {"begin1",1}; @@ -45,7 +45,7 @@ class CfgWeapons { lockedTargetSound[] = {"",0,1}; soundFly[] = {"A3\Sounds_F\weapons\Rockets\rocket_fly_1",1,1.1,700}; nameSound = "MissileLauncher"; - sounds[] = {"StandardSound"}; + sounds[] = {"StandardSound"}; class StandardSound { begin1[] = {"A3\Sounds_F\weapons\Rockets\missile_1",1.12202,1.3,1000}; soundBegin[] = {"begin1",1}; @@ -54,7 +54,7 @@ class CfgWeapons { cursor = "EmptyCursor"; cursorAim = "missile"; showAimCursorInternal = 0; - + autoReload = 1; magazineReloadTime = 20; }; diff --git a/addons/huntir/CfgMagazineWells.hpp b/addons/huntir/CfgMagazineWells.hpp index 2d336054df..4bd116e7a8 100644 --- a/addons/huntir/CfgMagazineWells.hpp +++ b/addons/huntir/CfgMagazineWells.hpp @@ -4,5 +4,5 @@ class CfgMagazineWells { }; class UGL_40x36 { //Vanilla and RHS [rhsusf\addons\rhsusf_c_weapons\cfgMagazineWells.hpp] ADDON[] = {"ACE_HuntIR_M203"}; - }; + }; }; diff --git a/addons/huntir/functions/script_component.hpp b/addons/huntir/functions/script_component.hpp index 29e0fbff41..faf446a5ec 100644 --- a/addons/huntir/functions/script_component.hpp +++ b/addons/huntir/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\huntir\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\huntir\script_component.hpp" diff --git a/addons/interact_menu/functions/fnc_findActionNode.sqf b/addons/interact_menu/functions/fnc_findActionNode.sqf index c2807a3e9c..f095482b99 100644 --- a/addons/interact_menu/functions/fnc_findActionNode.sqf +++ b/addons/interact_menu/functions/fnc_findActionNode.sqf @@ -9,7 +9,7 @@ * 1: Path * * Return Value: - * Action node or if not found + * Action node or if not found * * Example: * [actionTree, ["ACE_TapShoulderRight","VulcanPinchAction"]] call ace_interact_menu_fnc_findActionNode; diff --git a/addons/interact_menu/functions/script_component.hpp b/addons/interact_menu/functions/script_component.hpp index 723a7735f1..38f4a6a71d 100644 --- a/addons/interact_menu/functions/script_component.hpp +++ b/addons/interact_menu/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\interact_menu\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\interact_menu\script_component.hpp" diff --git a/addons/interaction/XEH_postInit.sqf b/addons/interaction/XEH_postInit.sqf index 1639d79bbf..6d7d96713c 100644 --- a/addons/interaction/XEH_postInit.sqf +++ b/addons/interaction/XEH_postInit.sqf @@ -89,7 +89,7 @@ GVAR(isOpeningDoor) = false; if (!GVAR(interactWithTerrainObjects)) exitWith {}; { if ( - isObjectHidden _x // after hiding on server + isObjectHidden _x // after hiding on server || {_x getVariable [QGVAR(terrainObjectReplaced), false]} // after checking but before hiding || {typeOf _x isNotEqualTo ""} ) then {continue}; diff --git a/addons/interaction/functions/fnc_addPassengersActions.sqf b/addons/interaction/functions/fnc_addPassengersActions.sqf index 93a8364415..32adea9e2c 100644 --- a/addons/interaction/functions/fnc_addPassengersActions.sqf +++ b/addons/interaction/functions/fnc_addPassengersActions.sqf @@ -41,7 +41,7 @@ private _actions = []; format ["%1", _unit], [_unit, true] call EFUNC(common,getName), [_icon, "#FFFFFF"], - { + { //statement (Run on hover) - reset the cache so we will insert actions immedietly when hovering over new unit TRACE_2("Cleaning Cache",_target,vehicle _target); [vehicle _target, QEGVAR(interact_menu,ATCache_ACE_SelfActions)] call EFUNC(common,eraseCache); diff --git a/addons/interaction/functions/fnc_renameGroupUI.sqf b/addons/interaction/functions/fnc_renameGroupUI.sqf index d67aff3322..e9b46d0f83 100644 --- a/addons/interaction/functions/fnc_renameGroupUI.sqf +++ b/addons/interaction/functions/fnc_renameGroupUI.sqf @@ -16,7 +16,7 @@ */ // delay a frame so we don't overlap with interaction-menu as it closes -[{ +[{ params [["_unit", objNull, [objNull]]]; private _display = findDisplay 46 createDisplay QGVAR(groupNameDisplay); @@ -27,7 +27,7 @@ params ["_display", "_exitCode"]; if !(_exitCode isEqualTo 1) exitWith {}; - + private _group = _display getVariable QGVAR(renamedGroup); private _textCtrl = _display displayCtrl 451; private _newName = ctrlText _textCtrl; diff --git a/addons/interaction/functions/script_component.hpp b/addons/interaction/functions/script_component.hpp index ef1c22f146..3cbd1f46d9 100644 --- a/addons/interaction/functions/script_component.hpp +++ b/addons/interaction/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\interaction\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\interaction\script_component.hpp" diff --git a/addons/interaction/groupRename_GUI.hpp b/addons/interaction/groupRename_GUI.hpp index a0b332b505..20684b0e46 100644 --- a/addons/interaction/groupRename_GUI.hpp +++ b/addons/interaction/groupRename_GUI.hpp @@ -14,7 +14,7 @@ class ctrlStaticTitle; class GVAR(groupNameDisplay) { idd = -1; enableSimulation = 1; - + class ControlsBackground { class Title: ctrlStaticTitle { x = QUOTE(safeZoneX + (safeZoneW / 2) - TOTAL_W/2); diff --git a/addons/inventory/functions/script_component.hpp b/addons/inventory/functions/script_component.hpp index 07c5e38d2d..e985011e17 100644 --- a/addons/inventory/functions/script_component.hpp +++ b/addons/inventory/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\inventory\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\inventory\script_component.hpp" diff --git a/addons/javelin/RscInGameUI.hpp b/addons/javelin/RscInGameUI.hpp index e34630dde3..4a2a567e22 100644 --- a/addons/javelin/RscInGameUI.hpp +++ b/addons/javelin/RscInGameUI.hpp @@ -19,15 +19,15 @@ class RscInGameUI { y = -10; w = 0; h = 0; - }; - + }; + class GVAR(elements_group): RscControlsGroupNoScrollbars { x = "safeZoneX"; y = "safeZoneY"; w = "safeZoneW"; h = "safeZoneH"; idc = 170; - class Controls { + class Controls { class CA_Distance: RscOpticsValue { idc = 151; sizeEx = "0"; @@ -238,7 +238,7 @@ class RscInGameUI { y = "safeZoneY"; w = "safeZoneW"; h = "safeZoneH"; - enabled = 0; + enabled = 0; show = 0; class Controls { class ACE_TargetingConstrains: RscControlsGroupNoScrollbars { diff --git a/addons/javelin/functions/fnc_onOpticDraw.sqf b/addons/javelin/functions/fnc_onOpticDraw.sqf index 8c3b088dda..8304220fd9 100644 --- a/addons/javelin/functions/fnc_onOpticDraw.sqf +++ b/addons/javelin/functions/fnc_onOpticDraw.sqf @@ -91,11 +91,11 @@ if (GVAR(isLockKeyDown) && {cameraView == "GUNNER"} && {((currentVisionMode ACE_ private _boundsInput = if (_currentTarget isKindOf "CAManBase") then { [_currentTarget,[-0.5,-0.5,-0.25],[0,0,0]]; } else { - [_currentTarget,[-1,-1,-1],_currentTarget selectionPosition "zamerny"]; + [_currentTarget,[-1,-1,-1],_currentTarget selectionPosition "zamerny"]; }; private _bpos = _boundsInput call EFUNC(common,worldToScreenBounds); - + private _lockTime = if (isNull _currentTarget) then {0} else {CBA_missionTime - _lockStartTime}; private _minX = ((linearConversion [1, (__LOCKONTIME - 0.5), _lockTime, 0.5 - 0.075*safeZoneW, (_bpos select 0), true]) + _offsetX) max __ConstraintLeft; private _minY = ((linearConversion [1, (__LOCKONTIME - 0.5), _lockTime, 0.5 - 0.075*safeZoneH, (_bpos select 1), true]) + _offsetY) max __ConstraintTop; @@ -128,7 +128,7 @@ if (isNull _newTarget) then { _currentShooter setVariable ["ace_missileguidance_target", nil, false]; __JavelinIGUITargetingLines ctrlShow false; - + // Disallow fire _fireDisabledEH = [_fireDisabledEH] call FUNC(disableFire); } else { diff --git a/addons/javelin/functions/script_component.hpp b/addons/javelin/functions/script_component.hpp index 21c6597c86..1053e11031 100644 --- a/addons/javelin/functions/script_component.hpp +++ b/addons/javelin/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\javelin\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\javelin\script_component.hpp" diff --git a/addons/kestrel4500/RscTitles.hpp b/addons/kestrel4500/RscTitles.hpp index 276e8c4392..b4a85951be 100644 --- a/addons/kestrel4500/RscTitles.hpp +++ b/addons/kestrel4500/RscTitles.hpp @@ -370,4 +370,4 @@ class RscTitles { }; }; }; -}; \ No newline at end of file +}; diff --git a/addons/kestrel4500/XEH_postInit.sqf b/addons/kestrel4500/XEH_postInit.sqf index 9511041bd2..033dbafbe8 100644 --- a/addons/kestrel4500/XEH_postInit.sqf +++ b/addons/kestrel4500/XEH_postInit.sqf @@ -29,4 +29,4 @@ GVAR(ImpellerState) = 0; GVAR(Kestrel4500) = false; GVAR(Overlay) = false; -[] call FUNC(restoreUserData); \ No newline at end of file +[] call FUNC(restoreUserData); diff --git a/addons/kestrel4500/config.cpp b/addons/kestrel4500/config.cpp index 11bc51f801..5ea15f07ff 100644 --- a/addons/kestrel4500/config.cpp +++ b/addons/kestrel4500/config.cpp @@ -18,4 +18,4 @@ class CfgPatches { #include "CfgSound.hpp" #include "CfgVehicles.hpp" #include "CfgWeapons.hpp" -#include "RscTitles.hpp" \ No newline at end of file +#include "RscTitles.hpp" diff --git a/addons/killtracker/XEH_postInit.sqf b/addons/killtracker/XEH_postInit.sqf index 36c2c3834f..b11b1fa4e0 100644 --- a/addons/killtracker/XEH_postInit.sqf +++ b/addons/killtracker/XEH_postInit.sqf @@ -21,7 +21,7 @@ if ((getText (missionconfigfile >> "CfgDebriefingSections" >> QUOTE(XADDON) >> " }; private _global = missionNamespace getVariable [QGVAR(globalSync), false]; // Global Sync (e.g. for spectator) -INFO_1("Running Kill Tracking [Global: %1]",_global); +INFO_1("Running Kill Tracking [Global: %1]",_global); // Variables: GVAR(eventsArray) = []; diff --git a/addons/laser/config.cpp b/addons/laser/config.cpp index fb6ae5e638..2d59a177de 100644 --- a/addons/laser/config.cpp +++ b/addons/laser/config.cpp @@ -13,7 +13,7 @@ class CfgPatches { }; }; -#include "ACE_Settings.hpp" +#include "ACE_Settings.hpp" #include "CfgEventhandlers.hpp" #include "CfgVehicles.hpp" #include "CfgWeapons.hpp" diff --git a/addons/laser/functions/script_component.hpp b/addons/laser/functions/script_component.hpp index 98d00342c0..e092c63551 100644 --- a/addons/laser/functions/script_component.hpp +++ b/addons/laser/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\laser\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\laser\script_component.hpp" diff --git a/addons/laserpointer/functions/script_component.hpp b/addons/laserpointer/functions/script_component.hpp index 727c32539f..743bd494fb 100644 --- a/addons/laserpointer/functions/script_component.hpp +++ b/addons/laserpointer/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\laserpointer\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\laserpointer\script_component.hpp" diff --git a/addons/logistics_rope/CfgWeapons.hpp b/addons/logistics_rope/CfgWeapons.hpp index 1b492be2a2..4efb85f51b 100644 --- a/addons/logistics_rope/CfgWeapons.hpp +++ b/addons/logistics_rope/CfgWeapons.hpp @@ -64,4 +64,4 @@ class CfgWeapons { mass = 108; }; }; -}; \ No newline at end of file +}; diff --git a/addons/logistics_uavbattery/functions/script_component.hpp b/addons/logistics_uavbattery/functions/script_component.hpp index 56cb8114f5..fcb2e76f39 100644 --- a/addons/logistics_uavbattery/functions/script_component.hpp +++ b/addons/logistics_uavbattery/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\logistics_uavbattery\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\logistics_uavbattery\script_component.hpp" diff --git a/addons/logistics_wirecutter/functions/script_component.hpp b/addons/logistics_wirecutter/functions/script_component.hpp index 4a5c48048c..9235a6c894 100644 --- a/addons/logistics_wirecutter/functions/script_component.hpp +++ b/addons/logistics_wirecutter/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\logistics_wirecutter\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\logistics_wirecutter\script_component.hpp" diff --git a/addons/magazinerepack/functions/script_component.hpp b/addons/magazinerepack/functions/script_component.hpp index d43593994d..36b5fd7190 100644 --- a/addons/magazinerepack/functions/script_component.hpp +++ b/addons/magazinerepack/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\magazinerepack\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\magazinerepack\script_component.hpp" diff --git a/addons/map/CfgAmmo.hpp b/addons/map/CfgAmmo.hpp index aca4042b4f..d54ab0a2c9 100644 --- a/addons/map/CfgAmmo.hpp +++ b/addons/map/CfgAmmo.hpp @@ -1,7 +1,7 @@ class CfgAmmo { - + class Grenade; - + class ACE_FlashlightProxy_White: Grenade { effectsSmoke = "ACE_FlashlightEffect_White"; explosionTime = 0.01; @@ -12,7 +12,7 @@ class CfgAmmo { simulation = "shotSmokeX"; smokeColor[] = {1,1,1,1}; timeToLive = 1e10; - + impactArmor[] = {}; impactConcrete[] = {}; impactDefault[] = {}; @@ -30,24 +30,24 @@ class CfgAmmo { impactWater[] = {}; impactWood[] = {}; }; - + class ACE_FlashlightProxy_Red: ACE_FlashlightProxy_White { effectsSmoke = "ACE_FlashlightEffect_Red"; }; - + class ACE_FlashlightProxy_Blue: ACE_FlashlightProxy_White { effectsSmoke = "ACE_FlashlightEffect_Blue"; }; - + class ACE_FlashlightProxy_Green: ACE_FlashlightProxy_White { effectsSmoke = "ACE_FlashlightEffect_Green"; }; - + class ACE_FlashlightProxy_Yellow: ACE_FlashlightProxy_White { effectsSmoke = "ACE_FlashlightEffect_Yellow"; }; - + class ACE_FlashlightProxy_Orange: ACE_FlashlightProxy_White { effectsSmoke = "ACE_FlashlightEffect_Orange"; }; -}; \ No newline at end of file +}; diff --git a/addons/map/CfgMarkers.hpp b/addons/map/CfgMarkers.hpp index 3dd6463891..303194de00 100644 --- a/addons/map/CfgMarkers.hpp +++ b/addons/map/CfgMarkers.hpp @@ -4,7 +4,7 @@ class CfgMarkers { // Reenable NATO symbols ... class b_unknown: Flag {scope = 2;}; - + // disable all civy markers (harbor etc.) class c_unknown: b_unknown {scope = 1;}; diff --git a/addons/map/Effects.hpp b/addons/map/Effects.hpp index 5258b225aa..dbd358eaba 100644 --- a/addons/map/Effects.hpp +++ b/addons/map/Effects.hpp @@ -40,4 +40,4 @@ class ACE_FlashlightEffect_Orange { simulation = "light"; type = "ACE_FlashlightLight_Orange"; }; -}; \ No newline at end of file +}; diff --git a/addons/map/XEH_postInitServer.sqf b/addons/map/XEH_postInitServer.sqf index dc0c7f991e..80cbb73d54 100644 --- a/addons/map/XEH_postInitServer.sqf +++ b/addons/map/XEH_postInitServer.sqf @@ -6,7 +6,7 @@ addMissionEventHandler ["HandleDisconnect",{ if (!GVAR(mapGlow)) exitWith {}; private _unitLight = _disconnectedPlayer getVariable [QGVAR(flashlight), ["", objNull]]; _unitLight params ["", "_glow"]; - + if ((!isNull _disconnectedPlayer) && {!isNull _glow}) then { detach _glow; deleteVehicle _glow; diff --git a/addons/map/initSettings.sqf b/addons/map/initSettings.sqf index 4da66c22eb..fa248bf736 100644 --- a/addons/map/initSettings.sqf +++ b/addons/map/initSettings.sqf @@ -68,7 +68,7 @@ true, { [QGVAR(BFT_Enabled), _this] call EFUNC(common,cbaSettings_settingChanged); - + if (GVAR(BFT_Enabled) && {isNil QGVAR(BFT_markers)}) then { GVAR(BFT_markers) = []; [FUNC(blueForceTrackingUpdate), GVAR(BFT_Interval), []] call CBA_fnc_addPerFrameHandler; diff --git a/addons/markers/functions/fnc_removeTimestamp.sqf b/addons/markers/functions/fnc_removeTimestamp.sqf index 9f9d6ab438..2d0f3d86c7 100644 --- a/addons/markers/functions/fnc_removeTimestamp.sqf +++ b/addons/markers/functions/fnc_removeTimestamp.sqf @@ -50,14 +50,14 @@ while {_keepCheckingDigits} do { _index = _index + 3; }; case ("]"): { - _keepCheckingDigits = false; + _keepCheckingDigits = false; }; case (" "): { _keepCheckingDigits = false; if (!(_string select [_index+3, 3] in ["am]", "pm]"])) then {_validTimestamp = false; }; }; default { - _keepCheckingDigits = false; + _keepCheckingDigits = false; _validTimestamp = false; }; }; diff --git a/addons/maverick/ACE_GuidanceConfig.hpp b/addons/maverick/ACE_GuidanceConfig.hpp index f6b9020157..948404b7cc 100644 --- a/addons/maverick/ACE_GuidanceConfig.hpp +++ b/addons/maverick/ACE_GuidanceConfig.hpp @@ -1,5 +1,5 @@ class EGVAR(missileguidance,AttackProfiles) { - class maverick { + class maverick { name = "LOAL-DIR"; nameLocked = "LOBL-DIR"; functionName = QEFUNC(missileguidance,attackProfile_DIR); diff --git a/addons/maverick/CfgMagazines.hpp b/addons/maverick/CfgMagazines.hpp index 524b3e0094..705d52010d 100644 --- a/addons/maverick/CfgMagazines.hpp +++ b/addons/maverick/CfgMagazines.hpp @@ -1,18 +1,18 @@ class CfgMagazines { class CA_Magazine; class VehicleMagazine: CA_Magazine {}; - + class magazine_Missile_AGM_02_x1: VehicleMagazine {}; class PylonMissile_Missile_AGM_02_x1: magazine_Missile_AGM_02_x1 {}; class PylonMissile_Missile_AGM_02_x2: magazine_Missile_AGM_02_x1 {}; - + class 6Rnd_Missile_AGM_02_F: VehicleMagazine {}; class PylonRack_1Rnd_Missile_AGM_02_F: 6Rnd_Missile_AGM_02_F {}; class PylonRack_3Rnd_Missile_AGM_02_F: PylonRack_1Rnd_Missile_AGM_02_F {}; - + class PylonRack_Missile_AGM_02_x1: magazine_Missile_AGM_02_x1 {}; class PylonRack_Missile_AGM_02_x2: magazine_Missile_AGM_02_x1 {}; - + class GVAR(L_magazine_x1): magazine_Missile_AGM_02_x1 { ammo = QGVAR(L); author = "xrufix"; @@ -54,7 +54,7 @@ class CfgMagazines { displayNameShort = CSTRING(L_MAG_short); pylonWeapon = QGVAR(L_Launcher_Plane); }; - + class GVAR(L_PylonRack_x1): PylonRack_Missile_AGM_02_x1 { ammo = QGVAR(L); author = "xrufix"; diff --git a/addons/maverick/CfgWeapons.hpp b/addons/maverick/CfgWeapons.hpp index e05c380381..1c0ae744ef 100644 --- a/addons/maverick/CfgWeapons.hpp +++ b/addons/maverick/CfgWeapons.hpp @@ -58,7 +58,7 @@ class CfgWeapons { }; weaponLockDelay = 0.1; weaponLockSystem = 0; - + EGVAR(laser,canSelect) = 1; // can ace_laser lock (allows switching laser code) EGVAR(laser,showHud) = 1; // show attack profile / lock on hud GVAR(enabled) = 1; diff --git a/addons/medical/ACE_Settings.hpp b/addons/medical/ACE_Settings.hpp index a1322f48e5..81984dab73 100644 --- a/addons/medical/ACE_Settings.hpp +++ b/addons/medical/ACE_Settings.hpp @@ -10,7 +10,7 @@ class ACE_Settings { }; */ class GVAR(enableVehicleCrashes) { - movedToSQF = 1; + movedToSQF = 1; }; class GVAR(spontaneousWakeUpChance) { movedToSQF = 1; diff --git a/addons/medical/functions/script_component.hpp b/addons/medical/functions/script_component.hpp index ea579c04a5..140463d68d 100644 --- a/addons/medical/functions/script_component.hpp +++ b/addons/medical/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\medical\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\medical\script_component.hpp" diff --git a/addons/medical_damage/CfgAmmo.hpp b/addons/medical_damage/CfgAmmo.hpp index 89dfb486bb..7ef0834161 100644 --- a/addons/medical_damage/CfgAmmo.hpp +++ b/addons/medical_damage/CfgAmmo.hpp @@ -71,7 +71,7 @@ class CfgAmmo { class BombDemine_01_Ammo_F: BombCore { ACE_damageType = "explosive"; }; - + // Autocannon rounds are special (#7401) class B_19mm_HE: BulletBase { ACE_damageType = "explosive"; diff --git a/addons/medical_damage/functions/script_component.hpp b/addons/medical_damage/functions/script_component.hpp index 66d3d51283..394e8aeed6 100644 --- a/addons/medical_damage/functions/script_component.hpp +++ b/addons/medical_damage/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\medical_damage\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\medical_damage\script_component.hpp" diff --git a/addons/medical_engine/functions/fnc_updateDamageEffects.sqf b/addons/medical_engine/functions/fnc_updateDamageEffects.sqf index 107a1945c6..f3981127f0 100644 --- a/addons/medical_engine/functions/fnc_updateDamageEffects.sqf +++ b/addons/medical_engine/functions/fnc_updateDamageEffects.sqf @@ -35,8 +35,8 @@ if (EGVAR(medical,fractures) > 0) then { if (EGVAR(medical,fractures) in [2, 3]) then { // the limp with a splint will still cause effects // Block sprint / force walking based on fracture setting and leg splint status private _hasLegSplint = (_fractures select 4) == -1 || {(_fractures select 5) == -1}; - if (EGVAR(medical,fractures) == 2) then { - [_unit, "blockSprint", QEGVAR(medical,fracture), _hasLegSplint] call EFUNC(common,statusEffect_set); + if (EGVAR(medical,fractures) == 2) then { + [_unit, "blockSprint", QEGVAR(medical,fracture), _hasLegSplint] call EFUNC(common,statusEffect_set); } else { [_unit, "forceWalk", QEGVAR(medical,fracture), _hasLegSplint] call EFUNC(common,statusEffect_set); }; diff --git a/addons/medical_gui/initSettings.sqf b/addons/medical_gui/initSettings.sqf index 16d0bdc4a9..48a02c2514 100644 --- a/addons/medical_gui/initSettings.sqf +++ b/addons/medical_gui/initSettings.sqf @@ -88,7 +88,7 @@ private _damageColors = [ { [ - format ["%1_%2", QGVAR(bloodLossColor), _forEachIndex], + format ["%1_%2", QGVAR(bloodLossColor), _forEachIndex], "COLOR", [format [localize LSTRING(BloodLossColorX_DisplayName), _forEachIndex], LSTRING(BloodLossColor_Description)], [ELSTRING(medical,Category), LSTRING(BloodLossColors)], diff --git a/addons/medical_treatment/functions/fnc_canTreat.sqf b/addons/medical_treatment/functions/fnc_canTreat.sqf index 938e8a356d..f7790e548d 100644 --- a/addons/medical_treatment/functions/fnc_canTreat.sqf +++ b/addons/medical_treatment/functions/fnc_canTreat.sqf @@ -40,7 +40,7 @@ isClass _config if (_condition isEqualTo {}) exitWith { _condition = true; }; - + _condition = call _condition; }; diff --git a/addons/medical_treatment/functions/script_component.hpp b/addons/medical_treatment/functions/script_component.hpp index 86227531f9..83dfa4371b 100644 --- a/addons/medical_treatment/functions/script_component.hpp +++ b/addons/medical_treatment/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\medical_treatment\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\medical_treatment\script_component.hpp" diff --git a/addons/microdagr/functions/script_component.hpp b/addons/microdagr/functions/script_component.hpp index 13fbbcf5fe..487d569038 100644 --- a/addons/microdagr/functions/script_component.hpp +++ b/addons/microdagr/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\microdagr\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\microdagr\script_component.hpp" diff --git a/addons/missileguidance/ACE_GuidanceConfig.hpp b/addons/missileguidance/ACE_GuidanceConfig.hpp index 8e3324b09d..3628c9eec0 100644 --- a/addons/missileguidance/ACE_GuidanceConfig.hpp +++ b/addons/missileguidance/ACE_GuidanceConfig.hpp @@ -86,7 +86,7 @@ class GVAR(SeekerTypes) { name = ""; visualName = ""; description = ""; - + functionName = QFUNC(seekerType_ARH); onFired = QFUNC(ahr_onFired); }; diff --git a/addons/missileguidance/XEH_pre_init.sqf b/addons/missileguidance/XEH_pre_init.sqf index f377efddb6..0798fed2e4 100644 --- a/addons/missileguidance/XEH_pre_init.sqf +++ b/addons/missileguidance/XEH_pre_init.sqf @@ -6,7 +6,7 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; -// Formally a ace_setting, users can still disable by `setting ace_missileguidance_enabled = x;` +// Formally a ace_setting, users can still disable by `setting ace_missileguidance_enabled = x;` // [0 - Off , 1 - PlayerOnly, 2 - PlayerAndAi] // As weapons take config changes, there is little point in being able to disable guidance if (isNil QGVAR(enabled)) then { GVAR(enabled) = 2; }; diff --git a/addons/missileguidance/functions/fnc_seekerType_ARH.sqf b/addons/missileguidance/functions/fnc_seekerType_ARH.sqf index a3bda11258..d8042b1d6c 100644 --- a/addons/missileguidance/functions/fnc_seekerType_ARH.sqf +++ b/addons/missileguidance/functions/fnc_seekerType_ARH.sqf @@ -30,7 +30,7 @@ if (_isActive || { CBA_missionTime >= _timeWhenActive }) then { _seekerStateParams set [6, true]; TRACE_1("Missile Pitbull",_seekerStateParams); }; - + // Internal radar homing // For performance reasons only poll for target every so often instead of each frame if ((_lastTargetPollTime + ACTIVE_RADAR_POLL_FREQUENCY) - CBA_missionTime < 0) then { @@ -83,7 +83,7 @@ if (_isActive || { CBA_missionTime >= _timeWhenActive }) then { _target = _x; }; } forEach _nearestObjects; - + _expectedTargetPos = _searchPos; }; diff --git a/addons/missileguidance/functions/script_component.hpp b/addons/missileguidance/functions/script_component.hpp index 7046e9271d..6b1c1a864a 100644 --- a/addons/missileguidance/functions/script_component.hpp +++ b/addons/missileguidance/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\missileguidance\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\missileguidance\script_component.hpp" diff --git a/addons/missionmodules/CfgFactionClasses.hpp b/addons/missionmodules/CfgFactionClasses.hpp index fc4abc3606..bf0aea3a10 100644 --- a/addons/missionmodules/CfgFactionClasses.hpp +++ b/addons/missionmodules/CfgFactionClasses.hpp @@ -3,4 +3,4 @@ class CfgFactionClasses { class ACE_missionModules: NO_CATEGORY { displayName = CSTRING(Category_DisplayName); }; -}; \ No newline at end of file +}; diff --git a/addons/missionmodules/CfgVehicles.hpp b/addons/missionmodules/CfgVehicles.hpp index 6a2f74b934..880623d488 100644 --- a/addons/missionmodules/CfgVehicles.hpp +++ b/addons/missionmodules/CfgVehicles.hpp @@ -65,4 +65,4 @@ class CfgVehicles { sync[] = {}; }; }; -}; \ No newline at end of file +}; diff --git a/addons/missionmodules/functions/script_component.hpp b/addons/missionmodules/functions/script_component.hpp index 42d34d4801..cab9cb2dd8 100644 --- a/addons/missionmodules/functions/script_component.hpp +++ b/addons/missionmodules/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\missionmodules\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\missionmodules\script_component.hpp" diff --git a/addons/mk6mortar/functions/script_component.hpp b/addons/mk6mortar/functions/script_component.hpp index 9980d4fc88..76eefc205a 100644 --- a/addons/mk6mortar/functions/script_component.hpp +++ b/addons/mk6mortar/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\mk6mortar\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\mk6mortar\script_component.hpp" diff --git a/addons/movement/functions/script_component.hpp b/addons/movement/functions/script_component.hpp index d33fa99b30..088b2beb1a 100644 --- a/addons/movement/functions/script_component.hpp +++ b/addons/movement/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\movement\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\movement\script_component.hpp" diff --git a/addons/nametags/functions/fnc_getVehicleData.sqf b/addons/nametags/functions/fnc_getVehicleData.sqf index ce7eec49b1..48eeab4626 100644 --- a/addons/nametags/functions/fnc_getVehicleData.sqf +++ b/addons/nametags/functions/fnc_getVehicleData.sqf @@ -69,7 +69,7 @@ private _fnc_addTurretUnit = { _role = FFV; }; - _data pushBack [_path, _role]; + _data pushBack [_path, _role]; }; @@ -84,7 +84,7 @@ private _fnc_addTurret = { for "_index" from 0 to (_count - 1) do { private _turretPath = _path + [_index - _offset]; private _turretConfig = _config select _index; - if (isClass _turretConfig) then { + if (isClass _turretConfig) then { [_turretConfig, _turretPath] call _fnc_addTurretUnit; [_turretConfig, _turretPath] call _fnc_addTurret; } else { diff --git a/addons/nightvision/RscTitles.hpp b/addons/nightvision/RscTitles.hpp index 98c2b11cb3..1a4d030e01 100644 --- a/addons/nightvision/RscTitles.hpp +++ b/addons/nightvision/RscTitles.hpp @@ -22,7 +22,7 @@ class RscTitles { class Mask: RscPicture { idc = 1001; }; - + // Add blinders for side monitors for tripple monitors (mask won't cover them) class trippleHeadLeft: RscPicture { idc = 1002; diff --git a/addons/nightvision/functions/script_component.hpp b/addons/nightvision/functions/script_component.hpp index d79af487d7..74be58745a 100644 --- a/addons/nightvision/functions/script_component.hpp +++ b/addons/nightvision/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\nightvision\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\nightvision\script_component.hpp" diff --git a/addons/nlaw/functions/fnc_keyDown.sqf b/addons/nlaw/functions/fnc_keyDown.sqf index fcc320360c..df8791aa11 100644 --- a/addons/nlaw/functions/fnc_keyDown.sqf +++ b/addons/nlaw/functions/fnc_keyDown.sqf @@ -65,7 +65,7 @@ playSound "ACE_Sound_Click"; _args set [3, false]; } else { // smoothing factor alpha - higher values will be more responsive to change, but also spike higher on jerky mouse movmeent - private _alpha = _deltaT / 3; + private _alpha = _deltaT / 3; GVAR(yawChange) = (_yawChange * _alpha) + GVAR(yawChange) * (1 - _alpha); GVAR(pitchChange) = (_pitchChange * _alpha) + GVAR(pitchChange) * (1 - _alpha); }; diff --git a/addons/optics/functions/script_component.hpp b/addons/optics/functions/script_component.hpp index 5613c1aec3..20e26bcb29 100644 --- a/addons/optics/functions/script_component.hpp +++ b/addons/optics/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\optics\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\optics\script_component.hpp" diff --git a/addons/optionsmenu/functions/script_component.hpp b/addons/optionsmenu/functions/script_component.hpp index dd11862f9d..cddc01fa3c 100644 --- a/addons/optionsmenu/functions/script_component.hpp +++ b/addons/optionsmenu/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\optionsmenu\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\optionsmenu\script_component.hpp" diff --git a/addons/overheating/functions/fnc_coolWeaponWithItem.sqf b/addons/overheating/functions/fnc_coolWeaponWithItem.sqf index 8558303829..7c3bf50aa9 100644 --- a/addons/overheating/functions/fnc_coolWeaponWithItem.sqf +++ b/addons/overheating/functions/fnc_coolWeaponWithItem.sqf @@ -95,4 +95,4 @@ private _fnc_condition = { {}, //_fnc_onFailure, _consumeText, _fnc_condition -] call EFUNC(common,progressBar); \ No newline at end of file +] call EFUNC(common,progressBar); diff --git a/addons/overheating/functions/fnc_updateAmmoTemperature.sqf b/addons/overheating/functions/fnc_updateAmmoTemperature.sqf index 12944774b7..97cbc1276c 100644 --- a/addons/overheating/functions/fnc_updateAmmoTemperature.sqf +++ b/addons/overheating/functions/fnc_updateAmmoTemperature.sqf @@ -80,7 +80,7 @@ if (_ammoTemperature > (GUNPOWDER_IGNITION_TEMP * GVAR(cookoffCoef))) then { { params ["_unit", "_muzzleCache", "_mode", "_muzzle"]; - // fire the cookoff + // fire the cookoff _unit forceWeaponFire [_muzzle, _mode]; // switch back to the cached muzzle if required diff --git a/addons/overheating/functions/script_component.hpp b/addons/overheating/functions/script_component.hpp index a8668e5b4f..7905d3b527 100644 --- a/addons/overheating/functions/script_component.hpp +++ b/addons/overheating/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\overheating\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\overheating\script_component.hpp" diff --git a/addons/overpressure/functions/fnc_cacheOverPressureValues.sqf b/addons/overpressure/functions/fnc_cacheOverPressureValues.sqf index 7e984f993c..2626004e87 100644 --- a/addons/overpressure/functions/fnc_cacheOverPressureValues.sqf +++ b/addons/overpressure/functions/fnc_cacheOverPressureValues.sqf @@ -15,7 +15,7 @@ * 1: Range * 2: Damage * - * Example: + * Example: * ["cannon_125mm","Sh_125mm_APFSDS_T_Green","24Rnd_125mm_APFSDS_T_Green"] call ace_overpressure_fnc_cacheOverPressureValues * * Public: No diff --git a/addons/overpressure/functions/script_component.hpp b/addons/overpressure/functions/script_component.hpp index d66ac7aec3..0091d8048b 100644 --- a/addons/overpressure/functions/script_component.hpp +++ b/addons/overpressure/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\overpressure\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\overpressure\script_component.hpp" diff --git a/addons/pylons/XEH_postInit.sqf b/addons/pylons/XEH_postInit.sqf index 3e0b9bb4f0..ed45222d3c 100644 --- a/addons/pylons/XEH_postInit.sqf +++ b/addons/pylons/XEH_postInit.sqf @@ -17,7 +17,7 @@ GVAR(loadoutAction) = [ // create action private _cfgVehicle = configFile >> "CfgVehicles"; _vehicles findIf {getNumber (_cfgVehicle >> typeOf _x >> "transportAmmo") > 0} != -1; }; - + (_isRearmVehicle && {[ace_player, _target] call FUNC(canConfigurePylons)}) } ] call EFUNC(interact_menu,createAction); diff --git a/addons/rearm/functions/fnc_canStoreAmmo.sqf b/addons/rearm/functions/fnc_canStoreAmmo.sqf index b0f22b6e07..af503011dd 100644 --- a/addons/rearm/functions/fnc_canStoreAmmo.sqf +++ b/addons/rearm/functions/fnc_canStoreAmmo.sqf @@ -17,7 +17,7 @@ */ params ["_truck", "_unit"]; - + (alive _unit) && {!isNull (_unit getVariable [QGVAR(dummy), objNull])} && {alive _truck} diff --git a/addons/rearm/functions/fnc_getNeedRearmMagazines.sqf b/addons/rearm/functions/fnc_getNeedRearmMagazines.sqf index e49729eac7..af1ae10d51 100644 --- a/addons/rearm/functions/fnc_getNeedRearmMagazines.sqf +++ b/addons/rearm/functions/fnc_getNeedRearmMagazines.sqf @@ -66,7 +66,7 @@ private _turrets = [_vehicle] call FUNC(getAllRearmTurrets); if (_turretPath isEqualTo _turretCurrent) then { _magazineClasses pushBackUnique _className; }; - } forEach (magazinesAllTurrets _vehicle); + } forEach (magazinesAllTurrets _vehicle); } else { _magazineClasses = [_vehicle, _turretPath] call FUNC(getTurretConfigMagazines); _magazineClasses = _magazineClasses arrayIntersect _magazineClasses; diff --git a/addons/rearm/functions/fnc_isSource.sqf b/addons/rearm/functions/fnc_isSource.sqf index c79c78308c..93f45be6a1 100644 --- a/addons/rearm/functions/fnc_isSource.sqf +++ b/addons/rearm/functions/fnc_isSource.sqf @@ -21,7 +21,7 @@ params [ ]; if ((_target getVariable [QGVAR(currentSupply), 0]) < 0) exitWith {false}; - + private _vehCfg = configOf _target; private _vanillaCargoConfig = getNumber (_vehCfg >> "transportAmmo"); private _rearmCargoConfig = getNumber (_vehCfg >> QGVAR(defaultSupply)); diff --git a/addons/rearm/functions/fnc_makeSource.sqf b/addons/rearm/functions/fnc_makeSource.sqf index 36f3fba553..c697925380 100644 --- a/addons/rearm/functions/fnc_makeSource.sqf +++ b/addons/rearm/functions/fnc_makeSource.sqf @@ -30,7 +30,7 @@ params [ ["_addToCurrent", false, [false]] ]; TRACE_3("makeSource",_source,_rearmCargo,_addToCurrent); - + if (isNull _source) exitWith {}; private _currentSupply = if (_addToCurrent) then { diff --git a/addons/recoil/functions/script_component.hpp b/addons/recoil/functions/script_component.hpp index 24cb1ba776..62bacef4b6 100644 --- a/addons/recoil/functions/script_component.hpp +++ b/addons/recoil/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\recoil\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\recoil\script_component.hpp" diff --git a/addons/reload/functions/script_component.hpp b/addons/reload/functions/script_component.hpp index 572f1fca84..a95b9c989a 100644 --- a/addons/reload/functions/script_component.hpp +++ b/addons/reload/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\reload\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\reload\script_component.hpp" diff --git a/addons/reloadlaunchers/functions/script_component.hpp b/addons/reloadlaunchers/functions/script_component.hpp index 9c129f36b1..18d4eefebd 100644 --- a/addons/reloadlaunchers/functions/script_component.hpp +++ b/addons/reloadlaunchers/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\reloadlaunchers\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\reloadlaunchers\script_component.hpp" diff --git a/addons/repair/dev/draw_showRepairInfo.sqf b/addons/repair/dev/draw_showRepairInfo.sqf index b5516d6b98..52b180392f 100644 --- a/addons/repair/dev/draw_showRepairInfo.sqf +++ b/addons/repair/dev/draw_showRepairInfo.sqf @@ -14,7 +14,7 @@ addMissionEventHandler ["Draw3D", { ([cursorObject] call FUNC(getWheelHitPointsWithSelections)) params ["_wheelHitPoints", "_wheelHitSelections"]; private _output = []; - + { private _selection = _x; private _hitpoint = _hitPoints select _forEachIndex; diff --git a/addons/repair/functions/fnc_modifyInteraction.sqf b/addons/repair/functions/fnc_modifyInteraction.sqf index 235afd9223..2edf515bac 100644 --- a/addons/repair/functions/fnc_modifyInteraction.sqf +++ b/addons/repair/functions/fnc_modifyInteraction.sqf @@ -24,4 +24,4 @@ params ["_target", "", "", "_actionData"]; private _color = ceil linearConversion [0, 1, damage _target, 0, 8, true]; TRACE_2("Modifying icon color",_target,_color); (_actionData select 2) set [1, DAMAGE_COLOR_SCALE select _color]; - + diff --git a/addons/repair/functions/fnc_repair.sqf b/addons/repair/functions/fnc_repair.sqf index 12cc2c3946..88b260b221 100644 --- a/addons/repair/functions/fnc_repair.sqf +++ b/addons/repair/functions/fnc_repair.sqf @@ -137,7 +137,7 @@ if (_callbackProgress == "") then { _callbackProgress = { (_this select 0) params ["_caller", "_target", "", "", "", "", "_claimObjectsAvailable"]; ( - (alive _target) && + (alive _target) && {(abs speed _target) < 1} && // make sure vehicle doesn't drive off {_claimObjectsAvailable findIf {!alive _x || {_x getVariable [QEGVAR(common,owner), objNull] isNotEqualTo _caller}} == -1} // make sure claim objects are still available ) diff --git a/addons/respawn/functions/script_component.hpp b/addons/respawn/functions/script_component.hpp index eeb32a47bd..d2a247f08c 100644 --- a/addons/respawn/functions/script_component.hpp +++ b/addons/respawn/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\respawn\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\respawn\script_component.hpp" diff --git a/addons/safemode/functions/script_component.hpp b/addons/safemode/functions/script_component.hpp index a25fbfa4c7..eda6cd66ff 100644 --- a/addons/safemode/functions/script_component.hpp +++ b/addons/safemode/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\safemode\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\safemode\script_component.hpp" diff --git a/addons/sandbag/functions/script_component.hpp b/addons/sandbag/functions/script_component.hpp index 1d6f10c806..9964e2ea35 100644 --- a/addons/sandbag/functions/script_component.hpp +++ b/addons/sandbag/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\sandbag\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\sandbag\script_component.hpp" diff --git a/addons/scopes/ACE_Settings.hpp b/addons/scopes/ACE_Settings.hpp index c1f767f1ae..c3aa151de7 100644 --- a/addons/scopes/ACE_Settings.hpp +++ b/addons/scopes/ACE_Settings.hpp @@ -6,7 +6,7 @@ class ACE_Settings { class GVAR(forceUseOfAdjustmentTurrets) { movedToSQF = 1; }; - + // Auto corrects the zeroing in both vanilla- and advanced ballistics class GVAR(correctZeroing) { movedToSQF = 1; @@ -19,7 +19,7 @@ class ACE_Settings { class GVAR(defaultZeroRange) { movedToSQF = 1; }; - + // Only relevant when advanced ballistics is enabled class GVAR(zeroReferenceTemperature) { movedToSQF = 1; @@ -33,11 +33,11 @@ class ACE_Settings { class GVAR(deduceBarometricPressureFromTerrainAltitude) { movedToSQF = 1; }; - + class GVAR(useLegacyUI) { movedToSQF = 1; }; - + class GVAR(simplifiedZeroing) { movedToSQF = 1; }; diff --git a/addons/scopes/CfgWeapons.hpp b/addons/scopes/CfgWeapons.hpp index de712b378f..8b6650cfc0 100644 --- a/addons/scopes/CfgWeapons.hpp +++ b/addons/scopes/CfgWeapons.hpp @@ -5,55 +5,55 @@ class Mode_FullAuto; class CfgWeapons { class ItemCore; class InventoryOpticsItem_Base_F; - + class optic_Yorris: ItemCore { ACE_ScopeHeightAboveRail = 2.77224; }; - + class optic_MRD: ItemCore { ACE_ScopeHeightAboveRail = 2.8; }; - + class optic_Aco: ItemCore { ACE_ScopeHeightAboveRail = 3.69248; }; - + class optic_ACO_grn: ItemCore { ACE_ScopeHeightAboveRail = 3.69248; }; - + class optic_ACO_grn_smg: ItemCore { ACE_ScopeHeightAboveRail = 3.69248; }; - + class optic_ACO_smg: ItemCore { ACE_ScopeHeightAboveRail = 3.69248; }; - + class optic_Holosight: ItemCore { ACE_ScopeHeightAboveRail = 4.66933; }; - + class optic_Holosight_smg: ItemCore { ACE_ScopeHeightAboveRail = 4.66933; }; - + class optic_Arco: ItemCore { ACE_ScopeHeightAboveRail = 4.89287; }; - + class optic_ERCO_blk_F: optic_Arco { ACE_ScopeHeightAboveRail = 3.48836; }; - + class optic_Hamr: ItemCore { ACE_ScopeHeightAboveRail = 4.48584; }; - + class optic_MRCO: ItemCore { ACE_ScopeHeightAboveRail = 3.88405; }; - + class optic_Nightstalker: ItemCore { ACE_ScopeHeightAboveRail = 5.54325; ACE_ScopeAdjust_Vertical[] = {-4, 30}; @@ -69,7 +69,7 @@ class CfgWeapons { }; }; }; - + class optic_NVS: ItemCore { ACE_ScopeHeightAboveRail = 5.54325; ACE_ScopeAdjust_Vertical[] = {-4, 30}; @@ -85,7 +85,7 @@ class CfgWeapons { }; }; }; - + class optic_TWS: ItemCore { ACE_ScopeHeightAboveRail = 5.52874; ACE_ScopeAdjust_Vertical[] = {-4, 30}; @@ -101,7 +101,7 @@ class CfgWeapons { }; }; }; - + class optic_LRPS: ItemCore { ACE_ScopeHeightAboveRail = 4.2098; ACE_ScopeAdjust_Vertical[] = {0, 27}; @@ -308,7 +308,7 @@ class CfgWeapons { }; class arifle_katiba_Base_F: Rifle_Base_F {}; - + class arifle_Katiba_F: arifle_katiba_Base_F { ACE_RailHeightAboveBore = 5.75468; ACE_IronSightBaseAngle = 0.011459; @@ -337,7 +337,7 @@ class CfgWeapons { }; class SDAR_base_F: Rifle_Base_F {}; - + class arifle_SDAR_F: SDAR_base_F { ACE_RailHeightAboveBore = 0; ACE_IronSightBaseAngle = -0.042972; @@ -448,7 +448,7 @@ class CfgWeapons { class MMG_01_hex_F: MMG_01_base_F { ACE_RailHeightAboveBore = 4.73961; ACE_IronSightBaseAngle = -0.003438; - }; + }; class MMG_02_camo_F: MMG_02_base_F { ACE_RailHeightAboveBore = 5.01913; ACE_IronSightBaseAngle = 0.010886; diff --git a/addons/scopes/XEH_PREP.hpp b/addons/scopes/XEH_PREP.hpp index 58b4e494f2..70af49a716 100644 --- a/addons/scopes/XEH_PREP.hpp +++ b/addons/scopes/XEH_PREP.hpp @@ -6,7 +6,7 @@ PREP(calculateZeroAngleCorrection); PREP(canAdjustZero); PREP(canResetZero); PREP(firedEH); -PREP(getBaseAngle); +PREP(getBaseAngle); PREP(getBoreHeight); PREP(getCurrentZeroRange); PREP(getOptics); diff --git a/addons/scopes/functions/fnc_firedEH.sqf b/addons/scopes/functions/fnc_firedEH.sqf index 8870592885..6508050679 100644 --- a/addons/scopes/functions/fnc_firedEH.sqf +++ b/addons/scopes/functions/fnc_firedEH.sqf @@ -30,7 +30,7 @@ TRACE_1("Adjusting With",_zeroing); if (GVAR(correctZeroing) || GVAR(simplifiedZeroing)) then { private _advancedBallistics = missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]; private _baseAngle = (_unit getVariable [QGVAR(baseAngle), [0,0,0]]) select _weaponIndex; - private _boreHeight = (_unit getVariable [QGVAR(boreHeight), [0,0,0]]) select _weaponIndex; + private _boreHeight = (_unit getVariable [QGVAR(boreHeight), [0,0,0]]) select _weaponIndex; private _oldZeroRange = currentZeroing _unit; private _newZeroRange = [_unit] call FUNC(getCurrentZeroRange); private _zeroCorrection = missionNamespace getVariable format[QGVAR(%1_%2_%3_%4_%5_%6_%7), _oldZeroRange, _newZeroRange, _boreHeight, _weapon, _ammo, _magazine, _advancedBallistics]; diff --git a/addons/scopes/functions/fnc_getBaseAngle.sqf b/addons/scopes/functions/fnc_getBaseAngle.sqf index da5e965938..a966ffa167 100644 --- a/addons/scopes/functions/fnc_getBaseAngle.sqf +++ b/addons/scopes/functions/fnc_getBaseAngle.sqf @@ -18,10 +18,10 @@ params ["_unit", "_weaponIndex"]; -if (_weaponIndex < 0 || {_weaponIndex > 2}) exitWith { 0 }; +if (_weaponIndex < 0 || {_weaponIndex > 2}) exitWith { 0 }; -private _weaponClass = [primaryWeapon _unit, secondaryWeapon _unit, handgunWeapon _unit] select _weaponIndex; -private _opticsClass = ([_unit] call FUNC(getOptics)) select _weaponIndex; +private _weaponClass = [primaryWeapon _unit, secondaryWeapon _unit, handgunWeapon _unit] select _weaponIndex; +private _opticsClass = ([_unit] call FUNC(getOptics)) select _weaponIndex; private _weaponConfig = configFile >> "CfgWeapons" >> _weaponClass; private _baseAngle = getNumber(_weaponConfig >> "ACE_IronSightBaseAngle"); diff --git a/addons/scopes/functions/fnc_getBoreHeight.sqf b/addons/scopes/functions/fnc_getBoreHeight.sqf index 8926585989..e0b9c0c22e 100644 --- a/addons/scopes/functions/fnc_getBoreHeight.sqf +++ b/addons/scopes/functions/fnc_getBoreHeight.sqf @@ -18,10 +18,10 @@ params ["_unit", "_weaponIndex"]; -if (_weaponIndex < 0 || {_weaponIndex > 2}) exitWith { 0 }; +if (_weaponIndex < 0 || {_weaponIndex > 2}) exitWith { 0 }; -private _weaponClass = [primaryWeapon _unit, secondaryWeapon _unit, handgunWeapon _unit] select _weaponIndex; -private _opticsClass = ([_unit] call FUNC(getOptics)) select _weaponIndex; +private _weaponClass = [primaryWeapon _unit, secondaryWeapon _unit, handgunWeapon _unit] select _weaponIndex; +private _opticsClass = ([_unit] call FUNC(getOptics)) select _weaponIndex; if (_opticsClass == "") then { _opticsClass = _weaponClass; }; diff --git a/addons/spectator/functions/script_component.hpp b/addons/spectator/functions/script_component.hpp index d5034cb39c..83581f08f7 100644 --- a/addons/spectator/functions/script_component.hpp +++ b/addons/spectator/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\spectator\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\spectator\script_component.hpp" diff --git a/addons/spottingscope/functions/script_component.hpp b/addons/spottingscope/functions/script_component.hpp index 504cde2ca6..12dfdc4e3e 100644 --- a/addons/spottingscope/functions/script_component.hpp +++ b/addons/spottingscope/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\spottingscope\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\spottingscope\script_component.hpp" diff --git a/addons/tacticalladder/functions/script_component.hpp b/addons/tacticalladder/functions/script_component.hpp index 53bdb8be62..6c29debfd9 100644 --- a/addons/tacticalladder/functions/script_component.hpp +++ b/addons/tacticalladder/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\tacticalladder\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\tacticalladder\script_component.hpp" diff --git a/addons/tagging/functions/script_component.hpp b/addons/tagging/functions/script_component.hpp index bc860f2283..9bb3bf1d72 100644 --- a/addons/tagging/functions/script_component.hpp +++ b/addons/tagging/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\tagging\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\tagging\script_component.hpp" diff --git a/addons/towing/functions/fnc_attachRopePFH.sqf b/addons/towing/functions/fnc_attachRopePFH.sqf index 5fd9fd6f32..8164060b84 100644 --- a/addons/towing/functions/fnc_attachRopePFH.sqf +++ b/addons/towing/functions/fnc_attachRopePFH.sqf @@ -50,7 +50,7 @@ if (_intersections isNotEqualTo []) then { GVAR(attachHelper) setVariable [QGVAR(object), _intersectObject]; }; - + }; if (_source isNotEqualTo [0, 0, 0]) then { diff --git a/addons/towing/functions/script_component.hpp b/addons/towing/functions/script_component.hpp index cb87a08576..6ebd098f2d 100644 --- a/addons/towing/functions/script_component.hpp +++ b/addons/towing/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\towing\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\towing\script_component.hpp" diff --git a/addons/trenches/functions/script_component.hpp b/addons/trenches/functions/script_component.hpp index 3747e01219..2509d7da50 100644 --- a/addons/trenches/functions/script_component.hpp +++ b/addons/trenches/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\trenches\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\trenches\script_component.hpp" diff --git a/addons/trenches/initSettings.sqf b/addons/trenches/initSettings.sqf index 7abce22295..13e373d25d 100644 --- a/addons/trenches/initSettings.sqf +++ b/addons/trenches/initSettings.sqf @@ -1,36 +1,36 @@ // Trenches dig/remove durations [ - QGVAR(smallEnvelopeDigDuration), - "TIME", + QGVAR(smallEnvelopeDigDuration), + "TIME", [LSTRING(SmallEnvelopeDigDuration_DisplayName), LSTRING(SmallEnvelopeDigDuration_Description)], LSTRING(Category), - [5, 600, 20], + [5, 600, 20], true ] call CBA_fnc_addSetting; [ - QGVAR(smallEnvelopeRemoveDuration), - "TIME", + QGVAR(smallEnvelopeRemoveDuration), + "TIME", [LSTRING(SmallEnvelopeRemoveDuration_DisplayName), LSTRING(SmallEnvelopeRemoveDuration_Description)], LSTRING(Category), - [5, 600, 12], + [5, 600, 12], true ] call CBA_fnc_addSetting; [ - QGVAR(bigEnvelopeDigDuration), - "TIME", + QGVAR(bigEnvelopeDigDuration), + "TIME", [LSTRING(BigEnvelopeDigDuration_DisplayName), LSTRING(BigEnvelopeDigDuration_Description)], LSTRING(Category), - [5, 600, 25], + [5, 600, 25], true ] call CBA_fnc_addSetting; [ - QGVAR(bigEnvelopeRemoveDuration), - "TIME", + QGVAR(bigEnvelopeRemoveDuration), + "TIME", [LSTRING(BigEnvelopeRemoveDuration_DisplayName), LSTRING(BigEnvelopeRemoveDuration_Description)], LSTRING(Category), - [5, 600, 15], + [5, 600, 15], true ] call CBA_fnc_addSetting; diff --git a/addons/tripod/functions/script_component.hpp b/addons/tripod/functions/script_component.hpp index 4fa165afc7..c35681b54e 100644 --- a/addons/tripod/functions/script_component.hpp +++ b/addons/tripod/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\tripod\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\tripod\script_component.hpp" diff --git a/addons/vector/functions/script_component.hpp b/addons/vector/functions/script_component.hpp index d4007d8aa4..a4a813c374 100644 --- a/addons/vector/functions/script_component.hpp +++ b/addons/vector/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\vector\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\vector\script_component.hpp" diff --git a/addons/vehicle_damage/CfgAmmo.hpp b/addons/vehicle_damage/CfgAmmo.hpp index 195d059c2a..23f582a814 100644 --- a/addons/vehicle_damage/CfgAmmo.hpp +++ b/addons/vehicle_damage/CfgAmmo.hpp @@ -10,7 +10,7 @@ class CfgAmmo { class BombCore; class DirectionalBombCore; class PipeBombCore; - + class B_30mm_HE; class GrenadeHand; class R_PG32V_F; @@ -20,9 +20,9 @@ class CfgAmmo { class M_SPG9_HEAT; class R_MRAAWS_HEAT_F; class B_338_Ball; - + class ACE_G_40mm_HE; - + CREATE_INCENDIARY_AMMO(BulletBase, BulletCore, 0.1); CREATE_INCENDIARY_AMMO(ShellBase, ShellCore, 1.0); CREATE_INCENDIARY_AMMO(ammo_Penetrator_Base, ShellBase, 1.0); @@ -40,7 +40,7 @@ class CfgAmmo { CREATE_INCENDIARY_AMMO(ammo_Gun30mmAABase, BulletBase, 0.7); CREATE_INCENDIARY_AMMO(ammo_Gun35mmAABase, BulletBase, 0.7); CREATE_INCENDIARY_AMMO(ammo_Missile_CannonLaunchedBase, MissileBase, 1.0); - + CREATE_INCENDIARY_AMMO(B_127x99_Ball, BulletBase, 0.2); CREATE_INCENDIARY_AMMO(B_127x99_SLAP, B_127x99_Ball, 0.8); CREATE_INCENDIARY_AMMO(B_127x108_Ball, BulletBase, 0.3); @@ -62,50 +62,50 @@ class CfgAmmo { CREATE_INCENDIARY_AMMO(ammo_Penetrator_120mm, ammo_Penetrator_Base, 1.0); CREATE_INCENDIARY_AMMO(ammo_Penetrator_Rocket_03_AP, ammo_Penetrator_Base, 0.7); CREATE_INCENDIARY_AMMO(ammo_Penetrator_Rocket_04_AP, ammo_Penetrator_Base, 0.7); - + CREATE_INCENDIARY_AMMO(Sh_120mm_HE, ShellBase, 0.4); CREATE_INCENDIARY_AMMO(Sh_120mm_APFSDS, ShellBase, 0.1); CREATE_INCENDIARY_AMMO(Sh_120mm_HEAT_MP, ShellBase, 0.8); CREATE_INCENDIARY_AMMO(Sh_155mm_AMOS, ShellBase, 0.4); CREATE_INCENDIARY_AMMO(Sh_82mm_AMOS, Sh_155mm_AMOS, 0.1); - + CREATE_INCENDIARY_AMMO(Bo_Mk82, BombCore, 0.8); CREATE_INCENDIARY_AMMO(R_TBG32V_F, R_PG32V_F, 0.2); - + CREATE_INCENDIARY_AMMO(R_80mm_HE, RocketBase, 0.2); CREATE_INCENDIARY_AMMO(R_60mm_HE, R_80mm_HE, 0.1); - + CREATE_INCENDIARY_AMMO(R_230mm_HE, SubmunitionBase, 0.9); CREATE_INCENDIARY_AMMO(R_230mm_fly, ShellBase, 0.9); - + CREATE_INCENDIARY_AMMO(G_40mm_HE, GrenadeBase, 0.1); CREATE_INCENDIARY_AMMO(G_20mm_HE, G_40mm_HE, 0.3); CREATE_INCENDIARY_AMMO(G_40mm_HEDP, G_40mm_HE, 0.8); - + CREATE_INCENDIARY_AMMO(Mo_cluster_AP, ShellBase, 0.9); CREATE_INCENDIARY_AMMO(M_Titan_AT, MissileBase, 1.0); CREATE_INCENDIARY_AMMO(M_Titan_AP, M_Titan_AT, 0.3); - + CREATE_INCENDIARY_AMMO(Sh_125mm_APFSDS, Sh_120mm_APFSDS, 0.15); CREATE_INCENDIARY_AMMO(Sh_125mm_HEAT, Sh_125mm_HE, 1.0); - + CREATE_INCENDIARY_AMMO(Gatling_30mm_HE_Plane_CAS_01_F, BulletBase, 0.6); - + CREATE_INCENDIARY_AMMO(Missile_AGM_02_F, MissileBase, 1.0); CREATE_INCENDIARY_AMMO(M_Mo_82mm_AT, MissileBase, 1.0); CREATE_INCENDIARY_AMMO(Rocket_04_HE_F, MissileBase, 0.4); CREATE_INCENDIARY_AMMO(Rocket_04_AP_F, Rocket_04_HE_F, 0.1); - + CREATE_INCENDIARY_AMMO(Sh_105mm_HEAT_MP, Sh_125mm_HEAT, 0.8); - + CREATE_INCENDIARY_AMMO(APERSTripMine_Wire_Ammo, DirectionalBombBase, 0.0); - + CREATE_INCENDIARY_AMMO(B_127x54_Ball, BulletBase, 0.8); CREATE_INCENDIARY_AMMO(B_93x64_Ball, BulletBase, 0.5); - + CREATE_INCENDIARY_AMMO(M_Vorona_HE, M_Vorona_HEAT, 0.2); CREATE_INCENDIARY_AMMO(M_SPG9_HE, M_SPG9_HEAT, 0.2); CREATE_INCENDIARY_AMMO(R_MRAAWS_HE_F, R_MRAAWS_HEAT_F, 0.4); - + CREATE_INCENDIARY_AMMO(B_20mm_AP, BulletBase, 0.2); }; diff --git a/addons/vehicle_damage/CfgVehicles.hpp b/addons/vehicle_damage/CfgVehicles.hpp index b34f793e0f..9ea47711ea 100644 --- a/addons/vehicle_damage/CfgVehicles.hpp +++ b/addons/vehicle_damage/CfgVehicles.hpp @@ -16,7 +16,7 @@ class CfgVehicles { model = "\A3\Structures_F\Wrecks\Wreck_T72_turret_F.p3d"; icon = "\A3\armor_f_gamma\MBT_02\Data\UI\map_MBT_02_ca.paa"; }; - + class Tank; class Car_F; class Tank_F: Tank { @@ -148,13 +148,13 @@ class CfgVehicles { "HitERA_Top_Front", "HitERA_Top_Left", "HitERA_Top_Right" }; }; - + class O_MBT_02_base_F; class O_MBT_02_cannon_F: O_MBT_02_base_F { GVAR(turret)[] = { QGVAR(Turret_MBT_02), {0, -1, 0} }; GVAR(canHaveFireRing) = 1; }; - + class APC_Tracked_02_base_F: Tank_F { GVAR(hullDetonationProb) = 0; GVAR(turretDetonationProb) = 0; @@ -227,7 +227,7 @@ class CfgVehicles { GVAR(engineFireProb) = 0.7; GVAR(detonationDuringFireProb) = 0.9; GVAR(slatHitpoints)[] = { - "HitSLAT_Left_1", "HitSLAT_Left_2", "HitSLAT_Left_3", + "HitSLAT_Left_1", "HitSLAT_Left_2", "HitSLAT_Left_3", "HitSLAT_Right_1", "HitSLAT_Right_2", "HitSLAT_Right_3", "HitSLAT_back", "HitSLAT_front" @@ -267,7 +267,7 @@ class CfgVehicles { GVAR(engineFireProb) = 0.7; GVAR(detonationDuringFireProb) = 0.5; GVAR(slatHitpoints)[] = { - "HitSLAT_Left_1", "HitSLAT_Left_2", "HitSLAT_Left_3", + "HitSLAT_Left_1", "HitSLAT_Left_2", "HitSLAT_Left_3", "HitSLAT_Right_1", "HitSLAT_Right_2", "HitSLAT_Right_3", "HitSLAT_back", "HitSLAT_front" @@ -282,7 +282,7 @@ class CfgVehicles { GVAR(engineFireProb) = 0.5; GVAR(detonationDuringFireProb) = 0.7; GVAR(slatHitpoints)[] = { - "HitSLAT_Left", "HitSLAT_Right", "HitSLAT_back", + "HitSLAT_Left", "HitSLAT_Right", "HitSLAT_back", "HitSLAT_top_left", "HitSLAT_top_right", "HitSLAT_top_back" }; GVAR(canHaveFireRing) = 1; diff --git a/addons/vehicle_damage/XEH_postInit.sqf b/addons/vehicle_damage/XEH_postInit.sqf index fd72a73753..ce563302e3 100644 --- a/addons/vehicle_damage/XEH_postInit.sqf +++ b/addons/vehicle_damage/XEH_postInit.sqf @@ -24,7 +24,7 @@ ["Tank", "init", LINKFUNC(addEventHandler), true, [], true] call CBA_fnc_addClassEventHandler; ["Wheeled_APC_F", "init", LINKFUNC(addEventHandler), true, [], true] call CBA_fnc_addClassEventHandler; - + if (GVAR(enableCarDamage)) then { ["Car", "init", LINKFUNC(addEventHandler), true, [], true] call CBA_fnc_addClassEventHandler; }; diff --git a/addons/vehicle_damage/functions/fnc_addEventHandler.sqf b/addons/vehicle_damage/functions/fnc_addEventHandler.sqf index 39a101d3b8..5c14a2f469 100644 --- a/addons/vehicle_damage/functions/fnc_addEventHandler.sqf +++ b/addons/vehicle_damage/functions/fnc_addEventHandler.sqf @@ -20,7 +20,7 @@ TRACE_2("addEventHandler",_vehicle,GVAR(enabled)); if !(GVAR(enabled)) exitWith { #ifdef DEBUG_MODE_FULL - [{ ["Warning: Vehicle Damage not enabled...", 2] call CBA_fnc_notify; }, [], 5] call CBA_fnc_waitAndExecute; + [{ ["Warning: Vehicle Damage not enabled...", 2] call CBA_fnc_notify; }, [], 5] call CBA_fnc_waitAndExecute; #endif }; @@ -51,7 +51,7 @@ private _iterateThroughConfig = { private _isEra = _configName in _eraHitpoints; private _isSlat = _configName in _slatHitpoints; private _isMisc = false; - + // prevent incompatibilites with old mods if ((toLower _configName) isEqualTo "hitturret") then { _isTurret = true; @@ -59,7 +59,7 @@ private _iterateThroughConfig = { if ((toLower _configName) isEqualTo "hitgun") then { _isGun = true; }; - + private _hash = _vehicle getVariable QGVAR(hitpointHash); { _x params ["_hitType", "_hitPoints"]; @@ -68,7 +68,7 @@ private _iterateThroughConfig = { _isMisc = true; }; } forEach _hitpointAliases; - + if (_isGun || _isTurret || _isEra || _isSlat || _isMisc) then { TRACE_6("found gun/turret/era/slat/misc",_isGun,_isTurret,_isEra,_isSlat,_isMisc,_hash); if (_isGun) then { diff --git a/addons/vehicle_damage/functions/fnc_calculatePenetrationInfo.sqf b/addons/vehicle_damage/functions/fnc_calculatePenetrationInfo.sqf index f8dd6f5b7b..48792bdbcb 100644 --- a/addons/vehicle_damage/functions/fnc_calculatePenetrationInfo.sqf +++ b/addons/vehicle_damage/functions/fnc_calculatePenetrationInfo.sqf @@ -26,13 +26,13 @@ _projectileData params ["_projectileType", "_projectileConfig"]; Perforation Calculation of APFSDS: Tungsten/Depleted Uranium: Rods P/Lw = a * (1 / tanh(b0 + b1 * (Lw/D))) * cos^m (theta) * sqrt (Pp / Pt) * e^((-(c0 + c1 * BHNT) * BHNT) / (Pp * Vt^2)) - + Steel Rods P/Lw = a * (1 / tanh(b0 + b1 * (Lw/D))) * cos^m (theta) * sqrt (Pp / Pt) * e^((-c * BHNT^k * BHNP^n) / (Pp * Vt^2)) - + Penetration Calculation of Tungsten APFSDS (Used for all penetrators): P/Lw = a * (1 / tanh(b0 + b1 * (Lw/D))) sqrt (Pp / Pt) * e^((-(c0 + c1 * BHNT) * BHNT) / (Pp * Vt^2)) - + where: Penetrator: D = Diameter of penetrator rod (always 22mm) @@ -42,33 +42,33 @@ _projectileData params ["_projectileType", "_projectileConfig"]; theta = NATO Obliquity angle of Penetration Pp = Penetrator Density in kg/m^3 BHNP = Brinell hardness number of penetrator - + Target: Pt = target density in kg/m^3 (always 7840kg/m^3) d = plate thickness in millimeters BHNT = Brinell hardness number of target (always 350) - + Material Data: Tungsten: Pp = 19300 BHNP = N/A - + a = 0.994 c0 = 134.5 c1 = -0.148 - + Depleted Uranium: Pp = 18600 BHNP = N/A - + a = 0.825 c0 = 90.0 c1 = -0.0849 - + Steel: Pp = 7850 BHNP = 500 - + a = 1.104 c = 9874 k = 0.3598 diff --git a/addons/vehicle_damage/functions/fnc_handleCookoff.sqf b/addons/vehicle_damage/functions/fnc_handleCookoff.sqf index 277c0a916e..2f48f76116 100644 --- a/addons/vehicle_damage/functions/fnc_handleCookoff.sqf +++ b/addons/vehicle_damage/functions/fnc_handleCookoff.sqf @@ -32,7 +32,7 @@ if (!_alreadyCookingOff && { _chanceOfFire >= random 1 }) exitWith { private _delayWithSmoke = _chanceOfFire < random 1; private _detonateAfterCookoff = (_fireDetonateChance / 4) > random 1; - + private _source = ""; if (toLower _hitPart isEqualTo "engine") then { _source = ["hit_engine_point", "HitPoints"]; @@ -43,7 +43,7 @@ if (!_alreadyCookingOff && { _chanceOfFire >= random 1 }) exitWith { LOG_4("Cooking-off [%1] with a chance-of-fire [%2] - Delayed Smoke | Detonate after cookoff [%3 | %4]",_vehicle,_chanceOfFire,_delayWithSmoke,_detonateAfterCookoff); [_vehicle] spawn FUNC(abandon); LOG_1("[%1] is on fire is bailing",_vehicle); - + // cant setVehicleAmmo 0 here because it removes FFV unit's ammo if (GVAR(removeAmmoDuringCookoff)) then { private _ammo = [_vehicle] call EFUNC(cookoff,getVehicleAmmo); diff --git a/addons/vehicle_damage/functions/fnc_handleDamage.sqf b/addons/vehicle_damage/functions/fnc_handleDamage.sqf index dd33fd2705..30bf4408ab 100644 --- a/addons/vehicle_damage/functions/fnc_handleDamage.sqf +++ b/addons/vehicle_damage/functions/fnc_handleDamage.sqf @@ -42,7 +42,7 @@ if !(_projectile in ["ace_ammoExplosion", "ACE_ammoExplosionLarge"]) then { private _frameHash = _vehicle getVariable [QGVAR(hitHash), nil]; private _hitArray = [_frameHash, _processingFrame] call CBA_fnc_hashGet; if (_hitArray isEqualTo []) exitWith {}; - + reverse _hitArray; TRACE_3("processing data from old frame",diag_frameNo,_processingFrame,_hitArray); { @@ -52,9 +52,9 @@ if !(_projectile in ["ace_ammoExplosion", "ACE_ammoExplosionLarge"]) then { LOG_2("cancelling rest of vehicle damage queue ( [%1] items left out of [%2] )",(count (_hitArray#1)) - _forEachIndex,count (_hitArray#1)) }; } forEach _hitArray; - + [_frameHash, _processingFrame] call CBA_fnc_hashRem; - + }, [_vehicle, diag_frameNo]] call CBA_fnc_execNextFrame; }; _currentFrameArray pushBack _this; diff --git a/addons/vehicle_damage/functions/fnc_handleVehicleDamage.sqf b/addons/vehicle_damage/functions/fnc_handleVehicleDamage.sqf index b17535f514..4d39dc6b78 100644 --- a/addons/vehicle_damage/functions/fnc_handleVehicleDamage.sqf +++ b/addons/vehicle_damage/functions/fnc_handleVehicleDamage.sqf @@ -69,7 +69,7 @@ if (isNil "_multHit") then { private _withinTime = (CBA_missionTime <= (_multHit select 0) + CONST_TIME) && { _injurer == (_multHit select 1) }; if (_hitPointInOldArray && _withinTime) then { _ignoreHit = true; - } else { + } 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 { private _oldHitPoints = _multHit select 2; diff --git a/addons/vehicle_damage/functions/fnc_injureOccupants.sqf b/addons/vehicle_damage/functions/fnc_injureOccupants.sqf index be08f583c8..7dc93cabd4 100644 --- a/addons/vehicle_damage/functions/fnc_injureOccupants.sqf +++ b/addons/vehicle_damage/functions/fnc_injureOccupants.sqf @@ -53,7 +53,7 @@ private _injuryCount = 0; _indexToInjure = _forEachIndex; }; } forEach _crewInjuryIndices; - + if (_indexToInjure >= 0) then { private _casualty = _vehicleCrew select (_crewInjuryIndices select _indexToInjure); if (alive _casualty) then { @@ -61,7 +61,7 @@ private _injuryCount = 0; private _indexCount = count _crewInjuryIndices; if (_indexCount >= 0) then { _crewInjuryIndices deleteAt _indexToInjure; - + // arbitrary percentages private _injuredBodyPart = ["Head", "Body", "LeftArm", "RightArm", "LeftLeg", "RightLeg"] selectRandomWeighted [0.3, 0.8, 0.5, 0.5, 0.3, 0.3]; private _currentUnitDamage = _casualty getHitpointDamage _injuredBodyPart; @@ -71,6 +71,6 @@ private _injuryCount = 0; }; }; }; - + if (_injuryCount >= _count) exitWith {}; } forEach _vehicleCrew; diff --git a/addons/vehicle_damage/functions/fnc_processHit.sqf b/addons/vehicle_damage/functions/fnc_processHit.sqf index 9f0c6560a7..d548eed5a3 100644 --- a/addons/vehicle_damage/functions/fnc_processHit.sqf +++ b/addons/vehicle_damage/functions/fnc_processHit.sqf @@ -155,7 +155,7 @@ if !(count (_currentVehicleAmmo select 0) isEqualTo 0) then { private _initialAmmoCount = getNumber (_magConfig >> _magazineClassname >> "count"); _chanceOfDetonation = _chanceOfDetonation + (_currentAmmoCount / _initialAmmoCount); _countOfExplodableAmmo = _countOfExplodableAmmo + 1; - + private _ammoClassname = getText (_magConfig >> _magazineClassname >> "ammo"); private _explosive = getNumber (_ammoConfig >> _ammoClassname >> "explosive"); private _hit = getNumber (_ammoConfig >> _ammoClassname >> "hit"); @@ -177,21 +177,21 @@ switch (_hitArea) do { case "engine": { _chanceToDetonate = ([_vehicleConfig >> QGVAR(engineDetonationProb), "NUMBER", 0] call CBA_fnc_getConfigEntry) * _incendiary * _currentFuel * _penChance; _chanceOfFire = ([_vehicleConfig >> QGVAR(engineFireProb), "NUMBER", 0] call CBA_fnc_getConfigEntry) * _incendiary * _currentFuel * _penChance; - + private _cookoffIntensity = 4 * _currentFuel; TRACE_6("hit engine",_chanceToDetonate,_chanceOfFire,_incendiary,_chanceOfDetonation,_currentFuel,_cookoffIntensity); - + if (_isCar) then { _chanceOfFire = 0; // no cookoff for cars }; - + if ([_vehicle, _chanceToDetonate, _currentVehicleAmmo, _explosiveAmmoCount, _nonExplosiveAmmoCount, _injurer] call FUNC(handleDetonation)) exitWith { [_vehicle] call FUNC(knockOut); }; // cap damage at 0.9 to avoid hard coded blow up _nextPartDamage = (0.9 min _nextPartDamage); - + // fatal engine/drive system damage if (_nextPartDamage == 0.9 || { 0.8 * _ammoEffectiveness > random 1 }) then { [_vehicle, _hitIndex, _hitpointName, 0.9 * _penChance] call FUNC(addDamage); @@ -199,7 +199,7 @@ switch (_hitArea) do { } else { [_vehicle, _hitIndex, _hitpointName, _nextPartDamage * _penChance] call FUNC(addDamage); }; - + // slightly lower injury chance since this hit the engine block [_vehicle, _injuryChance, _injuryCount, _injurer, [0.2, 0.2, 0.2, 0.4]] call FUNC(injureOccupants); [_vehicle, _chanceOfFire, _cookoffIntensity, _injurer, _hitArea, false] call FUNC(handleCookoff); @@ -207,24 +207,24 @@ switch (_hitArea) do { case "hull": { _chanceToDetonate = ([_vehicleConfig >> QGVAR(hullDetonationProb), "NUMBER", 0] call CBA_fnc_getConfigEntry) * _incendiary * ((_chanceOfDetonation + _currentFuel) / 2) * _penChance; _chanceOfFire = ([_vehicleConfig >> QGVAR(hullFireProb), "NUMBER", 0] call CBA_fnc_getConfigEntry) * _incendiary * ((_chanceOfDetonation + _currentFuel) / 2) * _penChance; - + private _cookoffIntensity = 1.5 + (_explosiveAmmoCount * _chanceOfFire); TRACE_6("hit hull",_chanceToDetonate,_chanceOfFire,_incendiary,_chanceOfDetonation,_currentFuel,_cookoffIntensity); - + if (_isCar) then { _chanceOfFire = 0; // no cookoff for cars }; - + if ([_vehicle, _chanceToDetonate, _currentVehicleAmmo, _explosiveAmmoCount, _nonExplosiveAmmoCount, _injurer] call FUNC(handleDetonation)) exitWith { [_vehicle, _hitIndex, _hitpointName, 0.89 * _penChance] call FUNC(addDamage); [_vehicle] call FUNC(knockOut); }; - + [_vehicle, _injuryChance, _injuryCount, _injurer, [1, 0.4, 0.4, 1]] call FUNC(injureOccupants); - + private _hash = _vehicle getVariable [QGVAR(hitpointHash), []]; private _hashKeys = [_hash] call CBA_fnc_hashKeys; - + // 25% chance of jamming turret - 25% of mobility kill - 25% of both - 75% chance of critical hull damage private _rand = random 1; TRACE_2("rolling hull damage",_ammoEffectiveness,_rand); @@ -249,7 +249,7 @@ switch (_hitArea) do { if !(_vehicle isKindOf "Wheeled_APC_F") then { _partKill = _partKill + TRACK_HITPOINTS#0; }; - + _vehicle setVariable [QGVAR(canMove), false]; }; case (_rand < 0.75): { @@ -258,49 +258,49 @@ switch (_hitArea) do { if !(_vehicle isKindOf "Wheeled_APC_F") then { _partKill = _partKill + TRACK_HITPOINTS#0; }; - + // iterate through all keys and find appropriate turret [_hash, { if (_value#0 isEqualTo "turret") then { _partKill pushBack _key; }; }] call CBA_fnc_hashEachPair; - + _vehicle setVariable [QGVAR(canMove), false]; _vehicle setVariable [QGVAR(canShoot), false]; }; default{}; }; }; - + { TRACE_1("doing damage to hitpoint", _x); [_vehicle, -1, _x, 1 * _penChance] call FUNC(addDamage); } forEach _partKill; - + [_vehicle, _chanceOfFire, _cookoffIntensity, _injurer, "", true] call FUNC(handleCookoff); }; case "turret": { _chanceToDetonate = ([_vehicleConfig >> QGVAR(turretDetonationProb), "NUMBER", 0] call CBA_fnc_getConfigEntry) * _incendiary * _chanceOfDetonation * _penChance; _chanceOfFire = ([_vehicleConfig >> QGVAR(turretFireProb), "NUMBER", 0] call CBA_fnc_getConfigEntry) * _incendiary * _chanceOfDetonation * _penChance; - + private _cookoffIntensity = _explosiveAmmoCount * _chanceOfFire; TRACE_6("hit turret",_chanceToDetonate,_chanceOfFire,_incendiary,_chanceOfDetonation,_currentFuel,_cookoffIntensity); - + if (_isCar) then { _chanceOfFire = 0; // no cookoff for cars }; - + if ([_vehicle, _chanceToDetonate, _currentVehicleAmmo, _explosiveAmmoCount, _nonExplosiveAmmoCount, _injurer] call FUNC(handleDetonation)) exitWith { [_vehicle] call FUNC(knockOut); }; - + if (0.8 * _ammoEffectiveness > random 1) then { TRACE_1("damaged turret", _ammoEffectiveness * 0.8); [_vehicle, _hitIndex, _hitpointName, 1 * _penChance] call FUNC(addDamage); _vehicle setVariable [QGVAR(canShoot), false]; }; - + [_vehicle, _injuryChance, _injuryCount, _injurer, [0.5, 1.5, 1.5, 0.8]] call FUNC(injureOccupants); [_vehicle, _chanceOfFire, _cookoffIntensity, _injurer, "", true] call FUNC(handleCookoff); }; @@ -316,7 +316,7 @@ switch (_hitArea) do { private _damage = (0.1 max (0.1 * _newDamage / _minDamage)) min 1; [_vehicle, _hitIndex, _hitpointName, (_currentPartDamage + _damage) * _penChance] call FUNC(addDamage); TRACE_3("damaged track",_damage,_newDamage,_minDamage); - + if ((_vehicle getHitIndex _hitIndex) >= 1) then { _vehicle setVariable [QGVAR(canMove), false]; }; @@ -329,13 +329,13 @@ switch (_hitArea) do { _chanceOfFire = (_incendiary * _currentFuel * _penChance) / 2; private _cookoffIntensity = _currentFuel * 5; TRACE_2("damaged fuel",_chanceOfFire,_cookoffIntensity); - + if (_isCar) then { _chanceOfFire = 0; // no cookoff for cars }; - + [_vehicle, _chanceOfFire, _cookoffIntensity, _injurer, "", false] call FUNC(handleCookoff); - + private _damage = (0.1 max (0.1 * _newDamage / _minDamage)) min 1; [_vehicle, _hitIndex, _hitpointName, (_currentPartDamage + _damage) * _penChance] call FUNC(addDamage); }; @@ -345,13 +345,13 @@ switch (_hitArea) do { if (_warheadType isEqualTo WARHEAD_TYPE_HEAT || { _warheadType isEqualTo WARHEAD_TYPE_TANDEM } || { _warheadType isEqualTo WARHEAD_TYPE_HE } || { 0.01 > random 1 }) then { private _currentDamage = _vehicle getHitIndex _hitIndex; TRACE_3("damaged slat",_warheadType,_warheadTypeStr,_currentDamage); - + if (_warheadType isEqualTo WARHEAD_TYPE_HEAT || { _warheadType isEqualTo WARHEAD_TYPE_TANDEM }) then { [_vehicle, _hitIndex, _hitpointName, 1] call FUNC(addDamage); } else { [_vehicle, _hitIndex, _hitpointName, _currentDamage + (0.5 max random 1)] call FUNC(addDamage); }; - + if (_currentDamage < 1 && _warheadType isEqualTo WARHEAD_TYPE_HEAT) then { _return = false; }; @@ -363,7 +363,7 @@ switch (_hitArea) do { private _currentDamage = _vehicle getHitIndex _hitIndex; TRACE_3("damaged era",_warheadType,_warheadTypeStr,_currentDamage); [_vehicle, _hitIndex, _hitpointName, 1] call FUNC(addDamage); - + // dont process anymore damage if this is HEAT - shouldnt happen anyway but ARMA says it does so you know if (_currentDamage < 1 && _warheadType isEqualTo WARHEAD_TYPE_HEAT) then { _return = false; diff --git a/addons/vehiclelock/functions/script_component.hpp b/addons/vehiclelock/functions/script_component.hpp index 0e05142c6e..ea59437b17 100644 --- a/addons/vehiclelock/functions/script_component.hpp +++ b/addons/vehiclelock/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\vehiclelock\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\vehiclelock\script_component.hpp" diff --git a/addons/vehicles/CfgVehicles.hpp b/addons/vehicles/CfgVehicles.hpp index 45d0e557e4..4bd65cd52f 100644 --- a/addons/vehicles/CfgVehicles.hpp +++ b/addons/vehicles/CfgVehicles.hpp @@ -112,14 +112,14 @@ class CfgVehicles { }; }; }; - - - + + + class MBT_02_base_F: Tank_F { fuelCapacity = 600 * FUEL_FACTOR; // again, couldn't find proper data }; - + // Change boat minigun ammo to 7.62 class Ship_F: Ship {}; @@ -154,7 +154,7 @@ class CfgVehicles { class MRAP_02_base_F: Car_F { fuelCapacity = 500 * FUEL_FACTOR; // couldn't find any data for the punisher }; - + class MRAP_03_base_F: Car_F { fuelCapacity = 860 * FUEL_FACTOR; smokeLauncherGrenadeCount = 3; diff --git a/addons/vehicles/XEH_PREP.hpp b/addons/vehicles/XEH_PREP.hpp index de72ce99f8..65dbbd53b8 100644 --- a/addons/vehicles/XEH_PREP.hpp +++ b/addons/vehicles/XEH_PREP.hpp @@ -1,4 +1,4 @@ PREP(autoThrottle); PREP(speedLimiter); PREP(startEngine); -PREP(setVehicleStartDelay); \ No newline at end of file +PREP(setVehicleStartDelay); diff --git a/addons/vehicles/functions/fnc_setVehicleStartDelay.sqf b/addons/vehicles/functions/fnc_setVehicleStartDelay.sqf index 337a1d961b..08a7ba55b9 100644 --- a/addons/vehicles/functions/fnc_setVehicleStartDelay.sqf +++ b/addons/vehicles/functions/fnc_setVehicleStartDelay.sqf @@ -20,4 +20,4 @@ params [["_veh", objNull, [objNull]], ["_delay", 0, [99]]]; if (isNull _veh || {!(_veh isKindOf "AllVehicles")}) exitWith {}; -_veh setVariable [QGVAR(engineStartDelay), _delay max 0, true]; \ No newline at end of file +_veh setVariable [QGVAR(engineStartDelay), _delay max 0, true]; diff --git a/addons/vehicles/functions/script_component.hpp b/addons/vehicles/functions/script_component.hpp index f84b06d718..4858805302 100644 --- a/addons/vehicles/functions/script_component.hpp +++ b/addons/vehicles/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\vehicles\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\vehicles\script_component.hpp" diff --git a/addons/weaponselect/XEH_postInit.sqf b/addons/weaponselect/XEH_postInit.sqf index 4706363271..0d5f3dd83f 100644 --- a/addons/weaponselect/XEH_postInit.sqf +++ b/addons/weaponselect/XEH_postInit.sqf @@ -201,7 +201,7 @@ if (!hasInterface) exitWith {}; if (!([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith))) exitWith {false}; // Conditions: specific if ((ACE_player isEqualTo (vehicle ACE_player)) || {ACE_player != (driver (vehicle ACE_player))}) exitWith {false}; - + // Statement (vehicle ACE_player) setCollisionLight !(isCollisionLightOn (vehicle ACE_player)); true diff --git a/addons/weaponselect/functions/script_component.hpp b/addons/weaponselect/functions/script_component.hpp index b7e33ed562..8b646cdaf8 100644 --- a/addons/weaponselect/functions/script_component.hpp +++ b/addons/weaponselect/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\weaponselect\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\weaponselect\script_component.hpp" diff --git a/addons/weather/functions/script_component.hpp b/addons/weather/functions/script_component.hpp index e1916225e8..2ad2cb2ab6 100644 --- a/addons/weather/functions/script_component.hpp +++ b/addons/weather/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\weather\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\weather\script_component.hpp" diff --git a/addons/yardage450/functions/script_component.hpp b/addons/yardage450/functions/script_component.hpp index ed5cf1b7c7..dde6a49b85 100644 --- a/addons/yardage450/functions/script_component.hpp +++ b/addons/yardage450/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\yardage450\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\yardage450\script_component.hpp" diff --git a/addons/zeus/functions/script_component.hpp b/addons/zeus/functions/script_component.hpp index 35453cc4e8..73e8156c1c 100644 --- a/addons/zeus/functions/script_component.hpp +++ b/addons/zeus/functions/script_component.hpp @@ -1 +1 @@ -#include "\z\ace\addons\zeus\script_component.hpp" \ No newline at end of file +#include "\z\ace\addons\zeus\script_component.hpp" diff --git a/optionals/compat_rh_m4/CfgAmmo.hpp b/optionals/compat_rh_m4/CfgAmmo.hpp index 5029cff22b..03b6098ad2 100644 --- a/optionals/compat_rh_m4/CfgAmmo.hpp +++ b/optionals/compat_rh_m4/CfgAmmo.hpp @@ -7,7 +7,7 @@ class CfgAmmo { class B_556x45_Ball; class B_65x39_Caseless; class B_762x51_Ball; - + class RH_9x19_B_M822: BulletBase { ACE_caliber=9.017; ACE_bulletLength=15.494; @@ -103,7 +103,7 @@ class CfgAmmo { ACE_dragModel=7; ACE_muzzleVelocities[]={700, 732, 750, 780}; ACE_barrelLengths[]={304.8, 406.4, 508.0, 609.6}; - }; + }; class RH_762x35_B_FMJ: B_65x39_Caseless { ACE_caliber=7.823; ACE_bulletLength=28.397; diff --git a/optionals/compat_rhs_afrf3/CfgAmmo.hpp b/optionals/compat_rhs_afrf3/CfgAmmo.hpp index a825ebe015..a8bdae618a 100644 --- a/optionals/compat_rhs_afrf3/CfgAmmo.hpp +++ b/optionals/compat_rhs_afrf3/CfgAmmo.hpp @@ -274,7 +274,7 @@ class CfgAmmo { class rhs_ammo_ap_penetrator: Sh_125mm_APFSDS { EGVAR(vehicle_damage,incendiary) = 0.1; }; - + class M_Titan_AT; class rhs_ammo_atgmCore_base: M_Titan_AT { EGVAR(vehicle_damage,incendiary) = 1.0; @@ -282,17 +282,17 @@ class CfgAmmo { class rhs_ammo_atgmBase_base: M_Titan_AT { EGVAR(vehicle_damage,incendiary) = 1.0; }; - + class rhs_ammo_rpgShell_base; class rhs_ammo_og9v: rhs_ammo_rpgShell_base { EGVAR(vehicle_damage,incendiary) = 0.1; }; - + class rhs_ammo_rpg15Shell_base; class rhs_ammo_og15v: rhs_ammo_rpg15Shell_base { EGVAR(vehicle_damage,incendiary) = 0.1; }; - + class B_30mm_AP; class rhs_ammo_30x165mm_base: B_30mm_AP { EGVAR(vehicle_damage,incendiary) = 0.2; diff --git a/optionals/compat_rhs_afrf3/CfgVehicles.hpp b/optionals/compat_rhs_afrf3/CfgVehicles.hpp index 94dcb00948..b6fa189790 100644 --- a/optionals/compat_rhs_afrf3/CfgVehicles.hpp +++ b/optionals/compat_rhs_afrf3/CfgVehicles.hpp @@ -39,7 +39,7 @@ class CfgVehicles { class MainTurret; }; }; - + class rhs_tank_base: Tank_F { EGVAR(refuel,fuelCapacity) = 1200; EGVAR(vehicle_damage,hullDetonationProb) = 0.8; @@ -320,7 +320,7 @@ class CfgVehicles { EGVAR(vehicle_damage,engineFireProb) = 0.5; EGVAR(vehicle_damage,detonationDuringFireProb) = 0; }; - + class rhs_t14_base: Tank_F { EGVAR(vehicle_damage,hullDetonationProb) = 0; EGVAR(vehicle_damage,turretDetonationProb) = 0; @@ -344,7 +344,7 @@ class CfgVehicles { }; EGVAR(vehicle_damage,canHaveFireRing) = 1; }; - + class rhs_t72bb_tv: rhs_a3t72tank_base { EGVAR(vehicle_damage,eraHitpoints)[] = { "era_1_hitpoint", "era_2_hitpoint", "era_3_hitpoint", "era_4_hitpoint", "era_5_hitpoint", "era_6_hitpoint", @@ -356,7 +356,7 @@ class CfgVehicles { "era_37_hitpoint", }; }; - + class rhs_t72bc_tv: rhs_a3t72tank_base { EGVAR(vehicle_damage,eraHitpoints)[] = { "era_1_hitpoint", "era_2_hitpoint", "era_3_hitpoint", "era_4_hitpoint", "era_5_hitpoint", "era_6_hitpoint", @@ -378,8 +378,8 @@ class CfgVehicles { "era_31_hitpoint", "era_32_hitpoint" }; EGVAR(vehicle_damage,slatHitpoints)[] = { - "SLAT_51_hitpoint", "SLAT_52_hitpoint", "SLAT_53_hitpoint", - "SLAT_54_hitpoint", "SLAT_55_hitpoint", "SLAT_56_hitpoint", + "SLAT_51_hitpoint", "SLAT_52_hitpoint", "SLAT_53_hitpoint", + "SLAT_54_hitpoint", "SLAT_55_hitpoint", "SLAT_56_hitpoint", "SLAT_57_hitpoint", "SLAT_68_hitpoint", "SLAT_69_hitpoint", "SLAT_70_hitpoint" }; @@ -439,7 +439,7 @@ class CfgVehicles { "SLAT_57_hitpoint" }; }; - + class rhs_t80bv: rhs_t80b { EGVAR(vehicle_damage,eraHitpoints)[] = { "era_1_hitpoint", "era_2_hitpoint", "era_3_hitpoint", "era_4_hitpoint", "era_5_hitpoint", "era_6_hitpoint", diff --git a/optionals/compat_rhs_afrf3/CfgWeapons.hpp b/optionals/compat_rhs_afrf3/CfgWeapons.hpp index 266c09b1df..29fa16bc22 100644 --- a/optionals/compat_rhs_afrf3/CfgWeapons.hpp +++ b/optionals/compat_rhs_afrf3/CfgWeapons.hpp @@ -125,7 +125,7 @@ class CfgWeapons { class rhs_tsh4: H_HelmetB { HEARING_PROTECTION_VICCREW }; - + class rhs_6b48: H_HelmetB { HEARING_PROTECTION_VICCREW }; @@ -337,7 +337,7 @@ class CfgWeapons { modes[] = {}; picture = "\rhsafrf\addons\rhs_heavyweapons\data\ico\rhs_Kornet_9M133_2_msv_ca.paa"; }; - + class rhs_uniform_flora; class rhs_uniform_df15: rhs_uniform_flora { ACE_GForceCoef = 0.8; diff --git a/optionals/compat_rhs_gref3/CfgAmmo.hpp b/optionals/compat_rhs_gref3/CfgAmmo.hpp index 99b886734e..64db7dd7e3 100644 --- a/optionals/compat_rhs_gref3/CfgAmmo.hpp +++ b/optionals/compat_rhs_gref3/CfgAmmo.hpp @@ -61,7 +61,7 @@ class CfgAmmo { class rhs_mine_M3_pressure_ammo: APERSMine_Range_Ammo { ace_explosives_defuseObjectPosition[] = {0, 0, 0.015}; }; - + class rhs_mine_M3_tripwire_ammo: rhs_mine_M3_pressure_ammo { ace_explosives_defuseObjectPosition[] = {0, 0, 0.055}; }; @@ -113,7 +113,7 @@ class CfgAmmo { class rhs_charge_M2tet_x2_ammo: DemoCharge_Remote_Ammo { ace_explosives_defuseObjectPosition[] = {0.095, 0, 0.055}; }; - + class rhs_ammo_3bk12_penetrator; class rhsgref_ammo_rkg3em_penetrator: rhs_ammo_3bk12_penetrator { EGVAR(vehicle_damage,incendiary) = 1.0; diff --git a/optionals/compat_rhs_usf3/CfgAmmo.hpp b/optionals/compat_rhs_usf3/CfgAmmo.hpp index dbf35096a7..d292c9e017 100644 --- a/optionals/compat_rhs_usf3/CfgAmmo.hpp +++ b/optionals/compat_rhs_usf3/CfgAmmo.hpp @@ -211,12 +211,12 @@ class CfgAmmo { ACE_muzzleVelocities[] = {340, 370, 400}; ACE_barrelLengths[] = {101.6, 127.0, 228.6}; }; - + class Sh_125mm_APFSDS; class rhsusf_ammo_basic_penetrator: Sh_125mm_APFSDS { EGVAR(vehicle_damage,incendiary) = 1.0; }; - + class rhs_ammo_ap_penetrator: Sh_125mm_APFSDS { EGVAR(vehicle_damage,incendiary) = 0.1; }; @@ -225,30 +225,30 @@ class CfgAmmo { class rhs_ammo_M829: Sh_120mm_APFSDS { EGVAR(vehicle_damage,incendiary) = 0.1; }; - + class rhs_ammo_M830: Sh_120mm_APFSDS { EGVAR(vehicle_damage,incendiary) = 1.0; }; - + class B_30mm_HE; class RHS_ammo_M792_HEI: B_30mm_HE { EGVAR(vehicle_damage,incendiary) = 0.8; }; - + class rhs_ammo_mk19m3_M384; class rhs_ammo_mk19m3_M430I: rhs_ammo_mk19m3_M384 { EGVAR(vehicle_damage,incendiary) = 0.8; }; - + class rhs_ammo_mk19m3_M430I_penetrator: rhsusf_ammo_basic_penetrator { EGVAR(vehicle_damage,incendiary) = 0.8; }; - + class B_30mm_APFSDS_Tracer_Red; class rhs_ammo_PGU14B_API: B_30mm_APFSDS_Tracer_Red { EGVAR(vehicle_damage,incendiary) = 0.8; }; - + class M_Titan_AT; class rhs_ammo_TOW_AT: M_Titan_AT { EGVAR(vehicle_damage,incendiary) = 1.0; @@ -258,17 +258,17 @@ class CfgAmmo { class rhs_ammo_127x99_Ball_AI: rhs_ammo_127x99_Ball { EGVAR(vehicle_damage,incendiary) = 0.8; }; - + class rhs_ammo_127x99_Ball_Tracer_Red; class rhs_ammo_127x99_Ball_Tracer_Red_AI: rhs_ammo_127x99_Ball_Tracer_Red { EGVAR(vehicle_damage,incendiary) = 0.8; }; - + class rhs_ammo_127x99_SLAP; class rhs_ammo_127x99_SLAP_AI: rhs_ammo_127x99_SLAP { EGVAR(vehicle_damage,incendiary) = 0.8; }; - + class rhs_ammo_127x99_SLAP_Tracer_Red; class rhs_ammo_127x99_SLAP_Tracer_Red_AI: rhs_ammo_127x99_SLAP_Tracer_Red { EGVAR(vehicle_damage,incendiary) = 0.8; @@ -285,7 +285,7 @@ class CfgAmmo { class rhsusf_40mm_HEDP: rhsusf_40mm_HE { EGVAR(vehicle_damage,incendiary) = 0.8; }; - + class rhs_ammo_M136_penetrator: rhsusf_ammo_basic_penetrator { EGVAR(vehicle_damage,incendiary) = 1.0; }; diff --git a/optionals/compat_rhs_usf3/CfgVehicles.hpp b/optionals/compat_rhs_usf3/CfgVehicles.hpp index 1d995333ff..80c275f029 100644 --- a/optionals/compat_rhs_usf3/CfgVehicles.hpp +++ b/optionals/compat_rhs_usf3/CfgVehicles.hpp @@ -313,10 +313,10 @@ class CfgVehicles { EGVAR(vehicle_damage,detonationDuringFireProb) = 0; EGVAR(vehicle_damage,hitpointAlias)[] = { { "hull", { "hitammohull", "hitammo" } } }; }; - + class RHS_M2A2; class RHS_M2A2_BUSKI: RHS_M2A2 { - EGVAR(vehicle_damage,eraHitpoints)[] = { + EGVAR(vehicle_damage,eraHitpoints)[] = { "era_1_hitpoint", "era_2_hitpoint", "era_3_hitpoint", "era_4_hitpoint", "era_5_hitpoint", "era_6_hitpoint", "era_7_hitpoint", "era_8_hitpoint", "era_9_hitpoint", "era_10_hitpoint", "era_11_hitpoint", "era_12_hitpoint", "era_13_hitpoint", "era_14_hitpoint", "era_15_hitpoint", @@ -331,7 +331,7 @@ class CfgVehicles { }; class RHS_M2A3; class RHS_M2A3_BUSKI: RHS_M2A3 { - EGVAR(vehicle_damage,eraHitpoints)[] = { + EGVAR(vehicle_damage,eraHitpoints)[] = { "era_1_hitpoint", "era_2_hitpoint", "era_3_hitpoint", "era_4_hitpoint", "era_5_hitpoint", "era_6_hitpoint", "era_7_hitpoint", "era_8_hitpoint", "era_9_hitpoint", "era_10_hitpoint", "era_11_hitpoint", "era_12_hitpoint", "era_13_hitpoint", "era_14_hitpoint", "era_15_hitpoint", @@ -345,7 +345,7 @@ class CfgVehicles { EGVAR(vehicle_damage,canHaveFireRing) = 1; }; class RHS_M2A3_BUSKIII: RHS_M2A3_BUSKI { - EGVAR(vehicle_damage,eraHitpoints)[] = { + EGVAR(vehicle_damage,eraHitpoints)[] = { "era_1_hitpoint", "era_2_hitpoint", "era_3_hitpoint", "era_4_hitpoint", "era_5_hitpoint", "era_6_hitpoint", "era_7_hitpoint", "era_8_hitpoint", "era_9_hitpoint", "era_10_hitpoint", "era_11_hitpoint", "era_12_hitpoint", "era_13_hitpoint", "era_14_hitpoint", "era_15_hitpoint", @@ -361,7 +361,7 @@ class CfgVehicles { }; }; class rhsusf_m1a1aim_tuski_wd: rhsusf_m1a1tank_base { - EGVAR(vehicle_damage,eraHitpoints)[] = { + EGVAR(vehicle_damage,eraHitpoints)[] = { "era_1_hitpoint", "era_2_hitpoint", "era_3_hitpoint", "era_4_hitpoint", "era_5_hitpoint", "era_6_hitpoint", "era_7_hitpoint", "era_8_hitpoint", "era_9_hitpoint", "era_10_hitpoint", "era_11_hitpoint", "era_12_hitpoint", "era_13_hitpoint", "era_14_hitpoint", "era_15_hitpoint", @@ -374,7 +374,7 @@ class CfgVehicles { }; class rhsusf_m1a2tank_base; class rhsusf_m1a2sep1tuskid_usarmy: rhsusf_m1a2tank_base { - EGVAR(vehicle_damage,eraHitpoints)[] = { + EGVAR(vehicle_damage,eraHitpoints)[] = { "era_1_hitpoint", "era_2_hitpoint", "era_3_hitpoint", "era_4_hitpoint", "era_5_hitpoint", "era_6_hitpoint", "era_7_hitpoint", "era_8_hitpoint", "era_9_hitpoint", "era_10_hitpoint", "era_11_hitpoint", "era_12_hitpoint", "era_13_hitpoint", "era_14_hitpoint", "era_15_hitpoint", @@ -386,7 +386,7 @@ class CfgVehicles { EGVAR(vehicle_damage,slatHitpoints)[] = { "SLAT_1_hitpoint" }; }; class rhsusf_m1a2sep1tuskiiwd_usarmy: rhsusf_m1a2sep1tuskid_usarmy { - EGVAR(vehicle_damage,eraHitpoints)[] = { + EGVAR(vehicle_damage,eraHitpoints)[] = { "era_1_hitpoint", "era_2_hitpoint", "era_3_hitpoint", "era_4_hitpoint", "era_5_hitpoint", "era_6_hitpoint", "era_7_hitpoint", "era_8_hitpoint", "era_9_hitpoint", "era_10_hitpoint", "era_11_hitpoint", "era_12_hitpoint", "era_13_hitpoint", "era_14_hitpoint", "era_15_hitpoint", @@ -399,7 +399,7 @@ class CfgVehicles { "era_46_hitpoint" }; }; - + class Plane_CAS_01_base_F; class RHS_A10: Plane_CAS_01_base_F { EGVAR(refuel,fuelCapacity) = 6223; @@ -573,7 +573,7 @@ class CfgVehicles { displayName = "M49A1 (10m)"; model = "\rhsusf\addons\rhsusf_weapons\mines\rhsusf_m49a1_c_e"; }; - + class rhsusf_props_JerryCan_Base: Items_base_F { EGVAR(cargo,canLoad) = 1; EGVAR(cargo,size) = 1; diff --git a/optionals/compat_sma3_iansky/CfgWeapons.hpp b/optionals/compat_sma3_iansky/CfgWeapons.hpp index 57fe1c8a48..e3d3e5a998 100644 --- a/optionals/compat_sma3_iansky/CfgWeapons.hpp +++ b/optionals/compat_sma3_iansky/CfgWeapons.hpp @@ -2,7 +2,7 @@ class CfgWeapons { class ItemCore; class InventoryOpticsItem_Base_F; - + class iansky_nfbeast: ItemCore { ACE_ScopeAdjust_Vertical[] = { -0.9, 34 }; ACE_ScopeAdjust_Horizontal[] = { -11, 11 };