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

0.95a

Browse Source 
+ added bulk trades to metals traders fixes #75
This commit is contained in:
vbawol
2013-02-14 18:01:19 -06:00
parent 58742df73a
commit 4bb6b117d8
3 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
dayz_code/actions/trade_items_wo_db.sqf
View File

@@ -17,37 +17,45 @@ _failed = false;
_qty = {_x == _part_in} count magazines player; _qty = {_x == _part_in} count magazines player;
// find total number of possible trades
_total_trades = floor (_qty / _qty_in);
if (_qty >= _qty_in) then { if (_qty >= _qty_in) then {
// Take currency // trade all items
for "_x" from 1 to _qty_in do { for "_x" from 1 to _total_trades do {
player removeMagazine _part_in;
};
// check for space if buying and do not check if selling // Take currency
for "_x" from 1 to _qty_out do {
if(_buy_o_sell == "buy") then {
_isOk = [player,_part_out] call BIS_fnc_invAdd;
if (!_isOk) exitWith { _failed = true; };
_counter = _counter + 1;
} else {
player addMagazine _part_out;
};
};
// revert trade since it failed
if(_failed) then {
// add back currency
for "_x" from 1 to _qty_in do { for "_x" from 1 to _qty_in do {
player addMagazine _part_in; player removeMagazine _part_in;
}; };
// remove partial trade
for "_x" from 1 to _counter do { // check for space if buying and do not check if selling
player removeMagazine _part_out; for "_x" from 1 to _qty_out do {
if(_buy_o_sell == "buy") then {
_isOk = [player,_part_out] call BIS_fnc_invAdd;
if (!_isOk) exitWith { _failed = true; };
_counter = _counter + 1;
} else {
player addMagazine _part_out;
};
};
// revert trade since it failed
if(_failed) then {
// add back currency
for "_x" from 1 to _qty_in do {
player addMagazine _part_in;
};
// remove partial trade
for "_x" from 1 to _counter do {
player removeMagazine _part_out;
};
cutText [localize "STR_DAYZ_CODE_2", "PLAIN DOWN"];
} else {
cutText [format[("Traded %1 %2 for %3 %4"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];
sleep 2;
}; };
cutText [localize "STR_DAYZ_CODE_2", "PLAIN DOWN"];
} else {
cutText [format[("Traded %1 %2 for %3 %4"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];
}; };
} else { } else {

2
dayz_code/config.cpp
View File

@@ -33,7 +33,7 @@ class CfgMods
hidePicture = 0; hidePicture = 0;
hideName = 0; hideName = 0;
action = "http://www.dayzepoch.com"; action = "http://www.dayzepoch.com";
version = "0.944"; version = "0.95";
hiveVersion = 0.96; //0.93 hiveVersion = 0.96; //0.93
}; };
}; };

2
dayz_code/rscTitles.hpp
View File

@@ -87,7 +87,7 @@ class RscDisplayMain : RscStandardDisplay
class DAYZ_Version : CA_Version class DAYZ_Version : CA_Version
{ {
idc = -1; idc = -1;
text = "DayZ Epoch 0.944 (1.7.5.1)"; text = "DayZ Epoch 0.95 (1.7.5.1)";
y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)"; y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
}; };
class CA_TitleMainMenu; class CA_TitleMainMenu;