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

Update damage handler diag_log

Browse Source 
Vanilla commit:

21864d065c
This commit is contained in:
ebaydayz
2016-11-18 16:36:37 -05:00
parent bec4ccce38
commit da5285e0ec
3 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 {""}] };

50
SQF/dayz_code/stringtable.xml
View File

@@ -7262,6 +7262,21 @@
<Key ID="str_player_studybody_female">
<English>Her name was %1, it appears she died from %2</English>
</Key>
<Key ID="str_player_death_suicide">
<English>%1 committed suicide</English>
<German>%1 Selbstmord</German>
<Russian>%1 покончил с собой</Russian>
</Key>
<Key ID="str_player_death_died">
<English>%1 died from %2</English>
<German>%1 starb durch %2</German>
<Russian>%1 умер от %2</Russian>
</Key>
<Key ID="str_player_death_killed">
<English>%1 was killed by %2 with a %3 from %4m</English>
<German>%1 wurde von %2 mit einer %3 von %4m getötet</German>
<Russian>%1 был убит игроком %2 с %3 с расстояния %4м</Russian>
</Key>
<!--
<Key ID="str_player_fail_drink">
<English>You may not drink while in a vehicle</English>
@@ -7525,6 +7540,16 @@
<English>blunt force trauma.</English>
<German>durch stumpfe Gewalteinwirkung.</German>
</Key>
<Key ID="str_death_rad">
<English>radiation</English>
<German>Strahlung</German>
<Russian>излучение</Russian>
</Key>
<Key ID="str_death_crushed">
<English>being crushed</English>
<German>zerquetscht</German>
<Russian>раздавлен</Russian>
</Key>
<Key ID="str_abort_playerclose">
<English>You cannot abort near another player!</English>
<Russian>Нельзя выходить находясь рядом с другим игроком!</Russian>
@@ -13864,31 +13889,6 @@
<French>Vous serez automatiquement rejoindre le jeu en %1 secondes. Appuyez sur ESC pour annuler et quitter le hall.</French>
<Czech>Budete auto-zapojit do hry za %1 sekund. Stisknutím klávesy ESC zrušit a nechat lobby.</Czech>
</Key>
<Key ID="str_death_rad">
<English>radiation</English>
<German>Strahlung</German>
<Russian>излучение</Russian>
</Key>
<Key ID="str_death_crushed">
<English>being crushed</English>
<German>zerquetscht</German>
<Russian>раздавлен</Russian>
</Key>
<Key ID="str_player_death_suicide">
<English>%1 committed suicide</English>
<German>%1 Selbstmord</German>
<Russian>%1 покончил с собой</Russian>
</Key>
<Key ID="str_player_death_died">
<English>%1 died from %2</English>
<German>%1 starb durch %2</German>
<Russian>%1 умер от %2</Russian>
</Key>
<Key ID="str_player_death_killed">
<English>%1 was killed by %2 with a %3 from %4m</English>
<German>%1 wurde von %2 mit einer %3 von %4m getötet</German>
<Russian>%1 был убит игроком %2 с %3 с расстояния %4м</Russian>
</Key>
<Key ID="STR_PITCH_DESERT_TENT">
<English>Pitch Desert Dome Tent</English>
<Russian>Поставить палатку-полусферу</Russian>

4
SQF/dayz_server/compile/server_playerDied.sqf
View File

@@ -41,8 +41,7 @@ diag_log format ["Player UID#%3 CID#%4 %1 as %5 died at %2",
];
#endif
// EPOCH DEATH MESSAGES
// DEATH MESSAGES
_suicide = _sourceName == _playerName;
if (_method in ["explosion","melee","shot","shothead","shotheavy"] && !(_method == "explosion" && (_suicide or _sourceName == "unknown"))) then {
@@ -79,7 +78,6 @@ if (_playerName != "unknown" or _sourceName != "unknown") then {
diag_log format["DeathMessage: %1",_message];
};
_newObject setDamage 1;
_newObject setOwner 0;
//dead_bodyCleanup set [count dead_bodyCleanup,_newObject];