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

1.0.1.8 part 2

Browse Source
This commit is contained in:
[VB]AWOL
2013-08-10 08:32:23 -05:00
parent 1c889add2b
commit cd96e8df2a
3 changed files with 269 additions and 3512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SQF/dayz_code/actions/remove.sqf
View File

@@ -2,13 +2,16 @@
delete object from db with extra waiting by [VB]AWOL
parameters: _obj
*/
private ["_obj","_objectID","_objectUID","_started","_finished","_animState","_isMedic","_isOk","_proceed","_counter","_limit","_objType","_sfx","_dis","_itemOut","_countOut","_selectedRemoveOutput","_friendlies","_nearestPole","_ownerID","_refundpart","_isWreck","_findNearestPoles","_findNearestPole","_IsNearPlot","_brokenTool","_removeTool","_isDestructable","_isRemovable"];
private ["_obj","_objectID","_objectUID","_started","_finished","_animState","_isMedic","_isOk","_proceed","_counter","_limit","_objType","_sfx","_dis","_itemOut","_countOut","_selectedRemoveOutput","_friendlies","_nearestPole","_ownerID","_refundpart","_isWreck","_findNearestPoles","_findNearestPole","_IsNearPlot","_brokenTool","_removeTool","_isDestructable","_isRemovable","_objOwnerID","_isOwnerOfObj"];
if(TradeInprogress) exitWith { cutText ["Remove already in progress." , "PLAIN DOWN"]; };
TradeInprogress = true;
_obj = _this select 3;
_objOwnerID = _obj getVariable["CharacterID","0"];
_isOwnerOfObj = (_objOwnerID == dayz_characterID);
if(_obj getVariable ["GeneratorRunning", false]) exitWith {TradeInprogress = false; cutText ["Cannot remove running generator.", "PLAIN DOWN"];};
_objectID = _obj getVariable ["ObjectID","0"];
@@ -107,7 +110,7 @@ while {_isOk} do {
if(_finished) then {
_counter = _counter + 1;
// 10% chance to break a required tool each pass
if(_isDestructable or _isRemovable) then {
if((_isDestructable or _isRemovable) and !_isOwnerOfObj) then {
if((random 10) <= 1) then {
_brokenTool = true;
};
@@ -145,8 +148,11 @@ if (_proceed) then {
if(!isNull(_obj)) then {
deleteVehicle _obj;
if(!_isWreck) then {
dayzDeleteObj = [_objectID,_objectUID];
publicVariableServer "dayzDeleteObj";
};
cutText [format["De-constructing %1.",_objType], "PLAIN DOWN"];

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

@@ -431,7 +431,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu
//Player Deaths
if(_typeOfCursorTarget == "Info_Board_EP1") then {
if (s_player_information < 0) then {
s_player_information = player addAction ["Recent Deaths", "\z\addons\dayz_code\actions\list_playerDeaths.sqf",[], 0, false, true, "",""];
s_player_information = player addAction ["Recent Murders", "\z\addons\dayz_code\actions\list_playerDeaths.sqf",[], 0, false, true, "",""];
};
} else {
player removeAction s_player_information;

3765
Server Files/mysql/epoch.sql
View File

File diff suppressed because it is too large Load Diff