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

Reformatted for legibility and debug output

Browse Source
This commit is contained in:
lambdatiger 2024-04-13 21:20:35 -05:00
parent 25f14af679
commit eb24c11e82
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/frag/CfgAmmoSpall.hpp
View File

@ -1,4 +1,5 @@
class GVAR(spallBase): B_65x39_Caseless {
ACE_FRAG_RM_EH;
submunitionAmmo[] = {QGVAR(small),4,QGVAR(medium),3,QGVAR(large),2,QGVAR(huge),1};
submunitionConeType[] = {"random", 20};
submunitionConeAngle = 40;
@ -9,7 +10,6 @@ class GVAR(spallBase): B_65x39_Caseless {
triggerSpeedCoef[] = {0.75,1.25};
deleteParentWhenTriggered = 1;
submunitionParentSpeedCoef = 1;
ACE_FRAG_RM_EH;
};

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

@ -38,7 +38,7 @@ TRACE_3("willFrag",_timeSinceLastFrag,CBA_missionTime,_maxFragCount);
_shotParentVehicle setVariable [QGVAR(obj_nextFragTime), CBA_missionTime + ACE_FRAG_HOLDOFF_VEHICLE];
private _maxFragCount = round linearConversion [ACE_FRAG_COUNT_MIN_TIME, ACE_FRAG_COUNT_MAX_TIME, _timeSinceLastFrag, ACE_FRAG_COUNT_MIN, ACE_FRAG_COUNT_MAX, true];
_ammo call FUNC(getFragInfo) params ["_fragRange", "_fragVel", "_fragTypes", "_modFragCount"];
_ammo call FUNC(getFragInfo) params ["_fragRange", "_fragVelocity", "_fragTypes", "_modFragCount"];
// For low frag rounds limit the # of frags created
if (_modFragCount < ACE_FRAG_LOW_FRAG_MOD_COUNT) then {
_maxFragCount = _modFragCount * ACE_FRAG_LOW_FRAG_COEFF;
@ -49,7 +49,7 @@ if (_modFragCount < ACE_FRAG_LOW_FRAG_MOD_COUNT) then {
TRACE_3("doFrag choices",_maxFragCount,_fragRange,GVAR(fragSimComplexity));
if (GVAR(fragSimComplexity) != 1 && _fragRange > 3) then {
_maxFragCount = _maxFragCount - ([_posASL, _fragVel, _fragRange, _maxFragCount, _fragTypes, _modFragCount, _shotParents] call FUNC(doFragTargeted));
_maxFragCount = _maxFragCount - ([_posASL, _fragVelocity, _fragRange, _maxFragCount, _fragTypes, _modFragCount, _shotParents] call FUNC(doFragTargeted));
};
if (GVAR(fragSimComplexity) > 0 && _maxFragCount >= ACE_FRAG_MIN_FRAG_BUDGET_FOR_RANDOM) then {

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

@ -31,9 +31,7 @@ if (_ammo == "" || {_objectHit isKindOf "CAManBase"}) exitWith {
private _material = _surfaceType call FUNC(getMaterialInfo);
if (_material == "ground") exitWith {
#ifdef DEBUG_MODE_FULL
systemChat "ground spall";
#endif
TRACE_1("ground",_surfaceType);
};
// Find spall speed / fragment info