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

General - Fix some format args/strings (#10251)

Browse Source
This commit is contained in:
PabstMirror 2024-08-24 12:55:45 -05:00 committed by GitHub
parent 59314edf62
commit 17f2de4ec1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
21 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,7 +80,7 @@ for "_i" from 0 to (count _cfgWeapons)-1 do {
diag_log text format ["AB_Diagnose_barrelTwist,%1,%2,%3,%4,%5",_weapon,_magazine,_ammo,_twistDirection,_barrelTwist]; diag_log text format ["AB_Diagnose_barrelTwist,%1,%2,%3,%4,%5",_weapon,_magazine,_ammo,_twistDirection,_barrelTwist];
}; };
if (_barrelLength == 0) then { if (_barrelLength == 0) then {
diag_log text format ["AB_Diagnose_barrelLength,%1,%2,%3,%4,%5",_weapon,_magazine,_ammo,_barrelLength]; diag_log text format ["AB_Diagnose_barrelLength,%1,%2,%3,%4",_weapon,_magazine,_ammo,_barrelLength];
}; };
}; };
} forEach _magazines; } forEach _magazines;

2
addons/artillerytables/functions/fnc_calculateMaxAngle.sqf
View File

@ -23,7 +23,7 @@ TRACE_2("callExtension:artillery:find_max_angle",_muzzleVelocity,_airFriction);
( (
"ace" callExtension ["artillery:find_max_angle", [_muzzleVelocity, _airFriction]] "ace" callExtension ["artillery:find_max_angle", [_muzzleVelocity, _airFriction]]
) params ["_data", "_code"]; ) params ["_data", "_code"];
TRACE_1("",_code) TRACE_1("",_code);
(parseSimpleArray _data) params ["_bestAngle", "_bestDistance", ""]; (parseSimpleArray _data) params ["_bestAngle", "_bestDistance", ""];
_returns = [deg _bestAngle * 6400 / 360, _bestDistance]; _returns = [deg _bestAngle * 6400 / 360, _bestDistance];
_returns params ["_bestAngle", "_bestDistance"]; _returns params ["_bestAngle", "_bestDistance"];

2
addons/artillerytables/functions/fnc_rangeTableOpen.sqf
View File

@ -34,7 +34,7 @@ TRACE_2("created dialog",_dialog,_ctrlChargeList);
// Get Mags: // Get Mags:
private _mags = [_weaponName] call CBA_fnc_compatibleMagazines; private _mags = [_weaponName] call CBA_fnc_compatibleMagazines;
if (_mags isEqualTo []) exitWith {WARNING_1("No Mags",_weaponName);}; if (_mags isEqualTo []) exitWith {WARNING_1("No Mags %1",_weaponName);};
private _magCfg = configFile >> "CfgMagazines"; private _magCfg = configFile >> "CfgMagazines";
private _magParamsArray = []; private _magParamsArray = [];
_mags = _mags apply { _mags = _mags apply {

2
addons/artillerytables/functions/fnc_rangeTableUpdate.sqf
View File

@ -38,7 +38,7 @@ TRACE_5("callExtension:artillery:calculate_table",_muzzleVelocity,_airFriction,_
( (
"ace" callExtension ["artillery:calculate_table", [_muzzleVelocity, _airFriction, _elevMin, _elevMax, GVAR(lastElevationMode)]] "ace" callExtension ["artillery:calculate_table", [_muzzleVelocity, _airFriction, _elevMin, _elevMax, GVAR(lastElevationMode)]]
) params ["_data", "_code"]; ) params ["_data", "_code"];
TRACE_1("",_code) TRACE_1("",_code);
GVAR(tableData) = createHashMap; GVAR(tableData) = createHashMap;
GVAR(tableSizeActual) = (parseSimpleArray _data) select 1; GVAR(tableSizeActual) = (parseSimpleArray _data) select 1;

2
addons/artillerytables/functions/fnc_simulateShot.sqf
View File

@ -41,7 +41,7 @@ TRACE_8("callExtension:artillery:simulate_shot",_radAngle,_targetHeight,_muzzleV
( (
"ace" callExtension ["artillery:simulate_shot", [_radAngle, _targetHeight, _muzzleVelocity, _airFriction, _crossWind, _tailWind, _temperature, _atmosphericDensityRatio]] "ace" callExtension ["artillery:simulate_shot", [_radAngle, _targetHeight, _muzzleVelocity, _airFriction, _crossWind, _tailWind, _temperature, _atmosphericDensityRatio]]
) params ["_data", "_code"]; ) params ["_data", "_code"];
TRACE_1("",_code) TRACE_1("",_code);
//[xDeviation, yDistance, timeOfFlight] //[xDeviation, yDistance, timeOfFlight]
parseSimpleArray _data parseSimpleArray _data

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

@ -38,7 +38,7 @@ if (_isDeprecatedLoaded && {!_isReplacementLoaded}) then {
switch (true) do { switch (true) do {
case (_componentMajor >= _major && {_componentMinor >= _minor} && {_componentPatch >= _patch}): { // Removed from this version case (_componentMajor >= _major && {_componentMinor >= _minor} && {_componentPatch >= _patch}): { // Removed from this version
private _message = format[ private _message = format[
"Component %1 is deprecated. It has been replaced by %2. The component %1 is no longer usable on this version. ", _oldComponentName, _newComponentName, _version]; "Component %1 is deprecated. It has been replaced by %2. The component %1 is no longer usable on this version %3. ", _oldComponentName, _newComponentName, _version];
systemChat format["ACE [ERROR] - %1", _message]; systemChat format["ACE [ERROR] - %1", _message];
ERROR(_message); ERROR(_message);
}; };

2
addons/explosives/functions/fnc_openTimerUI.sqf
View File

@ -66,7 +66,7 @@ _display displayAddEventHandler ["MouseZChanged", {
// Make sure explosive still exists and is near player // Make sure explosive still exists and is near player
if ((!isNull _display) && {!alive ACE_player} || {!alive GVAR(explosive)} || {(ACE_player distance GVAR(explosive)) > 5}) exitWith { if ((!isNull _display) && {!alive ACE_player} || {!alive GVAR(explosive)} || {(ACE_player distance GVAR(explosive)) > 5}) exitWith {
INFO_2("explosive became invalid",ACE_player,GVAR(explosive)); INFO_2("%1's explosive %2 became invalid",ACE_player,GVAR(explosive));
closeDialog 0; closeDialog 0;
_pfhID call CBA_fnc_removePerFrameHandler; _pfhID call CBA_fnc_removePerFrameHandler;
}; };

6
addons/fcs/dev/test_debugConfigs.sqf
View File

@ -71,13 +71,13 @@ private _problemUIs = [];
_problemUIs pushBackUnique format ["%1: ACE_FCS, but missing ACE_CA_DIST", _turretInfo]; _problemUIs pushBackUnique format ["%1: ACE_FCS, but missing ACE_CA_DIST", _turretInfo];
}; };
if (_aceFCS && {(198 in _idcList)}) then { if (_aceFCS && {(198 in _idcList)}) then {
_problemUIs pushBackUnique format ["%1: ACE_FCS, but NEW Lazr CA_DIST", _turretInfo, _vehicleType]; _problemUIs pushBackUnique format ["%1-%2: ACE_FCS, but NEW Lazr CA_DIST", _turretInfo, _vehicleType];
}; };
if ((!_aceFCS) && {(1713151 in _idcList)}) then { if ((!_aceFCS) && {(1713151 in _idcList)}) then {
_problemUIs pushBackUnique format ["%1: Not ACE but has ACE_CA_DIST", _turretInfo, _vehicleType]; _problemUIs pushBackUnique format ["%1-%2: Not ACE but has ACE_CA_DIST", _turretInfo, _vehicleType];
}; };
if (_vanillaFCS && {!(198 in _idcList)}) then { if (_vanillaFCS && {!(198 in _idcList)}) then {
_problemUIs pushBackUnique format ["%1: vanillaFCS but missing NEW Lazr CA_DIST [just a warning]", _turretInfo, _vehicleType]; _problemUIs pushBackUnique format ["%1-%2: vanillaFCS but missing NEW Lazr CA_DIST [just a warning]", _turretInfo, _vehicleType];
}; };
}; };
}; };

4
addons/fortify/functions/fnc_getPlaceableSet.sqf
View File

@ -37,11 +37,11 @@ _objects = _objects select {
if (isClass (configFile >> "CfgVehicles" >> _classname)) then { if (isClass (configFile >> "CfgVehicles" >> _classname)) then {
true true
} else { } else {
ERROR_2("Preset [%1] - Classname does not exist",_preset,_classname); ERROR_2("Preset [%1] - Classname [%2] does not exist",_preset,_classname);
false false
}; };
} else { } else {
ERROR_2("Preset [%1] - Bad data in objects array %2",_preset,_x); ERROR_2("Preset [%1] - Bad data [%2] in objects array %2",_preset,_x);
false false
}; };
}; };

2
addons/laser/functions/fnc_handleLaserTargetCreation.sqf
View File

@ -58,7 +58,7 @@ TRACE_1("params",_this);
}; };
}; };
if (!_foundSource) then { if (!_foundSource) then {
WARNING_1("Laser target doesn't have owner",_targetObject); WARNING_1("Laser target %1 doesn't have owner",_targetObject);
}; };
}, _this] call CBA_fnc_execNextFrame; }, _this] call CBA_fnc_execNextFrame;

2
addons/laser/functions/fnc_seekerFindLaserSpot.sqf
View File

@ -72,7 +72,7 @@ private _finalOwner = objNull;
TRACE_1("",_laser); TRACE_1("",_laser);
//Handle Weird Data Return - skips over this laser in the for loop //Handle Weird Data Return - skips over this laser in the for loop
if ((_laser isEqualTo []) || {_laser isEqualTo [-1, -1]}) exitWith {WARNING_1("Bad Laser Return",_laser);}; if ((_laser isEqualTo []) || {_laser isEqualTo [-1, -1]}) exitWith {WARNING_1("Bad Laser Return %1",_laser);};
_laser params [["_laserPos", [], [[]], 3], ["_laserDir", [], [[]], 3]]; _laser params [["_laserPos", [], [[]], 3], ["_laserDir", [], [[]], 3]];
if (GVAR(dispersionCount) > 0) then { if (GVAR(dispersionCount) > 0) then {

2
addons/map/functions/fnc_blueForceTrackingModule.sqf
View File

@ -22,4 +22,4 @@ params ["_logic"];
[_logic, QGVAR(BFT_HideAiGroups), "HideAiGroups"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(BFT_HideAiGroups), "HideAiGroups"] call EFUNC(common,readSettingFromModule);
[_logic, QGVAR(BFT_ShowPlayerNames), "ShowPlayerNames"] call EFUNC(common,readSettingFromModule); [_logic, QGVAR(BFT_ShowPlayerNames), "ShowPlayerNames"] call EFUNC(common,readSettingFromModule);
INFO_3("Blue Force Tracking Module Initialized:",GVAR(BFT_Enabled),GVAR(BFT_Interval),GVAR(BFT_HideAiGroups)); INFO_3("Blue Force Tracking Module Initialized:%1-%2-%3",GVAR(BFT_Enabled),GVAR(BFT_Interval),GVAR(BFT_HideAiGroups));

4
addons/medical_damage/functions/fnc_woundsHandlerBase.sqf
View File

@ -22,7 +22,7 @@ TRACE_3("woundsHandlerBase",_unit,_allDamages,_typeOfDamage);
if !(_typeOfDamage in GVAR(damageTypeDetails)) then { if !(_typeOfDamage in GVAR(damageTypeDetails)) then {
WARNING_1("damage type not found",_typeOfDamage); WARNING_1("damage type %1 not found",_typeOfDamage);
_typeOfDamage = "unknown"; _typeOfDamage = "unknown";
}; };
@ -80,7 +80,7 @@ private _bodyPartVisParams = [_unit, false, false, false, false]; // params arra
// Select the injury we are going to add // Select the injury we are going to add
selectRandomWeighted _weightedWoundTypes params ["_woundTypeToAdd", "", "_dmgMultiplier", "_bleedMultiplier", "_sizeMultiplier", "_painMultiplier", "_fractureMultiplier"]; selectRandomWeighted _weightedWoundTypes params ["_woundTypeToAdd", "", "_dmgMultiplier", "_bleedMultiplier", "_sizeMultiplier", "_painMultiplier", "_fractureMultiplier"];
if (isNil "_woundTypeToAdd") then { if (isNil "_woundTypeToAdd") then {
WARNING_4("No valid wound types",_damage,_dmgPerWound,_typeOfDamage,_bodyPart); WARNING_4("No valid wound types %1-%2-%3-%4",_damage,_dmgPerWound,_typeOfDamage,_bodyPart);
continue continue
}; };
GVAR(woundDetails) get _woundTypeToAdd params ["","_injuryBleedingRate","_injuryPain","_causeLimping","_causeFracture"]; GVAR(woundDetails) get _woundTypeToAdd params ["","_injuryBleedingRate","_injuryPain","_causeLimping","_causeFracture"];

2
addons/missileguidance/functions/fnc_checkLos.sqf
View File

@ -25,7 +25,7 @@ if (_checkVisibilityTest) exitWith {
_visibility > 0.001 _visibility > 0.001
}; };
if ((isNil "_seeker") || {isNil "_target"}) exitWith { if ((isNil "_seeker") || {isNil "_target"}) exitWith {
ERROR_2("nil",_seeker,_target); ERROR_2("nil %1->%2",_seeker,_target);
false false
}; };

2
addons/missileguidance/functions/fnc_doAttackProfile.sqf
View File

@ -25,7 +25,7 @@ private _attackProfileFunction = getText (configFile >> QGVAR(AttackProfiles) >>
private _attackProfilePos = _this call (missionNamespace getVariable _attackProfileFunction); private _attackProfilePos = _this call (missionNamespace getVariable _attackProfileFunction);
if ((isNil "_attackProfilePos") || {_attackProfilePos isEqualTo [0,0,0]}) exitWith { if ((isNil "_attackProfilePos") || {_attackProfilePos isEqualTo [0,0,0]}) exitWith {
ERROR_1("attack profile returned bad pos",_attackProfilePos); ERROR_1("attack profile %1 returned bad pos",_attackProfilePos);
[0,0,0] [0,0,0]
}; };

2
addons/realisticnames/dev_dumpPylon.sqf
View File

@ -22,7 +22,7 @@ private _magazines = configProperties [configFile >> "CfgMagazines", "isClass _x
diag_log text format ['class %1;', configName inheritsFrom _x]; diag_log text format ['class %1;', configName inheritsFrom _x];
diag_log text format ['class %1: %2 {', configName _x, configName inheritsFrom _x]; diag_log text format ['class %1: %2 {', configName _x, configName inheritsFrom _x];
diag_log text format ['displayName = "%1"; [vanilla: %2 - %3]', _weaponName, _pylonMagName, _pylonWeapon]; diag_log text format ['displayName = "%1"; [vanilla: %2 - %3]', _weaponName, _pylonMagName, _pylonWeapon];
diag_log text format ['};', configName _x, configName inheritsFrom _x, _weaponName, _pylonMagName]; diag_log text format ['};'];
}; };
}; };
}; };

4
addons/rearm/functions/fnc_rearm.sqf
View File

@ -20,9 +20,9 @@ params ["_target", "_unit"];
TRACE_2("rearm",_target,_unit); TRACE_2("rearm",_target,_unit);
private _attachedDummy = _unit getVariable [QGVAR(dummy), objNull]; private _attachedDummy = _unit getVariable [QGVAR(dummy), objNull];
if (isNull _attachedDummy) exitwith {ERROR_1("attachedDummy null",_attachedDummy);}; if (isNull _attachedDummy) exitwith {ERROR_1("attachedDummy null %1",_attachedDummy);};
private _magazineClass = _attachedDummy getVariable QGVAR(magazineClass); private _magazineClass = _attachedDummy getVariable QGVAR(magazineClass);
if (isNil "_magazineClass") exitWith {ERROR_1("magazineClass nil",_attachedDummy);}; if (isNil "_magazineClass") exitWith {ERROR_1("magazineClass nil %1",_attachedDummy);};
([_magazineClass] call FUNC(getCaliber)) params ["_cal", "_idx"]; ([_magazineClass] call FUNC(getCaliber)) params ["_cal", "_idx"];

2
addons/repair/functions/fnc_doRepairTrack.sqf
View File

@ -26,7 +26,7 @@ TRACE_4("params",_unit,_vehicle,_hitPoint,_claimedObjects);
_claimedObjects params [["_track", objNull]]; _claimedObjects params [["_track", objNull]];
if ((isNull _track) || {!([_unit, _track, ["isNotDragging", "isNotCarrying", "isNotOnLadder"]] call EFUNC(common,canInteractWith))}) exitWith { if ((isNull _track) || {!([_unit, _track, ["isNotDragging", "isNotCarrying", "isNotOnLadder"]] call EFUNC(common,canInteractWith))}) exitWith {
ERROR_1("Bad Track",_claimedObjects); ERROR_1("Bad Track %1",_claimedObjects);
}; };
// can't use a destroyed track // can't use a destroyed track

2
addons/repair/functions/fnc_doReplaceTrack.sqf
View File

@ -26,7 +26,7 @@ TRACE_4("params",_unit,_vehicle,_hitPoint,_claimedObjects);
_claimedObjects params [["_track", objNull]]; _claimedObjects params [["_track", objNull]];
if ((isNull _track) || {!([_unit, _track, ["isNotDragging", "isNotCarrying", "isNotOnLadder"]] call EFUNC(common,canInteractWith))}) exitWith { if ((isNull _track) || {!([_unit, _track, ["isNotDragging", "isNotCarrying", "isNotOnLadder"]] call EFUNC(common,canInteractWith))}) exitWith {
ERROR_1("Bad Track",_claimedObjects); ERROR_1("Bad Track %1",_claimedObjects);
}; };
// get current hitpoint damage // get current hitpoint damage

2
addons/repair/functions/fnc_doReplaceWheel.sqf
View File

@ -26,7 +26,7 @@ TRACE_4("params",_unit,_vehicle,_hitPoint,_claimedObjects);
_claimedObjects params [["_wheel", objNull]]; _claimedObjects params [["_wheel", objNull]];
if ((isNull _wheel) || {!([_unit, _wheel, ["isNotDragging", "isNotCarrying", "isNotOnLadder"]] call EFUNC(common,canInteractWith))}) exitWith { if ((isNull _wheel) || {!([_unit, _wheel, ["isNotDragging", "isNotCarrying", "isNotOnLadder"]] call EFUNC(common,canInteractWith))}) exitWith {
WARNING_1("Bad Claimed Wheel",_claimedObjects); WARNING_1("Bad Claimed Wheel %1",_claimedObjects);
}; };
// get current hitpoint damage // get current hitpoint damage

4
addons/zeus/functions/fnc_moduleCargoParadropWaypoint.sqf
View File

@ -22,8 +22,8 @@ TRACE_2("moduleCargoParadropWaypoint",_vehicleGroup,_wpPos);
private _vehicle = vehicle leader _vehicleGroup; private _vehicle = vehicle leader _vehicleGroup;
private _commander = driver _vehicle; private _commander = driver _vehicle;
private _cargo = _vehicle getVariable [QEGVAR(cargo,loaded), []]; private _cargo = _vehicle getVariable [QEGVAR(cargo,loaded), []];
if !(_vehicle isKindOf "Air") exitWith {WARNING_1("not in a air vehicle",typeOf _vehicle); true}; if !(_vehicle isKindOf "Air") exitWith {WARNING_1("not in a air vehicle %1",typeOf _vehicle); true};
if (_cargo isEqualTo []) exitWith {WARNING_1("no cargo",_cargo); true}; if (_cargo isEqualTo []) exitWith {WARNING_1("no cargo %1",_cargo); true};
private _previousSpeedMode = speedMode _vehicleGroup; private _previousSpeedMode = speedMode _vehicleGroup;
private _nextMoveUpdate = -1; private _nextMoveUpdate = -1;