1.0.2.14

SQF/dayz_code/Configs/CfgMagazines.hpp

@@ -566,16 +566,74 @@ class CfgMagazines {
 		{
 			class Crafting
 			{
-				text = "Smelt 10oz bar";
+				text = "Add 1oz Bar";
 				script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
-				neednearby[] = {"fire"};
-				requiretools[] = {"ItemToolbox"};
+				neednearby[] = {};
+				requiretools[] = {};
+				output[] = {{"ItemGoldBar2oz",1}};
+				input[] = {{"ItemGoldBar",2}};
+				
+			};
+			class Crafting1
+			{
+				text = "Add 10 1oz bars";
+				script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
+				neednearby[] = {};
+				requiretools[] = {};
 				output[] = {{"ItemGoldBar10oz",1}};
 				input[] = {{"ItemGoldBar",10}};
 				
 			};
 		};
 	};
+	/*
+	class ItemGoldBar2oz: CA_Magazine
+	{
+		scope = 2;
+		count = 1;
+		type = 256;
+		displayName = "Gold 2oz";
+		model = "\z\addons\dayz_epoch\models\gold_bar.p3d";
+		picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa";
+		descriptionShort = "2 x 1oz Gold Bar";
+		class ItemActions
+		{
+			class Crafting
+			{
+				text = "Add 1oz Bar";
+				script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
+				neednearby[] = {"fire"};
+				requiretools[] = {"ItemToolbox"};
+				output[] = {{"ItemGoldBar3oz",1}};
+				input[] = {{"ItemGoldBar2oz",1},{"ItemGoldBar",1}};
+				
+			};
+		};
+	};
+	class ItemGoldBar2oz: CA_Magazine
+	{
+		scope = 2;
+		count = 1;
+		type = 256;
+		displayName = "Gold 2oz";
+		model = "\z\addons\dayz_epoch\models\gold_bar.p3d";
+		picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa";
+		descriptionShort = "2 x 1oz Gold Bar";
+		class ItemActions
+		{
+			class Crafting
+			{
+				text = "Add 1oz Bar";
+				script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
+				neednearby[] = {"fire"};
+				requiretools[] = {"ItemToolbox"};
+				output[] = {{"ItemGoldBar4oz",1}};
+				input[] = {{"ItemGoldBar3oz",1},{"ItemGoldBar",1}};
+				
+			};
+		};
+	};
+	*/
 	class ItemGoldBar10oz: CA_Magazine
 	{
 		scope = 2;

SQF/dayz_code/Configs/CfgVehicles/DZE/Doors.hpp

@@ -136,7 +136,7 @@ class CinderWallDoor_DZ_Base: DZE_Housebase {
 	mapSize = 8;						/* Size of the icon */
 	icon = "\ca\data\data\Unknown_object.paa";			/* Path to the picture shown in the editor. */
 	accuracy = 1000;   
-	armor = 1600;					/* "Lifepoints", if you like to call it that way.*/
+	armor = 1000;					/* "Lifepoints", if you like to call it that way.*/
 	destrType = "DestructBuilding";		/* type of destruction, when armor = 0 */
 	scope = 2;							/* Display it in the editor? 1 = No, 2 = Yes */
 	offset[] = {0,1.5,0};
@@ -150,7 +150,7 @@ class CinderWallDoorLocked_DZ_Base: DZE_Housebase {
 	mapSize = 8;						/* Size of the icon */
 	icon = "\ca\data\data\Unknown_object.paa";			/* Path to the picture shown in the editor. */
 	accuracy = 1000;   
-	armor = 1600;					/* "Lifepoints", if you like to call it that way.*/
+	armor = 1000;					/* "Lifepoints", if you like to call it that way.*/
 	destrType = "DestructBuilding";		/* type of destruction, when armor = 0 */
 	scope = 2;							/* Display it in the editor? 1 = No, 2 = Yes */
 	offset[] = {0,1.5,0};

SQF/dayz_code/Configs/cfgVehicles.hpp

@@ -1612,7 +1612,7 @@ class CfgVehicles {
 		model="\z\addons\dayz_epoch\models\metal_floor.p3d";
 		icon = "\ca\data\data\Unknown_object.paa";
 		mapSize = 2;
-		armor = 1600;
+		armor = 1000;
 		displayName = "Metal Floor";
 		vehicleClass = "Fortifications";
 		GhostPreview = "MetalFloor_Preview_DZ";
@@ -1626,7 +1626,7 @@ class CfgVehicles {
 		model="\z\addons\dayz_epoch\models\cinder_wall_half.p3d";
 		icon = "\ca\data\data\Unknown_object.paa";
 		mapSize = 2;
-		armor = 1600;
+		armor = 1000;
 		displayName = "Half Cinder Block Wall";
 		vehicleClass = "Fortifications";
 		upgradeBuilding[] = {"CinderWall_DZ",{{"CinderBlocks",4},{"MortarBucket",1}}};
@@ -1642,7 +1642,7 @@ class CfgVehicles {
 		model="\z\addons\dayz_epoch\models\cinder_wall_full.p3d";
 		icon = "\ca\data\data\Unknown_object.paa";
 		mapSize = 2;
-		armor = 1600;
+		armor = 1000;
 		displayName = "Cinder Block Wall";
 		vehicleClass = "Fortifications";
 		maintainBuilding[] = {{"MortarBucket",1}};
@@ -1658,7 +1658,7 @@ class CfgVehicles {
 		model="\z\addons\dayz_epoch\models\steel_garage_frame.p3d";
 		icon = "\ca\data\data\Unknown_object.paa";
 		mapSize = 2;
-		armor = 1600;
+		armor = 1000;
 		displayName = "Block Garage Doorway";
 		vehicleClass = "Fortifications";
 		maintainBuilding[] = {{"MortarBucket",1}};
@@ -1675,7 +1675,7 @@ class CfgVehicles {
 		model="\z\addons\dayz_epoch\models\Steel_door_frame.p3d";
 		icon = "\ca\data\data\Unknown_object.paa";
 		mapSize = 2;
-		armor = 1600;
+		armor = 1000;
 		displayName = "Block Doorway";
 		vehicleClass = "Fortifications";
 		maintainBuilding[] = {{"MortarBucket",1}};
@@ -1900,7 +1900,7 @@ class CfgVehicles {
 		destrType = "DestructNo";
 		cost = 100;
 		offset[] = {0,1.5,0};
-		model="\z\addons\dayz_epoch\models\steel_garage_frame_ghost.p3d"; // todo change this 
+		model="\z\addons\dayz_epoch\models\Steel_door_frame_ghost.p3d"; // todo change this 
 		icon = "\ca\data\data\Unknown_object.paa";
 		mapSize = 2;
 		armor = 1000;

SQF/dayz_code/Configs/rscTitles.hpp

@@ -149,7 +149,7 @@ class RscDisplayMain : RscStandardDisplay
 		class DAYZ_Version : CA_Version
 		{
 			idc = -1;
-			text = "DayZ Epoch 1.0.2.13 DEV";
+			text = "DayZ Epoch 1.0.2.2 (DEV14)";
 			y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
 		};
 		delete CA_TitleMainMenu;

SQF/dayz_code/actions/player_build.sqf

@@ -22,6 +22,7 @@ DZE_cancelBuilding = false;
 DZE_5 = false;
 
 call gear_ui_init;
+closeDialog 1;
 
 if(_isWater) exitWith {TradeInprogress = false; cutText [localize "str_player_26", "PLAIN DOWN"];};
 if(_onLadder) exitWith {TradeInprogress = false; cutText [localize "str_player_21", "PLAIN DOWN"];};

SQF/dayz_code/compile/fn_lightFunctions.sqf

@@ -88,14 +88,3 @@ _nrTLs= position _twr nearObjects ["#lightpoint",30];
 		};
 	};
 };
-<<<<<<< HEAD
-=======
-
-axe_TestMoveHC={
-private ["_startPos","_currPos"];
-_currPos = _this select 0;
-_startPos = [_currPos,50,180,20,0,800,0] call BIS_fnc_findSafePos;
-player setPosATL _startPos;
-};
-
->>>>>>> origin/master

SQF/dayz_code/config.cpp

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

SQF/dayz_code/init/veh_resetEH.sqf

@@ -12,7 +12,7 @@ _this addeventhandler ["Killed",{ _this call vehicle_handleKilled } ];
 if (isServer) then {
 	_this removeAllEventHandlers "GetOut";
 	_this removeAllEventHandlers "GetIn";
-	_this addEventHandler ["GetOut", {[(_this select 0),"all"] call server_updateObject;}];
+	_this addEventHandler ["GetOut", {_this call server_antiWall;[(_this select 0),"all"] call server_updateObject;}];
 	_this addEventHandler ["GetIn", {[(_this select 0),"all"] call server_updateObject;}];
 };
 

SQF/dayz_epoch/textures/metal_floor.rvmat

@@ -0,0 +1,92 @@
+ambient[]={0.80784315,0.80784315,0.80784315,1};
+diffuse[]={0.80784315,0.80784315,0.80784315,1};
+forcedDiffuse[]={0,0,0,0};
+emmisive[]={0,0,0,1};
+specular[]={0.6901961,0.6901961,0.6901961,1};
+specularPower=200;
+PixelShaderID="Super";
+VertexShaderID="Super";
+class Stage1
+{
+	texture="z\addons\dayz_epoch\textures\MF_nohq.paa";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,0};
+		pos[]={0,0,0};
+	};
+};
+class Stage2
+{
+	texture="#(argb,8,8,3)color(0.5,0.5,0.5,1,DT)";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,0};
+		pos[]={0,0,0};
+	};
+};
+class Stage3
+{
+	texture="#(argb,8,8,3)color(0,0,0,0,MC)";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,0};
+		pos[]={0,0,0};
+	};
+};
+class Stage4
+{
+	texture="#(argb,8,8,3)color(1,1,1,1,AS)";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,0};
+		pos[]={0,0,0};
+	};
+};
+class Stage5
+{
+	texture="z\addons\dayz_epoch\textures\mf_smdi.paa";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,0};
+		pos[]={0,0,0};
+	};
+};
+class Stage6
+{
+	texture="#(ai,32,128,1)fresnel(1.7,7.0)";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,0};
+		pos[]={0,0,0};
+	};
+};
+class Stage7
+{
+	texture="ca\data\env_land_co.paa";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,0};
+		pos[]={0,0,0};
+	};
+};

SQF/dayz_server/init/server_functions.sqf

@@ -25,6 +25,8 @@ server_spawnCrashSite  =    compile preprocessFileLineNumbers "\z\addons\dayz_se
 server_handleZedSpawn =		compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_handleZedSpawn.sqf";
 server_spawnEvents =			compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_spawnEvent.sqf";
 
+server_antiWall =			compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_antiWall.sqf";
+
 fnc_plyrHit   = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\fnc_plyrHit.sqf";
 server_deaths = 			compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerDeaths.sqf";
 
@@ -305,7 +307,7 @@ spawn_vehicles = {
 };
 
 spawn_roadblocks = {
-	private ["_position","_veh","_num","_config","_itemType","_itemChance","_weights","_index","_iArray","_istoomany","_marker","_spawnloot","_nearby","_spawnveh","_WreckList"];
+	private ["_position","_veh","_istoomany","_marker","_spawnveh","_WreckList"];
 	_WreckList = ["SKODAWreck","HMMWVWreck","UralWreck","datsun01Wreck","hiluxWreck","datsun02Wreck","UAZWreck","Land_Misc_Garb_Heap_EP1","Fort_Barricade_EP1","Rubbish2"];
 	
 	waitUntil{!isNil "BIS_fnc_selectRandom"};
@@ -333,11 +335,6 @@ spawn_roadblocks = {
 			
 			waitUntil{!isNil "BIS_fnc_selectRandom"};
 			_spawnveh = _WreckList call BIS_fnc_selectRandom;
-			_spawnloot =  "DynamicDebris";
-
-			if((_spawnveh == "HMMWVWreck") or (_spawnveh == "UralWreck") or (_spawnveh == "UAZWreck")) then {
-				_spawnloot = "DynamicDebrisMilitary";
-			};
 		
 			//diag_log("DEBUG: Spawning a crashed " + _spawnveh + " with " + _spawnloot + " at " + str(_position));
 			_veh = createVehicle [_spawnveh,_position, [], 0, "CAN_COLLIDE"];
@@ -462,7 +459,7 @@ dayz_recordLogin = {
 // Cleanup flies
 server_cleanFlies = 
 {
-    private ["_sound","_newdayz_flyMonitor"];
+    private ["_sound","_newdayz_flyMonitor","_body"];
 	
 	DZE_FlyWorkingSet = DZE_FlyWorkingSet+dayz_flyMonitor;
 	dayz_flyMonitor = [];
@@ -475,18 +472,16 @@ server_cleanFlies =
 		// Remove flies
 		if (isNull _body) then {
 			deleteVehicle _sound;
-			[_body] call server_Delete;
 		} else {
 			_newdayz_flyMonitor set [count _newdayz_flyMonitor,_x];
 		};
 
 	} forEach DZE_FlyWorkingSet;
-	
 	DZE_FlyWorkingSet = _newdayz_flyMonitor;
 };
 
 server_cleanDead = {
-	private ["_objectPos","_noPlayerNear","_body","_handled"];
+	private ["_objectPos","_noPlayerNear","_body","_handle"];
 	{
 		if (_x isKindOf "zZombie_Base") then
 		{