0.87

added cancel to repair and salvage menus, added message to salvage when
player does not, fixed bulk crates selling of weapons and backpacks, Can
no longer place vaults on roads or within 50m of trader citys, Added now
entering/leaving messages to trader citys, Added kill messages from f0rt
and stapo.

dayz_code/actions/repair_cancel.sqf

@@ -0,0 +1,3 @@
+private [];
+{dayz_myCursorTarget removeAction _x} forEach s_player_repairActions;s_player_repairActions = [];
+s_player_repair_crtl = -1;

dayz_code/actions/repair_vehicle.sqf

@@ -60,5 +60,10 @@ if (_allFixed) then {
 	_vehicle setDamage 0;
 };
 
+if(count _hitpoints > 0 ) then {
 
-s_player_repair_crtl = 1;
+	_cancel = dayz_myCursorTarget addAction ["Cancel", "\z\addons\dayz_code\actions\repair_cancel.sqf","repair", 0, true, false, "",""];
+	s_player_repairActions set [count s_player_repairActions,_cancel];
+
+	s_player_repair_crtl = 1;
+};

dayz_code/actions/salvage.sqf

@@ -43,6 +43,8 @@ if (_hasToolbox) then {
 			cutText [format["You have successfully removed %1 from the %2",_namePart,_nameType], "PLAIN DOWN"];
 
 
+		} else {
+			cutText [localize "STR_DAYZ_CODE_2", "PLAIN DOWN"];
 		};
 
 		

dayz_code/actions/salvage_vehicle.sqf

@@ -57,6 +57,10 @@ _hitpoints = _vehicle call vehicle_getHitpoints;
 
 } forEach _hitpoints;
 
+if(count _hitpoints > 0 ) then {
+	
+	_cancel = dayz_myCursorTarget addAction ["Cancel", "\z\addons\dayz_code\actions\repair_cancel.sqf","repair", 0, true, false, "",""];
+	s_player_repairActions set [count s_player_repairActions,_cancel];
 
-
-s_player_repair_crtl = 1;
+	s_player_repair_crtl = 1;
+};

dayz_code/actions/trade_backpacks.sqf

@@ -12,6 +12,7 @@ _textPartIn = (_this select 3) select 5;
 _textPartOut = (_this select 3) select 6;
 _traderID = (_this select 3) select 7;
 _bos = 0;
+_bulkqty = 0;
 
 if(_buy_o_sell == "buy") then {
 	_qty = {_x == _part_in} count magazines player;

dayz_code/actions/trade_weapons.sqf

@@ -1,5 +1,5 @@
-private["_iarray","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_traderID","_bos","_isOk"];
-//		   [part_out,part_in, qty_out, qty_in,"buy"];
+private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_traderID","_bos","_bulkItem","_bulkqty","_gold_out","_gold_qty_out","_partial_qty_out","_silver_qty_out","_needed","_activatingPlayer","_textPartIn","_textPartOut"];
+// [part_out,part_in, qty_out, qty_in,"buy"];
 
 _activatingPlayer = _this select 1;
 
@@ -12,6 +12,7 @@ _textPartIn = (_this select 3) select 5;
 _textPartOut = (_this select 3) select 6;
 _traderID = (_this select 3) select 7;
 _bos = 0;
+_bulkqty = 0;
 
 if(_buy_o_sell == "buy") then {
 	_qty = {_x == _part_in} count magazines player;
@@ -48,8 +49,6 @@ if (_bulkqty >= 1) then {
 		};
 	};
 
-	
-
 	_qty_out = _qty_out * 12;
 
 	// gold = 36 copper
@@ -96,11 +95,6 @@ if (_bulkqty >= 1) then {
 			player addMagazine _part_out;
 		};
 	};
-
-
-
-	
-
 	
 	cutText [format[("Traded %1 %2 for %3 %4"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];
 

dayz_code/actions/vault_pitch.sqf

@@ -4,7 +4,7 @@ call gear_ui_init;
 _playerPos = 	getPosATL player;
 _item = _this;
 _hastentitem = _this in magazines player;
-_location = player modeltoworld [0,2.5,0];
+_location = player modeltoworld [0,1,0];
 _location set [2,0];
 _building = nearestObject [(vehicle player), "HouseBase"];
 _isOk = [(vehicle player),_building] call fnc_isInsideBuilding;
@@ -19,6 +19,9 @@ if (!_hastentitem) exitWith {cutText [format[(localize "str_player_31"),_text,"p
 
 //blocked
 if (["concrete",dayz_surfaceType] call fnc_inString) then { _isOk = true; diag_log ("surface concrete"); };
+if (isOnRoad _playerPos) then { _isOk = true; diag_log ("surface is road"); };
+if(!placevault) then { _isOk = true; diag_log ("is trader city"); };
+
 //Block Tents in pounds
 _objectsPond = 		nearestObjects [_playerPos, [], 10];
 	{

dayz_code/config.cpp

@@ -33,7 +33,7 @@ class CfgMods
 		hidePicture = 0;
 		hideName = 0;
 		action = "http://www.dayepoch.com";
-		version = "0.85";
+		version = "0.87";
 		hiveVersion = 0.96; //0.93
 	};
 };
@@ -83,20 +83,20 @@ class CfgInGameUI
 		colorEast[] = {0,0,0,0}; //{0.95,0.7,0.7,1};
 		colorCiv[] = {0,0,0,0}; //{0.8,0.8,0.8,1};
 		colorRes[] = {0,0,0,0}; //{0.7,0.7,0.95,1};
-		font = "EtelkaNarrowMediumPro";
-		size = "( 21 / 408 )"; //"( 21 / 408 )";
+		font = "";
+		size = ""; //"( 21 / 408 )";
 		class Columns
 		{
 			class Order
 			{
-				width = 0.046; //0.046;
-				colorBg[] = {0.1,0.27,0.1,0.8}; //{0.1,0.27,0.1,0.8};
+				width = 0; //0.046;
+				colorBg[] = {0,0,0,0}; //{0.1,0.27,0.1,0.8};
 				doubleLine = 0;
 			};
 			class Player
 			{
-				width = 0.25; //0.25;
-				colorBg[] = {0.1,0.23,0.1,0.8}; //{0.1,0.23,0.1,0.8};
+				width = 0; //0.25;
+				colorBg[] = {0,0,0,0}; //{0.1,0.23,0.1,0.8};
 				doubleLine = 0;
 			};
 			class KillsInfantry
@@ -136,9 +136,9 @@ class CfgInGameUI
 			};
 			class KillsTotal
 			{
-				width = 0.1; //0.1;
+				width = 0; //0.1;
 				doubleLine = 0;
-				colorBg[] = {0.1,0.35,0.1,0.9}; //{0.1,0.35,0.1,0.9};
+				colorBg[] = {0,0,0,0}; //{0.1,0.35,0.1,0.9};
 				picture = "\ca\ui\data\stats_total_ca.paa"; //"\ca\ui\data\stats_total_ca.paa";
 			};
 		};

dayz_code/init/compiles.sqf

@@ -221,15 +221,10 @@ if (!isDedicated) then {
 	
 	dayz_spaceInterrupt = {
 		private ["_dikCode", "_handled"];
-		_DisplayOrDialogOrControl = _this select 0;
 		_dikCode = 	_this select 1;
-		_shiftState = _this select 2;
-		_ctrlState =  _this select 3;
-		_altState =   _this select 4;
 		_handled = false;
-		DoRE = ({isPlayer _x} count (player nearEntities ["AllVehicles",500]) > 1);
-		
 		if (_dikCode in (actionKeys "GetOver")) then {
+			DoRE = ({isPlayer _x} count (player nearEntities ["AllVehicles",500]) > 1);
 			if (canRoll && animationState player in ["amovpercmrunslowwrfldf","amovpercmrunsraswrfldf","amovpercmevaslowwrfldf","amovpercmevasraswrfldf"]) then {
 				canRoll = false;
 				null = [] spawn {
@@ -281,7 +276,9 @@ if (!isDedicated) then {
 			[player,15,false,(getPosATL player)] spawn player_alertZombies;
 		};
 		
+		
 		if ((_dikCode == 0x38 or _dikCode == 0xB8) and (time - dayz_lastCheckBit > 10)) then {
+			dayz_lastCheckBit = time;
 			call dayz_forceSave;
 		};
 		/*

dayz_code/init/variables.sqf

@@ -53,6 +53,7 @@ pz_priest = "pz_priest";
 dayz_combatLog = "";
 canRoll = true;
 
+placevault = true;
 
 //Hunting Variables
 dayZ_partClasses = [

dayz_code/rscTitles.hpp

@@ -87,7 +87,7 @@ class RscDisplayMain : RscStandardDisplay
 		class DAYZ_Version : CA_Version
 		{
 			idc = -1;
-			text = "DayZ Epoch 0.85 (1.7.5.M1D25)";
+			text = "DayZ Epoch 0.87 (1.7.5.M2D1)";
 			y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
 		};
 		class CA_TitleMainMenu;