diff --git a/SQF/dayz_code/actions/trade_any_bicycle.sqf b/SQF/dayz_code/actions/trade_any_bicycle.sqf
index 439e588c0..8b4a0c186 100644
--- a/SQF/dayz_code/actions/trade_any_bicycle.sqf
+++ b/SQF/dayz_code/actions/trade_any_bicycle.sqf
@@ -4,8 +4,8 @@ if(TradeInprogress) exitWith { cutText [(localize "str_epoch_player_103") , "PLA
TradeInprogress = true;
// Test cannot lock while another player is nearby
-_playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 12]) > 1;
-if(_playerNear) exitWith { TradeInprogress = false; cutText [(localize "str_epoch_player_104") , "PLAIN DOWN"]; };
+//_playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 12]) > 1;
+//if(_playerNear) exitWith { TradeInprogress = false; cutText [(localize "str_epoch_player_104") , "PLAIN DOWN"]; };
// [part_out,part_in, qty_out, qty_in, loc];
@@ -148,27 +148,31 @@ if (_qty >= _qty_in) then {
_okToSell = false;
};
};
+ if(local _obj) then {
- if(_okToSell) then {
+ if(_okToSell) then {
- if(!isNull _obj and alive _obj) then {
+ if(!isNull _obj and alive _obj) then {
- for "_x" from 1 to _qty_out do {
- player addMagazine _part_out;
+ for "_x" from 1 to _qty_out do {
+ player addMagazine _part_out;
+ };
+
+ _objectID = _obj getVariable ["ObjectID","0"];
+ _objectUID = _obj getVariable ["ObjectUID","0"];
+
+ PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer];
+ publicVariableServer "PVDZE_obj_Delete";
+
+ deleteVehicle _obj;
+
+ cutText [format[(localize "str_epoch_player_181"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];
};
-
- _objectID = _obj getVariable ["ObjectID","0"];
- _objectUID = _obj getVariable ["ObjectUID","0"];
-
- PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer];
- publicVariableServer "PVDZE_obj_Delete";
-
- deleteVehicle _obj;
-
- cutText [format[(localize "str_epoch_player_181"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];
+ } else {
+ cutText [format[(localize "str_epoch_player_182"),_textPartIn] , "PLAIN DOWN"];
};
} else {
- cutText [format[(localize "str_epoch_player_182"),_textPartIn] , "PLAIN DOWN"];
+ cutText [(localize "str_epoch_player_245"), "PLAIN DOWN"];
};
};
diff --git a/SQF/dayz_code/actions/trade_any_boat.sqf b/SQF/dayz_code/actions/trade_any_boat.sqf
index f22ac7865..0ac49707a 100644
--- a/SQF/dayz_code/actions/trade_any_boat.sqf
+++ b/SQF/dayz_code/actions/trade_any_boat.sqf
@@ -4,8 +4,8 @@ if(TradeInprogress) exitWith { cutText [(localize "str_epoch_player_103") , "PLA
TradeInprogress = true;
// Test cannot lock while another player is nearby
-_playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 12]) > 1;
-if(_playerNear) exitWith { TradeInprogress = false; cutText [(localize "str_epoch_player_104") , "PLAIN DOWN"]; };
+//_playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 12]) > 1;
+//if(_playerNear) exitWith { TradeInprogress = false; cutText [(localize "str_epoch_player_104") , "PLAIN DOWN"]; };
// [part_out,part_in, qty_out, qty_in, loc];
@@ -145,6 +145,10 @@ if (_qty >= _qty_in) then {
_obj = _obj select 0;
_okToSell = true;
+ if(!local _obj) then {
+ _okToSell = false;
+ };
+
if(_okToSell and !isNull _obj and alive _obj) then {
for "_x" from 1 to _qty_out do {
@@ -160,6 +164,8 @@ if (_qty >= _qty_in) then {
deleteVehicle _obj;
cutText [format[(localize "str_epoch_player_181"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];
+ } else {
+ cutText [(localize "str_epoch_player_245"), "PLAIN DOWN"];
};
};
diff --git a/SQF/dayz_code/actions/trade_any_vehicle.sqf b/SQF/dayz_code/actions/trade_any_vehicle.sqf
index 195429724..399b52a59 100644
--- a/SQF/dayz_code/actions/trade_any_vehicle.sqf
+++ b/SQF/dayz_code/actions/trade_any_vehicle.sqf
@@ -4,8 +4,8 @@ if(TradeInprogress) exitWith { cutText [(localize "str_epoch_player_103") , "PLA
TradeInprogress = true;
// Test cannot lock while another player is nearby
-_playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 12]) > 1;
-if(_playerNear) exitWith { TradeInprogress = false; cutText [(localize "str_epoch_player_104") , "PLAIN DOWN"]; };
+//_playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 12]) > 1;
+//if(_playerNear) exitWith { TradeInprogress = false; cutText [(localize "str_epoch_player_104") , "PLAIN DOWN"]; };
// [part_out,part_in, qty_out, qty_in, loc];
@@ -169,10 +169,10 @@ if (_qty >= _qty_in) then {
};
};
- if(_okToSell) then {
+ if(local _obj and !isNull _obj and alive _obj) then {
+
+ if(_okToSell) then {
- if(!isNull _obj and alive _obj) then {
-
for "_x" from 1 to _qty_out do {
player addMagazine _part_out;
};
@@ -186,10 +186,14 @@ if (_qty >= _qty_in) then {
deleteVehicle _obj;
cutText [format[(localize "str_epoch_player_181"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];
+
+ } else {
+ cutText [format[(localize "str_epoch_player_182"),_textPartIn] , "PLAIN DOWN"];
};
} else {
- cutText [format[(localize "str_epoch_player_182"),_textPartIn] , "PLAIN DOWN"];
+ cutText [(localize "str_epoch_player_245"), "PLAIN DOWN"];
};
+
};
{player removeAction _x} forEach s_player_parts;s_player_parts = [];
diff --git a/SQF/dayz_epoch_b/stringtable.xml b/SQF/dayz_epoch_b/stringtable.xml
index 8e04be79e..ec75e0ec7 100644
--- a/SQF/dayz_epoch_b/stringtable.xml
+++ b/SQF/dayz_epoch_b/stringtable.xml
@@ -4974,5 +4974,15 @@
+
+ Failed to sell vehicle, you must get into drivers seat first.
+ Failed to sell vehicle, you must get into drivers seat first.
+ Failed to sell vehicle, you must get into drivers seat first.
+ Failed to sell vehicle, you must get into drivers seat first.
+ Failed to sell vehicle, you must get into drivers seat first.
+ Failed to sell vehicle, you must get into drivers seat first.
+ Failed to sell vehicle, you must get into drivers seat first.
+ Failed to sell vehicle, you must get into drivers seat first.
+