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

Update new death messages

Browse Source
This commit is contained in:
ebaydayz
2016-09-27 15:08:30 -04:00
parent 58e90da07d
commit 9b13bd0e5e
7 changed files with 115 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -577,6 +577,42 @@ if (!isDedicated) then {
_message call _displayText;
};
dayz_killFeed = {
private ["_distance","_icon","_message","_playerName","_sourceName"];
_playerName = _this select 1;
_sourceName = _this select 2;
_distance = _this select 4;
_icon = _this select 5;
if (_icon == "") exitWith {};
if (diag_ticktime - death_1_time < 10) then {
if (time - death_2_time < 10) then {
if (time - death_3_time < 10) then {
death_4 = death_3;
death_4_time = death_3_time;
} else {
death_4 = "";
};
death_3 = death_2;
death_3_time = death_2_time;
} else {
death_3 = "";
death_4 = "";
};
death_2 = death_1;
death_2_time = death_1_time;
} else {
death_2 = "";
death_3 = "";
death_4 = "";
};
death_1 = format["<t size='0.5'>%1</t><img image='%2'/><t size='0.5'> %3 (%4m)</t>",_sourceName,_icon,_playerName,_distance];;
death_1_time = diag_ticktime;
_message = format ["%1<br />%2<br />%3<br />%4",death_1,death_2,death_3,death_4];
[_message,safeZoneX,safeZoneY,10,0,0,8000] call BIS_fnc_dynamicText;
};
dayz_originalPlayer = player;
// database trader menu

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

@@ -324,16 +324,35 @@ if (!isDedicated) then {
// EPOCH ADDITION
"PVDZE_deathMessage" addPublicVariableEventHandler {
// do not allow PVDZE_deathMessage in publicvariable.txt, it is only sent from the server machine
private "_weapon";
_message = _this select 1;
_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 "killed": {
_weapon = _message select 3;
switch true do {
case (isClass (configFile >> "CfgWeapons" >> _weapon)): {
_message set [3, getText (configFile >> "CfgWeapons" >> _weapon >> "displayName")];
_message set [5, getText (configFile >> "CfgWeapons" >> _weapon >> "picture")];
};
case (isClass (configFile >> "CfgVehicles" >> _weapon)): {
_message set [3, getText (configFile >> "CfgVehicles" >> _weapon >> "displayName")];
_message set [5, getText (configFile >> "CfgVehicles" >> _weapon >> "picture")];
};
default {_message set [5,""]};
};
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]
};
case "suicide": {format [localize "str_player_death_suicide",_message select 1]};
};
switch (toLower DZE_DeathMsgChat) do {
// Use FunctionsManager logic unit (BIS_functions_mainscope) to send chat messages so no side or quotation marks are shown
case "global": {BIS_functions_mainscope globalChat _message;};
case "side": {BIS_functions_mainscope sideChat _message;};
case "global": {objNull globalChat _message;};
case "side": {objNull sideChat _message;};
case "system": {systemChat _message;};
};
if (DZE_DeathMsgCutText) then {_message call dayz_rollingMessages;};
if (DZE_DeathMsgDynamicText) then {/* add later */};
diag_log format["DeathMessage: %1",_message];
};
// flies and swarm sound sync

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

@@ -22,6 +22,15 @@ Message_3 = "";
Message_1_time = 0;
Message_2_time = 0;
Message_3_time = 0;
//Kill Feed
death_1 = "";
death_2 = "";
death_3 = "";
death_4 = "";
death_1_time = 0;
death_2_time = 0;
death_3_time = 0;
death_4_time = 0;
//OpenTarget timer
OpenTarget_Time = 0;