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

Updated debugging, by default tracking spheres sync properly and messages are a bit clearer

Browse Source
This commit is contained in:
lambdatiger 2024-01-14 23:08:37 -06:00
parent 3da173e0a9
commit eb61f5f7c0
6 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/frag/XEH_postInit.sqf
View File

@ -9,7 +9,7 @@
}; };
#ifdef DEBUG_MODE_DRAW #ifdef DEBUG_MODE_DRAW
if (hasInterface && GVAR(debugOptions)) then { if (hasInterface) then {
private _h = [LINKFUNC(dev_drawTrace), 0] call CBA_fnc_addPerFrameHandler; private _h = [LINKFUNC(dev_drawTrace), 0] call CBA_fnc_addPerFrameHandler;
missionNamespace setVariable [QGVAR(dev_drawPFEH), _h]; missionNamespace setVariable [QGVAR(dev_drawPFEH), _h];
["unit", LINKFUNC(dev_switchUnitHandle), true] call CBA_fnc_addPlayerEventHandler; ["unit", LINKFUNC(dev_switchUnitHandle), true] call CBA_fnc_addPlayerEventHandler;

3
addons/frag/XEH_preInit.sqf
View File

@ -8,7 +8,8 @@ PREP_RECOMPILE_END;
GVAR(spallMaterialCache) = createHashMap; GVAR(spallMaterialCache) = createHashMap;
GVAR(spallRoundCache) = createHashMap; GVAR(spallInfoCache) = createHashMap;
GVAR(shouldSpallCache) = createHashMap;
GVAR(lastSpallTime) = -2; GVAR(lastSpallTime) = -2;
GVAR(shouldFragCache) = createHashMap; GVAR(shouldFragCache) = createHashMap;

4
addons/frag/functions/fnc_doFrag.sqf
View File

@ -19,7 +19,7 @@
* *
* Public: No * Public: No
*/ */
TRACE_1("",_this); TRACE_1("begin doFrag",_this);
params [ params [
["_proj", objNull, [objNull]], ["_proj", objNull, [objNull]],
["_posASL", [0, 0, 0], [[]], [3]], ["_posASL", [0, 0, 0], [[]], [3]],
@ -41,7 +41,7 @@ if (_ammo isEqualTo "" || {_posASL isEqualTo [0, 0, 0] || _timeSince < ACE_FRAG_
TRACE_3("timeExit",_timeSince,CBA_missionTime,GVAR(lastFragTime)); TRACE_3("timeExit",_timeSince,CBA_missionTime,GVAR(lastFragTime));
}; };
private _maxFrags = round linearConversion [0.1, 1.5, _timeSince, ACE_FRAG_COUNT_MIN, ACE_FRAG_COUNT_MAX, true]; private _maxFrags = round linearConversion [0.1, 1.5, _timeSince, ACE_FRAG_COUNT_MIN, ACE_FRAG_COUNT_MAX, true];
TRACE_3("",_timeSince,CBA_missionTime,_maxFrags); TRACE_3("willFrag",_timeSince,CBA_missionTime,_maxFrags);
private _ammoArr = [_ammo] call FUNC(getFragInfo); private _ammoArr = [_ammo] call FUNC(getFragInfo);

4
addons/frag/functions/fnc_initBlackList.sqf
View File

@ -15,14 +15,14 @@
* Public: No * Public: No
*/ */
TRACE_1("Beginning blacklist init", GVAR(BlackList)); TRACE_1("Beginning blacklist init", GVAR(blackList));
if (!ADDON) then { if (!ADDON) then {
[FUNC(initBlackList), [], 1] call CBA_fnc_waitAndExecute; [FUNC(initBlackList), [], 1] call CBA_fnc_waitAndExecute;
}; };
// could improve text parsing of CBA setting string // could improve text parsing of CBA setting string
private _convArray = parseSimpleArray GVAR(BlackList); private _convArray = parseSimpleArray GVAR(blackList);
if (count _convArray == 0 ) exitWith { if (count _convArray == 0 ) exitWith {
TRACE_1("Empty blacklist", _convArray); TRACE_1("Empty blacklist", _convArray);

13
addons/frag/functions/fnc_initRound.sqf
View File

@ -14,7 +14,7 @@
* *
* Public: No * Public: No
*/ */
TRACE_1("",_this); TRACE_1("ACE_Frag rndInit",_this);
params [ params [
["_projectile", objNull, [objNull]] ["_projectile", objNull, [objNull]]
]; ];
@ -59,6 +59,10 @@ if (GVAR(spallEnabled) && {_shouldSpall}) then
private _shotPrnt = getShotParents _proj; private _shotPrnt = getShotParents _proj;
private _ammo = typeOf _proj; private _ammo = typeOf _proj;
private _vUp = vectorUp _proj; private _vUp = vectorUp _proj;
/*
* Wait a round to see what happens to the round, may result in
* multiple hits / slowdowns getting shunted to the first hit
*/
[ [
FUNC(doSpall), FUNC(doSpall),
[_proj, _hitObj, _posASL, _vel, _sNorm, _surfType, _ammo, _shotPrnt, _vUp] [_proj, _hitObj, _posASL, _vel, _sNorm, _surfType, _ammo, _shotPrnt, _vUp]
@ -66,4 +70,9 @@ if (GVAR(spallEnabled) && {_shouldSpall}) then
} }
]; ];
}; };
TRACE_2("exit",_shouldFrag,_shouldSpall); #ifdef DEBUG_MODE_DRAW
if (GVAR(debugOptions) && (_shouldFrag || _shouldSpall)) then {
[_projectile, "red", true] call FUNC(dev_trackObj);
};
#endif
TRACE_2("initExit",_shouldFrag,_shouldSpall);

8
addons/frag/functions/fnc_shouldSpall.sqf
View File

@ -18,16 +18,16 @@
params ["_ammo"]; params ["_ammo"];
private _shouldSpall = GVAR(spallRoundCache) get _ammo; private _shouldSpall = GVAR(shouldSpallCache) get _ammo;
if (!isNil "_shouldSpall") exitWith {_shouldSpall}; if (!isNil "_shouldSpall") exitWith {_shouldSpall};
private _caliber = getNumber (configFile >> "CfgAmmo" >> _ammo >> "caliber"); private _caliber = getNumber (configFile >> "CfgAmmo" >> _ammo >> "caliber");
private _explosive = getNumber (configFile >> "CfgAmmo" >> _ammo >> "explosive"); private _explosive = getNumber (configFile >> "CfgAmmo" >> _ammo >> "explosive");
private _idH = getNumber (configFile >> "CfgAmmo" >> _ammo >> "indirectHitRange"); private _indirectHit = getNumber (configFile >> "CfgAmmo" >> _ammo >> "indirectHitRange");
_shouldSpall = _caliber >= 2.5 || (_explosive > 0 && _idh >= 1); _shouldSpall = _caliber * GVAR(spallIntensity) >= 2.5 || (_explosive >= 0.5 && _explosive * _indirectHit * GVAR(spallIntensity) >= 4);
GVAR(spallRoundCache) set [_ammo, _shouldSpall]; GVAR(shouldSpallCache) set [_ammo, _shouldSpall];
_shouldSpall _shouldSpall