mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
variable name changes
This commit is contained in:
parent
4d9f61eeaf
commit
ae116e2577
@ -79,25 +79,25 @@ private _printCount = 0;
|
||||
|
||||
if (_shoulFrag || _logAll) then {
|
||||
|
||||
private _warn = false;
|
||||
private _print = false;
|
||||
private _skip = getNumber (_ammoConfig >> QGVAR(skip));
|
||||
private _fragTypes = getArray (_ammoConfig >> QGVAR(classes));
|
||||
if (_fragTypes isEqualTo []) then {_warn = true;};
|
||||
if (_fragTypes isEqualTo []) then {_print = true;};
|
||||
private _c = getNumber (_ammoConfig >> QGVAR(charge));
|
||||
if (_c == 0) then {_warn = true;};
|
||||
if (_c == 0) then {_print = true;};
|
||||
private _m = getNumber (_ammoConfig >> QGVAR(metal));
|
||||
if (_m == 0) then {_warn = true;};
|
||||
if (_m == 0) then {_print = true;};
|
||||
private _k = getNumber (_ammoConfig >> QGVAR(gurney_k));
|
||||
if (_k == 0) then {_warn = true;};
|
||||
if (_k == 0) then {_print = true;};
|
||||
private _gC = getNumber (_ammoConfig >> QGVAR(gurney_c));
|
||||
if (_gC == 0) then {_warn = true;};
|
||||
if (_gC == 0) then {_print = true;};
|
||||
private _fragCount = getNumber (_ammoConfig >> QGVAR(fragCount));
|
||||
if (_fragCount == 0) then {_fragCount = 200; _warn = true;};
|
||||
if (_fragCount == 0) then {_fragCount = 200; _print = true;};
|
||||
|
||||
if (!_printOnlyIncomplete || {_warn && _skip != 0}) then {
|
||||
if (!_printOnlyIncomplete || {_print && _skip != 0}) then {
|
||||
INC(_printCount);
|
||||
if (_csvFormat) then {
|
||||
diag_log text format ["%7,%1,%2,%3,%4,%5,%6,%8", _c, _m, _k, _gC, _skip, _fragCount, _ammo, [_ammoConfig, true] call BIS_fnc_returnParents];
|
||||
diag_log text format ["%7,%1,%2,%3,%4,%5,%6,%9,%8", _c, _m, _k, _gC, _skip, _fragCount, _ammo, [_ammoConfig, true] call BIS_fnc_returnParents, _shouldFrag];
|
||||
} else {
|
||||
diag_log text format ["Ammo [%1] MISSING frag configs:", _ammo];
|
||||
diag_log text format ["_c=%1,_m=%2,_k=%3,_gC=%4,_skip=%5,_fragCount=%6,_fragTypes=%7", _c, _m, _k, _gC, _skip, _fragCount, _fragTypes];
|
||||
|
@ -28,11 +28,11 @@ if (!isNil "_ammoInfo") exitWith {_ammoInfo};
|
||||
|
||||
private _ammoConfig = configFile >> "CfgAmmo" >> _ammo;
|
||||
private _fragTypes = [];
|
||||
private _warn = false;
|
||||
private _notify = false;
|
||||
if (isArray (_ammoConfig >> QGVAR(classes))) then {
|
||||
_fragTypes = getArray (_ammoConfig >> QGVAR(classes));
|
||||
} else {
|
||||
_warn = true;
|
||||
_notify = true;
|
||||
};
|
||||
|
||||
/************ Gurney equation notes *****************//*
|
||||
@ -58,34 +58,34 @@ if (isArray (_ammoConfig >> QGVAR(classes))) then {
|
||||
private _chargeMass = getNumber (_ammoConfig >> QGVAR(CHARGE));
|
||||
if (_chargeMass == 0) then {
|
||||
_chargeMass = 1;
|
||||
_warn = true;
|
||||
_notify = true;
|
||||
};
|
||||
|
||||
private _metalMass = getNumber (_ammoConfig >> QGVAR(METAL));
|
||||
if (_metalMass == 0) then {
|
||||
_metalMass = 2;
|
||||
_warn = true;
|
||||
_notify = true;
|
||||
};
|
||||
|
||||
private _geometryCoefficient = getNumber (_ammoConfig >> QGVAR(GURNEY_K));
|
||||
if (_geometryCoefficient == 0) then {
|
||||
_geometryCoefficient = 0.8;
|
||||
_warn = true;
|
||||
_notify = true;
|
||||
};
|
||||
|
||||
private _gurneyConstant = getNumber (_ammoConfig >> QGVAR(GURNEY_C));
|
||||
if (_gurneyConstant == 0) then {
|
||||
_gurneyConstant = 2440;
|
||||
_warn = true;
|
||||
_notify = true;
|
||||
};
|
||||
|
||||
private _fragCount = getNumber (_ammoConfig >> QGVAR(fragCount));
|
||||
if (_fragCount == 0) then {
|
||||
_fragCount = 400;
|
||||
_warn = true;
|
||||
_notify = true;
|
||||
};
|
||||
|
||||
if (_warn) then {
|
||||
if (_notify) then {
|
||||
INFO_1("Ammo class %1 lacks proper explosive properties definitions for frag!",_ammo);
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user