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

Consolidate duplicate sell distance variables

Browse Source
This commit is contained in:
ebaydayz
2016-09-12 14:14:38 -04:00
parent 2bb5c5942c
commit 29c16dc59f
10 changed files with 20 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Documents/1.0.6 Variable Name Changes.txt
View File

@@ -18,6 +18,7 @@
- dayz_combat --> no longer exists use (player getVariable["combattimeout",0] >= diag_tickTime) - dayz_combat --> no longer exists use (player getVariable["combattimeout",0] >= diag_tickTime)
- dayz_fullMoonNights --> dayz_ForcefullmoonNights - dayz_fullMoonNights --> dayz_ForcefullmoonNights
- dayz_MapArea --> no longer exists (was only used for DynamicVehicleArea and HeliCrashArea) - dayz_MapArea --> no longer exists (was only used for DynamicVehicleArea and HeliCrashArea)
- dayz_sellDistance_vehicle, dayz_sellDistance_boat, dayz_sellDistance_air --> Z_VehicleDistance
- dayz_updateObjects --> DayZ_GearedObjects - dayz_updateObjects --> DayZ_GearedObjects
- DynamicVehicleArea --> (getMarkerSize "center") select 1 - DynamicVehicleArea --> (getMarkerSize "center") select 1
- DZE_ActionInProgress --> dayz_actionInProgress - DZE_ActionInProgress --> dayz_actionInProgress

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

@@ -64,15 +64,7 @@ if (_finished) then {
_canAfford = false; _canAfford = false;
if(_bos == 1) then { if(_bos == 1) then {
_count = {(typeOf _x) == _part_in} count (nearestObjects [(getPosATL player), [_part_in], Z_VehicleDistance]);
_distance = dayz_sellDistance_vehicle;
if (_part_in isKindOf "Air") then {
_distance = dayz_sellDistance_air;
};
if (_part_in isKindOf "Ship") then {
_distance = dayz_sellDistance_boat;
};
_count = {(typeOf _x) == _part_in} count (nearestObjects [(getPosATL player), [_part_in], _distance]);
if (_count >= _qty_in) then { if (_count >= _qty_in) then {
_canAfford = true; _canAfford = true;
}; };
@@ -142,17 +134,8 @@ if (_finished) then {
format[localize "str_epoch_player_183",_textPartOut] call dayz_rollingMessages; format[localize "str_epoch_player_183",_textPartOut] call dayz_rollingMessages;
}; };
} else { } else {
//sell //sell
_distance = dayz_sellDistance_vehicle; _objects = nearestObjects [(getPosATL player), [_part_in], Z_VehicleDistance];
if (_part_in isKindOf "Air") then {
_distance = dayz_sellDistance_air;
};
if (_part_in isKindOf "Ship") then {
_distance = dayz_sellDistance_boat;
};
_objects = nearestObjects [(getPosATL player), [_part_in], _distance];
//diag_log format["DEBUG vehicle sell objects: %1", _objects]; //diag_log format["DEBUG vehicle sell objects: %1", _objects];

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

@@ -20,7 +20,7 @@ _bos = 0;
if(_buy_o_sell == "buy") then { if(_buy_o_sell == "buy") then {
_qty = {_x == _part_in} count magazines player; _qty = {_x == _part_in} count magazines player;
} else { } else {
_obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance_vehicle]; _obj = nearestObjects [(getPosATL player), [_part_in], Z_VehicleDistance];
_qty = count _obj; _qty = count _obj;
_bos = 1; _bos = 1;
}; };
@@ -71,7 +71,7 @@ if (_qty >= _qty_in) then {
if(_buy_o_sell == "buy") then { if(_buy_o_sell == "buy") then {
_qty = {_x == _part_in} count magazines player; _qty = {_x == _part_in} count magazines player;
} else { } else {
_obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance_vehicle]; _obj = nearestObjects [(getPosATL player), [_part_in], Z_VehicleDistance];
_qty = count _obj; _qty = count _obj;
}; };

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

@@ -68,15 +68,7 @@ if (_finished) then {
_canAfford = false; _canAfford = false;
if(_bos == 1) then { if(_bos == 1) then {
_count = {(typeOf _x) == _part_in} count (nearestObjects [(getPosATL player), [_part_in], Z_VehicleDistance]);
_distance = dayz_sellDistance_vehicle;
if (_part_in isKindOf "Air") then {
_distance = dayz_sellDistance_air;
};
if (_part_in isKindOf "Ship") then {
_distance = dayz_sellDistance_boat;
};
_count = {(typeOf _x) == _part_in} count (nearestObjects [(getPosATL player), [_part_in], _distance]);
if (_count >= _qty_in) then { if (_count >= _qty_in) then {
_canAfford = true; _canAfford = true;
}; };
@@ -150,17 +142,8 @@ if (_finished) then {
format[localize "str_epoch_player_183",_textPartOut] call dayz_rollingMessages; format[localize "str_epoch_player_183",_textPartOut] call dayz_rollingMessages;
}; };
} else { } else {
//sell //sell
_distance = dayz_sellDistance_vehicle; _objects = nearestObjects [(getPosATL player), [_part_in], Z_VehicleDistance];
if (_part_in isKindOf "Air") then {
_distance = dayz_sellDistance_air;
};
if (_part_in isKindOf "Ship") then {
_distance = dayz_sellDistance_boat;
};
_objects = nearestObjects [(getPosATL player), [_part_in], _distance];
//diag_log format["DEBUG vehicle sell objects: %1", _objects]; //diag_log format["DEBUG vehicle sell objects: %1", _objects];

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

@@ -24,7 +24,7 @@ _bos = 0;
if(_buy_o_sell == "buy") then { if(_buy_o_sell == "buy") then {
_qty = {_x == _part_in} count magazines player; _qty = {_x == _part_in} count magazines player;
} else { } else {
_obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance_boat]; _obj = nearestObjects [(getPosATL player), [_part_in], Z_VehicleDistance];
_qty = count _obj; _qty = count _obj;
_bos = 1; _bos = 1;
}; };
@@ -76,7 +76,7 @@ if (_qty >= _qty_in) then {
if(_buy_o_sell == "buy") then { if(_buy_o_sell == "buy") then {
_qty = {_x == _part_in} count magazines player; _qty = {_x == _part_in} count magazines player;
} else { } else {
_obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance_boat]; _obj = nearestObjects [(getPosATL player), [_part_in], Z_VehicleDistance];
_qty = count _obj; _qty = count _obj;
}; };

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

@@ -68,15 +68,7 @@ if (_finished) then {
_canAfford = false; _canAfford = false;
if(_bos == 1) then { if(_bos == 1) then {
_count = {(typeOf _x) == _part_in} count (nearestObjects [(getPosATL player), [_part_in], Z_VehicleDistance]);
_distance = dayz_sellDistance_vehicle;
if (_part_in isKindOf "Air") then {
_distance = dayz_sellDistance_air;
};
if (_part_in isKindOf "Ship") then {
_distance = dayz_sellDistance_boat;
};
_count = {(typeOf _x) == _part_in} count (nearestObjects [(getPosATL player), [_part_in], _distance]);
if (_count >= _qty_in) then { if (_count >= _qty_in) then {
_canAfford = true; _canAfford = true;
}; };
@@ -149,17 +141,8 @@ if (_finished) then {
format[localize "str_epoch_player_183",_textPartOut] call dayz_rollingMessages; format[localize "str_epoch_player_183",_textPartOut] call dayz_rollingMessages;
}; };
} else { } else {
//sell //sell
_distance = dayz_sellDistance_vehicle; _objects = nearestObjects [(getPosATL player), [_part_in], Z_VehicleDistance];
if (_part_in isKindOf "Air") then {
_distance = dayz_sellDistance_air;
};
if (_part_in isKindOf "Ship") then {
_distance = dayz_sellDistance_boat;
};
_objects = nearestObjects [(getPosATL player), [_part_in], _distance];
//diag_log format["DEBUG vehicle sell objects: %1", _objects]; //diag_log format["DEBUG vehicle sell objects: %1", _objects];

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

@@ -68,15 +68,7 @@ if (_finished) then {
_canAfford = false; _canAfford = false;
if(_bos == 1) then { if(_bos == 1) then {
_count = {(typeOf _x) == _part_in} count (nearestObjects [(getPosATL player), [_part_in], Z_VehicleDistance]);
_distance = dayz_sellDistance_vehicle;
if (_part_in isKindOf "Air") then {
_distance = dayz_sellDistance_air;
};
if (_part_in isKindOf "Ship") then {
_distance = dayz_sellDistance_boat;
};
_count = {(typeOf _x) == _part_in} count (nearestObjects [(getPosATL player), [_part_in], _distance]);
if (_count >= _qty_in) then { if (_count >= _qty_in) then {
_canAfford = true; _canAfford = true;
}; };
@@ -145,15 +137,7 @@ if (_finished) then {
} else { } else {
//sell //sell
_distance = dayz_sellDistance_vehicle; _objects = nearestObjects [(getPosATL player), [_part_in], Z_VehicleDistance];
if (_part_in isKindOf "Air") then {
_distance = dayz_sellDistance_air;
};
if (_part_in isKindOf "Ship") then {
_distance = dayz_sellDistance_boat;
};
_objects = nearestObjects [(getPosATL player), [_part_in], _distance];
//diag_log format["DEBUG vehicle sell objects: %1", _objects]; //diag_log format["DEBUG vehicle sell objects: %1", _objects];

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

@@ -24,12 +24,7 @@ _bos = 0;
if(_buy_o_sell == "buy") then { if(_buy_o_sell == "buy") then {
_qty = {_x == _part_in} count magazines player; _qty = {_x == _part_in} count magazines player;
} else { } else {
_obj = nearestObjects [(getPosATL player), [_part_in], Z_VehicleDistance];
if (_part_in isKindOf "Air") then {
_obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance_air];
} else {
_obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance_vehicle];
};
_qty = count _obj; _qty = count _obj;
_bos = 1; _bos = 1;
}; };
@@ -80,11 +75,7 @@ if (_qty >= _qty_in) then {
if(_buy_o_sell == "buy") then { if(_buy_o_sell == "buy") then {
_qty = {_x == _part_in} count magazines player; _qty = {_x == _part_in} count magazines player;
} else { } else {
if (_part_in isKindOf "AIR") then { _obj = nearestObjects [(getPosATL player), [_part_in], Z_VehicleDistance];
_obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance_air];
} else {
_obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance_vehicle];
};
_qty = count _obj; _qty = count _obj;
}; };

11
SQF/dayz_code/compile/player_traderMenuHive.sqf
View File

@@ -12,7 +12,7 @@ TraderCatList = [];
TraderItemList = []; TraderItemList = [];
TraderDialogLoadItemList = { TraderDialogLoadItemList = {
private ["_index","_trader_id","_activatingPlayer","_distance","_objclass","_item_list"]; private ["_index","_trader_id","_activatingPlayer","_objclass","_item_list"];
TraderItemList = []; TraderItemList = [];
_index = _this select 0; _index = _this select 0;
@@ -128,14 +128,7 @@ TraderDialogLoadItemList = {
}; };
} else { } else {
if (isClass(configFile >> "CfgVehicles" >> _name)) then { if (isClass(configFile >> "CfgVehicles" >> _name)) then {
_distance = dayz_sellDistance_vehicle; _count = {(typeOf _x) == _name} count (nearestObjects [(getPosATL player), [_name], Z_VehicleDistance]);
if (_name isKindOf "Air") then {
_distance = dayz_sellDistance_air;
};
if (_name isKindOf "Ship") then {
_distance = dayz_sellDistance_boat;
};
_count = {(typeOf _x) == _name} count (nearestObjects [(getPosATL player), [_name], _distance]);
}; };
}; };
}; };

3
SQF/dayz_code/configVariables.sqf
View File

@@ -45,9 +45,6 @@ DZE_groupManagement = false; //Enable or disable group management. Enabled by de
DZE_salvageLocked = true; //Enable or disable salvaging of locked vehicles, useful for stopping griefing on locked vehicles. DZE_salvageLocked = true; //Enable or disable salvaging of locked vehicles, useful for stopping griefing on locked vehicles.
// Trader Menu // Trader Menu
dayz_sellDistance_vehicle = 10; // Max distance players can sell land vehicles from at traders
dayz_sellDistance_boat = 30; // Max distance players can sell boats from at traders
dayz_sellDistance_air = 40; // Max distance players can sell air vehicles from at traders
DZE_ConfigTrader = true; // Use config files for traders instead of database. Loads faster and uses less network traffic. False enables database traders with legacy trader menu. DZE_ConfigTrader = true; // Use config files for traders instead of database. Loads faster and uses less network traffic. False enables database traders with legacy trader menu.
DZE_serverLogTrades = true; // Log trades to server RPT (sent with publicVariableServer on every trade) 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_GemWorthArray = [["ItemTopaz",15000], ["ItemObsidian",20000], ["ItemSapphire",25000], ["ItemAmethyst",30000], ["ItemEmerald",35000], ["ItemCitrine",40000], ["ItemRuby",45000]]; //array of gem prices, works only in advanced trading