From da5285e0ecc2d81e620c854655c1c868d4623a39 Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Fri, 18 Nov 2016 16:36:37 -0500 Subject: [PATCH] Update damage handler diag_log Vanilla commit: https://github.com/DayZMod/DayZ/commit/21864d065c88b4c1f4579f4f20afc7bc6efc0097 --- SQF/dayz_code/compile/fn_damageHandler.sqf | 4 +- SQF/dayz_code/stringtable.xml | 50 +++++++++---------- SQF/dayz_server/compile/server_playerDied.sqf | 4 +- 3 files changed, 28 insertions(+), 30 deletions(-) diff --git a/SQF/dayz_code/compile/fn_damageHandler.sqf b/SQF/dayz_code/compile/fn_damageHandler.sqf index a87a6b08c..04bd6e9dc 100644 --- a/SQF/dayz_code/compile/fn_damageHandler.sqf +++ b/SQF/dayz_code/compile/fn_damageHandler.sqf @@ -165,15 +165,15 @@ if (_unit == player) then { //Overkill logging. PVS network send every two seconds = lag. Not worth it just for extra anticheat logs. //Log to server :-( OverProcessing really not needed. - /*if (((!(isNil {_source})) AND {(!(isNull _source))}) AND {(_isMan AND {(!local _source)})}) then { + /*if (!local _source && _isMan) then { _wpst = weaponState _source; if (diag_ticktime-(_source getVariable ["lastloghit",0])>2) then { private ["_sourceWeap"]; _source setVariable ["lastloghit",diag_ticktime]; _sourceDist = round(_unit distance _source); _sourceWeap = switch (true) do { - case ((vehicle _source) != _source) : { format ["in %1",getText(configFile >> "CfgVehicles" >> _sourceVehicleType >> "displayName")] }; case (_isZombieHit) : { _ammo }; + case (_sourceVehicleType isKindOf "LandVehicle" or _sourceVehicleType isKindOf "Air" or _sourceVehicleType isKindOf "Ship") : { format ["in %1",getText(configFile >> "CfgVehicles" >> _sourceVehicleType >> "displayName")] }; case (_wpst select 0 == "Throw") : { format ["with %1 thrown", _wpst select 3] }; case (["Horn", currentWeapon _source] call fnc_inString) : {"with suspicious vehicle "+str((getposATL _source) nearEntities [["Air", "LandVehicle", "Ship"],5])}; case (["Melee", _wpst select 0] call fnc_inString) : { format ["with %2%1",_wpst select 0, if (_sourceDist>6) then {"suspicious weapon "} else {""}] }; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index cc913746b..45d1dff4a 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -7262,6 +7262,21 @@ Her name was %1, it appears she died from %2 + + %1 committed suicide + %1 Selbstmord + %1 покончил с собой + + + %1 died from %2 + %1 starb durch %2 + %1 умер от %2 + + + %1 was killed by %2 with a %3 from %4m + %1 wurde von %2 mit einer %3 von %4m getötet + %1 был убит игроком %2 с %3 с расстояния %4м +