diff --git a/addons/frag/functions/fnc_addBlackList.sqf b/addons/frag/functions/fnc_addBlackList.sqf index 37643cbf9b..3766df13e8 100644 --- a/addons/frag/functions/fnc_addBlackList.sqf +++ b/addons/frag/functions/fnc_addBlackList.sqf @@ -1,10 +1,10 @@ #include "..\script_component.hpp" /* * Author: Jaynus, NouberNou, Lambda.Tiger - * Adds a round to the blacklist (will be ignored). + * Adds a round type to the blacklist (will be ignored). * * Arguments: - * 0: Projectile + * 0: Projectile or classname * * Return Value: * None @@ -18,4 +18,12 @@ params ["_proj"]; TRACE_1("addBlackList",_round); -GVAR(shouldFragCache) set [typeOf _ammo, false]; \ No newline at end of file +switch (typeName _proj) do { + case "OBJECT": { + GVAR(shouldFragCache) set [typeOf _proj, false]; + }; + case "STRING": { + GVAR(shouldFragCache) set [_proj, false]; + }; + default { }; +}; \ No newline at end of file diff --git a/addons/frag/functions/fnc_getFragInfo.sqf b/addons/frag/functions/fnc_getFragInfo.sqf index e407fb19ef..0f04208b7c 100644 --- a/addons/frag/functions/fnc_getFragInfo.sqf +++ b/addons/frag/functions/fnc_getFragInfo.sqf @@ -64,7 +64,7 @@ if (_k == 0) then {_k = 0.8; _warn = true;}; private _gC = getNumber (configFile >> "cfgAmmo" >> _ammo >> QGVAR(GURNEY_C)); if (_gC == 0) then {_gC = 2440; _warn = true;}; private _fragCount = getNumber (configFile >> "cfgAmmo" >> _ammo >> QGVAR(fragCount)); -if (_fragCount == 0) then {_fragCount = 200; _warn = true;}; +if (_fragCount == 0) then {_fragCount = 400; _warn = true;}; if (_warn) then { INFO_1("Ammo class %1 lacks proper explosive properties definitions for frag!",_ammo); @@ -79,7 +79,7 @@ if (_warn) then { * of spherical fragmentation */ _ammoInfo = [ - sqrt (_fragCount / (4 * pi * 0.01)), + sqrt (_fragCount / (4 * pi * 0.005)), 0.8 * _gC * sqrt (_c / (_m + _c * _k)), _fragTypes, _fragCount / 4 / pi