mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
compacted text a bit
This commit is contained in:
parent
85b566a176
commit
67ede76494
@ -24,7 +24,6 @@
|
||||
}
|
||||
] call CBA_fnc_addEventHandler;
|
||||
|
||||
|
||||
#ifdef LOG_FRAG_INFO
|
||||
[true, true, 30] call FUNC(dev_debugAmmo);
|
||||
#endif
|
||||
|
@ -6,7 +6,6 @@ PREP_RECOMPILE_START;
|
||||
#include "XEH_PREP.hpp"
|
||||
PREP_RECOMPILE_END;
|
||||
|
||||
|
||||
GVAR(spallMaterialCache) = createHashMap;
|
||||
GVAR(spallInfoCache) = createHashMap;
|
||||
GVAR(shouldSpallCache) = createHashMap;
|
||||
@ -16,7 +15,6 @@ GVAR(shouldFragCache) = createHashMap;
|
||||
GVAR(fragInfoCache) = createHashMap;
|
||||
GVAR(lastFragTime) = -2;
|
||||
|
||||
|
||||
#include "initSettings.inc.sqf"
|
||||
|
||||
#ifdef DEBUG_MODE_DRAW
|
||||
@ -28,5 +26,4 @@ GVAR(dev_drawPFEH) = -1;
|
||||
#include "initSettingsDebug.inc.sqf"
|
||||
#endif
|
||||
|
||||
|
||||
ADDON = true;
|
||||
|
@ -18,7 +18,6 @@
|
||||
params ["_projectile"];
|
||||
TRACE_1("addBlackList",_round);
|
||||
|
||||
|
||||
if (_projectile isEqualType objNull) then {
|
||||
_projectile = typeOf _projectile;
|
||||
};
|
||||
|
@ -22,7 +22,6 @@ params [
|
||||
["_logAll", false, [false]]
|
||||
];
|
||||
|
||||
|
||||
private _allAmmoConfigs = configProperties [configFile >> "cfgAmmo", "isClass _x && !('ace_frag' in configName _x)", true];
|
||||
private _processedCfgAmmos = [];
|
||||
|
||||
@ -36,7 +35,6 @@ diag_log text "//****************** fragCalcDump Beg ******************//";
|
||||
continue
|
||||
};
|
||||
|
||||
|
||||
private _shouldFrag = [_ammo] call FUNC(shouldFrag);
|
||||
if (_nSkip || _logAll) then {
|
||||
private _fragInfo = [_ammo] call FUNC(getFragInfo);
|
||||
|
@ -27,7 +27,6 @@ if (!local _currentUnit) exitWith {
|
||||
] call CBA_fnc_waitUntilAndExecute;
|
||||
};
|
||||
|
||||
|
||||
private _actionID = missionNamespace getVariable [QGVAR(dev_clearTraceAction), -1];
|
||||
if (_actionID > -1 && {!isNull _lastUnit}) then {
|
||||
_lastUnit removeAction _actionID;
|
||||
|
@ -49,7 +49,6 @@ if (_objects isEqualTo []) exitWith {
|
||||
0;
|
||||
};
|
||||
|
||||
|
||||
// grab crews and add them in so that targets stay approx. sorted by distance
|
||||
{
|
||||
private _crew = crew _x;
|
||||
@ -74,7 +73,7 @@ private _totalFragCount = 0;
|
||||
};
|
||||
private _target = _x;
|
||||
|
||||
#ifdef DEBUG_MODE_DRAWFRAG
|
||||
#ifdef DEBUG_MODE_DRAW
|
||||
[_target, false] call FUNC(dev_trackHitBox);
|
||||
#endif
|
||||
|
||||
@ -99,9 +98,6 @@ private _totalFragCount = 0;
|
||||
_height = _dims#2;
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
private _distance = _target distance _posASL;
|
||||
|
||||
// calculate chance to be hit by a fragment
|
||||
|
@ -61,12 +61,10 @@ private _velocityChange = vectorMagnitude _lastVelocity - vectorMagnitude _vel;
|
||||
private _spallPower = (ACE_FRAG_ROUND_COEF * _caliber * sqrt _velocityChange + _explosive * _indirectHit) * GVAR(spallIntensity);
|
||||
TRACE_3("found speed",_velocityChange,_caliber,_spallPower);
|
||||
|
||||
|
||||
if (_spallPower < 2) exitWith {
|
||||
TRACE_1("lowImpulse",_ammo);
|
||||
};
|
||||
|
||||
|
||||
private _lastVelocityUnit = vectorNormalized _lastVelocity;
|
||||
private _deltaStep = _lastVelocityUnit vectorMultiply 0.05;
|
||||
|
||||
|
@ -19,7 +19,6 @@ params [
|
||||
["_projectile", objNull, [objNull]]
|
||||
];
|
||||
|
||||
|
||||
private _ammo = typeOf _projectile;
|
||||
if (_ammo isEqualTo "" || {isNull _projectile}) exitWith {
|
||||
TRACE_2("bad ammo or projectile",_ammo,_projectile);
|
||||
@ -45,7 +44,6 @@ if (_shouldFrag && GVAR(enabled)) then {
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
private _shouldSpall = _ammo call FUNC(shouldSpall);
|
||||
if (GVAR(spallEnabled) && {_shouldSpall}) then {
|
||||
_projectile addEventHandler [
|
||||
|
@ -16,7 +16,6 @@ private _category = format ["ACE %1", localize LSTRING(Module_DisplayName)];
|
||||
1
|
||||
] call CBA_fnc_addSetting;
|
||||
|
||||
|
||||
[
|
||||
QGVAR(reflectionsEnabled), "CHECKBOX",
|
||||
[LSTRING(EnableReflections), LSTRING(EnableReflections_Desc)],
|
||||
|
Loading…
x
Reference in New Issue
Block a user