W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix firedNear did not work as intended

Browse Source
This commit is contained in:
A Man
2022-05-05 17:58:36 +02:00
parent effb78fe13
commit 89d4bdfc9a
1 changed files with 78 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
SQF/dayz_code/compile/player_weaponFiredNear.sqf
View File

@@ -1,36 +1,25 @@
//[unit, weapon, muzzle, mode, ammo, magazine, projectile]
private ["_handled"];
//Init
//[unit, firer, distance, weapon, muzzle, mode, ammo]
_unit = _this select 0;
_firer = _this select 1;
_distance = _this select 2;
_weapon = _this select 3;
_ammo = _this select 6;
//_killerID = _firer getVariable["MemberID",0];
local _unit = _this select 0;
local _firer = _this select 1;
_handled = false;
_arc = 60;
_isBallistic = (getNumber (configfile >> "CfgAmmo" >> _ammo >> "whistleOnFire") > 0);
_dmgDistance = getNumber (configfile >> "CfgAmmo" >> _ammo >> "whistleDist");
_isRocket = ((_ammo isKindOf "RocketBase") && (_firer isKindOf "CAManBase"));
_isPlayer = (_unit == player);
_inVehicle = (vehicle _unit != _unit);
//_evType = "";
//_recordable = false;
local _distance = _this select 2;
local _weapon = _this select 3;
local _ammo = _this select 6;
local _handled = false;
local _arc = 60;
local _isBallistic = (getNumber (configfile >> "CfgAmmo" >> _ammo >> "whistleOnFire") > 0);
local _dmgDistance = getNumber (configfile >> "CfgAmmo" >> _ammo >> "whistleDist");
local _isRocket = ((_ammo isKindOf "RocketBase") && (_firer isKindOf "CAManBase"));
local _isPlayer = (_unit == player);
local _inVehicle = (vehicle _unit != _unit);
// Both the firer and those nearby (<=8m) go into "combat" to prevent ALT-F4
//diag_log ("DEBUG: AMMO TYPE: " +str(_ammo));
if !(_ammo isKindOf "LitObject") then {
_firer setVariable["startcombattimer", 1];
if !(_firer getVariable["inCombat",false]) then {
_firer setVariable["inCombat",true,true];
};
if (!(_ammo isKindOf "LitObject") && !(_ammo isKindOf "ThrownObjects")) then {
// Fired eventhandler handles the combat of the firer
if (_distance <= 8) then {
_unit setVariable["startcombattimer", 1];
if !(_unit getVariable["inCombat",false]) then {
_unit setVariable["inCombat",true,true];
};
[player,true] call fnc_setCombat;
};
};
@@ -38,17 +27,17 @@ private ["_handled"];
if (_firer == player) exitWith {};
//Is in danger angle?
_turretDir = _firer weaponDirection _weapon;
_weaponDir = ((_turretDir select 0) atan2 (_turretDir select 1));
_pos1 = getPosATL _unit;
_pos2 = getPosATL _firer;
_facing = ((_pos1 select 0) - (_pos2 select 0)) atan2 ((_pos1 select 1) - (_pos2 select 1));
_firingArc = (_weaponDir - _facing);
_firingArc = (-_firingArc) max (_firingArc);
local _turretDir = _firer weaponDirection _weapon;
local _weaponDir = ((_turretDir select 0) atan2 (_turretDir select 1));
local _pos1 = getPosATL _unit;
local _pos2 = getPosATL _firer;
local _facing = ((_pos1 select 0) - (_pos2 select 0)) atan2 ((_pos1 select 1) - (_pos2 select 1));
local _firingArc = (_weaponDir - _facing);
local _firingArc = (-_firingArc) max (_firingArc);
//In front?
_isInFront = (_firingArc < _arc);
_isInRear = (_firingArc > (180 - _arc));
local _isInFront = (_firingArc < _arc);
local _isInRear = (_firingArc > (180 - _arc));
//Ballistic Handler
if ((_isBallistic && _isInFront) && (_distance < (_dmgDistance * 2))) then {