From fd2eb14c5e165b3d40263e1dd063c6a5667dc298 Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Fri, 29 Jul 2016 15:48:32 -0400 Subject: [PATCH] Give inTraderCity a default value There is no point in setting inTraderCity = "Any"; since you can use the isInTraderCity variable to check if a player is in any trader city. Also "Any" will return false for isNil, so the only time "Unknown Trader City" was being used was when the player had not entered any city yet. If they left a known trader and went to an unknown one the RPT message would say "bought x at Any". Now it will correctly say "Unknown Trader" anytime a purchase is made without inTraderCity being set. --- .../actions/AdvancedTrading/functions/z_at_logTrade.sqf | 1 - SQF/dayz_code/actions/trade_any_bicycle.sqf | 1 - SQF/dayz_code/actions/trade_any_bicycle_old.sqf | 1 - SQF/dayz_code/actions/trade_any_boat.sqf | 1 - SQF/dayz_code/actions/trade_any_boat_old.sqf | 1 - SQF/dayz_code/actions/trade_any_vehicle.sqf | 1 - SQF/dayz_code/actions/trade_any_vehicle_free.sqf | 1 - SQF/dayz_code/actions/trade_any_vehicle_old.sqf | 1 - SQF/dayz_code/actions/trade_backpacks.sqf | 1 - SQF/dayz_code/actions/trade_backpacks_old.sqf | 1 - SQF/dayz_code/actions/trade_items.sqf | 1 - SQF/dayz_code/actions/trade_items_old.sqf | 1 - SQF/dayz_code/actions/trade_weapons.sqf | 1 - SQF/dayz_code/actions/trade_weapons_old.sqf | 1 - SQF/dayz_code/compile/player_traderCity.sqf | 2 +- SQF/dayz_code/init/variables.sqf | 1 + 16 files changed, 2 insertions(+), 15 deletions(-) diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_logTrade.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_logTrade.sqf index c6b83a76e..4bba7a5bb 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_logTrade.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_logTrade.sqf @@ -14,7 +14,6 @@ _Z_logTrade = { }; _tcost = _price call Z_calcDefaultCurrencyNoImg; _currency = if (Z_SingleCurrency) then {"Coins"} else {""}; - if (isNil "inTraderCity") then {inTraderCity = "Unknown Trader City"}; // Log to client RPT if (Z_SingleCurrency) then { diff --git a/SQF/dayz_code/actions/trade_any_bicycle.sqf b/SQF/dayz_code/actions/trade_any_bicycle.sqf index dff5e7a91..556c99824 100644 --- a/SQF/dayz_code/actions/trade_any_bicycle.sqf +++ b/SQF/dayz_code/actions/trade_any_bicycle.sqf @@ -94,7 +94,6 @@ if (_finished) then { //["PVDZE_obj_Trade",[_activatingPlayer,_traderID,_bos]] call callRpcProcedure; // if (isNil "_obj") then { _obj = "Unknown Vehicle" }; - if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" }; if(_bos == 1) then { // Selling PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_in,inTraderCity,_part_out,_qty_out]; diff --git a/SQF/dayz_code/actions/trade_any_bicycle_old.sqf b/SQF/dayz_code/actions/trade_any_bicycle_old.sqf index 19ff0287c..5840c58b7 100644 --- a/SQF/dayz_code/actions/trade_any_bicycle_old.sqf +++ b/SQF/dayz_code/actions/trade_any_bicycle_old.sqf @@ -79,7 +79,6 @@ if (_qty >= _qty_in) then { //["PVDZE_obj_Trade",[_activatingPlayer,_traderID,_bos]] call callRpcProcedure; if (isNil "_obj") then { _obj = "Unknown Vehicle" }; - if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" }; PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_obj,inTraderCity]; publicVariableServer "PVDZE_obj_Trade"; diff --git a/SQF/dayz_code/actions/trade_any_boat.sqf b/SQF/dayz_code/actions/trade_any_boat.sqf index 9c7ac1e39..6e5750902 100644 --- a/SQF/dayz_code/actions/trade_any_boat.sqf +++ b/SQF/dayz_code/actions/trade_any_boat.sqf @@ -98,7 +98,6 @@ if (_finished) then { //["PVDZE_obj_Trade",[_activatingPlayer,_traderID,_bos]] call callRpcProcedure; // if (isNil "_obj") then { _obj = "Unknown Vehicle" }; - if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" }; if(_bos == 1) then { // Selling PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_in,inTraderCity,_part_out,_qty_out]; diff --git a/SQF/dayz_code/actions/trade_any_boat_old.sqf b/SQF/dayz_code/actions/trade_any_boat_old.sqf index de741d550..9362d86ae 100644 --- a/SQF/dayz_code/actions/trade_any_boat_old.sqf +++ b/SQF/dayz_code/actions/trade_any_boat_old.sqf @@ -84,7 +84,6 @@ if (_qty >= _qty_in) then { //["PVDZE_obj_Trade",[_activatingPlayer,_traderID,_bos]] call callRpcProcedure; if (isNil "_obj") then { _obj = "Unknown Vehicle" }; - if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" }; PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_obj,inTraderCity]; publicVariableServer "PVDZE_obj_Trade"; diff --git a/SQF/dayz_code/actions/trade_any_vehicle.sqf b/SQF/dayz_code/actions/trade_any_vehicle.sqf index 884e072b8..7163a4673 100644 --- a/SQF/dayz_code/actions/trade_any_vehicle.sqf +++ b/SQF/dayz_code/actions/trade_any_vehicle.sqf @@ -97,7 +97,6 @@ if (_finished) then { if (_canAfford) then { // if (isNil "_obj") then { _obj = "Unknown Vehicle" }; - if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" }; if(_bos == 1) then { // Selling PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_in,inTraderCity,_part_out,_qty_out]; diff --git a/SQF/dayz_code/actions/trade_any_vehicle_free.sqf b/SQF/dayz_code/actions/trade_any_vehicle_free.sqf index c35b379d9..965916f34 100644 --- a/SQF/dayz_code/actions/trade_any_vehicle_free.sqf +++ b/SQF/dayz_code/actions/trade_any_vehicle_free.sqf @@ -97,7 +97,6 @@ if (_finished) then { if (_canAfford) then { // if (isNil "_obj") then { _obj = "Unknown Vehicle" }; - if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" }; if(_bos == 1) then { // Selling PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_in,inTraderCity,_part_out,_qty_out]; diff --git a/SQF/dayz_code/actions/trade_any_vehicle_old.sqf b/SQF/dayz_code/actions/trade_any_vehicle_old.sqf index c98798c2f..3c0eb299f 100644 --- a/SQF/dayz_code/actions/trade_any_vehicle_old.sqf +++ b/SQF/dayz_code/actions/trade_any_vehicle_old.sqf @@ -91,7 +91,6 @@ if (_qty >= _qty_in) then { if (_qty >= _qty_in) then { if (isNil "_obj") then { _obj = "Unknown Vehicle" }; - if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" }; PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_obj,inTraderCity]; publicVariableServer "PVDZE_obj_Trade"; diff --git a/SQF/dayz_code/actions/trade_backpacks.sqf b/SQF/dayz_code/actions/trade_backpacks.sqf index 208f1928c..d0fc6b155 100644 --- a/SQF/dayz_code/actions/trade_backpacks.sqf +++ b/SQF/dayz_code/actions/trade_backpacks.sqf @@ -94,7 +94,6 @@ if (_finished) then { if (_canAfford) then { if (isNil "_bag") then { _bag = "Unknown Backpack" }; - if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" }; if(_bos == 1) then { // Selling PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_in,inTraderCity,_part_out,_qty_out]; diff --git a/SQF/dayz_code/actions/trade_backpacks_old.sqf b/SQF/dayz_code/actions/trade_backpacks_old.sqf index 134dd9344..dfd34dc4a 100644 --- a/SQF/dayz_code/actions/trade_backpacks_old.sqf +++ b/SQF/dayz_code/actions/trade_backpacks_old.sqf @@ -85,7 +85,6 @@ if (_qty >= _qty_in) then { if (_qty >= _qty_in) then { if (isNil "_bag") then { _bag = "Unknown Backpack" }; - if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" }; PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_bag,inTraderCity]; publicVariableServer "PVDZE_obj_Trade"; diff --git a/SQF/dayz_code/actions/trade_items.sqf b/SQF/dayz_code/actions/trade_items.sqf index 9221b9c36..1b302b7b7 100644 --- a/SQF/dayz_code/actions/trade_items.sqf +++ b/SQF/dayz_code/actions/trade_items.sqf @@ -107,7 +107,6 @@ while {r_autoTrade} do { // Continue with trade. if (isNil "_part_in") then { _part_in = "Unknown Item" }; - if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" }; if(_bos == 1) then { // Selling PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_in,inTraderCity,_part_out,_qty_out]; diff --git a/SQF/dayz_code/actions/trade_items_old.sqf b/SQF/dayz_code/actions/trade_items_old.sqf index cee8a9abd..44a0f5358 100644 --- a/SQF/dayz_code/actions/trade_items_old.sqf +++ b/SQF/dayz_code/actions/trade_items_old.sqf @@ -103,7 +103,6 @@ for "_x" from 1 to _total_trades do { // Continue with trade. if (isNil "_part_in") then { _part_in = "Unknown Item" }; - if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" }; PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_in,inTraderCity]; publicVariableServer "PVDZE_obj_Trade"; diff --git a/SQF/dayz_code/actions/trade_weapons.sqf b/SQF/dayz_code/actions/trade_weapons.sqf index 13a76dded..0a1d84546 100644 --- a/SQF/dayz_code/actions/trade_weapons.sqf +++ b/SQF/dayz_code/actions/trade_weapons.sqf @@ -141,7 +141,6 @@ if (_finished) then { if (_canAfford) then { if (isNil "_part_out") then { _part_out = "Unknown Weapon/Magazine" }; - if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" }; if(_bos == 1) then { // Selling PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_in,inTraderCity,_part_out,_qty_out]; diff --git a/SQF/dayz_code/actions/trade_weapons_old.sqf b/SQF/dayz_code/actions/trade_weapons_old.sqf index f378ab70c..53707a19c 100644 --- a/SQF/dayz_code/actions/trade_weapons_old.sqf +++ b/SQF/dayz_code/actions/trade_weapons_old.sqf @@ -81,7 +81,6 @@ if (_qty >= _qty_in) then { if (_qty >= _qty_in) then { if (isNil "_part_out") then { _part_out = "Unknown Weapon/Magazine" }; - if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" }; PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_out,inTraderCity]; publicVariableServer "PVDZE_obj_Trade"; diff --git a/SQF/dayz_code/compile/player_traderCity.sqf b/SQF/dayz_code/compile/player_traderCity.sqf index 09bd29247..0fc32020d 100644 --- a/SQF/dayz_code/compile/player_traderCity.sqf +++ b/SQF/dayz_code/compile/player_traderCity.sqf @@ -25,7 +25,7 @@ switch _enterORleave do { }; canbuild = true; - inTraderCity = "Any"; + inTraderCity = "Unknown Trader"; isInTraderCity = false; }; }; \ No newline at end of file diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index 2e9603de9..8eb380b2c 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -517,6 +517,7 @@ if (isNil "DZE_plotOwnershipExclusions") then { DZE_plotTakeOwnershipItems = DayZ_SafeObjects - (DZE_LockableStorage + ["Plastic_Pole_EP1_DZ","DZ_storage_base"]); }; isInTraderCity = false; +inTraderCity = "Unknown Trader"; PlayerDeaths = []; PVDZE_obj_Trade = []; // For all traders increment qty PVDZE_plr_DeathB = [];