Fixes

dayz_code/actions/refuel.sqf

@@ -67,7 +67,7 @@ _availableCans = ["ItemJerrycan","ItemFuelBarrel"];
 					if (r_interrupt) then {
 						r_doLoop = false;
 					};
-					if (vehicle player == player) then {
+					if (vehicle player != player) then {
 						r_doLoop = false;
 					};
 					sleep 0.1;

dayz_code/compile/player_friendliesCheck.sqf

@@ -21,12 +21,12 @@ _tagList = player getVariable ["tagList", []];
 			_tag setVariable ["belongsTo", _rcharID];	
 
 			// Force white
-			_tag setobjecttexture [0,"#(argb,8,8,3)color(1,1,1,0.5,ca)"];
+			// _tag setobjecttexture [0,"#(argb,8,8,3)color(1,1,1,0.5,ca)"];
 			
 			diag_log format["SETUP ORB FOR: %1", _x];
 			
 			// Maintenance array
-			_tagList set [count _tagList, [_x, _tag,"white"]];
+			_tagList set [count _tagList, [_x, _tag,"init"]];
 			player setVariable ["tagList", _tagList];
 		};
 	};
@@ -39,8 +39,8 @@ _newTagList = [];
 	_tag = _x select 1;
 	_status = _x select 2;
 	_statusNew = "white";
-	//_tagColor = "";
-	_tagColor = "#(argb,8,8,3)color(1,1,1,0.5,ca)";
+	_tagColor = "";
+	// _tagColor = "#(argb,8,8,3)color(1,1,1,0.5,ca)";
 	
 	
 	// friendly player disconnected
@@ -49,7 +49,7 @@ _newTagList = [];
 	} else {
 		
 		if (_status != "green") then {	
-			diag_log format["CHECK IF FRIENDLY: %1", _player];
+			//diag_log format["CHECK IF FRIENDLY: %1", _player];
 			_rcharID = _player getVariable ["characterID", "0"];
 			_rfriendlies = _player getVariable ["friendlies", []];
 			_rfriendlyTo = _player getVariable ["friendlyTo", []];
@@ -57,7 +57,7 @@ _newTagList = [];
 			if ((_rcharID in _friendlies) and (_charID in _rfriendlies)) then {
 				if (!(_charID in _rfriendlyTo)) then {
 
-					diag_log format["IS FRIENDLY: %1", _player];
+					// diag_log format["IS FRIENDLY: %1", _player];
 				
 					_rfriendlyTo set [count _rfriendlyTo, _charID];
 					_player setVariable ["friendlyTo", _rfriendlyTo, true];
@@ -83,7 +83,7 @@ _newTagList = [];
 					};
 				};
 
-				diag_log format["CHECK HUMANITY: %1 %2", _player, _humanity];
+				// diag_log format["CHECK HUMANITY: %1 %2", _player, _humanity];
 			};
 
 			
@@ -95,7 +95,7 @@ _newTagList = [];
 			}; 
 
 		};
-		diag_log format["CHECK STATUS: %1 != %2", _statusNew, _status];
+		// diag_log format["CHECK STATUS: %1 != %2", _statusNew, _status];
 		_newTagList set [count _newTagList, [_player, _tag, _status]];
 	};
 } forEach _tagList;

dayz_code/init/compiles.sqf

@@ -124,7 +124,7 @@ if (!isDedicated) then {
 		_control1 = _display displayctrl 8400;
 		_control2 = _display displayctrl 102;
 		// 120 sec timeout
-		while { _timeOut < 3000 && !dayz_clientPreload && !dayz_authed } do {
+		while { _timeOut < 1500 && !dayz_clientPreload && !dayz_authed } do {
 
 			if ( isNull _display ) then {
 				waitUntil { !dialog; };

dayz_code/stringtable.xml

@@ -2493,7 +2493,7 @@
       <Czech>Red Bull is an energy drink sold by Austrian company Red Bull GmbH,</Czech>
     </Key>
     <Key ID="STR_FOOD_NAME_OSHERBET">
-      <Original>Orange Sherbet/Original>
+      <Original>Orange Sherbet</Original>
       <English>Orange Sherbet</English>
       <German>Orange Sherbet</German>
       <Russian>Orange Sherbet</Russian>

dayz_epoch/textures/camokeypad.rvmat

@@ -0,0 +1,32 @@
+ambient[]={1,1,1,1};
+diffuse[]={1,1,1,1};
+forcedDiffuse[]={0,0,0,0};
+emmisive[]={0,0,0,1};
+specular[]={0.10588235,0.13725491,0.17254902,1};
+specularPower=22.700001;
+PixelShaderID="NormalMapSpecularDIMap";
+VertexShaderID="NormalMap";
+class Stage1
+{
+	texture="z\addons\dayz_epoch\textures\keypad_norm.paa";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,0};
+		pos[]={0,0,0};
+	};
+};
+class Stage2
+{
+	texture="z\addons\dayz_epoch\textures\keypad_spec.paa";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,0};
+		pos[]={0,0,0};
+	};
+};

dayz_epoch/textures/camonet.rvmat

@@ -0,0 +1,25 @@
+ambient[]={0.50588238,0.50588238,0.50588238,1};
+diffuse[]={0.50588238,0.50588238,0.50588238,1};
+forcedDiffuse[]={0,0,0,0};
+emmisive[]={0,0,0,1};
+specular[]={0.15686275,0.22352941,0.16078432,1};
+specularPower=100;
+PixelShaderID="NormalMapSpecularDIMap";
+VertexShaderID="NormalMap";
+class Stage0
+{
+	texture="z\addons\dayz_epoch\textures\camonet_co.paa";
+	uvSource="tex";
+};
+class Stage1
+{
+	texture="z\addons\dayz_epoch\textures\camonet_norm.paa";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,0};
+		pos[]={0,0,0};
+	};
+};

dayz_epoch/textures/lockbox.rvmat

@@ -0,0 +1,32 @@
+ambient[]={1,1,1,1};
+diffuse[]={1,1,1,1};
+forcedDiffuse[]={0,0,0,0};
+emmisive[]={0,0,0,1};
+specular[]={0.082352944,0.10196079,0.082352944,1};
+specularPower=100;
+PixelShaderID="NormalMapSpecularDIMap";
+VertexShaderID="NormalMap";
+class Stage1
+{
+	texture="z\addons\dayz_epoch\textures\lockbox_norm.paa";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,0};
+		pos[]={0,0,0};
+	};
+};
+class Stage2
+{
+	texture="z\addons\dayz_epoch\textures\lockbox_spec.paa";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,0};
+		pos[]={0,0,0};
+	};
+};

dayz_equip/config.cpp

@@ -2430,7 +2430,7 @@ class CfgMagazines
 		type = 256;
 		displayName = "Zombie Parts";
 		model = "\z\addons\dayz_epoch\models\zombie_parts_bag_v2.p3d";
-		picture = "\z\addons\dayz_epoch\pictures\arts_bag_texture3c_CA.paa";
+		picture = "\z\addons\dayz_epoch\pictures\parts_bag_texture3c_CA.paa";
 		descriptionShort = "Zombie Parts in a Bag: Trade these for Bio Meat at medic traders.";
 
 	};
@@ -3117,7 +3117,17 @@ class CfgMagazines
 			};
 		};
 	};
+	class ItemLockbox: CA_Magazine
+	{
+		scope = 2;
+		count = 1;
+		type = 256;
+		displayName = "Lockbox";
+		model = "\z\addons\dayz_epoch\models\lockbox.p3d";
+		picture = "\z\addons\dayz_epoch\pictures\equip_safe_ca.paa";
+		descriptionShort = "Semi secure lockbox";
 		
+	};
 	class ItemTankTrap: CA_Magazine
 	{
 		scope = 2;

dayz_server/modules/drop_bombs.sqf

@@ -0,0 +1,4 @@
+// Sample Drop Bomb
+
+_position = [MarkerPosition,0,DynamicVehicleArea,10,0,2000,0] call BIS_fnc_findSafePos;
+bomb = "Bo_GBU12_LGB" createVehicle [(_position select 0),(_position select 1), 1000];

dayz_server/modules/hello_world.sqf

@@ -1,3 +1,3 @@
 // Sample Hello World
 
-[nil,nil,"per",rTITLETEXT,"Hello World","PLAIN DOWN"] call RE;
+[nil,nil,"per",rTITLETEXT,"Welcome to DayzEpoch.com","PLAIN DOWN"] call RE;

dayz_server/modules/hello_world2.sqf

@@ -1,3 +0,0 @@
-// Sample Hello World
-
-[nil,nil,"per",rTITLETEXT,"Hello World 2","PLAIN DOWN"] call RE;