diff --git a/Sources/epoch_code/compile/traders/EPOCH_startBankTransfer.sqf b/Sources/epoch_code/compile/traders/EPOCH_startBankTransfer.sqf index dc4b6f40..ac5ac1ce 100644 --- a/Sources/epoch_code/compile/traders/EPOCH_startBankTransfer.sqf +++ b/Sources/epoch_code/compile/traders/EPOCH_startBankTransfer.sqf @@ -8,13 +8,16 @@ if (isNil "EPOCH_bankTransferActive") then { [] spawn { private ["_transferTarget","_progress","_sleep","_deposit","_withdraw","_transfer","_totalTransfer"]; - + ctrlSetText[1004,"Transfer started, please wait."]; _deposit = parseNumber(ctrlText 1401) min EPOCH_playerCrypto; _withdraw = parseNumber(ctrlText 1402) min EPOCH_bankBalance; _transfer = parseNumber(ctrlText 1400) min EPOCH_bankBalance; + _config = 'CfgEpochClient' call EPOCH_returnConfig; + getArray(_config >> "bankTransferTime") params [["_timePerCrypto",0.0006],["_maxWait",1.2],["_minWait",0.06]]; + _totalTransfer = (_deposit + _withdraw) + _transfer; _progress = 0; @@ -27,11 +30,11 @@ if (isNil "EPOCH_bankTransferActive") then { if (_deposit > 0 || _withdraw > 0 || (_transfer > 0 && _transferTarget != "")) then { - _sleep = ((_totalTransfer * 0.0006) min 1.2) max 0.06; + _sleep = ((_totalTransfer * _timePerCrypto) min _maxWait) max _minWait; for "_i" from 0 to 100 do { if (isNull(findDisplay -13)) exitWith{}; _progress = _progress + 1; - if (_progress > 100) exitWith{}; + if (_progress >= 100) exitWith{}; ctrlSetText[1200, format["\x\addons\a3_epoch_code\Data\UI\loading_bar_%1.paa", _progress]]; uiSleep _sleep; }; diff --git a/Sources/epoch_config/Configs/CfgEpochClient.hpp b/Sources/epoch_config/Configs/CfgEpochClient.hpp index a3ef0c9b..7aac2f47 100644 --- a/Sources/epoch_config/Configs/CfgEpochClient.hpp +++ b/Sources/epoch_config/Configs/CfgEpochClient.hpp @@ -16,7 +16,7 @@ class CfgEpochClient epochVersion = "0.3.9.0"; sapperRngChance = 100; // increase number to reduce chances and reduce to increase. Default 100 = 1% - 55% if soiled (+ 2% if in city) chance to spawn sapper droneRngChance = 100; // increase number to reduce chances and reduce to increase. Default 100 = // 2% chance (+ 4% chance if in city) (1% - 2% Half if using silencer) to spawn drone if shot fired - buildingNearbyMilitary = 0; //1 to allow building nearby + buildingNearbyMilitary = 0; //1 to allow building nearby Military buildings buildingNearbyMilitaryRange = 300; //Define radius of blocked area buildingNearbyMilitaryClasses[] = {"Cargo_Tower_base_F","Cargo_HQ_base_F","Cargo_Patrol_base_F","Cargo_House_base_F"}; restrictedLocations[] = {"NameCityCapital"}; @@ -108,6 +108,9 @@ class CfgEpochClient playerDisableRevenge = 0; // 0 = invoke playerKilledScreen when killed by another player, 1 = disable. playerRevengeMinAliveTime = 900; // time in seconds player must be alive before Revenge option is available. + // banking + bankTransferTime[] = {0.0006,1.2,0.06}; // {time per crypto,max wait time,min wait time} + // include configs #include "CfgEpochClient\Altis.hpp" #include "CfgEpochClient\australia.hpp"