mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2026-02-04 15:22:53 +03:00
RC2
This commit is contained in:
File diff suppressed because one or more lines are too long
@@ -166,7 +166,7 @@ class RscDisplayMain : RscStandardDisplay
|
|||||||
class DAYZ_Version : CA_Version
|
class DAYZ_Version : CA_Version
|
||||||
{
|
{
|
||||||
idc = -1;
|
idc = -1;
|
||||||
text = "DayZ Epoch 1.0.2.9";
|
text = "DayZ Epoch 1.0.3 RC2";
|
||||||
y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
|
y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
|
||||||
};
|
};
|
||||||
delete CA_TitleMainMenu;
|
delete CA_TitleMainMenu;
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ class CfgMods
|
|||||||
hidePicture = 0;
|
hidePicture = 0;
|
||||||
hideName = 0;
|
hideName = 0;
|
||||||
action = "http://www.dayzepoch.com";
|
action = "http://www.dayzepoch.com";
|
||||||
version = "1.0.2.9";
|
version = "1.0.2.91";
|
||||||
hiveVersion = 0.96; //0.93
|
hiveVersion = 0.96; //0.93
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1351,7 +1351,7 @@ class FSM
|
|||||||
priority = 2.000000;
|
priority = 2.000000;
|
||||||
to="ERROR__No_Player_1";
|
to="ERROR__No_Player_1";
|
||||||
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
|
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""">*/;
|
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
|
||||||
};
|
};
|
||||||
/*%FSM</LINK>*/
|
/*%FSM</LINK>*/
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ class CfgPatches {
|
|||||||
units[] = {};
|
units[] = {};
|
||||||
weapons[] = {};
|
weapons[] = {};
|
||||||
requiredVersion = 0.1;
|
requiredVersion = 0.1;
|
||||||
dayzVersion = "1.0.2.9";
|
dayzVersion = "1.0.2.91";
|
||||||
requiredAddons[] = {"dayz_code"};
|
requiredAddons[] = {"dayz_code"};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -3,7 +3,7 @@ class CfgPatches {
|
|||||||
units[] = {};
|
units[] = {};
|
||||||
weapons[] = {};
|
weapons[] = {};
|
||||||
requiredVersion = 0.1;
|
requiredVersion = 0.1;
|
||||||
dayzVersion = "1.0.2.9";
|
dayzVersion = "1.0.2.91";
|
||||||
requiredAddons[] = {"dayz_code"};
|
requiredAddons[] = {"dayz_code"};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -652,13 +652,13 @@ server_spawncleanDead = {
|
|||||||
if (_x isKindOf "zZombie_Base") then
|
if (_x isKindOf "zZombie_Base") then
|
||||||
{
|
{
|
||||||
_x call dayz_perform_purge;
|
_x call dayz_perform_purge;
|
||||||
sleep 0.1;
|
sleep 0.025;
|
||||||
};
|
};
|
||||||
if (_x isKindOf "CAManBase") then {
|
if (_x isKindOf "CAManBase") then {
|
||||||
_deathTime = _x getVariable ["processedDeath", diag_tickTime];
|
_deathTime = _x getVariable ["processedDeath", diag_tickTime];
|
||||||
if (diag_tickTime - _deathTime > 3600) then {
|
if (diag_tickTime - _deathTime > 3600) then {
|
||||||
_x call dayz_perform_purge;
|
_x call dayz_perform_purge;
|
||||||
sleep 0.1;
|
sleep 0.025;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -667,82 +667,94 @@ server_spawncleanDead = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
server_spawnCleanNull = {
|
server_spawnCleanNull = {
|
||||||
|
private ["_delQtyNull"];
|
||||||
_delQtyNull = 0;
|
_delQtyNull = 0;
|
||||||
{
|
{
|
||||||
if (isNull _x) then {
|
if (isNull _x) then {
|
||||||
_x call dayz_perform_purge;
|
_x call dayz_perform_purge;
|
||||||
sleep 0.1;
|
sleep 0.025;
|
||||||
_delQtyNull = _delQtyNull + 1;
|
_delQtyNull = _delQtyNull + 1;
|
||||||
};
|
};
|
||||||
sleep 0.001;
|
sleep 0.001;
|
||||||
} forEach (allMissionObjects "");
|
} forEach (allMissionObjects "");
|
||||||
|
|
||||||
if (_delQtyNull > 0) then {
|
if (_delQtyNull > 0) then {
|
||||||
diag_log (format["CLEANUP: Deleted %1 null objects",_delQtyNull]);
|
diag_log (format["CLEANUP: Deleted %1 null objects",_delQtyNull]);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
server_spawnCleanFire = {
|
server_spawnCleanFire = {
|
||||||
|
private ["_delQtyFP","_qty","_delQtyNull","_missionFires"];
|
||||||
|
_missionFires = allMissionObjects "Land_Fire_DZ";
|
||||||
_delQtyFP = 0;
|
_delQtyFP = 0;
|
||||||
{
|
{
|
||||||
if (local _x) then {
|
if (local _x) then {
|
||||||
deleteVehicle _x;
|
deleteVehicle _x;
|
||||||
sleep 0.1;
|
sleep 0.025;
|
||||||
_delQtyFP = _delQtyFP + 1;
|
_delQtyFP = _delQtyFP + 1;
|
||||||
};
|
};
|
||||||
sleep 0.001;
|
sleep 0.001;
|
||||||
} forEach (allMissionObjects "Land_Fire_DZ");
|
} forEach _missionFires;
|
||||||
if (_delQtyFP > 0) then {
|
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 = {
|
server_spawnCleanLoot = {
|
||||||
|
private ["_created","_delQty","_nearby","_age","_keep","_qty","_missionObjs","_dateNow"];
|
||||||
|
_missionObjs = allMissionObjects "ReammoBox";
|
||||||
_delQty = 0;
|
_delQty = 0;
|
||||||
_timeNow = diag_tickTime;
|
_dateNow = (DateToNumber date);
|
||||||
{
|
{
|
||||||
if (local _x) then {
|
_keep = _x getVariable ["permaLoot",false];
|
||||||
_keep = _x getVariable ["permaLoot",false];
|
if (!_keep) then {
|
||||||
if (!_keep) then {
|
_created = _x getVariable ["created",-0.1];
|
||||||
_created = _x getVariable ["created",-0.1];
|
if (_created == -0.1) then {
|
||||||
if (_created == -0.1) then {
|
_x setVariable ["created",_dateNow,false];
|
||||||
_x setVariable ["created",_timeNow,false];
|
_created = _dateNow;
|
||||||
_created = _timeNow;
|
} 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;
|
sleep 0.001;
|
||||||
} forEach (allMissionObjects "ReammoBox");
|
} forEach _missionObjs;
|
||||||
if (_delQty > 0) then {
|
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 = {
|
server_spawnCleanAnimals = {
|
||||||
|
private ["_delQtyAnimal","_qty","_missonAnimals"];
|
||||||
|
_missonAnimals = allMissionObjects "CAAnimalBase";
|
||||||
_delQtyAnimal = 0;
|
_delQtyAnimal = 0;
|
||||||
{
|
{
|
||||||
if (local _x) then {
|
if (local _x) then {
|
||||||
_x call dayz_perform_purge;
|
_x call dayz_perform_purge;
|
||||||
sleep 0.1;
|
sleep 0.025;
|
||||||
_delQtyAnimal = _delQtyAnimal + 1;
|
_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;
|
sleep 0.001;
|
||||||
} forEach (allMissionObjects "CAAnimalBase");
|
} forEach _missonAnimals;
|
||||||
if (_delQtyAnimal > 0) then {
|
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;
|
|
||||||
};
|
|
||||||
@@ -22,7 +22,7 @@ class CfgPatches {
|
|||||||
units[] = {};
|
units[] = {};
|
||||||
weapons[] = {};
|
weapons[] = {};
|
||||||
requiredVersion = 0.1;
|
requiredVersion = 0.1;
|
||||||
dayzVersion = "1.0.2.9";
|
dayzVersion = "1.0.2.91";
|
||||||
requiredAddons[] = {};
|
requiredAddons[] = {};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
dir = "@DayZ_Epoch";
|
dir = "@DayZ_Epoch";
|
||||||
name = "DayZ Epoch 1.0.2.9";
|
name = "DayZ Epoch 1.0.2.91";
|
||||||
actionName = "Website";
|
actionName = "Website";
|
||||||
picture = "dayz_logo_ca.paa";
|
picture = "dayz_logo_ca.paa";
|
||||||
action = "http://www.dayzepoch.com";
|
action = "http://www.dayzepoch.com";
|
||||||
Reference in New Issue
Block a user