Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup - Trim all trailing whitespace (#8651)

Browse Source
This commit is contained in:
PabstMirror 2021-10-30 16:42:03 -05:00 committed by GitHub
parent 58f43288ab
commit 7bc6fdfa66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
181 changed files with 421 additions and 421 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/advanced_ballistics/ACE_Settings.hpp
View File

@ -4,7 +4,7 @@ class ACE_Settings {
};
class GVAR(muzzleVelocityVariationEnabled) {
movedToSQF = 1;
};
};
class GVAR(ammoTemperatureEnabled) {
movedToSQF = 1;
};

2
addons/advanced_ballistics/RscTitles.hpp
View File

@ -52,4 +52,4 @@ class RscTitles {
};
};
};
};
};

2
addons/advanced_ballistics/functions/fnc_diagnoseWeapons.sqf
View File

@ -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];

2
addons/advanced_ballistics/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\advanced_ballistics\script_component.hpp"
#include "\z\ace\addons\advanced_ballistics\script_component.hpp"

2
addons/advanced_fatigue/functions/fnc_handleStaminaBar.sqf
View File

@ -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 {

6
addons/ai/functions/fnc_garrisonMove.sqf
View File

@ -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]];
};
};
};
};
};

4
addons/aircraft/CfgMagazines.hpp
View File

@ -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);

4
addons/arsenal/functions/fnc_addRightPanelButton.sqf
View File

@ -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]];
};

6
addons/arsenal/functions/fnc_buttonImport.sqf
View File

@ -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);

2
addons/arsenal/functions/fnc_fillLoadoutsList.sqf
View File

@ -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)

2
addons/arsenal/functions/fnc_onSelChangedRightListnBox.sqf
View File

@ -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;
};

2
addons/arsenal/functions/fnc_statTextStatement_mass.sqf
View File

@ -8,7 +8,7 @@
* 1: item config path (CONFIG)
*
* Return Value:
* String to display
* String to display
*
* Public: No
*/

2
addons/arsenal/functions/fnc_statTextStatement_scopeVisionMode.sqf
View File

@ -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
]

2
addons/arsenal/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\arsenal\script_component.hpp"
#include "\z\ace\addons\arsenal\script_component.hpp"

2
addons/arsenal/ui/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\arsenal\script_component.hpp"
#include "\z\ace\addons\arsenal\script_component.hpp"

2
addons/atragmx/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\atragmx\script_component.hpp"
#include "\z\ace\addons\atragmx\script_component.hpp"

2
addons/attach/functions/fnc_handleKilled.sqf
View File

@ -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:

2
addons/attach/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\attach\script_component.hpp"
#include "\z\ace\addons\attach\script_component.hpp"

2
addons/backpacks/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\backpacks\script_component.hpp"
#include "\z\ace\addons\backpacks\script_component.hpp"

2
addons/ballistics/CfgAmmo.hpp
View File

@ -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;

2
addons/ballistics/scripts/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\ballistics\script_component.hpp"
#include "\z\ace\addons\ballistics\script_component.hpp"

2
addons/captives/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\captives\script_component.hpp"
#include "\z\ace\addons\captives\script_component.hpp"

2
addons/cargo/functions/fnc_unloadItem.sqf
View File

@ -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;
};

28
addons/chemlights/CfgAmmo.hpp
View File

@ -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;
};

2
addons/chemlights/CfgLights.hpp
View File

@ -99,7 +99,7 @@ class CfgLights {
class ACE_ChemlightLight_UltraHiOrange: ACE_ChemlightLight_Orange {
intensity = 12000;
ULTRA_HI_ATTENUATION
};

2
addons/common/functions/fnc_cachedCall.sqf
View File

@ -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, []];

2
addons/common/functions/fnc_getTurretIndex.sqf
View File

@ -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"};

2
addons/common/functions/fnc_readSettingsFromParamsArray.sqf
View File

@ -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)
};

2
addons/common/scripts/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\common\script_component.hpp"
#include "\z\ace\addons\common\script_component.hpp"

2
addons/concertina_wire/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\concertina_wire\script_component.hpp"
#include "\z\ace\addons\concertina_wire\script_component.hpp"

2
addons/cookoff/XEH_postInit.sqf
View File

@ -13,7 +13,7 @@
[QGVAR(cleanupEffects), {
params ["_vehicle", ["_effects", []]];
_effects = _effects + (_vehicle getVariable [QGVAR(effects), []]);
if !(_effects isEqualTo []) then {
{ deleteVehicle _x } count _effects;

110
addons/cookoff/functions/fnc_cookOffEffect.sqf
View File

@ -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
];
};

2
addons/cookoff/functions/fnc_smoke.sqf
View File

@ -17,7 +17,7 @@
*/
params ["_vehicle", ["_positions", []]];
private _turretConfig = [_vehicle, [0]] call CBA_fnc_getTurret;
private _positionBarrelEnd = getText (_turretConfig >> "gunBeg");

2
addons/csw/CfgMagazineGroups.hpp
View File

@ -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;

2
addons/csw/CfgMagazines.hpp
View File

@ -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);

2
addons/dagr/CfgEventHandlers.hpp
View File

@ -15,4 +15,4 @@ class Extended_PostInit_EventHandlers {
class ADDON {
init = QUOTE(call COMPILE_SCRIPT(XEH_postInit));
};
};
};

2
addons/dagr/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\dagr\script_component.hpp"
#include "\z\ace\addons\dagr\script_component.hpp"

2
addons/disarming/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\disarming\script_component.hpp"
#include "\z\ace\addons\disarming\script_component.hpp"

2
addons/dogtags/XEH_preInit.sqf
View File

@ -7,5 +7,5 @@ PREP_RECOMPILE_START;
PREP_RECOMPILE_END;
GVAR(disabledFactions) = [] call CBA_fnc_createNamespace;
ADDON = true;

4
addons/dragging/CfgMovesBasic.hpp
View File

@ -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";

2
addons/dragging/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\dragging\script_component.hpp"
#include "\z\ace\addons\dragging\script_component.hpp"

2
addons/dragon/CfgAmmo.hpp
View File

@ -34,7 +34,7 @@ class CfgAmmo {
cost = 500;
simulationStep = 0.005;
maxControlRange = 1500;
EGVAR(vehicle_damage,incendiary) = 1.0;
class ace_missileguidance {

2
addons/dragon/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\dragon\script_component.hpp"
#include "\z\ace\addons\dragon\script_component.hpp"

2
addons/fastroping/CfgSounds.hpp
View File

@ -9,4 +9,4 @@ class CfgSounds {
sound[] = {QUOTE(PATHTOF(data\sounds\fastroping_thud.ogg)), 10, 1.0};
titles[] = {};
};
};
};

2
addons/fcs/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\fcs\script_component.hpp"
#include "\z\ace\addons\fcs\script_component.hpp"

2
addons/finger/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\finger\script_component.hpp"
#include "\z\ace\addons\finger\script_component.hpp"

2
addons/fire/CfgSounds.hpp
View File

@ -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);

6
addons/fire/RscTitles.hpp
View File

@ -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);

2
addons/fire/XEH_postInit.sqf
View File

@ -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;

2
addons/fire/functions/fnc_fireManagerPFH.sqf
View File

@ -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);

2
addons/flashlights/XEH_postInitClient.sqf
View File

@ -5,4 +5,4 @@ if (!hasInterface) exitWith {};
LOG(MSG_INIT);
//todo: make flashlights attachable to players
//todo: make flashlights attachable to players

2
addons/gforces/CfgWeapons.hpp
View File

@ -22,4 +22,4 @@ class CfgWeapons {
class U_I_E_Uniform_01_coveralls_F: Uniform_Base {
ACE_GForceCoef = 0.8;
};
};
};

2
addons/gforces/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\gforces\script_component.hpp"
#include "\z\ace\addons\gforces\script_component.hpp"

2
addons/grenades/functions/fnc_nextMode.sqf
View File

@ -33,7 +33,7 @@ private _hint = localize ([
LSTRING(HighThrow),
LSTRING(PreciseThrow),
LSTRING(RollGrenade),
LSTRING(DropGrenade)
LSTRING(DropGrenade)
] select _mode);
[_hint] call EFUNC(common,displayTextStructured);

2
addons/grenades/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\grenades\script_component.hpp"
#include "\z\ace\addons\grenades\script_component.hpp"

2
addons/hearing/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\hearing\script_component.hpp"
#include "\z\ace\addons\hearing\script_component.hpp"

4
addons/hellfire/CfgMagazines.hpp
View File

@ -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;

2
addons/hellfire/CfgWeapons.hpp
View File

@ -44,7 +44,7 @@ class CfgWeapons {
cursor = "EmptyCursor";
cursorAim = "missile";
showAimCursorInternal = 0;
// vanilla weapon lock systems
weaponLockSystem = 8;
cmImmunity = 0.9;

4
addons/hellfire/functions/fnc_setupVehicle.sqf
View File

@ -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;

2
addons/hitreactions/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\hitreactions\script_component.hpp"
#include "\z\ace\addons\hitreactions\script_component.hpp"

6
addons/hot/CfgWeapons.hpp
View File

@ -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;
};

2
addons/huntir/CfgMagazineWells.hpp
View File

@ -4,5 +4,5 @@ class CfgMagazineWells {
};
class UGL_40x36 { //Vanilla and RHS [rhsusf\addons\rhsusf_c_weapons\cfgMagazineWells.hpp]
ADDON[] = {"ACE_HuntIR_M203"};
};
};
};

2
addons/huntir/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\huntir\script_component.hpp"
#include "\z\ace\addons\huntir\script_component.hpp"

2
addons/interact_menu/functions/fnc_findActionNode.sqf
View File

@ -9,7 +9,7 @@
* 1: Path <ARRAY>
*
* Return Value:
* Action node <ARRAY> or <NIL> if not found
* Action node <ARRAY> or <NIL> if not found
*
* Example:
* [actionTree, ["ACE_TapShoulderRight","VulcanPinchAction"]] call ace_interact_menu_fnc_findActionNode;

2
addons/interact_menu/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\interact_menu\script_component.hpp"
#include "\z\ace\addons\interact_menu\script_component.hpp"

2
addons/interaction/XEH_postInit.sqf
View File

@ -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};

2
addons/interaction/functions/fnc_addPassengersActions.sqf
View File

@ -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);

4
addons/interaction/functions/fnc_renameGroupUI.sqf
View File

@ -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;

2
addons/interaction/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\interaction\script_component.hpp"
#include "\z\ace\addons\interaction\script_component.hpp"

2
addons/interaction/groupRename_GUI.hpp
View File

@ -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);

2
addons/inventory/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\inventory\script_component.hpp"
#include "\z\ace\addons\inventory\script_component.hpp"

8
addons/javelin/RscInGameUI.hpp
View File

@ -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 {

6
addons/javelin/functions/fnc_onOpticDraw.sqf
View File

@ -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 {

2
addons/javelin/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\javelin\script_component.hpp"
#include "\z\ace\addons\javelin\script_component.hpp"

2
addons/kestrel4500/RscTitles.hpp
View File

@ -370,4 +370,4 @@ class RscTitles {
};
};
};
};
};

2
addons/kestrel4500/XEH_postInit.sqf
View File

@ -29,4 +29,4 @@ GVAR(ImpellerState) = 0;
GVAR(Kestrel4500) = false;
GVAR(Overlay) = false;
[] call FUNC(restoreUserData);
[] call FUNC(restoreUserData);

2
addons/kestrel4500/config.cpp
View File

@ -18,4 +18,4 @@ class CfgPatches {
#include "CfgSound.hpp"
#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"
#include "RscTitles.hpp"
#include "RscTitles.hpp"

2
addons/killtracker/XEH_postInit.sqf
View File

@ -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) = [];

2
addons/laser/config.cpp
View File

@ -13,7 +13,7 @@ class CfgPatches {
};
};
#include "ACE_Settings.hpp"
#include "ACE_Settings.hpp"
#include "CfgEventhandlers.hpp"
#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"

2
addons/laser/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\laser\script_component.hpp"
#include "\z\ace\addons\laser\script_component.hpp"

2
addons/laserpointer/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\laserpointer\script_component.hpp"
#include "\z\ace\addons\laserpointer\script_component.hpp"

2
addons/logistics_rope/CfgWeapons.hpp
View File

@ -64,4 +64,4 @@ class CfgWeapons {
mass = 108;
};
};
};
};

2
addons/logistics_uavbattery/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\logistics_uavbattery\script_component.hpp"
#include "\z\ace\addons\logistics_uavbattery\script_component.hpp"

2
addons/logistics_wirecutter/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\logistics_wirecutter\script_component.hpp"
#include "\z\ace\addons\logistics_wirecutter\script_component.hpp"

2
addons/magazinerepack/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\magazinerepack\script_component.hpp"
#include "\z\ace\addons\magazinerepack\script_component.hpp"

18
addons/map/CfgAmmo.hpp
View File

@ -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";
};
};
};

2
addons/map/CfgMarkers.hpp
View File

@ -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;};

2
addons/map/Effects.hpp
View File

@ -40,4 +40,4 @@ class ACE_FlashlightEffect_Orange {
simulation = "light";
type = "ACE_FlashlightLight_Orange";
};
};
};

2
addons/map/XEH_postInitServer.sqf
View File

@ -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;

2
addons/map/initSettings.sqf
View File

@ -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;

4
addons/markers/functions/fnc_removeTimestamp.sqf
View File

@ -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;
};
};

2
addons/maverick/ACE_GuidanceConfig.hpp
View File

@ -1,5 +1,5 @@
class EGVAR(missileguidance,AttackProfiles) {
class maverick {
class maverick {
name = "LOAL-DIR";
nameLocked = "LOBL-DIR";
functionName = QEFUNC(missileguidance,attackProfile_DIR);

10
addons/maverick/CfgMagazines.hpp
View File

@ -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";

2
addons/maverick/CfgWeapons.hpp
View File

@ -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;

2
addons/medical/ACE_Settings.hpp
View File

@ -10,7 +10,7 @@ class ACE_Settings {
};
*/
class GVAR(enableVehicleCrashes) {
movedToSQF = 1;
movedToSQF = 1;
};
class GVAR(spontaneousWakeUpChance) {
movedToSQF = 1;

2
addons/medical/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\medical\script_component.hpp"
#include "\z\ace\addons\medical\script_component.hpp"

2
addons/medical_damage/CfgAmmo.hpp
View File

@ -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";

2
addons/medical_damage/functions/script_component.hpp
View File

@ -1 +1 @@
#include "\z\ace\addons\medical_damage\script_component.hpp"
#include "\z\ace\addons\medical_damage\script_component.hpp"

4
addons/medical_engine/functions/fnc_updateDamageEffects.sqf
View File

@ -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);
};

2
addons/medical_gui/initSettings.sqf
View File

@ -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)],

Some files were not shown because too many files have changed in this diff Show More