Merge pull request #5 from vbawol/master

pull from awols master

CHANGE LOG 1.0.5.txt

@@ -9,6 +9,7 @@
 [ADDED] Default player skin for fresh spawns, selected randomly DZE_defaultSkin = [["Male skin1","Male skin2"],["Female skin1","Female skin2"]]. @icomrade
 [ADDED] The USEC CH53 Super Stallion to the dynamic vehicle lists & trader. @Namindu @raginruffalo
 [ADDED] The BAF Merlin has been added to the neutral aircraft trader under Unarmed Helicopters. @raginruffalo
+[ADDED] Added CH53 Super Stallion to Allowed to Tow Heli array in "variables.sqf" @Namindu
 
 [FIXED] Instance already initialized error in server_monitor.sqf @vbawol
 [FIXED] Fixed infinite chainsaw fuel when put into vaults/lockboxes. @SilvDev

SQF/dayz/config.cpp

@@ -43,7 +43,7 @@ class RscTitles {
 			y = "0.00001 * safezoneH + safezoneY";
 			w = "1 * safezoneW";
 			h = "1 * safezoneH";
-			text = "\dayz\ui\screen_death_ca.paa";
+			text = "\z\addons\dayz_epoch\ui\screen_death_ca.paa";
 		};
 	};
 	

SQF/dayz_code/Configs/RscDisplay/RscPlayerUI.hpp

@@ -119,6 +119,14 @@ class RscTitles
 		name = "statusBorder";
 		onLoad = "uiNamespace setVariable ['DAYZ_GUI_display', _this select 0];";
 		class ControlsBackground {
+			class RscStructuredText_1199: RscStructuredText
+			{
+				idc = 1199;
+				x = 0.250001;
+				y = 0.350001;
+				w = 0.5;
+				h = 0.1;
+			};
 			class RscPicture_1901: RscPictureGUI
 			{
 				idc = 1901;

SQF/dayz_code/compile/fn_damageActions.sqf

@@ -31,28 +31,28 @@ if (_inVehicle) then {
 			//allow switch to pilot
 			if (((_assignedRole select 0) != "driver") && ((!alive _driver) || ((_vehicle emptyPositions "Driver") > 0))) then {
 				if (_vehicle isKindOf "helicopter") then {
-					_action = _vehicle addAction [localize "STR_EPOCH_PLAYER_308A", "\z\addons\dayz_code\actions\veh_seatActions.sqf",["MoveToPilot",_driver], 0, false, true];
+					_action = _vehicle addAction[localize "STR_EPOCH_PLAYER_308A", "\z\addons\dayz_code\actions\veh_seatActions.sqf", ["MoveToPilot", _driver], 0, false, true];
 				} else {
-					_action = _vehicle addAction [localize "STR_EPOCH_PLAYER_308", "\z\addons\dayz_code\actions\veh_seatActions.sqf",["MoveToPilot",_driver], 0, false, true];
+					_action = _vehicle addAction[localize "STR_EPOCH_PLAYER_308", "\z\addons\dayz_code\actions\veh_seatActions.sqf", ["MoveToPilot", _driver], -1, false, true];
 				};
 				r_player_actions2 set [count r_player_actions2,_action];
 				r_action2 = true;
 			};
 			//allow switch to cargo
 			if (((_assignedRole select 0) != "cargo") && ((_vehicle emptyPositions "Cargo") > 0)) then {
-				_action = _vehicle addAction [localize "STR_EPOCH_PLAYER_309", "\z\addons\dayz_code\actions\veh_seatActions.sqf",["MoveToCargo",_driver], 0, false, true];
+				_action = _vehicle addAction [localize "STR_EPOCH_PLAYER_309", "\z\addons\dayz_code\actions\veh_seatActions.sqf",["MoveToCargo",_driver], -1, false, true];
 				r_player_actions2 set [count r_player_actions2,_action];
 				r_action2 = true;
 			};
 			//allow switch to gunner
 			if (((_assignedRole select 0) != "Turret") && ((_vehicle emptyPositions "Gunner") > 0)) then {
-				_action = _vehicle addAction [localize "STR_EPOCH_PLAYER_310", "\z\addons\dayz_code\actions\veh_seatActions.sqf",["MoveToTurret",_driver], 0, false, true];
+				_action = _vehicle addAction[localize "STR_EPOCH_PLAYER_310", "\z\addons\dayz_code\actions\veh_seatActions.sqf", ["MoveToTurret", _driver], 0, false, true];
 				r_player_actions2 set [count r_player_actions2,_action];
 				r_action2 = true;
 			};
 			//allow switch to commander
 			if (((assignedCommander _vehicle) != player) && ((_vehicle emptyPositions "Commander") > 0)) then {
-				_action = _vehicle addAction [localize "STR_EPOCH_PLAYER_311", "\z\addons\dayz_code\actions\veh_seatActions.sqf",["MoveToTurret",_driver], 0, false, true];
+				_action = _vehicle addAction[localize "STR_EPOCH_PLAYER_311", "\z\addons\dayz_code\actions\veh_seatActions.sqf", ["MoveToTurret", _driver], 0, false, true];
 				r_player_actions2 set [count r_player_actions2,_action];
 				r_action2 = true;
 			};

SQF/dayz_code/init/compiles.sqf

@@ -559,6 +559,8 @@ if (!isDedicated) then {
 		if (isServer) then {
 			_unit addEventHandler ["local", {_this call zombie_findOwner}];
 		};
+		_id = _unit addeventhandler["HandleDamage", { _this call local_zombieDamage }];
+		_id = _unit addeventhandler["Killed", { [_this, "zombieKills"] call local_eventKill }];
 	};
 
 	dayz_EjectPlayer = {

SQF/dayz_code/init/variables.sqf

@@ -386,7 +386,8 @@ DZE_HeliAllowTowFrom = [
 	"CH_47F_EP1_DZ",
 	"CH_47F_BAF",
 	"CH_47F_EP1",
-	"BAF_Merlin_DZE"
+	"BAF_Merlin_DZE",
+	"CH53_DZE"
 ];
 
 DZE_HeliAllowToTow = [

SQF/dayz_code/medical/init_medical.sqf

@@ -61,10 +61,6 @@ while {true} do {
 		[] spawn fnc_med_publicBlood;
 	};
 	
-	//Add player actions
-	[] call fnc_usec_damageActions;
-	[] call fnc_usec_selfActions;
-	
 	//Low Blood Effects
 	if (!r_player_unconscious) then {
 		if (((r_player_blood/r_player_bloodTotal) < 0.35)) then {

SQF/dayz_code/system/player_spawn_1.sqf

@@ -1,47 +1,75 @@
 private ["_handle","_cursor","_delMe","_first","_town","_day","_world","_nearestCity"];
-while {true} do {
+_timer = diag_tickTime;
-	_handle = [] spawn player_animalCheck;
+_timer1 = diag_tickTime;
-	waitUntil{scriptDone _handle};
+_spawnCheck = diag_tickTime;
+_timer2 = diag_Ticktime;
+_NewDay  = diag_tickTime;
 
-	//check monitored buildings
+while {true} do {
-	_cursor = 0;
+	//add player actions
-	_delMe = false;
+	if ((diag_tickTime - _timer2) > 0.5) then {
-	{
+		[] call fnc_usec_damageActions;
-		private["_bPos","_isNoone"];
+		[] call fnc_usec_selfActions;
-		_bPos = getPosATL _x;
+		_timer2 = diag_Ticktime;
-		_isNoone = {isPlayer _x} count (_bPos nearEntities ["Man",200]) == 0;
+	};
-		if (_isNoone) then {
+
-			_x setVariable ["zombied",objNull,true];
+	if ((diag_tickTime - _timer) > 300) then {
-			dayz_buildingMonitor set [_cursor,"DEL"];
+		//Other Counters
-			_delMe = true;
+		dayz_currentGlobalAnimals = count entities "CAAnimalBase";
-		};
+		dayz_currentGlobalZombies = count entities "zZombie_Base";
-		_cursor = _cursor + 1;
+		
-	} count dayz_buildingMonitor;
+		//Animals
-	if (_delMe) then {
+		[] spawn player_animalCheck;
-		dayz_buildingMonitor = dayz_buildingMonitor - ["DEL"];
+		
+		_timer = diag_tickTime;
+	};
+	
+	if ((diag_tickTime - _timer1) > 60) then {
+		_position = getPosATL player;
+		//Current amounts
+		dayz_spawnZombies = {alive _x AND local _x} count (_position nearEntities ["zZombie_Base",200]);
+		dayz_CurrentNearByZombies = {alive _x} count (_position nearEntities ["zZombie_Base",200]);
+		dayz_currentWeaponHolders = count (_position nearObjects ["ReammoBox",100]);
+
+		_timer1 = diag_tickTime;
+	};
+	
+	//spawning system
+	if ((diag_tickTime - _spawnCheck) > 14) then {
+		["both"] spawn player_spawnCheck;
+
+		_spawnCheck  = diag_tickTime;
 	};
 	
 	//Check if new day
-	_day = round(360 * (dateToNumber date));
+	if ((diag_tickTime - _NewDay) > 5) then {
-	if(dayz_currentDay != _day) then {
+		private "_day";
-		dayz_sunRise = call world_sunRise;
+		_day = round(360 * (dateToNumber date));
-		dayz_currentDay = _day;
+		if(dayz_currentDay != _day) then {
-	};
+			dayz_sunRise = call world_sunRise;
+			dayz_currentDay = _day;
 			
-	_world = toUpper(worldName); //toUpper(getText (configFile >> "CfgWorlds" >> (worldName) >> "description"));
-	_nearestCity = nearestLocations [([player] call FNC_GetPos), ["NameCityCapital","NameCity","NameVillage","NameLocal"],300];
 			
-	if (count _nearestCity > 0) then {
+		};
-		_town = text (_nearestCity select 0); 
+
-		if(dayz_PreviousTown == "Wilderness") then {
+		_NewDay  = diag_tickTime;
+
+		_world = toUpper(worldName); //toUpper(getText (configFile >> "CfgWorlds" >> (worldName) >> "description"));
+		_nearestCity = nearestLocations [([player] call FNC_GetPos), ["NameCityCapital","NameCity","NameVillage","NameLocal"],300];
+		
+		if (count _nearestCity > 0) then {
+			_town = text (_nearestCity select 0); 
+			if(dayz_PreviousTown == "Wilderness") then {
+				dayz_PreviousTown = _town;
+			};
+			if(_town != dayz_PreviousTown) then {
+				_first = [_world,_town,""] spawn BIS_fnc_infoText;
+			};
 			dayz_PreviousTown = _town;
 		};
-		if(_town != dayz_PreviousTown) then {
+
-			_first = [_world,_town,""] spawn BIS_fnc_infoText;
-		};
-		dayz_PreviousTown = _town;
 	};
 
 	//wait
-	sleep 5;
+	sleep 0.001;
 };

Server Files/MPMissions/DayZ_Epoch_25.sauerland/mission.sqm

@@ -1332,8 +1332,6 @@ class Mission
 			expCond="(player distance Seedorf) < 100;";
 			expActiv="[""Boat Vendor"",true,""enter""] spawn player_traderCity;";
 			expDesactiv="[""Boat Vendor"",true,""leave""] spawn player_traderCity;";
-			expActiv="TitleText[""Now Entering Trader City Seedorf"",""PLAIN DOWN""]; canbuild = false;";
-			expDesactiv="TitleText[""Now Leaving Trader City Seedorf"",""PLAIN DOWN""]; canbuild = true;";
 			class Effects
 			{
 			};