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

Merge branch 'master' of https://github.com/lambdatiger/ace_frag-overhaul

Browse Source
This commit is contained in:
lambdatiger 2024-01-15 15:29:26 -06:00
commit 2f1c7d9bf7
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/frag/functions/fnc_dev_switchUnitHandle.sqf
View File

@ -30,7 +30,7 @@ if (!local _currentUnit) exitWith {
private _aID = missionNamespace getVariable [QGVAR(dev_clearTraceAction), -1]; private _aID = missionNamespace getVariable [QGVAR(dev_clearTraceAction), -1];
if (_aID > -1 && {_lastUnit isNotEqualTo objNull}) then { if (_aID > -1 && {!isNull _lastUnit}) then {
_lastUnit removeAction _aID; _lastUnit removeAction _aID;
}; };

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

@ -43,7 +43,6 @@ if (_ammo isEqualTo "" || {_posASL isEqualTo [0, 0, 0] || _timeSinceLastFrag < A
private _maxFragCount = round linearConversion [0.1, 1.5, _timeSinceLastFrag, ACE_FRAG_COUNT_MIN, ACE_FRAG_COUNT_MAX, true]; private _maxFragCount = round linearConversion [0.1, 1.5, _timeSinceLastFrag, ACE_FRAG_COUNT_MIN, ACE_FRAG_COUNT_MAX, true];
TRACE_3("willFrag",_timeSinceLastFrag,CBA_missionTime,_maxFragCount); TRACE_3("willFrag",_timeSinceLastFrag,CBA_missionTime,_maxFragCount);
private _ammoArr = [_ammo] call FUNC(getFragInfo); private _ammoArr = [_ammo] call FUNC(getFragInfo);
_ammoArr params ["_fragRange", "_fragVel", "_fragTypes", "_modFragCount"]; _ammoArr params ["_fragRange", "_fragVel", "_fragTypes", "_modFragCount"];
// For low frag rounds limit the # of frags created // For low frag rounds limit the # of frags created