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

Forgot to update doFragRandom docs with previous changes

Browse Source
This commit is contained in:
lambdatiger 2024-04-14 03:34:42 -05:00
parent 283b80645e
commit 868c6135bf
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,8 +20,8 @@
#define ACE_FRAG_MIN_FRAG_BUDGET_FOR_RANDOM 3
params ["_posASL", "_velocity", "_ammo", "_shotParents"];
TRACE_4("doFrag",_posASL,_velocity,_ammo,_shotParents);
params ["_posASL", "_projectileVelocity", "_ammo", "_shotParents"];
TRACE_4("doFrag",_posASL,_projectileVelocity,_ammo,_shotParents);
// Don't let a single object cause all fragmentation events
_shotParents params ["_shotParentVehicle"];
@ -53,5 +53,5 @@ if (GVAR(fragSimComplexity) != 1 && _fragRange > 3) then {
};
if (GVAR(fragSimComplexity) > 0 && _maxFragCount >= ACE_FRAG_MIN_FRAG_BUDGET_FOR_RANDOM) then {
[_posASL, _fragVelocity, _fragTypes, _maxFragCount, _shotParents] call FUNC(doFragRandom);
[_posASL, _fragVelocity, _projectileVelocity, _fragTypes, _maxFragCount, _shotParents] call FUNC(doFragRandom);
};

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

@ -6,10 +6,11 @@
*
* Arguments:
* 0: Position (posASL) of fragmenting projectile <ARRAY>
* 1: Velocity of the fragmenting projectile <ARRAY>
* 2: Type of fragments to generate <ARRAY>
* 3: Remaining fragment budget <NUMBER>
* 4: Shot parents <ARRAY>
* 1: Initial fragment velocity from Gurney equation <NUMBER>
* 2: Velocity of the fragmenting projectile <ARRAY>
* 3: Type of fragments to generate <ARRAY>
* 4: Remaining fragment budget <NUMBER>
* 5: Shot parents <ARRAY>
*
* Return Value:
* None
@ -20,7 +21,7 @@
* Public: No
*/
params ["_posASL", "_fragVelocity", "_fragType", "_maxFragCount", "_shotParents"];
params ["_posASL", "_fragVelocity", "_projectileVelocity", "_fragType", "_maxFragCount", "_shotParents"];
TRACE_5("doFragRandom",_posASL,_fragVelocity,_fragType,_maxFragCount,_shotParents);
// See CfgAmmoFragSpawner for different frag types
@ -43,7 +44,7 @@ _maxFragCount = switch (true) do {
private _fragSpawner = createVehicle [_type + _maxFragCount + _hMode, ASLToATL _posASL, [], 0, "CAN_COLLIDE"];
private _randDir = random 360;
_fragSpawner setVectorDirandUp [[0,0,-1], [cos _randDir, sin _randDir,0]];
_fragSpawner setVelocity [0, 0, -0.5*_fragVelocity];
_fragSpawner setVelocity (_projectileVelocity vectorAdd [0, 0, -0.5*_fragVelocity]);
_fragSpawner setShotParents _shotParents;
TRACE_2("spawnedRandomFragmenter",typeOf _fragSpawner,getObjectID _fragSpawner);