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

0.922

Browse Source 
+ Tag friendly should now work only players.
+ Tweaks to vault lock unlock code to attempt to prevent extra bugged
menu option.
+ Kill messages should now work with global chat.
This commit is contained in:
vbawol
2013-02-06 10:45:34 -06:00
parent 10c11d51ea
commit d21edefbd6
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dayz_code/compile/fn_damageActions.sqf
View File

@@ -153,15 +153,6 @@ if (_hasPatient and !r_drag_sqf and !r_action and !_inVehicle and !r_player_unco
};
};
} forEach _magTypes;
} else {
// should only fire if cursor target is man and not vehicle
if ((isPlayer _unit) and !(_charID in _friendlies)) then {
r_action = true;
_action = _unit addAction ["Tag as friendly", "\z\addons\dayz_code\actions\player_tagFriendly.sqf", [], 0, false, true, "", ""];
r_player_actions set [count r_player_actions,_action];
};
};
//CAN CARRY BACKPACK
if ((_type in USEC_PackableObjects) and (_classbag == "")) then {
@@ -169,6 +160,15 @@ if (_hasPatient and !r_drag_sqf and !r_action and !_inVehicle and !r_player_unco
_action = _unit addAction [format[localize "str_actions_medical_12",_typeVeh], "\z\addons\dayz_code\actions\pack.sqf",[_unit], 0, true, true];
r_player_actions set [count r_player_actions,_action];
};
} else {
// should only fire if cursor target is man and not vehicle
if ((isPlayer _unit) and !(_charID in _friendlies)) then {
r_action = true;
_action = _unit addAction ["Tag as friendly", "\z\addons\dayz_code\actions\player_tagFriendly.sqf", [], 0, false, true, "", ""];
r_player_actions set [count r_player_actions,_action];
};
};
if ((_unit isKindOf "Building")) then {
_type = TypeOf(_unit);

10
dayz_code/compile/fn_selfActions.sqf
View File

@@ -215,12 +215,12 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 6))
//Allow owner to unlock vault
if(cursorTarget isKindOf "VaultStorageLocked" and _canDo and _ownerID != "0") then {
if (_ownerID == dayz_playerUID) then {
if (s_player_unlockvault < 0) then {
if (s_player_unlockvault < 0 and (player distance cursorTarget < 3)) then {
s_player_unlockvault = player addAction ["Unlock Vault", "\z\addons\dayz_code\actions\vault_unlock.sqf",cursorTarget, 0, false, true, "",""];
};
} else {
if(_hasToolbox) then{
if (s_player_unlockvault < 0) then {
if (s_player_unlockvault < 0 and (player distance cursorTarget < 3)) then {
s_player_unlockvault = player addAction ["Crack Vault", "\z\addons\dayz_code\actions\vault_unlock.sqf",cursorTarget, 0, false, true, "",""];
};
} else {
@@ -235,12 +235,12 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 6))
};
//Allow owner to pack vault
if(cursorTarget isKindOf "VaultStorage" and _canDo and _ownerID != "0" and _ownerID == dayz_playerUID) then {
if(cursorTarget isKindOf "VaultStorage" and _canDo and _ownerID != "0" and _ownerID == dayz_playerUID and (player distance cursorTarget < 3)) then {
if ((s_player_lockvault < 0) and (player distance cursorTarget < 3)) then {
if (s_player_lockvault < 0) then {
s_player_lockvault = player addAction ["Lock Vault", "\z\addons\dayz_code\actions\vault_lock.sqf",cursorTarget, 0, false, true, "",""];
};
if ((s_player_packvault < 0) and (player distance cursorTarget < 3)) then {
if (s_player_packvault < 0) then {
s_player_packvault = player addAction ["<t color='#ff0000'>Pack Vault</t>", "\z\addons\dayz_code\actions\vault_pack.sqf",cursorTarget, 0, false, true, "",""];
};
} else {

2
dayz_code/config.cpp
View File

@@ -33,7 +33,7 @@ class CfgMods
hidePicture = 0;
hideName = 0;
action = "http://www.dayzepoch.com";
version = "0.92";
version = "0.922";
hiveVersion = 0.96; //0.93
};
};

4
dayz_server/compile/server_playerDied.sqf
View File

@@ -27,10 +27,10 @@ if (_killerName == "nil" || _victimName == _killerName) then {
diag_log _loc_message;
//SHOW THE MESSAGE INGAME [GLOBAL CHAT]
// [nil, nil, rspawn, [_victim, _message], { (_this select 0) globalChat (_this select 1) }] call RE;
[nil, nil, rspawn, [_victim, _message], { (_this select 0) globalChat (_this select 1) }] call RE;
//SHOW THE MESSAGE INGAME [TITLE TEXT]
[nil,nil,rTITLETEXT,_message,"PLAIN DOWN"] call RE;
//[nil,nil,rTITLETEXT,_message,"PLAIN DOWN"] call RE;
_victim setVariable["AttackedBy", "nil", true];
_victim setVariable["AttackedByName", "nil", true];