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 death message showing RunOver when it shouldn't

Browse Source
This commit is contained in:
ebayShopper
2017-03-25 20:05:36 -04:00
parent 87abb204e9
commit 50ba58f5ae
4 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGE LOG 1.0.6.2.txt
View File

@@ -15,6 +15,7 @@
[FIXED] Swimming in air or ground after relog, clothes change and respawn on certain maps. #1913 @Cherdenko
[FIXED] Arma cheats enterable on map display and create marker text box. #1915 @BigEgg17
[FIXED] It is no longer possible to duplicate melee weapons by double clicking to drop and right clicking at the same time. @F507DMT
[FIXED] Death messages sometimes showing RunOver when they should not due to dayz_hitBy variable not resetting after being runover. @oiad
[NOTE] Fixes below are included in the mission file and server pbo as part of server package 1.0.6.1A (March 10th 2017)
[FIXED] Fixed food and drink going down 10x faster from melee and other "working" actions.

12
SQF/dayz_code/compile/fn_damageHandler.sqf
View File

@@ -25,21 +25,19 @@ _isLocal = local _source;
_falling = (((_hit == "legs") AND {(_source==_unit)}) AND {((_ammo=="") AND {(Dayz_freefall select 1 > 3)})});
//Simple hack to help with a few issues from direct damage to physic based damage. ***until 2.0***
if (isNull dayz_getout) then {
if (diag_tickTime - dayz_getoutTime > 2 && (vehicle player == player)) then {
_vehicleArray = nearestObjects [(getPosATL (vehicle _unit)),["Car","Air","Motorcycle","Ship","Tank"],3];
{if (typeOf _x == "ParachuteWest") then {_vehicleArray = _vehicleArray - [_x];};} count _vehicleArray;
{
if ((speed _x > 10) or (speed _x < -8)) exitwith { dayz_HitBy = _x; };
if ((speed _x > 10) or (speed _x < -8)) exitWith { dayz_hitByTime = diag_tickTime; };
} count _vehicleArray;
};
//Lets see if the player has been struck by a moving vehicle.
if (!isNull dayz_HitBy && vehicle player == player) then { _ammo = "RunOver"; };
if ((_hit == "Legs") AND {(_ammo == "RunOver")}) then { dayz_HitBy = objNull; };
if (diag_tickTime - dayz_hitByTime < 2) then { _ammo = "RunOver"; };
//If a vehicle is moveing faster then 15 lets register some kind of direct damage rather then relying on indirect/physics damage.
if (!isNull dayz_getout && diag_tickTime - dayz_getoutTime < 5) then { _ammo = "Dragged"; };
if ((_hit == "Legs") AND {(_ammo == "Dragged")}) then { dayz_getout = objNull; };
//If a vehicle is moving faster then 15 lets register some kind of direct damage rather then relying on indirect/physics damage.
if (diag_tickTime - dayz_getoutTime < 2) then { _ammo = "Dragged"; };
_end = false;

1
SQF/dayz_code/compile/vehicle_getOut.sqf
View File

@@ -49,7 +49,6 @@ if (_unit == player) then {
//Lets make sure we can process some dmg from ejecting from the vehicle even traveling at lower speeds.
if (((speed _vehicle) > 15) or ((speed _vehicle) < -10)) then {
dayz_getout = _vehicle;
dayz_getoutTime = diag_tickTime;
};
};

3
SQF/dayz_code/init/variables.sqf
View File

@@ -659,9 +659,8 @@ if (!isDedicated) then {
dayz_dodge = false;
Dayz_constructionContext = [];
Dayz_freefall = [ time, 0, 0.1 ];
dayz_getout = objNull;
dayz_getoutTime = 0;
dayz_HitBy = objNull;
dayz_hitByTime = 0;
skipGearSound = false;
TimeOutDisplayed = false;
voice_actions = ["voiceOverNet","PushToTalk","PushToTalkAll","PushToTalkCommand","PushToTalkDirect","PushToTalkGroup","PushToTalkSide","PushToTalkVehicle"];