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

RC1

Browse Source
This commit is contained in:
[VB]AWOL
2013-11-27 14:44:48 -06:00
parent 430716bb98
commit 677f42bb6f
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,17 @@ private ["_isWreckBuilding","_temp_keys","_magazinesPlayer","_isPZombie","_vehic
if (DZE_ActionInProgress) exitWith {}; // Do not allow if any script is running. if (DZE_ActionInProgress) exitWith {}; // Do not allow if any script is running.
_groups = allGroups;
//Clean groups
{
if (_x == group player) then {
diag_log ("Player In Group" + str(_x) + " WITH " + str(count units _x) + " UNITS");
} else {
diag_log ("Player NotIn Group" + str(_x) + " WITH " + str(count units _x) + " UNITS");
};
diag_log ("Units" + str(units _x));
} forEach _groups;
_vehicle = vehicle player; _vehicle = vehicle player;
_isPZombie = player isKindOf "PZombie_VB"; _isPZombie = player isKindOf "PZombie_VB";
_inVehicle = (_vehicle != player); _inVehicle = (_vehicle != player);

3
SQF/dayz_server/compile/server_onPlayerDisconnect.sqf
View File

@@ -23,6 +23,7 @@ if (!isNull _playerObj) then {
if (vehicle _playerObj != _playerObj) then { if (vehicle _playerObj != _playerObj) then {
_playerObj action ["eject", vehicle _playerObj]; _playerObj action ["eject", vehicle _playerObj];
_invehicle = true; _invehicle = true;
diag_log format["LOGOUT IN VEHICLE: %1 at location %2", _playerName,(getPosATL _playerObj)];
}; };
if ((_timeout - time) > 0) then { if ((_timeout - time) > 0) then {
@@ -44,7 +45,7 @@ if (!isNull _playerObj) then {
if (alive _playerObj) then { if (alive _playerObj) then {
_isplayernearby = (DZE_BackpackGuard and!_invehicle and ({(isPlayer _x) and (alive _x)} count (_playerPos nearEntities ["AllVehicles", 5]) > 1)); _isplayernearby = (DZE_BackpackGuard and !_invehicle and ({(isPlayer _x) and (alive _x)} count (_playerPos nearEntities ["AllVehicles", 5]) > 1));
// prevent saving more than 20 magazine items // prevent saving more than 20 magazine items
_magazines = [(magazines _playerObj),20] call array_reduceSize; _magazines = [(magazines _playerObj),20] call array_reduceSize;

8
SQF/dayz_server/system/server_cleanup.fsm
View File

@@ -21,11 +21,11 @@ item16[] = {"group_cleanup",2,250,-450.000000,25.000000,-350.000000,75.000000,0.
item17[] = {"__0_min__loop_1",4,218,50.000000,-75.000000,150.000000,-25.000000,5.000000,"10 min" \n " loop"}; item17[] = {"__0_min__loop_1",4,218,50.000000,-75.000000,150.000000,-25.000000,5.000000,"10 min" \n " loop"};
item18[] = {"cleanup_dead",2,250,50.000000,25.000000,150.000000,75.000000,0.000000,"cleanup" \n "dead"}; item18[] = {"cleanup_dead",2,250,50.000000,25.000000,150.000000,75.000000,0.000000,"cleanup" \n "dead"};
item19[] = {"___min__loop",4,218,-200.000000,-75.000000,-100.000000,-25.000000,3.000000,"1 min" \n " loop"}; item19[] = {"___min__loop",4,218,-200.000000,-75.000000,-100.000000,-25.000000,3.000000,"1 min" \n " loop"};
item20[] = {"cleanup_loot",2,4346,-200.000000,25.000000,-100.000000,75.000000,0.000000,"cleanup" \n "loot"}; item20[] = {"cleanup_loot",2,250,-200.000000,25.000000,-100.000000,75.000000,0.000000,"cleanup" \n "loot"};
item21[] = {"__5_min__loop",4,218,175.000000,-75.000000,275.000000,-25.000000,6.000000,"15 min" \n " loop"}; item21[] = {"__5_min__loop",4,218,175.000000,-75.000000,275.000000,-25.000000,6.000000,"15 min" \n " loop"};
item22[] = {"cleanup_animals",2,250,175.000000,25.000000,275.000000,75.000000,0.000000,"cleanup" \n "animals and fire"}; item22[] = {"cleanup_animals",2,250,175.000000,25.000000,275.000000,75.000000,0.000000,"cleanup" \n "animals and fire"};
item23[] = {"__0_min__loop",4,218,300.000000,-75.000000,400.000000,-25.000000,7.000000,"30 min" \n " loop"}; item23[] = {"__0_min__loop",4,218,300.000000,-75.000000,400.000000,-25.000000,7.000000,"30 min" \n " loop"};
item24[] = {"cleanup_null",2,250,300.000000,25.000000,400.000000,75.000000,0.000000,"cleanup" \n "null"}; item24[] = {"cleanup_null",2,4346,300.000000,25.000000,400.000000,75.000000,0.000000,"cleanup" \n "null"};
link0[] = {0,11}; link0[] = {0,11};
link1[] = {1,2}; link1[] = {1,2};
link2[] = {2,3}; link2[] = {2,3};
@@ -59,7 +59,7 @@ link29[] = {22,5};
link30[] = {23,24}; link30[] = {23,24};
link31[] = {24,5}; link31[] = {24,5};
globals[] = {25.000000,1,0,0,0,640,480,1,42,6316128,1,-508.946564,440.498199,435.888916,-341.331024,861,880,1}; globals[] = {25.000000,1,0,0,0,640,480,1,42,6316128,1,-508.946564,440.498199,435.888916,-341.331024,861,880,1};
window[] = {2,-1,-1,-1,-1,1046,234,1526,234,3,879}; window[] = {2,-1,-1,-1,-1,1020,208,1500,208,3,879};
*//*%FSM</HEAD>*/ *//*%FSM</HEAD>*/
class FSM class FSM
{ {
@@ -392,7 +392,7 @@ class FSM
class cleanup_null class cleanup_null
{ {
name = "cleanup_null"; name = "cleanup_null";
init = /*%FSM<STATEINIT""">*/"[] spawn server_spawnCleanNull;"/*%FSM</STATEINIT""">*/; init = /*%FSM<STATEINIT""">*/"// [] spawn server_spawnCleanNull;"/*%FSM</STATEINIT""">*/;
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/; precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
class Links class Links
{ {