This commit is contained in:
[VB]AWOL
2013-11-30 10:23:36 -06:00
parent e50e8af55b
commit ec4f68c4d1
9 changed files with 55 additions and 43 deletions

File diff suppressed because one or more lines are too long

View File

@@ -166,7 +166,7 @@ class RscDisplayMain : RscStandardDisplay
class DAYZ_Version : CA_Version
{
idc = -1;
text = "DayZ Epoch 1.0.2.9";
text = "DayZ Epoch 1.0.3 RC2";
y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
};
delete CA_TitleMainMenu;

View File

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

View File

@@ -1351,7 +1351,7 @@ class FSM
priority = 2.000000;
to="ERROR__No_Player_1";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
condition=/*%FSM<CONDITION""">*/"(_myEpochAnim != ""1.0.2.9"") || (_myEpoch != ""1.0.2.9"") || (_myEpochB != ""1.0.2.9"") || (_myEpochSfx != ""1.0.2.9"")"/*%FSM</CONDITION""">*/;
condition=/*%FSM<CONDITION""">*/"(_myEpochAnim != ""1.0.2.91"") || (_myEpoch != ""1.0.2.91"") || (_myEpochB != ""1.0.2.91"") || (_myEpochSfx != ""1.0.2.91"")"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/

View File

@@ -3,7 +3,7 @@ class CfgPatches {
units[] = {};
weapons[] = {};
requiredVersion = 0.1;
dayzVersion = "1.0.2.9";
dayzVersion = "1.0.2.91";
requiredAddons[] = {"dayz_code"};
};
};

View File

@@ -3,7 +3,7 @@ class CfgPatches {
units[] = {};
weapons[] = {};
requiredVersion = 0.1;
dayzVersion = "1.0.2.9";
dayzVersion = "1.0.2.91";
requiredAddons[] = {"dayz_code"};
};
};

View File

@@ -652,13 +652,13 @@ server_spawncleanDead = {
if (_x isKindOf "zZombie_Base") then
{
_x call dayz_perform_purge;
sleep 0.1;
sleep 0.025;
};
if (_x isKindOf "CAManBase") then {
_deathTime = _x getVariable ["processedDeath", diag_tickTime];
if (diag_tickTime - _deathTime > 3600) then {
_x call dayz_perform_purge;
sleep 0.1;
sleep 0.025;
};
};
};
@@ -667,82 +667,94 @@ server_spawncleanDead = {
};
server_spawnCleanNull = {
private ["_delQtyNull"];
_delQtyNull = 0;
{
if (isNull _x) then {
_x call dayz_perform_purge;
sleep 0.1;
sleep 0.025;
_delQtyNull = _delQtyNull + 1;
};
sleep 0.001;
} forEach (allMissionObjects "");
if (_delQtyNull > 0) then {
diag_log (format["CLEANUP: Deleted %1 null objects",_delQtyNull]);
};
};
server_spawnCleanFire = {
private ["_delQtyFP","_qty","_delQtyNull","_missionFires"];
_missionFires = allMissionObjects "Land_Fire_DZ";
_delQtyFP = 0;
{
if (local _x) then {
deleteVehicle _x;
sleep 0.1;
sleep 0.025;
_delQtyFP = _delQtyFP + 1;
};
sleep 0.001;
} forEach (allMissionObjects "Land_Fire_DZ");
} forEach _missionFires;
if (_delQtyFP > 0) then {
diag_log (format["CLEANUP: Deleted %1 fireplaces",_delQtyNull]);
_qty = count _missionFires;
diag_log (format["CLEANUP: Deleted %1 fireplaces out of %2",_delQtyNull,_qty]);
};
};
server_spawnCleanLoot = {
private ["_created","_delQty","_nearby","_age","_keep","_qty","_missionObjs","_dateNow"];
_missionObjs = allMissionObjects "ReammoBox";
_delQty = 0;
_timeNow = diag_tickTime;
_dateNow = (DateToNumber date);
{
if (local _x) then {
_keep = _x getVariable ["permaLoot",false];
if (!_keep) then {
_created = _x getVariable ["created",-0.1];
if (_created == -0.1) then {
_x setVariable ["created",_timeNow,false];
_created = _timeNow;
_keep = _x getVariable ["permaLoot",false];
if (!_keep) then {
_created = _x getVariable ["created",-0.1];
if (_created == -0.1) then {
_x setVariable ["created",_dateNow,false];
_created = _dateNow;
} else {
_age = (_dateNow - _created) * 525948;
if (_age > 20) then {
_nearby = {(isPlayer _x) and (alive _x)} count (_x nearEntities [["CAManBase","AllVehicles"], 130]);
if (_nearby==0) then {
deleteVehicle _x;
sleep 0.025;
_delQty = _delQty + 1;
};
};
_nearby = {(isPlayer _x) and (alive _x)} count (_x nearEntities [["CAManBase","AllVehicles"], 130]);
if ((_nearby==0) && (_timeNow - _created > 1200)) then {
deleteVehicle _x;
sleep 0.1;
_delQty = _delQty + 1;
};
};
};
sleep 0.001;
} forEach (allMissionObjects "ReammoBox");
} forEach _missionObjs;
if (_delQty > 0) then {
diag_log (format["CLEANUP: Deleted %1 Loot Piles",_delQty]);
_qty = count _missionObjs;
diag_log (format["CLEANUP: Deleted %1 Loot Piles out of %2",_delQty,_qty]);
};
};
server_spawnCleanAnimals = {
private ["_delQtyAnimal","_qty","_missonAnimals"];
_missonAnimals = allMissionObjects "CAAnimalBase";
_delQtyAnimal = 0;
{
if (local _x) then {
_x call dayz_perform_purge;
sleep 0.1;
sleep 0.025;
_delQtyAnimal = _delQtyAnimal + 1;
} else {
if (!alive _x) then {
_nearby = {(isPlayer _x) and (alive _x)} count (_x nearEntities [["CAManBase","AllVehicles"], 130]);
if (_nearby==0) then {
_x call dayz_perform_purge;
sleep 0.025;
_delQtyAnimal = _delQtyAnimal + 1;
};
};
};
sleep 0.001;
} forEach (allMissionObjects "CAAnimalBase");
} forEach _missonAnimals;
if (_delQtyAnimal > 0) then {
diag_log (format["CLEANUP: Deleted %1 Animals",_delQtyAnimal]);
_qty = count _missonAnimals;
diag_log (format["CLEANUP: Deleted %1 Animals out of %2",_delQtyAnimal,_qty]);
};
};
server_spawnUpdateObjects = {
//diag_log format["DEBUG: needUpdate_objects=%1",needUpdate_objects];
{
needUpdate_objects = needUpdate_objects - [_x];
[_x,"damage",true] call server_updateObject;
} forEach needUpdate_objects;
};
};

View File

@@ -22,7 +22,7 @@ class CfgPatches {
units[] = {};
weapons[] = {};
requiredVersion = 0.1;
dayzVersion = "1.0.2.9";
dayzVersion = "1.0.2.91";
requiredAddons[] = {};
};
};

View File

@@ -1,5 +1,5 @@
dir = "@DayZ_Epoch";
name = "DayZ Epoch 1.0.2.9";
name = "DayZ Epoch 1.0.2.91";
actionName = "Website";
picture = "dayz_logo_ca.paa";
action = "http://www.dayzepoch.com";