0.981 + 1.7.6.1 CE

+ Increased raise horde distance to 65m.
+ decreased raise horde action timer to 7 seconds.
+ sync with 1.7.6.1 CE
This commit is contained in:
vbawol
2013-02-26 20:05:35 -06:00
parent 52461f4a52
commit 3c9df28ead
319 changed files with 5267 additions and 1695 deletions

View File

@@ -105,9 +105,9 @@ while {true} do {
*/
//Has infection?
if (r_player_infected) then {
[player,"cough",8,true] call dayz_zombieSpeak;
};
//if (r_player_infected) then {
// [player,"cough",8,false] call dayz_zombieSpeak;
//};
//Record Check
_lastUpdate = time - dayZ_lastPlayerUpdate;
@@ -156,7 +156,7 @@ while {true} do {
_rnd = random 1;
if (_rnd > 0.7) then {
r_player_infected = true;
player setVariable["USEC_infected",true];
//player setVariable["USEC_infected",true];
};
};
};
@@ -167,21 +167,37 @@ while {true} do {
_rnd = random 1;
if (_rnd > 0.95) then {
r_player_infected = true;
player setVariable["USEC_infected",true];
//player setVariable["USEC_infected",true];
};
};
};
};
};
//If has infection reduce blood
//If has infection reduce blood cough and add shake
if (r_player_infected) then {
if !(player getVariable["USEC_infected",false]) then {
player setVariable["USEC_infected",true,true];
};
_rnd = ceil (random 8);
[player,"cough",_rnd,false,9] call dayz_zombieSpeak;
if (_rnd < 3) then {
addCamShake [2, 1, 25];
};
if (r_player_blood > 3000) then {
r_player_blood = r_player_blood - 3;
player setVariable["USEC_BloodQty",r_player_blood];
};
};
//Pain Shake Effects
if (r_player_inpain and !r_player_unconscious) then {
playSound "breath_1";
addCamShake [2, 1, 25];
};
//Hunger Effect
_foodVal = dayz_statusArray select 0;
_thirstVal = dayz_statusArray select 1;
@@ -220,7 +236,9 @@ while {true} do {
if ((time - dayz_damageCounter) > 180) then {
if (!r_player_unconscious) then {
dayz_canDisconnect = true;
["dayzDiscoRem",getPlayerUID player] call callRpcProcedure;
//["dayzDiscoRem",getPlayerUID player] call callRpcProcedure;
dayzDiscoRem = getPlayerUID player;
publicVariable "dayzDiscoRem";
//Ensure Control is hidden
_display = uiNamespace getVariable 'DAYZ_GUI_display';
@@ -233,8 +251,15 @@ while {true} do {
//Save Checker
if (dayz_unsaved) then {
if ((time - dayz_lastSave) > _saveTime) then {
["dayzPlayerSave",[player,dayz_Magazines,false]] call callRpcProcedure;
//["dayzPlayerSave",[player,dayz_Magazines,false]] call callRpcProcedure;
dayzPlayerSave = [player,dayz_Magazines,false];
publicVariableServer "dayzPlayerSave";
if (isServer) then {
dayzPlayerSave call server_playerSync;
};
dayz_lastSave = time;
dayz_Magazines = [];
};
@@ -252,26 +277,6 @@ while {true} do {
//dayz_playerTrigger attachTo [_refObj,[0,0,0]];
//dayz_playerTrigger setTriggerArea [_size,_size,0,false];
if (dayzDebug) then {
//Debug Info
_headShots = player getVariable["headShots",0];
_kills = player getVariable["zombieKills",0];
_killsH = player getVariable["humanKills",0];
_killsB = player getVariable["banditKills",0];
_humanity = player getVariable["humanity",0];
_zombies = count entities "zZombie_Base";
_zombiesA = {alive _x} count entities "zZombie_Base";
//_groups = count allGroups;
//_dead = count allDead;
//dayz_zombiesLocal = {local _x} count entities "zZombie_Base";
//_loot = count allMissionObjects "WeaponHolder";
//_wrecks = count allMissionObjects "Wreck_Base";
//_lootL = {local _x} count allMissionObjects "WeaponHolder";
//_speed = (_vel distance [0,0,0]);
hintSilent format["DEBUG MONITOR: \n\nZombies Killed: %1\nHeadshots: %2\nMurders: %10\nBandits Killed: %12\nBlood: %4\nZombies (alive/total): %15/%8\nName: %14\nHumanity: %11",_kills,_headShots,_speed,r_player_blood,round(dayz_temperatur),r_player_infected,dayz_inside,_zombies,_lastSave,_killsH,round(_humanity),_killsB,_freeTarget,dayz_playerName,_zombiesA];
};
// If in combat, display counter and restrict logout
_startcombattimer = player getVariable["startcombattimer",0];
if (_startcombattimer == 1) then {