mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2025-12-13 19:52:38 +03:00
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.
This commit is contained in:
@@ -14,7 +14,6 @@ _Z_logTrade = {
|
|||||||
};
|
};
|
||||||
_tcost = _price call Z_calcDefaultCurrencyNoImg;
|
_tcost = _price call Z_calcDefaultCurrencyNoImg;
|
||||||
_currency = if (Z_SingleCurrency) then {"Coins"} else {""};
|
_currency = if (Z_SingleCurrency) then {"Coins"} else {""};
|
||||||
if (isNil "inTraderCity") then {inTraderCity = "Unknown Trader City"};
|
|
||||||
|
|
||||||
// Log to client RPT
|
// Log to client RPT
|
||||||
if (Z_SingleCurrency) then {
|
if (Z_SingleCurrency) then {
|
||||||
|
|||||||
@@ -94,7 +94,6 @@ if (_finished) then {
|
|||||||
|
|
||||||
//["PVDZE_obj_Trade",[_activatingPlayer,_traderID,_bos]] call callRpcProcedure;
|
//["PVDZE_obj_Trade",[_activatingPlayer,_traderID,_bos]] call callRpcProcedure;
|
||||||
// if (isNil "_obj") then { _obj = "Unknown Vehicle" };
|
// if (isNil "_obj") then { _obj = "Unknown Vehicle" };
|
||||||
if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" };
|
|
||||||
if(_bos == 1) then {
|
if(_bos == 1) then {
|
||||||
// Selling
|
// Selling
|
||||||
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_in,inTraderCity,_part_out,_qty_out];
|
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_in,inTraderCity,_part_out,_qty_out];
|
||||||
|
|||||||
@@ -79,7 +79,6 @@ if (_qty >= _qty_in) then {
|
|||||||
|
|
||||||
//["PVDZE_obj_Trade",[_activatingPlayer,_traderID,_bos]] call callRpcProcedure;
|
//["PVDZE_obj_Trade",[_activatingPlayer,_traderID,_bos]] call callRpcProcedure;
|
||||||
if (isNil "_obj") then { _obj = "Unknown Vehicle" };
|
if (isNil "_obj") then { _obj = "Unknown Vehicle" };
|
||||||
if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" };
|
|
||||||
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_obj,inTraderCity];
|
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_obj,inTraderCity];
|
||||||
publicVariableServer "PVDZE_obj_Trade";
|
publicVariableServer "PVDZE_obj_Trade";
|
||||||
|
|
||||||
|
|||||||
@@ -98,7 +98,6 @@ if (_finished) then {
|
|||||||
|
|
||||||
//["PVDZE_obj_Trade",[_activatingPlayer,_traderID,_bos]] call callRpcProcedure;
|
//["PVDZE_obj_Trade",[_activatingPlayer,_traderID,_bos]] call callRpcProcedure;
|
||||||
// if (isNil "_obj") then { _obj = "Unknown Vehicle" };
|
// if (isNil "_obj") then { _obj = "Unknown Vehicle" };
|
||||||
if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" };
|
|
||||||
if(_bos == 1) then {
|
if(_bos == 1) then {
|
||||||
// Selling
|
// Selling
|
||||||
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_in,inTraderCity,_part_out,_qty_out];
|
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_in,inTraderCity,_part_out,_qty_out];
|
||||||
|
|||||||
@@ -84,7 +84,6 @@ if (_qty >= _qty_in) then {
|
|||||||
|
|
||||||
//["PVDZE_obj_Trade",[_activatingPlayer,_traderID,_bos]] call callRpcProcedure;
|
//["PVDZE_obj_Trade",[_activatingPlayer,_traderID,_bos]] call callRpcProcedure;
|
||||||
if (isNil "_obj") then { _obj = "Unknown Vehicle" };
|
if (isNil "_obj") then { _obj = "Unknown Vehicle" };
|
||||||
if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" };
|
|
||||||
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_obj,inTraderCity];
|
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_obj,inTraderCity];
|
||||||
publicVariableServer "PVDZE_obj_Trade";
|
publicVariableServer "PVDZE_obj_Trade";
|
||||||
|
|
||||||
|
|||||||
@@ -97,7 +97,6 @@ if (_finished) then {
|
|||||||
if (_canAfford) then {
|
if (_canAfford) then {
|
||||||
|
|
||||||
// if (isNil "_obj") then { _obj = "Unknown Vehicle" };
|
// if (isNil "_obj") then { _obj = "Unknown Vehicle" };
|
||||||
if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" };
|
|
||||||
if(_bos == 1) then {
|
if(_bos == 1) then {
|
||||||
// Selling
|
// Selling
|
||||||
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_in,inTraderCity,_part_out,_qty_out];
|
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_in,inTraderCity,_part_out,_qty_out];
|
||||||
|
|||||||
@@ -97,7 +97,6 @@ if (_finished) then {
|
|||||||
if (_canAfford) then {
|
if (_canAfford) then {
|
||||||
|
|
||||||
// if (isNil "_obj") then { _obj = "Unknown Vehicle" };
|
// if (isNil "_obj") then { _obj = "Unknown Vehicle" };
|
||||||
if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" };
|
|
||||||
if(_bos == 1) then {
|
if(_bos == 1) then {
|
||||||
// Selling
|
// Selling
|
||||||
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_in,inTraderCity,_part_out,_qty_out];
|
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_in,inTraderCity,_part_out,_qty_out];
|
||||||
|
|||||||
@@ -91,7 +91,6 @@ if (_qty >= _qty_in) then {
|
|||||||
if (_qty >= _qty_in) then {
|
if (_qty >= _qty_in) then {
|
||||||
|
|
||||||
if (isNil "_obj") then { _obj = "Unknown Vehicle" };
|
if (isNil "_obj") then { _obj = "Unknown Vehicle" };
|
||||||
if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" };
|
|
||||||
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_obj,inTraderCity];
|
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_obj,inTraderCity];
|
||||||
publicVariableServer "PVDZE_obj_Trade";
|
publicVariableServer "PVDZE_obj_Trade";
|
||||||
|
|
||||||
|
|||||||
@@ -94,7 +94,6 @@ if (_finished) then {
|
|||||||
if (_canAfford) then {
|
if (_canAfford) then {
|
||||||
|
|
||||||
if (isNil "_bag") then { _bag = "Unknown Backpack" };
|
if (isNil "_bag") then { _bag = "Unknown Backpack" };
|
||||||
if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" };
|
|
||||||
if(_bos == 1) then {
|
if(_bos == 1) then {
|
||||||
// Selling
|
// Selling
|
||||||
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_in,inTraderCity,_part_out,_qty_out];
|
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_in,inTraderCity,_part_out,_qty_out];
|
||||||
|
|||||||
@@ -85,7 +85,6 @@ if (_qty >= _qty_in) then {
|
|||||||
if (_qty >= _qty_in) then {
|
if (_qty >= _qty_in) then {
|
||||||
|
|
||||||
if (isNil "_bag") then { _bag = "Unknown Backpack" };
|
if (isNil "_bag") then { _bag = "Unknown Backpack" };
|
||||||
if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" };
|
|
||||||
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_bag,inTraderCity];
|
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_bag,inTraderCity];
|
||||||
publicVariableServer "PVDZE_obj_Trade";
|
publicVariableServer "PVDZE_obj_Trade";
|
||||||
|
|
||||||
|
|||||||
@@ -107,7 +107,6 @@ while {r_autoTrade} do {
|
|||||||
|
|
||||||
// Continue with trade.
|
// Continue with trade.
|
||||||
if (isNil "_part_in") then { _part_in = "Unknown Item" };
|
if (isNil "_part_in") then { _part_in = "Unknown Item" };
|
||||||
if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" };
|
|
||||||
if(_bos == 1) then {
|
if(_bos == 1) then {
|
||||||
// Selling
|
// Selling
|
||||||
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_in,inTraderCity,_part_out,_qty_out];
|
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_in,inTraderCity,_part_out,_qty_out];
|
||||||
|
|||||||
@@ -103,7 +103,6 @@ for "_x" from 1 to _total_trades do {
|
|||||||
|
|
||||||
// Continue with trade.
|
// Continue with trade.
|
||||||
if (isNil "_part_in") then { _part_in = "Unknown Item" };
|
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];
|
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_in,inTraderCity];
|
||||||
publicVariableServer "PVDZE_obj_Trade";
|
publicVariableServer "PVDZE_obj_Trade";
|
||||||
|
|
||||||
|
|||||||
@@ -141,7 +141,6 @@ if (_finished) then {
|
|||||||
if (_canAfford) then {
|
if (_canAfford) then {
|
||||||
|
|
||||||
if (isNil "_part_out") then { _part_out = "Unknown Weapon/Magazine" };
|
if (isNil "_part_out") then { _part_out = "Unknown Weapon/Magazine" };
|
||||||
if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" };
|
|
||||||
if(_bos == 1) then {
|
if(_bos == 1) then {
|
||||||
// Selling
|
// Selling
|
||||||
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_in,inTraderCity,_part_out,_qty_out];
|
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_in,inTraderCity,_part_out,_qty_out];
|
||||||
|
|||||||
@@ -81,7 +81,6 @@ if (_qty >= _qty_in) then {
|
|||||||
if (_qty >= _qty_in) then {
|
if (_qty >= _qty_in) then {
|
||||||
|
|
||||||
if (isNil "_part_out") then { _part_out = "Unknown Weapon/Magazine" };
|
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];
|
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_out,inTraderCity];
|
||||||
publicVariableServer "PVDZE_obj_Trade";
|
publicVariableServer "PVDZE_obj_Trade";
|
||||||
|
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ switch _enterORleave do {
|
|||||||
};
|
};
|
||||||
|
|
||||||
canbuild = true;
|
canbuild = true;
|
||||||
inTraderCity = "Any";
|
inTraderCity = "Unknown Trader";
|
||||||
isInTraderCity = false;
|
isInTraderCity = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -517,6 +517,7 @@ if (isNil "DZE_plotOwnershipExclusions") then {
|
|||||||
DZE_plotTakeOwnershipItems = DayZ_SafeObjects - (DZE_LockableStorage + ["Plastic_Pole_EP1_DZ","DZ_storage_base"]);
|
DZE_plotTakeOwnershipItems = DayZ_SafeObjects - (DZE_LockableStorage + ["Plastic_Pole_EP1_DZ","DZ_storage_base"]);
|
||||||
};
|
};
|
||||||
isInTraderCity = false;
|
isInTraderCity = false;
|
||||||
|
inTraderCity = "Unknown Trader";
|
||||||
PlayerDeaths = [];
|
PlayerDeaths = [];
|
||||||
PVDZE_obj_Trade = []; // For all traders increment qty
|
PVDZE_obj_Trade = []; // For all traders increment qty
|
||||||
PVDZE_plr_DeathB = [];
|
PVDZE_plr_DeathB = [];
|
||||||
|
|||||||
Reference in New Issue
Block a user