mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Merge branch 'master' of https://github.com/lambdatiger/ace_frag-overhaul
This commit is contained in:
commit
e3c8e8d6ab
@ -16,4 +16,4 @@
|
||||
*/
|
||||
//IGNORE_PRIVATE_WARNING ["_unit", "_weapon", "_muzzle", "_mode", "_ammo", "_magazine", "_projectile", "_vehicle", "_gunner", "_turret"];
|
||||
TRACE_10("firedEH:",_unit, _weapon, _muzzle, _mode, _ammo, _magazine, _projectile, _vehicle, _gunner, _turret);
|
||||
[_projectile, true, ((side _unit) getFriend (side ACE_player)) >= 0.6] call FUNC(dev_addRound);
|
||||
[_projectile, true, [side group _unit, side group ACE_player] call BIS_fnc_sideIsFriendly] call FUNC(dev_addRound);
|
||||
|
@ -40,8 +40,9 @@ diag_log text "//****************** fragCalcDump Beg ******************//";
|
||||
private _fragInfo = [_ammo] call FUNC(getFragInfo);
|
||||
_fragInfo params ["_fragRange", "_fragMaxVelocity", "", "_modifiedFragCount"];
|
||||
private _fragCount = 4 * pi* _modifiedFragCount;
|
||||
private _indirectHitRange = getNumber (configFile >> "cfgAmmo" >> _ammo >> "indirectHitRange");
|
||||
private _indirectHit = getNumber (configFile >> "cfgAmmo" >> _ammo >> "indirectHit");
|
||||
private _ammoConfig = configFile >> "CfgAmmo" >> _ammo;
|
||||
private _indirectHitRange = getNumber (_ammoConfig >> "indirectHitRange");
|
||||
private _indirectHit = getNumber (_ammoConfig >> "indirectHit");
|
||||
private _fragPowerSpeedRange = [0.5, 1] vectorMultiply _fragMaxVelocity;
|
||||
|
||||
diag_log text format ["Ammo type: %1 | Should frag: %2", _ammo, _shouldFrag];
|
||||
|
Loading…
Reference in New Issue
Block a user