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

Disable frag by default. Add @pabstmirror fix closes #1339 closes #820

Browse Source
This commit is contained in:
jaynus 2015-05-21 15:06:55 -07:00
parent 58a55313cd
commit c297257421
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/frag/ACE_Settings.hpp
View File

@ -9,7 +9,7 @@ class ACE_Settings {
displayName = "$STR_ACE_frag_EnableSpall";
description = "$STR_ACE_frag_EnableSpall_Desc";
typeName = "BOOL";
value = 1;
value = 0;
};
class GVAR(maxTrack) {
displayName = "$STR_ACE_frag_MaxTrack";

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

@ -54,7 +54,7 @@ if(_doFragTrack && alive _round) then {
_spallTrackID = [];
private["_args"];
_args = [_round, (getPosASL _round), (velocity _round), _type, time, _gun, _doSpall, _spallTrack, _spallTrackID,
_args = [_round, (getPosASL _round), (velocity _round), _type, diag_frameno, _gun, _doSpall, _spallTrack, _spallTrackID,
(getNumber (configFile >> "CfgAmmo" >> _type >> QGVAR(skip))),
(getNumber (configFile >> "CfgAmmo" >> _type >> "explosive")),
(getNumber (configFile >> "CfgAmmo" >> _type >> "indirectHitRange")),

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

@ -1,10 +1,10 @@
#include "script_component.hpp"
private ["_round", "_lastPos", "_lastVel", "_type", "_time", "_doSpall", "_spallTrack", "_foundObjectHPIds", "_skip", "_explosive", "_indirectRange", "_force", "_fragPower"];
private ["_round", "_lastPos", "_lastVel", "_type", "_firedFrame", "_doSpall", "_spallTrack", "_foundObjectHPIds", "_skip", "_explosive", "_indirectRange", "_force", "_fragPower"];
_round = _this select 0;
_lastPos = _this select 1;
_lastVel = _this select 2;
_type = _this select 3;
_time = _this select 4;
_firedFrame = _this select 4;
_doSpall = _this select 6;
_spallTrack = _this select 7;
_foundObjectHPIds = _this select 8;
@ -19,7 +19,7 @@ if(_round in GVAR(blackList)) exitWith {
};
if (!alive _round) then {
if(_time != time) then {
if((diag_frameno - _firedFrame) > 1) then {
if(_skip == 0) then {
if((_explosive > 0.5 && {_indirectRange >= 4.5} && {_fragPower >= 35}) || {_force == 1} ) then {
[QGVAR(frag_eh), _this] call ace_common_fnc_serverEvent;