W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Give inTraderCity a default value

Browse Source 
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:
ebaydayz
2016-07-29 15:48:32 -04:00
parent ac63a7d903
commit fd2eb14c5e
16 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_logTrade.sqf
View File

@@ -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 {

1
SQF/dayz_code/actions/trade_any_bicycle.sqf
View File

@@ -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];

1
SQF/dayz_code/actions/trade_any_bicycle_old.sqf
View File

@@ -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";

1
SQF/dayz_code/actions/trade_any_boat.sqf
View File

@@ -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];

1
SQF/dayz_code/actions/trade_any_boat_old.sqf
View File

@@ -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";

1
SQF/dayz_code/actions/trade_any_vehicle.sqf
View File

@@ -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];

1
SQF/dayz_code/actions/trade_any_vehicle_free.sqf
View File

@@ -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];

1
SQF/dayz_code/actions/trade_any_vehicle_old.sqf
View File

@@ -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";

1
SQF/dayz_code/actions/trade_backpacks.sqf
View File

@@ -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];

1
SQF/dayz_code/actions/trade_backpacks_old.sqf
View File

@@ -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";

1
SQF/dayz_code/actions/trade_items.sqf
View File

@@ -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];

1
SQF/dayz_code/actions/trade_items_old.sqf
View File

@@ -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";

1
SQF/dayz_code/actions/trade_weapons.sqf
View File

@@ -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];

1
SQF/dayz_code/actions/trade_weapons_old.sqf
View File

@@ -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";

2
SQF/dayz_code/compile/player_traderCity.sqf
View File

@@ -25,7 +25,7 @@ switch _enterORleave do {
};
canbuild = true;
inTraderCity = "Any";
inTraderCity = "Unknown Trader";
isInTraderCity = false;
};
};

1
SQF/dayz_code/init/variables.sqf
View File

@@ -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 = [];