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

Don't show selected vehicleX message on Adv Trade startup

Browse Source 
Only show Selected vehicleX systemChat message when clicking the buy
in/sell from vehicle button. Previously it was showing every time the
menu opened.

Also added better logging to RPT. Shows "Trader Menu: %1 x %2 added" and
"Trader Menu: %1 added"
This commit is contained in:
ebaydayz
2016-05-05 12:37:10 -04:00
parent f900ee4520
commit 2c6ef2ced3
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_buyItems.sqf
View File

@@ -140,11 +140,11 @@ if(_enoughMoney) then {
{ {
if( _x select 1 == "trade_weapons")then{ if( _x select 1 == "trade_weapons")then{
_backpack addWeaponCargoGlobal [_x select 0, _x select 9]; _backpack addWeaponCargoGlobal [_x select 0, _x select 9];
diag_log format [localize "STR_EPOCH_TRADE_ADDED_QTY", _x select 0, _x select 9]; diag_log format [localize "STR_EPOCH_TRADE_ADDED_QTY", _x select 0, _x select 9, localize "STR_EPOCH_PLAYER_289"];
}; };
if( _x select 1 == "trade_items")then{ if( _x select 1 == "trade_items")then{
_backpack addMagazineCargoGlobal [_x select 0, _x select 9]; _backpack addMagazineCargoGlobal [_x select 0, _x select 9];
diag_log format [localize "STR_EPOCH_TRADE_ADDED_QTY", _x select 0, _x select 9]; diag_log format [localize "STR_EPOCH_TRADE_ADDED_QTY", _x select 0, _x select 9, localize "STR_EPOCH_PLAYER_289"];
}; };
if((_x select 1) in ["trade_any_vehicle", "trade_any_vehicle_free", "trade_any_vehicle_old", "trade_any_bicycle", "trade_any_bicycle_old", "trade_any_boat", "trade_any_boat_old"])then{ if((_x select 1) in ["trade_any_vehicle", "trade_any_vehicle_free", "trade_any_vehicle_old", "trade_any_bicycle", "trade_any_bicycle_old", "trade_any_boat", "trade_any_boat_old"])then{
_item2Add = [(_x select 0), (_x select 1)] call _buyVehicle; _item2Add = [(_x select 0), (_x select 1)] call _buyVehicle;
@@ -161,15 +161,15 @@ if(_enoughMoney) then {
systemChat format["Adding %1 items in %2",count (Z_BuyingArray), typeOf Z_vehicle]; systemChat format["Adding %1 items in %2",count (Z_BuyingArray), typeOf Z_vehicle];
if( _x select 1 == "trade_weapons")then{ if( _x select 1 == "trade_weapons")then{
Z_vehicle addWeaponCargoGlobal [_x select 0, _x select 9]; Z_vehicle addWeaponCargoGlobal [_x select 0, _x select 9];
diag_log format [localize "STR_EPOCH_TRADE_ADDED_QTY", _x select 0, _x select 9]; diag_log format [localize "STR_EPOCH_TRADE_ADDED_QTY", _x select 0, _x select 9, localize "STR_EPOCH_PLAYER_289"];
}; };
if( _x select 1 == "trade_items")then{ if( _x select 1 == "trade_items")then{
Z_vehicle addMagazineCargoGlobal [_x select 0, _x select 9]; Z_vehicle addMagazineCargoGlobal [_x select 0, _x select 9];
diag_log format [localize "STR_EPOCH_TRADE_ADDED_QTY", _x select 0, _x select 9]; diag_log format [localize "STR_EPOCH_TRADE_ADDED_QTY", _x select 0, _x select 9, localize "STR_EPOCH_PLAYER_289"];
}; };
if( _x select 1 == "trade_backpacks")then{ if( _x select 1 == "trade_backpacks")then{
Z_vehicle addBackpackCargoGlobal [_x select 0, _x select 9]; Z_vehicle addBackpackCargoGlobal [_x select 0, _x select 9];
diag_log format [localize "STR_EPOCH_TRADE_ADDED_QTY", _x select 0, _x select 9]; diag_log format [localize "STR_EPOCH_TRADE_ADDED_QTY", _x select 0, _x select 9, localize "STR_EPOCH_PLAYER_289"];
}; };
if((_x select 1) in ["trade_any_vehicle", "trade_any_vehicle_free", "trade_any_vehicle_old", "trade_any_bicycle", "trade_any_bicycle_old", "trade_any_boat", "trade_any_boat_old"])then{ if((_x select 1) in ["trade_any_vehicle", "trade_any_vehicle_free", "trade_any_vehicle_old", "trade_any_bicycle", "trade_any_bicycle_old", "trade_any_boat", "trade_any_boat_old"])then{
_item2Add = [(_x select 0), (_x select 1)] call _buyVehicle; _item2Add = [(_x select 0), (_x select 1)] call _buyVehicle;
@@ -188,7 +188,7 @@ if(_enoughMoney) then {
_count = 0; _count = 0;
while{ _count < (_x select 9)}do{ while{ _count < (_x select 9)}do{
player addWeapon (_x select 0); player addWeapon (_x select 0);
diag_log format [localize "STR_EPOCH_TRADE_ADDED", _x select 0]; diag_log format [localize "STR_EPOCH_TRADE_ADDED", _x select 0, localize "STR_EPOCH_PLAYER_289"];
_count = _count + 1; _count = _count + 1;
}; };
}; };
@@ -196,7 +196,7 @@ if(_enoughMoney) then {
_count = 0; _count = 0;
while{ _count < (_x select 9)} do { while{ _count < (_x select 9)} do {
player addMagazine (_x select 0); player addMagazine (_x select 0);
diag_log format [localize "STR_EPOCH_TRADE_ADDED", _x select 0]; diag_log format [localize "STR_EPOCH_TRADE_ADDED", _x select 0, localize "STR_EPOCH_PLAYER_289"];
_count = _count + 1; _count = _count + 1;
}; };
}; };

2
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_checkCloseVehicle.sqf
View File

@@ -11,9 +11,9 @@ _list = nearestObjects [_pos, ["Air","LandVehicle","Ship"], Z_VehicleDistance];
_result = false; _result = false;
if(!isNull _vehicle)then{ if(!isNull _vehicle)then{
Z_vehicle = _vehicle; Z_vehicle = _vehicle;
systemChat format[localize "STR_EPOCH_TRADE_SELECTED",typeOf Z_vehicle];
_result = true; _result = true;
if (_this) then { // Set trade title, don't set on menu start up since gear is selected initially. if (_this) then { // Set trade title, don't set on menu start up since gear is selected initially.
systemChat format[localize "STR_EPOCH_TRADE_SELECTED",typeOf Z_vehicle];
if (Z_Selling) then { if (Z_Selling) then {
[format[localize "STR_EPOCH_TRADE_SELLING_FROM", typeOf Z_vehicle]] call Z_filleTradeTitle; [format[localize "STR_EPOCH_TRADE_SELLING_FROM", typeOf Z_vehicle]] call Z_filleTradeTitle;
} else { } else {

8
SQF/dayz_code/stringtable.xml
View File

@@ -15747,12 +15747,12 @@
<Russian>Добавлено: %1 предметов в рюкзак</Russian> <Russian>Добавлено: %1 предметов в рюкзак</Russian>
</Key> </Key>
<Key ID="STR_EPOCH_TRADE_ADDED_QTY"> <Key ID="STR_EPOCH_TRADE_ADDED_QTY">
<English>%1 x %2 added</English> <English>%3: %1 x %2 added</English>
<Russian>%1 x %2 добавлено</Russian> <Russian>%3: %1 x %2 добавлено</Russian>
</Key> </Key>
<Key ID="STR_EPOCH_TRADE_ADDED"> <Key ID="STR_EPOCH_TRADE_ADDED">
<English>%1 added</English> <English>%2: %1 added</English>
<Russian>%1 добавлено</Russian> <Russian>%2: %1 добавлено</Russian>
</Key> </Key>
<Key ID="STR_EPOCH_TRADE_SUCCESSFUL"> <Key ID="STR_EPOCH_TRADE_SUCCESSFUL">
<English>Trade successfull.</English> <English>Trade successfull.</English>