Skip to content

Commit a6783d8

Browse files
DomT602Jason2605
andcommitted
Death log update (#596)
* Death log * Cleanup * Setting * Add macros Co-authored-by: Jason_000 <Jason2605@users.noreply.github.com>
1 parent 84c4f7c commit a6783d8

4 files changed

Lines changed: 38 additions & 41 deletions

File tree

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#include "\life_server\script_macros.hpp"
2+
/*
3+
File: fn_entityKilled.sqf
4+
Author: DomT602
5+
Description:
6+
Called when an entity dies
7+
*/
8+
params [
9+
["_killed",objNull,[objNull]],
10+
["_killer",objNull,[objNull]]
11+
];
12+
13+
if (isPlayer _killed) then {
14+
if (LIFE_SETTINGS(getNumber,"player_deathLog") isEqualTo 0) exitWith {};
15+
private _killedName = name _killed;
16+
private _killerName = name _killer;
17+
private _message = format ["Death Message: %1 has killed %2", _killerName, _killedName];
18+
if (_killed isEqualTo _killer) then {
19+
_message = format ["Suicide Message: %1 committed suicide (or disconnected)", _killedName];
20+
} else {
21+
private _weapon = currentWeapon _killer;
22+
if (_weapon isEqualTo "") then {
23+
private _vehicle = vehicle _killer;
24+
if (_vehicle isKindOf "Car") then {
25+
_message = format ["Vehicle Death Message: %1 has knocked down %2 with a %3", _killerName, _killedName, (getText(configFile >> "CfgVehicles" >> (typeOf _vehicle) >> "displayName"))];
26+
} else {
27+
if (_vehicle isKindOf "Air") then {
28+
_message = format ["Aircraft Death Message: %1 has obliterated %2 with a %3", _killerName, _killedName, (getText(configFile >> "CfgVehicles" >> (typeOf _vehicle) >> "displayName"))];
29+
};
30+
};
31+
} else {
32+
_message = format ["Weapon Death Message: %1 has killed %2 with Weapon %3 from %4 Meters", _killerName, _killedName, (getText(configFile >> "cfgWeapons" >> _weapon >> "displayName")), floor(_killer distance _killed)];
33+
};
34+
};
35+
diag_log format ["death_log: %1",_message];
36+
};

life_server/Functions/Systems/fn_whoDoneIt.sqf

Lines changed: 0 additions & 40 deletions
This file was deleted.

life_server/config.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ class CfgFunctions {
6666
class chopShopSell {};
6767
class clientDisconnect {};
6868
class entityRespawned {};
69+
class entityKilled {};
6970
class cleanupRequest {};
7071
class keyManagement {};
7172
class vehicleUpdate {};

life_server/init.sqf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ _extDBNotLoaded = "";
1717
serv_sv_use = [];
1818
publicVariable "life_server_isReady";
1919
life_save_civilian_position = if (LIFE_SETTINGS(getNumber,"save_civilian_position") isEqualTo 0) then {false} else {true};
20-
fn_whoDoneIt = compile preprocessFileLineNumbers "\life_server\Functions\Systems\fn_whoDoneIt.sqf";
2120

2221
/*
2322
Prepare the headless client.
@@ -207,6 +206,7 @@ aiSpawn = ["hunting_zone",30] spawn TON_fnc_huntingZone;
207206

208207
server_corpses = [];
209208
addMissionEventHandler ["EntityRespawned", {_this call TON_fnc_entityRespawned}];
209+
addMissionEventHandler ["EntityKilled", {_this call TON_fnc_entityKilled}];
210210

211211
diag_log "----------------------------------------------------------------------------------------------------";
212212
diag_log format [" End of Altis Life Server Init :: Total Execution Time %1 seconds ",(diag_tickTime) - _timeStamp];

0 commit comments

Comments
 (0)