diff --git a/SQF/dayz_code/actions/player_breakin.sqf b/SQF/dayz_code/actions/player_breakin.sqf index 51dde95e0..04a6ddfed 100644 --- a/SQF/dayz_code/actions/player_breakin.sqf +++ b/SQF/dayz_code/actions/player_breakin.sqf @@ -121,7 +121,7 @@ if (isnil "_proceed") then { if (_proceed) then { //Completed but no success. if (!_brokein) then { - PVDZ_sec_atp = format["BROKEINFAILED: Play3r %1 Broke into Failed %2 at %3 chances:%4,%5",player, (typeof _target), (mapGridPosition _pos), _sledgeChance, _crowBarChance]; + PVDZ_sec_atp = format["BROKEINFAILED: Play3r UID#%1 Broke into Failed %2 at %3 chances:%4,%5",(getPlayerUID player), (typeOf _target), (mapGridPosition _pos), _sledgeChance, _crowBarChance]; _msg = "STR_BLD_BREAKIN_COMPLETE_FAIL"; } else { @@ -133,7 +133,7 @@ if (_proceed) then { _target animate ["DoorL", 1]; - PVDZ_sec_atp = format["BROKEINSUCCESSFUL: Play3r %1 Broke into %2 at %3",player, (typeof _target), (mapGridPosition _pos)]; + PVDZ_sec_atp = format["BROKEINSUCCESSFUL: Play3r UID#%1 Broke into %2 at %3",(getPlayerUID player), (typeOf _target), (mapGridPosition _pos)]; _msg = "STR_BLD_BREAKIN_COMPLETE"; }; diff --git a/SQF/dayz_code/compile/fn_damageHandler.sqf b/SQF/dayz_code/compile/fn_damageHandler.sqf index 1144a69b2..a22d2d3d4 100644 --- a/SQF/dayz_code/compile/fn_damageHandler.sqf +++ b/SQF/dayz_code/compile/fn_damageHandler.sqf @@ -172,7 +172,7 @@ if (_unit == player) then { _sourceDist = round(_unit distance _source); _sourceWeap = switch (true) do { case (_ammo in ["PipeBomb","Mine","MineE"]): { format["with %1",_ammo] }; - case (_isVehicle) : { format ["with %1",getText(configFile >> "CfgVehicles" >> _sourceVehicleType >> "displayName")] }; + case (_isVehicle) : { format ["with %1",_sourceVehicleType] }; 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 (["Horn",currentWeapon _source] call fnc_inString) : { format ["with %1 suspicious", currentWeapon _source]}; @@ -301,10 +301,10 @@ if (_damage > 0.4) then { //Create Wound _unit setVariable["hit_"+_wound,true,true]; - PVDZ_hlt_Bleed = [_unit,_wound,_damage]; + PVDZ_hlt_Bleed = [_unit,_wound]; publicVariable "PVDZ_hlt_Bleed"; // draw blood stream on character, on all gameclients - [_unit,_wound,_hit] spawn fnc_usec_damageBleed; // draw blood stream on character, locally + [_unit,_wound] spawn fnc_usec_damageBleed; // draw blood stream on character, locally //Set Injured if not already _isInjured = _unit getVariable["USEC_injured",false]; @@ -343,9 +343,9 @@ if (_damage > 0.4) then { //Create Wound _unit setVariable["hit_"+_wound,true,true]; - PVDZ_hlt_Bleed = [_unit,_wound,_damage]; + PVDZ_hlt_Bleed = [_unit,_wound]; publicVariable "PVDZ_hlt_Bleed"; // draw blood stream on character, on all gameclients - [_unit,_wound,_hit] spawn fnc_usec_damageBleed; // draw blood stream on character, locally + [_unit,_wound] spawn fnc_usec_damageBleed; // draw blood stream on character, locally //Set Injured if not already _isInjured = _unit getVariable["USEC_injured",false]; if (!_isInjured) then { diff --git a/SQF/dayz_code/compile/player_humanityMorph.sqf b/SQF/dayz_code/compile/player_humanityMorph.sqf index 02376cff9..313bd7400 100644 --- a/SQF/dayz_code/compile/player_humanityMorph.sqf +++ b/SQF/dayz_code/compile/player_humanityMorph.sqf @@ -62,7 +62,7 @@ if (count _medical > 0) then { { //diag_log format ["loop _x:1 wound:%2",_x, (USEC_typeOfWounds select _forEachIndex)]; player setVariable ["hit_"+_x,true,true]; - PVDZ_hlt_Bleed = [player, _x, 1]; + PVDZ_hlt_Bleed = [player, _x]; publicVariable "PVDZ_hlt_Bleed"; } forEach (_medical select 8); diff --git a/SQF/dayz_code/compile/vehicle_getOut.sqf b/SQF/dayz_code/compile/vehicle_getOut.sqf index c9d4d5d61..d98e1b504 100644 --- a/SQF/dayz_code/compile/vehicle_getOut.sqf +++ b/SQF/dayz_code/compile/vehicle_getOut.sqf @@ -39,7 +39,7 @@ if (_unit == player) then { }; //Log to server RPT (could give false pos) - should help admins see who is trying to abuse this. - PVDZ_sec_atp = format["WARNING: Play3r %1 exited %2 close to built fence as %3",_unit, (typeof _vehicle), _position]; + PVDZ_sec_atp = format["WARNING: Play3r UID#%1 exited %2 close to built fence as %3",(getPlayerUID _unit), (typeOf _vehicle), _position]; publicVariableServer "PVDZ_sec_atp"; localize "str_actions_exitBlocked" call dayz_rollingMessages; diff --git a/SQF/dayz_code/medical/setup_functions_med.sqf b/SQF/dayz_code/medical/setup_functions_med.sqf index 877e474fc..52e80e18b 100644 --- a/SQF/dayz_code/medical/setup_functions_med.sqf +++ b/SQF/dayz_code/medical/setup_functions_med.sqf @@ -269,14 +269,13 @@ fnc_usec_damageBleed = { /*********************************************************** PROCESS DAMAGE TO A UNIT - Function fnc_usec_damageBleed: Draw a creepy blood stream from a player limb - - [_unit, _wound, _injury] call fnc_usec_damageBleed; + - [_unit, _wound] call fnc_usec_damageBleed; ************************************************************/ private["_wound","_modelPos","_point","_source"]; _unit = _this select 0; _wound = _this select 1; _point = objNull; _source = objNull; - //_injury = _this select 2; // not used. damage% ??? if (isServer) exitWith{}; // no graphical effects on server! /* diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index 3e2f352d9..2b018a51d 100644 --- a/SQF/dayz_code/system/player_monitor.fsm +++ b/SQF/dayz_code/system/player_monitor.fsm @@ -751,8 +751,8 @@ class FSM "" \n "{" \n " if (player getVariable[""hit_""+_x,false]) then { " \n - " [player,_x,_x] spawn fnc_usec_damageBleed; " \n - " PVDZ_hlt_Bleed = [player,_x,_x];" \n + " [player,_x] spawn fnc_usec_damageBleed; " \n + " PVDZ_hlt_Bleed = [player,_x];" \n " publicVariable ""PVDZ_hlt_Bleed""; // draw blood stream on character, on all gameclients" \n " };" \n "} forEach USEC_typeOfWounds;" \n