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

Merge pull request #1962 from oiad/master

Browse Source 
AI hit messages and continuity
This commit is contained in:
icomrade
2017-09-08 10:01:31 -04:00
committed by GitHub
parent 026788e714 4355824aad
commit 6239959a13
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,7 +171,7 @@ if (_unit == player) then {
_sourceDist = round(_unit distance _source); _sourceDist = round(_unit distance _source);
_sourceWeap = switch (true) do { _sourceWeap = switch (true) do {
case (_ammo in ["PipeBomb","Mine","MineE"]): { format["with %1",_ammo] }; case (_ammo in ["PipeBomb","Mine","MineE"]): { format["with %1",_ammo] };
case (_isVehicle) : { format ["in %1",getText(configFile >> "CfgVehicles" >> _sourceVehicleType >> "displayName")] }; case (_isVehicle) : { format ["with a %1",getText(configFile >> "CfgVehicles" >> _sourceVehicleType >> "displayName")] };
case (_ammo in MeleeAmmo) : { format ["with %2%1",_wpst select 0, if (_sourceDist>6) then {"suspicious weapon "} else {""}] }; case (_ammo in MeleeAmmo) : { format ["with %2%1",_wpst select 0, if (_sourceDist>6) then {"suspicious weapon "} else {""}] };
case (_wpst select 0 == "Throw") : { format ["with %1 thrown", _wpst select 3] }; 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 (["Horn", currentWeapon _source] call fnc_inString) : {"with suspicious vehicle "+str((getposATL _source) nearEntities [["Air", "LandVehicle", "Ship"],5])};

4
SQF/dayz_server/init/server_functions.sqf
View File

@@ -250,7 +250,7 @@ fa_plr2str = {
_name = _x getVariable ["bodyName", nil]; _name = _x getVariable ["bodyName", nil];
if ((isNil "_name" OR {(_name == "")}) AND ({alive _x})) then { _name = name _x; }; if ((isNil "_name" OR {(_name == "")}) AND ({alive _x})) then { _name = name _x; };
if (isNil "_name" OR {(_name == "")}) then { _name = "UID#"+(getPlayerUID _x); }; if (isNil "_name" OR {(_name == "")}) then { _name = "UID#"+(getPlayerUID _x); };
_res = format["PID#%1(%2)", owner _x, _name ]; _res = if (isPlayer _x) then {format["PID#%1(%2)", owner _x, _name]} else {localize "STR_PLAYER_AI"};
}; };
_res _res
}; };
@@ -269,4 +269,4 @@ array_reduceSize = {
// Precise base building 1.0.5 // Precise base building 1.0.5
call compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\kk_functions.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\kk_functions.sqf";
#include "mission_check.sqf" #include "mission_check.sqf"