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

Update new runover death message

Browse Source
This commit is contained in:
ebaydayz
2016-09-28 18:57:09 -04:00
parent 66fd5bee57
commit b4be955a0d
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -182,7 +182,7 @@ if (_unit == player) then {
case (_ammo == "RunOver"): {"runover"}; case (_ammo == "RunOver"): {"runover"};
case (_ammo == "Dragged"): {"eject"}; case (_ammo == "Dragged"): {"eject"};
case (_ammo in MeleeAmmo): {"melee"}; case (_ammo in MeleeAmmo): {"melee"};
case (!isNil "_wpst" && {!(_wpst select 0 in ["","Throw"])}): {"shot"}; case (!isNil "_wpst" && {!(_wpst select 0 in ["","Throw"]) or (vehicle _source != _source)}): {"shot"};
default {"none"}; default {"none"};
}; };
if (dayz_lastDamageSource != "none") then {dayz_lastDamageTime = diag_tickTime;}; if (dayz_lastDamageSource != "none") then {dayz_lastDamageTime = diag_tickTime;};

2
SQF/dayz_code/init/compiles.sqf
View File

@@ -605,7 +605,7 @@ if (!isDedicated) then {
death_4 = ""; death_4 = "";
}; };
death_1 = format["<t size='.528' align='left'>%1</t><img size='.8' align='left' image='%2'/><t size='.528' align='left'> %3 (%4m)</t>",_sourceName,_icon,_playerName,_distance]; death_1 = format["<t size='.528' align='left' color='#a81e13'>%1</t><img size='.8' align='left' image='%2'/><t size='.528' align='left' color='#3FB07D'> %3 (%4m)</t>",_sourceName,_icon,_playerName,_distance];
death_1_time = diag_ticktime; death_1_time = diag_ticktime;
_message = format ["%1<br />%2<br />%3<br />%4",death_1,death_2,death_3,death_4]; _message = format ["%1<br />%2<br />%3<br />%4",death_1,death_2,death_3,death_4];
[_message,safeZoneX,safeZoneY,10,0,0,8000] spawn BIS_fnc_dynamicText; [_message,safeZoneX,safeZoneY,10,0,0,8000] spawn BIS_fnc_dynamicText;

23
SQF/dayz_code/init/publicEH.sqf
View File

@@ -324,22 +324,23 @@ if (!isDedicated) then {
// EPOCH ADDITION // EPOCH ADDITION
"PVDZE_deathMessage" addPublicVariableEventHandler { "PVDZE_deathMessage" addPublicVariableEventHandler {
private "_weapon"; private ["_root","_weapon"];
_message = _this select 1; _message = _this select 1;
_message = switch (_message select 0) do { _message = switch (_message select 0) do {
case "died": {format [localize "str_player_death_died",_message select 1,localize format["str_death_%1",_message select 2]]}; case "died": {format [localize "str_player_death_died",_message select 1,localize format["str_death_%1",_message select 2]]};
case "killed": { case "killed": {
_weapon = _message select 3; _weapon = _message select 3;
switch true do { _root = switch true do {
case (isClass (configFile >> "CfgWeapons" >> _weapon)): { case (isClass (configFile >> "CfgWeapons" >> _weapon)): {"CfgWeapons"};
_message set [3, getText (configFile >> "CfgWeapons" >> _weapon >> "displayName")]; case (isClass (configFile >> "CfgVehicles" >> _weapon)): {"CfgVehicles"};
_message set [5, getText (configFile >> "CfgWeapons" >> _weapon >> "picture")]; case (isClass (configFile >> "CfgMagazines" >> _weapon)): {"CfgMagazines"};
}; default {""};
case (isClass (configFile >> "CfgVehicles" >> _weapon)): { };
_message set [3, getText (configFile >> "CfgVehicles" >> _weapon >> "displayName")]; if (_root == "") then {
_message set [5, getText (configFile >> "CfgVehicles" >> _weapon >> "picture")]; _message set [5,""];
}; } else {
default {_message set [5,""]}; _message set [3,getText (configFile >> _root >> _weapon >> "displayName")];
_message set [5,getText (configFile >> _root >> _weapon >> "picture")];
}; };
if (DZE_DeathMsgDynamicText) then {_message call dayz_killFeed}; if (DZE_DeathMsgDynamicText) then {_message call dayz_killFeed};
format [localize "str_player_death_killed",_message select 1,_message select 2,_message select 3,_message select 4] format [localize "str_player_death_killed",_message select 1,_message select 2,_message select 3,_message select 4]

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

@@ -44,7 +44,7 @@ diag_log format ["Player UID#%3 CID#%4 %1 as %5 died at %2",
// EPOCH DEATH MESSAGES // EPOCH DEATH MESSAGES
if (_method in ["explosion","melee","runover","shot","shothead","shotheavy"]) then { if (_method in ["explosion","melee","shot","shothead","shotheavy"]) then {
if (_sourceName == _playerName) then { if (_sourceName == _playerName) then {
_message = ["suicide",_playerName]; _message = ["suicide",_playerName];
} else { } else {
@@ -55,7 +55,7 @@ if (_method in ["explosion","melee","runover","shot","shothead","shotheavy"]) th
}; };
} else { } else {
// No source name, distance or weapon needed: "%1 died from %2" str_death_%1 (see stringtable) // No source name, distance or weapon needed: "%1 died from %2" str_death_%1 (see stringtable)
// Possible methods: ["bled","combatlog","crushed","dehyd","eject","fall","starve","sick","rad","unknown","zombie"] // Possible methods: ["bled","combatlog","crushed","dehyd","eject","fall","starve","sick","rad","runover","unknown","zombie"]
_message = ["died",_playerName,_method]; _message = ["died",_playerName,_method];
}; };