W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-04-18 18:26:39 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Advanced trading tidying, spelling fixes, private fixes and string fixes (#1716)

Browse Source 
* Advanced trading tidying, spelling fixes, private fixes and string fixes.

Fixes snap building issue with metal floors
Fixed spelling mistakes in various scripts
Fixed formatting uglyness in various scripts
Fixed invalid private lines in various scripts
Changed Advanced trading so buying worked more like selling, You can't
select backpack if you don't have a pack nor can you select a vehicle if
you don't have a vehicle.
Removed some redundant strings from Advanced trading and changed a few
of the strings to be more englishy
Removed the ability to buy a backpack into your backpack (You cant do
this anyway)
Fixed a bug where if you had nothing in your backpack it would break the
checkArrayInConfig script so the titlebar would not refresh correctly
Removed slot counts on no backpack and no vehicle (No need for it, just
clutter)
Moved backpack/vehicle checking to z_at_getContainer.sqf

* Last part of tidyness fixes

Last part of tidyness fixes

* Actual backpack fix

Lets actually fix the buying backpack into backpack or backpack when you
already have one.

* Missing from commit

Missing from commit
This commit is contained in:
oiad
2016-07-31 02:03:00 +12:00
committed by ebaydayz
parent 1d2fc3b266
commit 7c4d25ef1a
59 changed files with 536 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SQF/dayz_code/Configs/CfgExtra/snappoints.hpp
View File

@@ -304,10 +304,10 @@ class SnapBuilding {
class MetalFloor_DZ: FloorsWallsStairs{
points[] = {
{0,0,0,"Pivot"},
{0, -2.64, 0.025,"Back"},
{0, 2.64, 0.025,"Front"},
{-2.64, 0, 0.025,"Left"},
{2.64, 0, 0.025,"Right"}
{0, -2.64, 0.166,"Back"},
{0, 2.64, 0.166,"Front"},
{-2.64, 0, 0.166,"Left"},
{2.64, 0, 0.166,"Right"}
};
radius = 12;
};

12
SQF/dayz_code/actions/A_Plot_for_Life/object_removePlotRadius.sqf
View File

@@ -1,19 +1,18 @@
// Remove preview build by RimBlock (http://epochmod.com/forum/index.php?/user/12612-rimblock/)
private ["_location","_object","_objects","_i","_dir","_nearPlotPole","_validMarkers","_findNearestPoles","_poleinv","_IsNearPlot","_plotpole"];
private ["_distance","_plotPole","_findNearestPoles","_validMarkers","_isNearPlot","_poleInv"]
_distance = (DZE_PlotPole select 0) + 5;
// check for near plot
_plotpole = nearestobject [(vehicle player),"Plastic_Pole_EP1_DZ"];
_plotPole = nearestobject [(vehicle player),"Plastic_Pole_EP1_DZ"];
_findNearestPoles = (position _plotpole) nearEntities ["Land_coneLight", _distance];
_validMarkers = [];
_isnearplot = 0;
_isNearPlot = 0;
{
_poleinv = _x getVariable ["inventory",[]];
_poleInv = _x getVariable ["inventory",[]];
if (_poleinv select 0 == "PPMarker") then {
if (_poleInv select 0 == "PPMarker") then {
_validMarkers set [count _validMarkers,_x];
};
} count _findNearestPoles;
@@ -27,4 +26,3 @@ if (_IsNearPlot > 0) then{
deleteVehicle _x;
} count _validMarkers;
};

8
SQF/dayz_code/actions/A_Plot_for_Life/object_showPlotRadius.sqf
View File

@@ -1,11 +1,10 @@
// Build preview adopted from Axe Cop (@vos) Base Destruction Script
// Amended by RimBlock (http://epochmod.com/forum/index.php?/user/12612-rimblock/) to allow plot radius removal.
private ["_location","_object","_i","_dir","_nearPlotPole","_light","_lightlocationtemp","_lightlocation","_lightarray"];
private ["_location","_object","_i","_nearPlotPole","_lightArray","_BD_radius","_BD_center","_color"];
// global vars
_nearPlotPole = nearestObject [player, "Plastic_Pole_EP1_DZ"];
_lightarray = [];
_lightArray = [];
//"privatized" center variable
_BD_radius = DZE_PlotPole select 0;
@@ -21,6 +20,3 @@ for "_i" from 0 to 360 step (450 / _BD_radius) do {
_object setVariable ["Inventory", ["PPMarker"],true];
_object enableSimulation false;
_object setpos _location;
};

1
SQF/dayz_code/actions/A_Plot_for_Life/plot_take_ownership.sqf
View File

@@ -92,5 +92,4 @@ if (_isowner select 0) then {
};
} count _findNearestObjects;
format[localize "STR_EPOCH_APLOTFORLIFE_TAKE_OWNERSHIP",_changecount] call dayz_rollingMessages;
};

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

@@ -1,4 +1,5 @@
private ["_player","_amount","_wealth","_newwealth", "_result"];
_player = _this select 0;
_amount = _this select 1;
_result = false;
@@ -10,4 +11,5 @@ if (_player == player) then {call player_forceSave;};
_player setVariable ["moneychanged",1,true];
_newwealth = _player getVariable[Z_MoneyVariable,0];
if (_newwealth >= _wealth) then { _result = true; };
_result

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

@@ -1,4 +1,5 @@
private ["_player","_amount","_wealth","_newwealth", "_result"];
_player = _this select 0;
_amount = _this select 1;
_result = false;
@@ -18,4 +19,5 @@ if (_player == player) then {call player_forceSave;};
} else {
_result = true;
};
_result

45
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_allowBuying.sqf
View File

@@ -1,7 +1,7 @@
private ["_selection","_return","_toBuyWeaps","_toBuyMags","_toBuyBags","_toolsToBuy","_sidearmToBuy","_primaryToBuy","_currentPrimarys"
,"_currentSec","_currentPrim","_currentTool","_p","_b","_check0","_check1","_check2","_check3","_check4","_mags","_weaps","_bags"
,"_normalBags","_normalMags","_normalWeaps","_allowedMags","_allowedPrimary","_allowedTools","_allowedSidearm","_allowedWeapons","_allowedBackpacks"
,"_totalSpace","_totalNewSpace","_counter","_parentClasses","_alreadyInBackpack","_kinds","_kinds2","_kinds3","_ammmounts","_ammmounts2","_ammmounts3",
,"_totalSpace","_totalNewSpace","_counter","_parentClasses","_alreadyInBackpack","_kinds","_kinds2","_kinds3","_amounts","_amounts2","_amounts3",
"_actualMags","_toolClasses","_duplicate","_quantity","_tool","_totalBagSlots"
];
_selection = Z_SellingFrom;
@@ -82,15 +82,11 @@ if(_selection == 2) then{ //gear
};
if (_allowedBackpacks >= _toBuyBags) then {
_check3 = true;
}else{
systemChat format[localize "STR_EPOCH_TRADE_BAG_FULL",_allowedBackpacks];
};
if(_check1 && _check2 && _check3)then{
_return = true;
if (_check1 && _check2 && _check3) then { _return = true; };
};
};
if (_selection == 1) then { //vehicle
_allowedMags = 0;
_allowedWeapons = 0;
@@ -106,36 +102,35 @@ if(_selection == 1) then{ //vehicle
_normalBags = [];
_kinds = _mags select 0;
_ammmounts = _mags select 1;
_amounts = _mags select 1;
{
_counter = 0 ;
while{ _counter < ( _ammmounts select _forEachIndex)}do{
while {_counter < (_amounts select _forEachIndex)} do {
_normalMags set [count(_normalMags),_x];
_counter = _counter + 1;
};
} forEach _kinds;
_kinds2 = _weaps select 0;
_ammmounts2 = _weaps select 1;
_amounts2 = _weaps select 1;
{
_counter = 0 ;
while{ _counter < ( _ammmounts2 select _forEachIndex)}do{
while {_counter < (_amounts2 select _forEachIndex)} do {
_normalWeaps set [count(_normalWeaps),_x];
_counter = _counter + 1;
};
} forEach _kinds2;
_kinds3 = _bags select 0;
_ammmounts3 = _bags select 1;
_amounts3 = _bags select 1;
{
_counter = 0 ;
while{ _counter < ( _ammmounts3 select _forEachIndex)}do{
while{_counter < (_amounts3 select _forEachIndex)} do {
_normalBags set [count(_normalBags),_x];
_counter = _counter + 1;
};
} forEach _kinds3;
_allowedWeapons = getNumber (configFile >> 'CfgVehicles' >> (typeOf Z_vehicle) >> 'transportMaxWeapons') - count(_normalWeaps);
_allowedMags = getNumber (configFile >> 'CfgVehicles' >> (typeOf Z_vehicle) >> 'transportMaxMagazines') - count(_normalMags);
_allowedBackpacks = getNumber (configFile >> 'CfgVehicles' >> (typeOf Z_vehicle) >> 'transportMaxBackpacks') - count(_normalBags);
@@ -161,10 +156,9 @@ if(_selection == 1) then{ //vehicle
systemChat format[localize "STR_EPOCH_TRADE_VEHICLE_BAGS", _allowedBackpacks];
};
if(_check1 && _check2 && _check3)then{
_return = true;
};
if (_check1 && _check2 && _check3) then { _return = true; };
};
if (_selection == 0) then { //backpack
_allowedWeapons = 0;
_allowedMags = 0;
@@ -185,20 +179,20 @@ if(_selection == 0) then{ //backpack
_normalWeaps = [];
_kinds = _mags select 0;
_ammmounts = _mags select 1;
_amounts = _mags select 1;
{
_counter = 0 ;
while{ _counter < ( _ammmounts select _forEachIndex)} do {
while {_counter < (_amounts select _forEachIndex)} do {
_normalMags set [count(_normalMags), _x];
_counter = _counter + 1;
};
} forEach _kinds;
_kinds2 = _weaps select 0;
_ammmounts2 = _weaps select 1;
_amounts2 = _weaps select 1;
{
_counter = 0 ;
while{ _counter < ( _ammmounts2 select _forEachIndex)} do {
while {_counter < (_amounts2 select _forEachIndex)} do {
_normalWeaps set [count(_normalWeaps), _x];
_counter = _counter + 1;
};
@@ -208,8 +202,6 @@ if(_selection == 0) then{ //backpack
_totalBagSlots = getNumber (configFile >> 'CfgVehicles' >> (typeOf _backpack) >> 'transportMaxMagazines');
_allowedMags = _totalBagSlots - count(_normalMags);
_currentPrim = 0;
_currentSec = 0;
_currentTool = 0;
@@ -227,7 +219,6 @@ if(_selection == 0) then{ //backpack
};
} count _normalWeaps;
_alreadyInBackpack = (10 * _currentPrim) + (5 * _currentSec) + _currentTool + count(_normalMags);
_totalNewSpace = 10 * _primaryToBuy + 5 * _sidearmToBuy + _toolsToBuy + _toBuyMags;
@@ -235,7 +226,7 @@ if(_selection == 0) then{ //backpack
_totalSpace = _alreadyInBackpack + _totalNewSpace;
} else {
systemChat localize "STR_EPOCH_TRADE_NEED_BAG";
systemChat localize "STR_EPOCH_TRADE_NO_BACKPACK";
};
_check1 = false;
@@ -255,8 +246,6 @@ if(_selection == 0) then{ //backpack
};
if (_allowedBackpacks >= _toBuyBags) then {
_check3 = true;
} else {
systemChat format[localize "STR_EPOCH_TRADE_BAG_BAGS", _allowedBackpacks ];
};
if (_totalSpace <= _totalBagSlots) then {
@@ -265,9 +254,7 @@ if(_selection == 0) then{ //backpack
systemChat localize "STR_EPOCH_TRADE_BACKPACK_FULL";
};
if(_check0 && _check1 && _check2 && _check3 && _check4)then{
_return = true;
};
if (_check0 && _check1 && _check2 && _check3 && _check4) then { _return = true; };
};
_return;

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

@@ -1,5 +1,5 @@
private ["_magazinesToBuy", "_weaponsToBuy", "_backpacksToBuy", "_toolsToBuy", "_sidearmToBuy", "_primaryToBuy", "_priceToBuy"
,"_enoughMoney", "_myMoney", "_canBuy", "_moneyInfo","_count","_success","_backpack","_toolClasses","_itemsToLog","_tCost","_bTotal"
,"_enoughMoney", "_myMoney", "_canBuy", "_moneyInfo","_count","_success","_backpack","_toolClasses","_itemsToLog","_tCost","_bTotal","_backpack"
];
if (count Z_BuyingArray < 1) exitWith { systemChat localize "STR_EPOCH_TRADE_BUY_NO_ITEMS"; };
@@ -11,8 +11,9 @@ _toolsToBuy = 0;
_sidearmToBuy = 0;
_primaryToBuy = 0;
_vehiclesToBuy = 0;
_priceToBuy = 0;
_backpack = unitBackpack player;
_toolClasses = [];
_itemsToLog = [[],[],[],"buy"];
@@ -103,6 +104,9 @@ if (Z_SingleCurrency) then {
_enoughMoney = _moneyInfo select 0;
};
if (Z_SellingFrom == 0 && _backpacksToBuy >= 1) exitWith { systemChat localize "STR_EPOCH_TRADE_BAG_BAGS"; }; //backpack
if (Z_SellingFrom == 2 && !isNull _backpack) exitWith { systemChat localize "STR_EPOCH_TRADE_HAVE_BACKPACK"; }; //gear
if (_enoughMoney) then {
if (_canBuy) then {
_bTotal = 0;

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

@@ -1,4 +1,5 @@
private ["_arrayOfTraderCat","_counter","_cat","_cfgtraders","_y","_type","_buy","_sell","_pic","_text","_worth","_buyCurrency","_sellCurrency","_ignore","_categoryNumber"];
call Z_clearBuyList;
Z_BuyableArray = [];
_arrayOfTraderCat = Z_traderData;

18
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_calcPrice.sqf
View File

@@ -3,46 +3,46 @@
*
* Calculate the total price for single currency.
**/
private ["_sellPrice","_ctrltext","_bTotal"];
private ["_sellPrice","_ctrlText","_bTotal"];
#include "defines.hpp"
_bTotal = 0;
_sellPrice = 0;
if (Z_SingleCurrency) then {
_ctrltext = '';
_ctrlText = "";
if (Z_Selling) then {
{
_sellPrice = _sellPrice + (_x select 2);
} count Z_SellArray;
_ctrltext = format["%1 %2", _sellPrice , CurrencyName];
_ctrlText = format["%1 %2", _sellPrice , CurrencyName];
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_RIGHTLISTTITLE) ctrlSetText format ["%1 (%2 items)", localize "STR_EPOCH_TRADE_SELLING", count Z_SellArray];
} else {
{
_sellPrice = _sellPrice + ((_x select 2) * (_x select 9));
_bTotal = _bTotal + (_x select 9);
} count Z_BuyingArray;
_ctrltext = format["%1 %2", _sellPrice , CurrencyName];
_ctrlText = format["%1 %2", _sellPrice , CurrencyName];
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_RIGHTLISTTITLE) ctrlSetText format ["%1 (%2 items)", localize "STR_EPOCH_TRADE_BUYING", _bTotal];
};
ctrlSetText [Z_AT_PRICEDISPLAY, _ctrltext];
ctrlSetText [Z_AT_PRICEDISPLAY, _ctrlText];
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_PRICEINFO) ctrlSetStructuredText parseText '';
} else {
if (Z_Selling) then {
_ctrltext = "";
_ctrlText = "";
{
_sellPrice = _sellPrice + ((_x select 2) * (_x select 11));
} count Z_SellArray;
_ctrltext = _sellPrice call Z_calcDefaultCurrency;
_ctrlText = _sellPrice call Z_calcDefaultCurrency;
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_RIGHTLISTTITLE) ctrlSetText format ["%1 (%2 items)", localize "STR_EPOCH_TRADE_SELLING", count Z_SellArray];
} else {
{
_sellPrice = _sellPrice + ((_x select 2) * (_x select 11) * (_x select 9));
_bTotal = _bTotal + (_x select 9);
} count Z_BuyingArray;
_ctrltext = _sellPrice call Z_calcDefaultCurrency;
_ctrlText = _sellPrice call Z_calcDefaultCurrency;
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_RIGHTLISTTITLE) ctrlSetText format ["%1 (%2 items)", localize "STR_EPOCH_TRADE_BUYING", _bTotal];
};
ctrlSetText [Z_AT_PRICEDISPLAY, ''];
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_PRICEINFO) ctrlSetStructuredText parseText _ctrltext;
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_PRICEINFO) ctrlSetStructuredText parseText _ctrlText;
};

22
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_canAfford.sqf
View File

@@ -1,4 +1,4 @@
private ['_worth', '_total_currency','_return','_part','_totalToPay','_inventoryMoney','_backpackMoney',"_kinds","_kinds2","_kinds3","_ammmounts","_ammmounts2","_ammmounts3"
private ['_worth', '_total_currency','_return','_part','_totalToPay','_inventoryMoney','_backpackMoney',"_kinds","_kinds2","_kinds3","_amounts","_amounts2","_amounts3"
,"_vehicleMoney"];
_totalToPay = _this;
@@ -30,14 +30,14 @@ if( Z_AllowTakingMoneyFromBackpack ) then {
_mags = getMagazineCargo _backpackPlayer;
_backpackMoney = [];
_kinds = _mags select 0;
_ammmounts = _mags select 1;
_amounts = _mags select 1;
{
_part = (configFile >> "CfgMagazines" >> _x);
_worth = (_part >> "worth");
if isNumber (_worth) then {
_total_currency = _total_currency + ( getNumber(_worth) * (_ammmounts select _forEachIndex));
_total_currency = _total_currency + (getNumber(_worth) * (_amounts select _forEachIndex));
_counter = 0 ;
while{_counter < (_ammmounts select _forEachIndex)} do {
while {_counter < (_amounts select _forEachIndex)} do {
_backpackMoney set [count(_backpackMoney),_x];
_counter = _counter + 1;
};
@@ -45,9 +45,9 @@ if( Z_AllowTakingMoneyFromBackpack ) then {
_findGem = DZE_GemList find _x;
if (_findGem >= 0) then {
_worth = DZE_GemWorthList select _findGem;
_total_currency = _total_currency + (_worth * (_ammmounts select _forEachIndex));
_total_currency = _total_currency + (_worth * (_amounts select _forEachIndex));
_counter = 0 ;
while{_counter < (_ammmounts select _forEachIndex)} do {
while {_counter < (_amounts select _forEachIndex)} do {
_backpackMoney set [count(_backpackMoney),_x];
_counter = _counter + 1;
};
@@ -63,14 +63,14 @@ if( Z_AllowTakingMoneyFromVehicle ) then {
_mags = getMagazineCargo Z_vehicle;
_vehicleMoney = [];
_kinds = _mags select 0;
_ammmounts = _mags select 1;
_amounts = _mags select 1;
{
_part = (configFile >> "CfgMagazines" >> _x);
_worth = (_part >> "worth");
if isNumber (_worth) then {
_total_currency = _total_currency + ( getNumber(_worth) * (_ammmounts select _forEachIndex));
_total_currency = _total_currency + (getNumber(_worth) * (_amounts select _forEachIndex));
_counter = 0 ;
while{_counter < ( _ammmounts select _forEachIndex)}do{
while {_counter < (_amounts select _forEachIndex)} do {
_vehicleMoney set [count(_vehicleMoney),_x];
_counter = _counter + 1;
};
@@ -78,9 +78,9 @@ if( Z_AllowTakingMoneyFromVehicle ) then {
_findGem = DZE_GemList find _x;
if (_findGem >= 0) then {
_worth = DZE_GemWorthList select _findGem;
_total_currency = _total_currency + (_worth * (_ammmounts select _forEachIndex));
_total_currency = _total_currency + (_worth * (_amounts select _forEachIndex));
_counter = 0 ;
while{_counter < (_ammmounts select _forEachIndex)} do {
while {_counter < (_amounts select _forEachIndex)} do {
_backpackMoney set [count(_backpackMoney),_x];
_counter = _counter + 1;
};

37
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_checkArrayInConfig.sqf
View File

@@ -8,7 +8,7 @@
*
* Fills up the sell or buy list if the item has a valid config.
**/
private ["_weaps","_mags","_extraText","_all","_total","_arrayOfTraderCat","_totalPrice","_ctrltext","_backUpText","_bags"];
private ["_weaps","_mags","_extraText","_all","_arrayOfTraderCat","_totalPrice","_backUpText","_bags"];
#include "defines.hpp"
_weaps = _this select 0;
@@ -16,13 +16,14 @@ _mags = _this select 1;
_extraText = _this select 2;
_bags = _this select 3;
_vehTrade = false;
if (false call Z_checkCloseVehicle) then {
_all = _weaps + _mags + _bags + [(typeOf Z_vehicle)];
_vehTrade = true;
} else {
_all = _weaps + _mags + _bags;
};
_total = count(_all);
_arrayOfTraderCat = Z_traderData;
_HasKeyCheck = {
_obj = _this select 0;
@@ -44,17 +45,17 @@ _HasKeyCheck = {
_keyFound;
};
_totalPrice = 0;
if(_total > 0)then{
{
_y = _x;
{
private ["_cat","_excists","_pic","_text","_type","_sell","_buy","_buyCurrency","_sellCurrency","_worth"];
private ["_cat","_exists","_pic","_text","_type","_sell","_buy","_buyCurrency","_sellCurrency","_worth"];
_cat = format["Category_%1",(_arrayOfTraderCat select _forEachIndex select 1)];
if (isNumber (missionConfigFile >> "CfgTraderCategory" >> _cat >> "duplicate")) then {
_cat = format["Category_%1",getNumber (missionConfigFile >> "CfgTraderCategory" >> _cat >> "duplicate")];
};
_excists = isClass(missionConfigFile >> "CfgTraderCategory" >> _cat >> _y );
if(_excists)exitWith{
_exists = isClass(missionConfigFile >> "CfgTraderCategory" >> _cat >> _y);
if (_exists) exitWith {
_pic = "";
_text = "";
_type = getText(missionConfigFile >> "CfgTraderCategory" >> _cat >> _y >> "type");
@@ -78,9 +79,7 @@ if(_total > 0)then{
};
};
if( isNil '_text')then{
_text = _y;
};
if (isNil '_text') then { _text = _y; };
_HasKey = true;
if (_vehTrade && {(typeOf Z_vehicle) == _y}) then {
if (!(_type in ["trade_any_bicycle", "trade_any_bicycle_old", "trade_any_vehicle_free"]) && DZE_SaleRequiresKey) then {
@@ -96,9 +95,7 @@ if(_total > 0)then{
_sellCurrency = _sell select 1;
_part = (configFile >> "CfgMagazines" >> _sellCurrency);
_worth = getNumber(_part >> "worth");
if (_worth == 0) then {
_worth = DZE_GemWorthList select (DZE_GemList find _buyCurrency);
};
if (_worth == 0) then { _worth = DZE_GemWorthList select (DZE_GemList find _buyCurrency); };
} else {
_buyCurrency = CurrencyName;
_sellCurrency = CurrencyName;
@@ -114,22 +111,14 @@ if(_total > 0)then{
_backUpText = _extraText;
if(Z_SellingFrom != 2)then{
_extraText = getText (configFile >> 'CfgVehicles' >> _extraText >> 'displayName');
};
if (isNil '_extraText')then{
_extraText = _backUpText;
};
if (Z_SellingFrom != 2) then { _extraText = getText (configFile >> 'CfgVehicles' >> _extraText >> 'displayName'); };
if (isNil '_extraText') then { _extraText = _backUpText; };
if (Z_SingleCurrency) then {
_ctrltext = format[localize "STR_EPOCH_TRADE_OFFER", _totalPrice,CurrencyName];
ctrlSetText [Z_AT_TRADERLINE2, _ctrltext];
ctrlSetText [Z_AT_TRADERLINE2, format[localize "STR_EPOCH_TRADE_OFFER", _totalPrice,CurrencyName]];
} else {
ctrlSetText [Z_AT_TRADERLINE2, ''];
};
_ctrltext = format[localize "STR_EPOCH_TRADE_ACCEPT", count(Z_SellableArray) , _extraText];
ctrlSetText [Z_AT_TRADERLINE1, _ctrltext];
ctrlSetText [Z_AT_TRADERLINE1, format[localize "STR_EPOCH_TRADE_ACCEPT", count(Z_SellableArray) , _extraText]];
call Z_fillSellList;
};

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

@@ -1,4 +1,5 @@
private ["_vehicle","_list","_result","_pos"];
Z_vehicle = objNull;
_vehicle = objNull;
_pos = [player] call FNC_GetPos;
@@ -9,6 +10,7 @@ _list = nearestObjects [_pos, ["Air","LandVehicle","Ship"], Z_VehicleDistance];
};
} count _list;
_result = false;
if (!isNull _vehicle) then {
Z_vehicle = _vehicle;
_result = true;
@@ -21,4 +23,5 @@ if(!isNull _vehicle)then{
};
};
};
_result

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

@@ -4,5 +4,6 @@
* Clears the visual listbox of items you could buy.
**/
#include "defines.hpp"
lbClear Z_AT_BUYABLELIST;
lbSetCurSel [Z_AT_BUYABLELIST,-1]; // clear

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

@@ -3,6 +3,6 @@
*
* Clears the visual listbox of items you were going to buy.
**/
#include "defines.hpp"
lbClear Z_AT_BUYINGLIST;

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

@@ -4,5 +4,6 @@
* Clears the visual listbox of items you were going to sell and could be selled.
**/
#include "defines.hpp"
lbClear Z_AT_SELLABLELIST;
lbClear Z_AT_SELLINGLIST;

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

@@ -4,4 +4,5 @@
* Clears the visual listbox of items you were going to sell.
**/
#include "defines.hpp"
lbClear Z_AT_SELLABLELIST;

5
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayBackpackInfo.sqf
View File

@@ -1,7 +1,4 @@
private ["_item","_picture","_class","_display","_transportMaxWeapons","_transportMaxMagazines","_transportmaxBackpacks","_buyPrice","_sellPrice"
,"_buyCurrency","_sellCurrency","_formattedText","_picBuy","_picSell"
];
private ["_item","_picture","_class","_display","_transportMaxWeapons","_transportMaxMagazines","_transportmaxBackpacks","_buyPrice","_sellPrice","_buyCurrency","_sellCurrency","_formattedText","_picBuy","_picSell"];
#include "defines.hpp"
_item = _this select 0;

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

@@ -1,11 +1,13 @@
private ['_item','_picture','_class','_display','_buyPrice','_sellPrice','_formattedText','_buyCurrency','_sellCurrency','_compatible','_weapon','_attach','_config','_compatibleText','_type','_text'];
#include "defines.hpp"
_item = _this select 0;
_picture = _item select 4;
_class = _item select 0;
_display = _item select 3;
_buyPrice = 0;
_sellPrice = 0;
if (Z_Selling) then {
_buyPrice = _item select 6;
_buyCurrency = _item select 8;

4
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayVehicleInfo.sqf
View File

@@ -1,7 +1,6 @@
private ['_item', '_type','_picture',"_class","_display","_transportMaxWeapons","_transportMaxMagazines","_transportmaxBackpacks"
,"_buyPrice","_sellPrice","_buyCurrency","_sellCurrency","_formattedText","_fuelCapacity","_maxSpeed","_armor","_seats","_weapons",
"_weapons2","_config","_wepText","_turret","_text"
];
"_weapons2","_config","_wepText","_turret","_text"];
#include "defines.hpp"
@@ -129,7 +128,6 @@ if (Z_SingleCurrency) then {
, _picture, _display, _class, _transportmaxBackpacks, _sellPrice, _buyPrice, CurrencyName, _transportMaxWeapons,_transportMaxMagazines, localize "STR_EPOCH_NAME", localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", localize "STR_EPOCH_PLAYER_291", localize "STR_EPOCH_MAGS", localize "STR_EPOCH_WEPS", localize "STR_EPOCH_BAGS",
localize "STR_EPOCH_ARMOR",_armor,localize "STR_EPOCH_FUEL",_fuelCapacity,localize "STR_EPOCH_MAX",localize "STR_EPOCH_SPEED",_maxSpeed,localize "STR_EPOCH_SEATS",_seats,localize "STR_EPOCH_WEAPONS",_wepText
];
} else {
_picSell = getText (configFile >> 'CfgMagazines' >> _sellCurrency >> 'picture');
_sellCurrency = getText (configFile >> 'CfgMagazines' >> _sellCurrency >> 'displayName');

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

@@ -1,4 +1,6 @@
private "_index";
#include "defines.hpp"
{
_index = lbAdd [Z_AT_BUYABLELIST, _x select 3];
lbSetPicture [Z_AT_BUYABLELIST, _index, _x select 4 ];

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

@@ -1,4 +1,6 @@
private "_index";
#include "defines.hpp"
{
_index = lbAdd [Z_AT_BUYINGLIST, _x select 3];
lbSetPicture [Z_AT_BUYINGLIST, _index, _x select 4];

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

@@ -1,5 +1,6 @@
private "_index";
#include "defines.hpp"
call Z_clearBuyList;
{

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

@@ -3,7 +3,9 @@
*
* Visualy fills in the listbox of items that can be sold.
**/
private "_index";
#include "defines.hpp"
{
_index = lbAdd [Z_AT_SELLABLELIST, _x select 3];
lbSetPicture [Z_AT_SELLABLELIST, _index, _x select 4 ];

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

@@ -3,7 +3,9 @@
*
* Visualy fills in the listbox of items currently being sold.
**/
private "_index";
#include "defines.hpp"
{
_index = lbAdd [Z_AT_SELLINGLIST, _x select 3];
lbSetPicture [Z_AT_SELLINGLIST, _index, _x select 4];

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

@@ -5,6 +5,8 @@
*
* Changes the indication of where you are selling/buying from in the trade window.
**/
private "_text";
#include "defines.hpp"
_text = _this select 0;
ctrlSetText [Z_AT_CONTAINERINDICATOR, _text];

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

@@ -5,6 +5,7 @@
*
* Filters the buyable or sellable list on your input.
**/
private ["_query","_newSellArray","_newBuyArray"];
if (count _this > 0) then {
_query = _this select 0; // the search string.

18
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_getBackpackItems.sqf
View File

@@ -3,12 +3,14 @@
*
* Gets all your items stored in your backpack and innitiates the selling list.
**/
private ["_backpack","_pic","_formattedText","_mags","_weaps","_normalMags","_normalWeaps","_kinds","_kinds2","_amounts","_amounts2"];
#include "defines.hpp"
private ["_backpack","_pic","_formattedText","_mags","_weaps","_normalMags","_normalWeaps","_kinds","_kinds2","_ammmounts","_ammmounts2","_ctrltext"];
call Z_clearLists;
Z_SellableArray = [];
Z_SellArray = [];
_backpack = unitBackpack player;
if (!isNull _backpack) then {
_pic = getText (configFile >> 'CfgVehicles' >> (typeOf _backpack) >> 'picture');
@@ -24,30 +26,24 @@ if (!isNull _backpack) then {
_normalMags = [];
_normalWeaps = [];
_kinds = _mags select 0;
_ammmounts = _mags select 1;
_amounts = _mags select 1;
{
_counter = 0 ;
while{ _counter < ( _ammmounts select _forEachIndex)}do{
while {_counter < (_amounts select _forEachIndex)} do {
_normalMags set [count(_normalMags),_x];
_counter = _counter + 1;
};
} forEach _kinds;
_kinds2 = _weaps select 0;
_ammmounts2 = _weaps select 1;
_amounts2 = _weaps select 1;
{
_counter = 0 ;
while{ _counter < ( _ammmounts2 select _forEachIndex)}do{
while {_counter < (_amounts2 select _forEachIndex)} do {
_normalWeaps set [count(_normalWeaps),_x];
_counter = _counter + 1;
};
} forEach _kinds2;
[_normalMags,_normalWeaps, typeOf _backpack,[]] call Z_checkArrayInConfig;
}else{
_ctrltext = localize "STR_EPOCH_TRADE_STUPID";
ctrlSetText [Z_AT_TRADERLINE2, _ctrltext];
_ctrltext = localize "STR_EPOCH_TRADE_NO_BACKPACK";
ctrlSetText [Z_AT_TRADERLINE1, _ctrltext];
};

31
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_getContainer.sqf
View File

@@ -1,11 +1,11 @@
/**
* call Z_getContainer
*
* Switches between selling and buying and the item container (gear/vehicle/bakcpack) and initiates item loading.
* Switches between selling and buying and the item container (gear/vehicle/backpack) and initiates item loading.
**/
private ["_lbIndex","_canBuyInVehicle"];
private ["_lbIndex","_canBuyInVehicle","_backpack"];
#include "defines.hpp"
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_SLOTSDISPLAY) ctrlSetText format["0 / 0 / 0"];
if (Z_Selling) then {
call Z_clearBuyingList;
Z_BuyingArray = [];
@@ -15,6 +15,7 @@ Z_SellableArray = [];
Z_SellArray = [];
_lbIndex = _this select 0;
_backpack = unitBackpack player;
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_ITEMINFO) ctrlSetStructuredText parseText "";
@@ -23,14 +24,25 @@ call Z_calcPrice;
if (Z_Selling) then {
switch (_lbIndex) do {
case 0: {
if (!isNull _backpack) then {
[localize "STR_EPOCH_TRADE_SELLING_BACKPACK"] call Z_filleTradeTitle;
Z_SellingFrom = 0;
call Z_getBackpackItems;
} else {
ctrlSetText [Z_AT_TRADERLINE1, localize "STR_EPOCH_TRADE_NO_BACKPACK"];
ctrlSetText [Z_AT_SLOTSDISPLAY, " "];
};
};
case 1: {
_canBuyInVehicle = true call Z_checkCloseVehicle;
if (_canBuyInVehicle) then {
[localize "STR_EPOCH_TRADE_SELLING_VEHICLE"] call Z_filleTradeTitle;
Z_SellingFrom = 1;
call Z_getVehicleItems;
} else {
ctrlSetText [Z_AT_TRADERLINE1, localize "STR_EPOCH_PLAYER_245"];
ctrlSetText [Z_AT_SLOTSDISPLAY, " "];
};
};
case 2: {
[localize "STR_EPOCH_TRADE_SELLING_GEAR"] call Z_filleTradeTitle;
@@ -43,19 +55,24 @@ if(Z_Selling)then{
ctrlSetText [Z_AT_TRADERLINE1, localize "STR_EPOCH_TRADE_SELLING_ALL"];
switch (_lbIndex) do {
case 0: {
if (!isNull _backpack) then {
Z_SellingFrom = 0;
[localize "STR_EPOCH_TRADE_BUYING_BACKPACK"] call Z_filleTradeTitle;
[0] call Z_calculateFreeSpace;
} else {
ctrlSetText [Z_AT_TRADERLINE1, localize "STR_EPOCH_TRADE_NO_BACKPACK"];
ctrlSetText [Z_AT_SLOTSDISPLAY, " "];
};
};
case 1: {
Z_SellingFrom = 1;
[localize "STR_EPOCH_TRADE_BUYING_VEHICLE"] call Z_filleTradeTitle;
_canBuyInVehicle = true call Z_checkCloseVehicle;
if (_canBuyInVehicle) then {
Z_SellingFrom = 1;
[localize "STR_EPOCH_TRADE_BUYING_VEHICLE"] call Z_filleTradeTitle;
[1] call Z_calculateFreeSpace;
} else {
systemChat localize "STR_EPOCH_PLAYER_245";
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_SLOTSDISPLAY) ctrlSetText format["%1 / %2 / %3",0,0,0];
ctrlSetText [Z_AT_TRADERLINE1, localize "STR_EPOCH_PLAYER_245"];
ctrlSetText [Z_AT_SLOTSDISPLAY, " "];
};
};
case 2: {

7
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_getGearItems.sqf
View File

@@ -1,10 +1,11 @@
/**
* call Z_getBackpackItems
* call Z_getGearItems
*
* Gets all your items stored in your gear and innitiates the selling list.
**/
private ["_mags","_weaps","_skin","_formattedText","_bag","_bags"];
private ["_mags","_weaps","_skin","_formattedText","_bag","_bags","_pic"];
#include "defines.hpp"
call Z_clearLists;
Z_SellArray = [];
Z_SellableArray = [];
@@ -23,4 +24,4 @@ _formattedText = format [
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_CONTAINERINFO) ctrlSetStructuredText parseText _formattedText;
[_weaps,_mags,localize "STR_EPOCH_YOUR_GEAR",_bags] call Z_checkArrayInConfig;
[_weaps,_mags,toLower (localize "STR_UI_GEAR"),_bags] call Z_checkArrayInConfig;

4
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_getItemConfig.sqf
View File

@@ -1,6 +1,6 @@
#include "defines.hpp"
private ['_item', '_type'];
#include "defines.hpp"
_item = _this select 0;
_type = _item select 1;

22
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_getVehicleItems.sqf
View File

@@ -1,9 +1,11 @@
/**
* call Z_getBackpackItems
* call Z_getVehicleItems
*
* Gets all your items stored in your vehicle and innitiates the selling list.
**/
private ["_vehicle","_pos","_list","_formattedText","_pic","_mags","_weaps","_bags","_normalMags","_normalWeaps","_normalBags","_kinds","_amounts","_counter","_kinds2","_amounts2"];
#include "defines.hpp"
Z_vehicle = objNull;
call Z_clearLists;
Z_SellableArray = [];
@@ -38,20 +40,20 @@ if (!isNull _vehicle) then {
_normalBags = [];
_kinds = _mags select 0;
_ammmounts = _mags select 1;
_amounts = _mags select 1;
{
_counter = 0 ;
while{ _counter < ( _ammmounts select _forEachIndex)}do{
while {_counter < (_amounts select _forEachIndex)} do {
_normalMags set [count(_normalMags),_x];
_counter = _counter + 1;
};
} forEach _kinds;
_kinds2 = _weaps select 0;
_ammmounts2 = _weaps select 1;
_amounts2 = _weaps select 1;
{
_counter = 0 ;
while{ _counter < ( _ammmounts2 select _forEachIndex)}do{
while {_counter < (_amounts2 select _forEachIndex)} do {
_normalWeaps set [count(_normalWeaps),_x];
_counter = _counter + 1;
};
@@ -60,10 +62,10 @@ if (!isNull _vehicle) then {
// Can't sell backpacks from vehicle because there is currently no command to remove single backpacks from cargo (only clearBackpackCargo which removes all)
/*
_kinds3 = _bags select 0;
_ammmounts3 = _bags select 1;
_amounts3 = _bags select 1;
{
_counter = 0 ;
while{ _counter < ( _ammmounts3 select _forEachIndex)}do{
while {_counter < (_amounts3 select _forEachIndex)} do {
_normalBags set [count(_normalBags),_x];
_counter = _counter + 1;
};
@@ -71,10 +73,4 @@ if (!isNull _vehicle) then {
*/
[_normalWeaps,_normalMags, typeOf _vehicle,_normalBags] call Z_checkArrayInConfig;
}else{
_ctrltext = localize "STR_EPOCH_PLAYER_245";
ctrlSetText [Z_AT_TRADERLINE2, _ctrltext];
_ctrltext = localize "STR_EPOCH_TRADE_NO_VEHICLE";
ctrlSetText [Z_AT_TRADERLINE1, _ctrltext];
};

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

@@ -1,7 +1,7 @@
private ["_Z_logTrade","_classNames","_className","_amounts","_amount","_prices","_price","_quantity","_queueAmounts","_queueNames","_queuePrices","_index","_buyOrSell"];
_Z_logTrade = {
private ["_buyOrSell","_className","_container","_currency","_price","_quantity"];
private ["_buyOrSell","_className","_container","_currency","_price","_quantity","_tCost"];
_className = _this select 0;
_quantity = _this select 1;
@@ -12,7 +12,7 @@ _Z_logTrade = {
case 1 : {localize "STR_EPOCH_TRADE_VEHICLE"};
case 2 : {localize "STR_UI_GEAR"};
};
_tcost = _price call Z_calcDefaultCurrencyNoImg;
_tCost = _price call Z_calcDefaultCurrencyNoImg;
_currency = if (Z_SingleCurrency) then {"Coins"} else {""};
// Log to client RPT
@@ -24,9 +24,9 @@ _Z_logTrade = {
};
} else {
if (_buyOrSell == "buy") then {
diag_log format["%5: Bought %4 x %1 into %7 at %2 for %3",_className,inTraderCity,_tcost,_quantity,localize "STR_EPOCH_PLAYER_289",_currency,_container];
diag_log format["%5: Bought %4 x %1 into %7 at %2 for %3",_className,inTraderCity,_tCost,_quantity,localize "STR_EPOCH_PLAYER_289",_currency,_container];
} else {
diag_log format["%5: Sold %4 x %1 from %7 at %2 for %3",_className,inTraderCity,_tcost,_quantity,localize "STR_EPOCH_PLAYER_289",_currency,_container];
diag_log format["%5: Sold %4 x %1 from %7 at %2 for %3",_className,inTraderCity,_tCost,_quantity,localize "STR_EPOCH_PLAYER_289",_currency,_container];
};
};
@@ -40,9 +40,9 @@ _Z_logTrade = {
};
} else {
if (_buyOrSell == "buy") then {
PVDZE_obj_Trade = [player,0,0,_className,inTraderCity,_currency,_tcost,_quantity,_container,false];
PVDZE_obj_Trade = [player,0,0,_className,inTraderCity,_currency,_tCost,_quantity,_container,false];
} else {
PVDZE_obj_Trade = [player,0,1,_className,inTraderCity,_currency,_tcost,_quantity,_container,false];
PVDZE_obj_Trade = [player,0,1,_className,inTraderCity,_currency,_tCost,_quantity,_container,false];
};
};
publicVariableServer "PVDZE_obj_Trade";

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

@@ -1,4 +1,6 @@
private ["_index","_temp","_index2"];
#include "defines.hpp"
_index = _this select 0;
if (!isNil"_index" && _index > -1) then {
lbDelete [Z_AT_SELLABLELIST, _index];

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

@@ -1,4 +1,6 @@
private "_index";
#include "defines.hpp"
_index = _this select 0;
if (!isNil"_index" && _index > -1) then {
lbDelete [Z_AT_BUYINGLIST, _index];

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

@@ -1,4 +1,6 @@
private ["_index","_temp","_index2"];
#include "defines.hpp"
_index = _this select 0;
if (!isNil"_index" && _index > -1) then {
lbDelete [Z_AT_SELLINGLIST, _index];

6
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_sellItems.sqf
View File

@@ -56,10 +56,12 @@ _sellVehicle = {
if (_okToSell) then {
_returnInfo = [_objectCharacterId, _obj, _objectID, _objectUID, _sellType];
} else {
systemChat format[localize "str_epoch_player_182",typeOf _obj]; _returnInfo = [];
systemChat format[localize "str_epoch_player_182",typeOf _obj];
_returnInfo = [];
};
} else {
systemChat localize "str_epoch_player_245"; _returnInfo = [];
systemChat localize "str_epoch_player_245";
_returnInfo = [];
};
};
_returnInfo;

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

@@ -1,6 +1,6 @@
private ["_amount","_index","_index2","_temp"];
#include "defines.hpp"
_index = _this select 0;
_amount = parseNumber(_this select 1);
if (!isNil"_index" && _index > -1 && (typeName _amount == "SCALAR") && _amount > 0) then {

1
SQF/dayz_code/actions/AdvancedTrading/init.sqf
View File

@@ -34,7 +34,6 @@ if(isNil "Z_AdvancedTradingInit")then{
DZE_GemWorthList set [(count DZE_GemWorthList), _largest];
};
Z_Selling = true;
Z_SellingFrom = 2;
Z_vehicle = objNull;

3
SQF/dayz_code/actions/doorManagement/doorAddFriend.sqf
View File

@@ -1,4 +1,5 @@
private ["_pos","_plots","_inList"];
private ["_pos","_plots","_inList","_friends","_toAdd"];
_pos = _this select 0;
if (_pos < 0) exitWith {};
_toAdd = (Humans select _pos);

3
SQF/dayz_code/actions/doorManagement/doorGetFriends.sqf
View File

@@ -1,4 +1,5 @@
private ["_plots","_friendlies","_thePlot"];
private ["_friends"];
lbClear 7102;
_friends = TheDoor getVariable ["doorfriends",[]];
{

3
SQF/dayz_code/actions/doorManagement/doorNearbyHumans.sqf
View File

@@ -1,4 +1,5 @@
private ["_close"];
private ["_closePeople","_friendUID","_friendName"];
lbClear 7101;
_closePeople = player nearEntities ["CAManBase", 10];
if (!DZE_doorManagementMustBeClose) then {_closePeople = playableUnits};

3
SQF/dayz_code/actions/doorManagement/doorRemoveFriend.sqf
View File

@@ -1,4 +1,5 @@
private ["_list","_plots","_thePlot","_friends"];
private ["_pos","_friends","_toRemove","_newList"];
_pos = _this select 0;
if (_pos < 0) exitWith {};
_friends = TheDoor getVariable ["doorfriends", []];

19
SQF/dayz_code/actions/doorManagement/initDoorManagement.sqf
View File

@@ -1,4 +1,6 @@
private ["_display","isOwner"];
disableSerialization;
if (count(_this) > 0) then
{
TheDoor = _this select 3;
@@ -11,14 +13,14 @@ _display = findDisplay 61144;
_display closeDisplay 3000;
// Check player access
_isowner = [player, TheDoor] call FNC_check_access;
if( ((_isowner select 0) && DZE_doorManagementAllowManage_owner) // door owner
|| ((_isowner select 1) && DZE_doorManagementAllowManage_ownerFriendlies) // door owner's friendly tagged
|| ((_isowner select 2) && DZE_doorManagementAllowManage_plotOwner) // plot owner
|| ((_isowner select 3) && DZE_doorManagementAllowManage_plotFriends) // plot friends
|| ((_isowner select 4) && DZE_doorManagementAllowManage_plotAdmins) // plot management admins
|| ((_isowner select 5) && DZE_doorManagementAllowManage_doorFriends) // door friends
|| ((_isowner select 6) && DZE_doorManagementAllowManage_doorAdmins) // door management admins
_isOwner = [player, TheDoor] call FNC_check_access;
if( ((_isOwner select 0) && DZE_doorManagementAllowManage_owner) // door owner
|| ((_isOwner select 1) && DZE_doorManagementAllowManage_ownerFriendlies) // door owner's friendly tagged
|| ((_isOwner select 2) && DZE_doorManagementAllowManage_plotOwner) // plot owner
|| ((_isOwner select 3) && DZE_doorManagementAllowManage_plotFriends) // plot friends
|| ((_isOwner select 4) && DZE_doorManagementAllowManage_plotAdmins) // plot management admins
|| ((_isOwner select 5) && DZE_doorManagementAllowManage_doorFriends) // door friends
|| ((_isOwner select 6) && DZE_doorManagementAllowManage_doorAdmins) // door management admins
) then {
createDialog "DoorManagement";
call DoorNearbyHumans;
@@ -26,4 +28,3 @@ if( ((_isowner select 0) && DZE_doorManagementAllowManage_owner) // door owner
} else {
localize "STR_EPOCH_DOORMANAGEMENT_NORIGHTS" call dayz_rollingMessages;
};

1
SQF/dayz_code/actions/doorManagement/player_enterCode.sqf
View File

@@ -1,3 +1,4 @@
private "_display";
// Close DoorAccess
_display = findDisplay 61144;

4
SQF/dayz_code/actions/plotManagement/plotAddFriend.sqf
View File

@@ -1,4 +1,5 @@
private ["_pos","_plots","_thePlot","_inList"];
private ["_pos","_plots","_thePlot","_inList","_toAdd","_friends"];
_pos = _this select 0;
if (_pos < 0) exitWith {};
_toAdd = (Humans select _pos);
@@ -18,6 +19,5 @@ if (isServer) then {
publicVariableServer "PVDZ_veh_Save";
};
call PlotGetFriends;
call PlotNearbyHumans;

1
SQF/dayz_code/actions/plotManagement/plotGetFriends.sqf
View File

@@ -1,4 +1,5 @@
private ["_plots","_friendlies","_thePlot"];
lbClear 7002;
_plots = nearestObjects [[player] call FNC_getPos, ["Plastic_Pole_EP1_DZ"],15];
_thePlot = _plots select 0;

1
SQF/dayz_code/actions/plotManagement/plotNearbyHumans.sqf
View File

@@ -1,4 +1,5 @@
private ["_closePeople","_friendUID","_friendName"];
lbClear 7001;
if (!DZE_plotManagementMustBeClose) then {_closePeople = playableUnits;} else {_closePeople = player nearEntities ["CAManBase", 10];};
Humans = [];

2
SQF/dayz_code/actions/plotManagement/plotObjects.sqf
View File

@@ -1,4 +1,4 @@
private ["_newWealth","_missing","_missingQty","_proceed","_itemIn","_countIn","_target","_objectClasses","_range","_objects","_requirements","_count","_cost","_option","_buildables"];
private ["_range","_buildables","_count","_colour","_result","_ctrl"];
disableSerialization;
_range = DZE_PlotPole select 0;

1
SQF/dayz_code/actions/plotManagement/plotRemoveFriend.sqf
View File

@@ -1,4 +1,5 @@
private ["_pos","_plots","_thePlot","_friends","_toRemove","_newList"];
_pos = _this select 0;
if (_pos < 0) exitWith {};
_plots = nearestObjects [[player] call FNC_getPos, ["Plastic_Pole_EP1_DZ"],15];

2
SQF/dayz_code/configVariables.sqf
View File

@@ -51,7 +51,7 @@ DZE_GodModeBaseExclude = []; //Array of object class names excluded from the god
DZE_advancedTrading = true; //Use advanced trading system. WARNING: set to false if you use database traders, you should use config-traders anyway!
DZE_serverLogTrades = true; // Log trades to server RPT (sent with publicVariableServer on every trade)
DZE_GemWorthArray = [["ItemTopaz",15000], ["ItemObsidian",20000], ["ItemSapphire",25000], ["ItemAmethyst",30000], ["ItemEmerald",35000], ["ItemCitrine",40000], ["ItemRuby",45000]]; //array of gem prices, works only in advanced trading
DZE_SaleRequiresKey = false; //Require the player has the key for a vehicle in oreder to sell it. The key can be in the player's toolbelt or backpack, or the vehicle's inventory. False by default
DZE_SaleRequiresKey = false; //Require the player has the key for a vehicle in order to sell it. The key can be in the player's toolbelt or backpack, or the vehicle's inventory. False by default
Z_AT_FolderLocation = '\z\addons\dayz_code\actions\AdvancedTrading';
Z_VehicleDistance = 40; // Distance that a vehicle needs to be to see it's content or to sell it.
Z_SingleCurrency = false; // Does your server use a single currency system.

83
SQF/dayz_code/stringtable.xml
View File

@@ -13162,7 +13162,7 @@
<Czech>Vytvořit Dřevěnou ohradu</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_245">
<English>Failed, you must get into drivers seat first.</English>
<English>You must get into the drivers seat of a vehicle first.</English>
<German>Fehlgeschlagen, Sie müssen zuerst auf den Fahrersitz.</German>
<Russian>Вы должны попасть на сиденье водителя хотя бы раз.</Russian>
<!-- <Spanish></Spanish> -->
@@ -16062,28 +16062,28 @@
<Czech>Prodejní</Czech>
</Key>
<Key ID="STR_EPOCH_TRADE_SELLING_GEAR">
<English>Selling from gear.</English>
<English>Selling from your gear.</English>
<German>Verkauf aus meiner Ausrüstung.</German>
<Russian>Продажа из снаряжения.</Russian>
<Spanish>Selling from gear.</Spanish>
<French>Selling from gear.</French>
<Czech>Selling from gear.</Czech>
<Spanish>Selling from your gear.</Spanish>
<French>Selling from your gear.</French>
<Czech>Selling from your gear.</Czech>
</Key>
<Key ID="STR_EPOCH_TRADE_SELLING_VEHICLE">
<English>Selling from vehicle.</English>
<English>Selling from your vehicle.</English>
<German>Verkauf aus dem Fahrzeug.</German>
<Russian>Продажа из транспорта.</Russian>
<Spanish>Selling from vehicle.</Spanish>
<French>Selling from vehicle.</French>
<Czech>Selling from vehicle.</Czech>
<Spanish>Selling from your vehicle.</Spanish>
<French>Selling from your vehicle.</French>
<Czech>Selling from your vehicle.</Czech>
</Key>
<Key ID="STR_EPOCH_TRADE_SELLING_BACKPACK">
<English>Selling from backpack.</English>
<English>Selling from your backpack.</English>
<German>Verkauf aus dem Rucksack.</German>
<Russian>Продажа из рюкзака.</Russian>
<Spanish>Selling from backpack.</Spanish>
<French>Selling from backpack.</French>
<Czech>Selling from backpack.</Czech>
<Spanish>Selling from your backpack.</Spanish>
<French>Selling from your backpack.</French>
<Czech>Selling from your backpack.</Czech>
</Key>
<Key ID="STR_EPOCH_TRADE_SELLING_ALL">
<English>These are all the items I'm selling.</English>
@@ -16094,28 +16094,28 @@
<Czech>These are all the items I'm selling.</Czech>
</Key>
<Key ID="STR_EPOCH_TRADE_BUYING_VEHICLE">
<English>Buying in vehicle.</English>
<English>Buying into your vehicle.</English>
<German>Kauf ins Fahrzeug.</German>
<Russian>Покупка в транспорт.</Russian>
<Spanish>Buying in vehicle.</Spanish>
<French>Buying in vehicle.</French>
<Czech>Buying in vehicle.</Czech>
<Spanish>Buying into your vehicle.</Spanish>
<French>Buying into your vehicle.</French>
<Czech>Buying into your vehicle.</Czech>
</Key>
<Key ID="STR_EPOCH_TRADE_BUYING_BACKPACK">
<English>Buying in backpack.</English>
<English>Buying into your backpack.</English>
<German>Kauf in den Rucksack.</German>
<Russian>Покупка в рюкзак.</Russian>
<Spanish>Buying in backpack.</Spanish>
<French>Buying in backpack.</French>
<Czech>Buying in backpack.</Czech>
<Spanish>Buying into your backpack.</Spanish>
<French>Buying into your backpack.</French>
<Czech>Buying into your backpack.</Czech>
</Key>
<Key ID="STR_EPOCH_TRADE_BUYING_GEAR">
<English>Buying in gear.</English>
<English>Buying into your gear.</English>
<German>Kauf in meine Ausrüstung.</German>
<Russian>Покупка в снаряжение.</Russian>
<Spanish>Buying in gear.</Spanish>
<French>Buying in gear.</French>
<Czech>Buying in gear.</Czech>
<Spanish>Buying into your gear.</Spanish>
<French>Buying into your gear.</French>
<Czech>Buying into your gear.</Czech>
</Key>
<Key ID="STR_EPOCH_TRADE_NOTHING">
<English>Nothing</English>
@@ -16147,18 +16147,6 @@
<French>Détails</French>
<Czech>Podrobnosti</Czech>
</Key>
<Key ID="STR_EPOCH_TRADE_STUPID">
<English>I'm not stupid.</English>
<German>Ich bin doch nicht blöd.</German>
<Russian>Я не глупый.</Russian>
<Spanish>I'm not stupid.</Spanish>
<French>I'm not stupid.</French>
<Czech>I'm not stupid.</Czech>
</Key>
<Key ID="STR_EPOCH_TRADE_NO_VEHICLE">
<English>I do not see any vehicle.</English>
<Russian>Я не вижу вашего транспорта.</Russian>
</Key>
<Key ID="STR_EPOCH_TRADE_NO_BACKPACK">
<English>You are not wearing a backpack.</English>
<German>Du hast keinen Rucksack.</German>
@@ -16167,6 +16155,9 @@
<French>You are not wearing a backpack.</French>
<Czech>You are not wearing a backpack.</Czech>
</Key>
<Key ID="STR_EPOCH_TRADE_HAVE_BACKPACK">
<English>You already have a backpack.</English>
</Key>
<Key ID="STR_EPOCH_TRADE_OFFER">
<English>I would offer %1 %2.</English>
<German>Ich biete %1 %2.</German>
@@ -16176,7 +16167,7 @@
<Czech>I would offer %1 %2.</Czech>
</Key>
<Key ID="STR_EPOCH_TRADE_ACCEPT">
<English>I accept %1 items from %2.</English>
<English>I accept %1 items from your %2.</English>
<German>Ich nehme %1 aus %2.</German>
<Russian>Я беру: %1 шт. из %2.</Russian>
<Spanish>I accept %1 items from %2.</Spanish>
@@ -16192,17 +16183,13 @@
<Russian>Вы можете купить только один транспорт за сделку.</Russian>
</Key>
<Key ID="STR_EPOCH_TRADE_GEAR_FULL">
<English>You can only buy %1 primary, %2 sidearm and %3 tools in your gear.</English>
<English>You can only buy %1 primary, %2 sidearm and %3 tools into your gear.</English>
<Russian>Вы можете купить в снаряжение: оружия-%1, пистолетов-%2, инструментов-%3.</Russian>
</Key>
<Key ID="STR_EPOCH_TRADE_MAGS_FULL">
<English>You can only buy %1 magazines into your gear.</English>
<Russian>Вы можете купить предметов в снаряжение: %1.</Russian>
</Key>
<Key ID="STR_EPOCH_TRADE_BAG_FULL">
<English>You can only buy %1 backpacks into your gear.</English>
<Russian>Вы можете купить рюкзаков в снаряжение: %1.</Russian>
</Key>
<Key ID="STR_EPOCH_TRADE_VEHICLE_WEPS">
<English>You can only buy %1 weapons into your vehicle.</English>
<Russian>Вы можете купить оружия в ваш автомобиль: %1.</Russian>
@@ -16215,10 +16202,6 @@
<English>You can only buy %1 backpacks into your vehicle.</English>
<Russian>Вы можете купить рюкзаков в ваш транспорт: %1.</Russian>
</Key>
<Key ID="STR_EPOCH_TRADE_NEED_BAG">
<English>You need a backpack.</English>
<Russian>Вам нужен рюкзак.</Russian>
</Key>
<Key ID="STR_EPOCH_TRADE_BACKPACK_FULL">
<English>Total backpack space exceeded.</English>
</Key>
@@ -16231,7 +16214,7 @@
<Russian>В рюкзак поместится предметов: %1.</Russian>
</Key>
<Key ID="STR_EPOCH_TRADE_BAG_BAGS">
<English>Only %1 bags will fit into your backpack.</English>
<English>You can't purchase a backpack into your backpack.</English>
<Russian>В рюкзак поместится рюкзаков: %1.</Russian>
</Key>
<Key ID="STR_EPOCH_TRADE_BUY_IN_BACKPACK">
@@ -16407,10 +16390,6 @@
<French>Des places</French>
<Czech>Sedadla</Czech>
</Key>
<Key ID="STR_EPOCH_YOUR_GEAR">
<English>your gear</English>
<Russian>вашего снаряжения</Russian>
</Key>
<Key ID="STR_EPOCH_METALFLOOR">
<English>Metal Floor</English>
<German>Metal Floor</German>