mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2025-12-13 19:52:38 +03:00
Use BIS_fnc_numberText for SC number displays
See: https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-239647854 That should be all of them @ndavalos let me know if I missed any.
This commit is contained in:
@@ -251,7 +251,7 @@ if (_enoughMoney) then {
|
|||||||
} else {
|
} else {
|
||||||
_success = [player,_priceToBuy] call SC_fnc_removeCoins;
|
_success = [player,_priceToBuy] call SC_fnc_removeCoins;
|
||||||
if (_success) then {
|
if (_success) then {
|
||||||
systemChat format[localize "STR_EPOCH_TRADE_SUCCESS_COINS", _priceToBuy, CurrencyName];
|
systemChat format[localize "STR_EPOCH_TRADE_SUCCESS_COINS",[_priceToBuy] call BIS_fnc_numberText,CurrencyName];
|
||||||
} else {
|
} else {
|
||||||
systemChat localize "STR_EPOCH_TRADE_DEBUG";
|
systemChat localize "STR_EPOCH_TRADE_DEBUG";
|
||||||
};
|
};
|
||||||
@@ -259,7 +259,7 @@ if (_enoughMoney) then {
|
|||||||
_itemsToLog call Z_logTrade;
|
_itemsToLog call Z_logTrade;
|
||||||
} else {
|
} else {
|
||||||
if (Z_SingleCurrency) then {
|
if (Z_SingleCurrency) then {
|
||||||
systemChat format[localize "STR_EPOCH_TRADE_NEED_COINS",_priceToBuy,CurrencyName];
|
systemChat format[localize "STR_EPOCH_TRADE_NEED_COINS",[_priceToBuy] call BIS_fnc_numberText,CurrencyName];
|
||||||
} else {
|
} else {
|
||||||
systemChat localize "STR_EPOCH_TRADE_NEED_MONEY";
|
systemChat localize "STR_EPOCH_TRADE_NEED_MONEY";
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -15,14 +15,14 @@ if (Z_SingleCurrency) then {
|
|||||||
{
|
{
|
||||||
_sellPrice = _sellPrice + (_x select 2);
|
_sellPrice = _sellPrice + (_x select 2);
|
||||||
} count Z_SellArray;
|
} count Z_SellArray;
|
||||||
_ctrlText = format["%1 %2", _sellPrice , CurrencyName];
|
_ctrlText = format["%1 %2",[_sellPrice] call BIS_fnc_numberText,CurrencyName];
|
||||||
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_RIGHTLISTTITLE) ctrlSetText format ["%1 (%2 items)", localize "STR_EPOCH_TRADE_SELLING", count Z_SellArray];
|
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_RIGHTLISTTITLE) ctrlSetText format ["%1 (%2 items)", localize "STR_EPOCH_TRADE_SELLING", count Z_SellArray];
|
||||||
} else {
|
} else {
|
||||||
{
|
{
|
||||||
_sellPrice = _sellPrice + ((_x select 2) * (_x select 9));
|
_sellPrice = _sellPrice + ((_x select 2) * (_x select 9));
|
||||||
_bTotal = _bTotal + (_x select 9);
|
_bTotal = _bTotal + (_x select 9);
|
||||||
} count Z_BuyingArray;
|
} count Z_BuyingArray;
|
||||||
_ctrlText = format["%1 %2", _sellPrice , CurrencyName];
|
_ctrlText = format["%1 %2",[_sellPrice] call BIS_fnc_numberText,CurrencyName];
|
||||||
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_RIGHTLISTTITLE) ctrlSetText format ["%1 (%2 items)", localize "STR_EPOCH_TRADE_BUYING", _bTotal];
|
(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];
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ if (Z_SellingFrom != 2) then { _extraText = getText (configFile >> 'CfgVehicles'
|
|||||||
if (isNil '_extraText') then { _extraText = _backUpText; };
|
if (isNil '_extraText') then { _extraText = _backUpText; };
|
||||||
|
|
||||||
if (Z_SingleCurrency) then {
|
if (Z_SingleCurrency) then {
|
||||||
ctrlSetText [Z_AT_TRADERLINE2, format[localize "STR_EPOCH_TRADE_OFFER", _totalPrice,CurrencyName]];
|
ctrlSetText [Z_AT_TRADERLINE2, format[localize "STR_EPOCH_TRADE_OFFER",[_totalPrice] call BIS_fnc_numberText,CurrencyName]];
|
||||||
} else {
|
} else {
|
||||||
ctrlSetText [Z_AT_TRADERLINE2, ''];
|
ctrlSetText [Z_AT_TRADERLINE2, ''];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -223,7 +223,7 @@ if (Z_SingleCurrency) then {
|
|||||||
if (typeName _money == "SCALAR") then {
|
if (typeName _money == "SCALAR") then {
|
||||||
if (Z_SingleCurrency) then {
|
if (Z_SingleCurrency) then {
|
||||||
_success = [player,_money] call SC_fnc_addCoins;
|
_success = [player,_money] call SC_fnc_addCoins;
|
||||||
systemChat format[localize "STR_EPOCH_TRADE_SUCCESS_CHANGE", _money , CurrencyName];
|
systemChat format[localize "STR_EPOCH_TRADE_SUCCESS_CHANGE",[_money] call BIS_fnc_numberText,CurrencyName];
|
||||||
} else {
|
} else {
|
||||||
_success = [_money,0,false,0,[],[]] call Z_returnChange;
|
_success = [_money,0,false,0,[],[]] call Z_returnChange;
|
||||||
_tCost = "";
|
_tCost = "";
|
||||||
|
|||||||
53
SQF/dayz_code/compile/fn_numberDigits.sqf
Normal file
53
SQF/dayz_code/compile/fn_numberDigits.sqf
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
/*
|
||||||
|
|
||||||
|
Description:
|
||||||
|
Break number into array of digits
|
||||||
|
|
||||||
|
Example:
|
||||||
|
123456 > [1,2,3,4,5,6]
|
||||||
|
|
||||||
|
Parameter(s):
|
||||||
|
_this: NUMBER
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
ARRAY
|
||||||
|
*/
|
||||||
|
|
||||||
|
private ["_number","_step","_stepLocal","_result","_numberLocal","_add"];
|
||||||
|
|
||||||
|
_number = [_this,0,0,[0]] call bis_fnc_param;
|
||||||
|
|
||||||
|
if (_number < 10) then {
|
||||||
|
|
||||||
|
[_number]
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
_step = 10;
|
||||||
|
_stepLocal = _step;
|
||||||
|
_result = [0];
|
||||||
|
_add = false;
|
||||||
|
|
||||||
|
while {_stepLocal < (_number * _step)} do {
|
||||||
|
|
||||||
|
_numberLocal = _number % (_stepLocal);
|
||||||
|
|
||||||
|
{
|
||||||
|
_numberLocal = _numberLocal - _x;
|
||||||
|
} foreach _result;
|
||||||
|
|
||||||
|
_numberLocal = floor (_numberLocal / _stepLocal * _step);
|
||||||
|
|
||||||
|
if (_numberLocal < 0) then {_numberLocal = 9};
|
||||||
|
|
||||||
|
_result = [_numberLocal] + _result;
|
||||||
|
_stepLocal = _stepLocal * (_step);
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
if ((_result select 0) == 0) then {_result = [1] + _result;};
|
||||||
|
|
||||||
|
_result resize (count _result - 1);
|
||||||
|
_result
|
||||||
|
|
||||||
|
};
|
||||||
35
SQF/dayz_code/compile/fn_numberText.sqf
Normal file
35
SQF/dayz_code/compile/fn_numberText.sqf
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
/*
|
||||||
|
|
||||||
|
Description:
|
||||||
|
Convert a number into string (avoiding scientific notation)
|
||||||
|
|
||||||
|
Parameter(s):
|
||||||
|
_this: ARRAY containing single NUMBER
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
STRING
|
||||||
|
|
||||||
|
Example:
|
||||||
|
[scalarNumber] call BIS_fnc_numberText
|
||||||
|
*/
|
||||||
|
|
||||||
|
private ["_number","_mod","_digots","_digitsCount","_modBase","_numberText"];
|
||||||
|
|
||||||
|
_number = [_this,0,0,[0, ""]] call bis_fnc_param;
|
||||||
|
_mod = [_this,1,3,[0]] call bis_fnc_param;
|
||||||
|
|
||||||
|
if (typeName _number == "STRING") then {
|
||||||
|
_number = parseNumber _number;
|
||||||
|
};
|
||||||
|
|
||||||
|
_digits = _number call BIS_fnc_numberDigits;
|
||||||
|
_digitsCount = count _digits - 1;
|
||||||
|
_modBase = _digitsCount % _mod;
|
||||||
|
_numberText = "";
|
||||||
|
|
||||||
|
{
|
||||||
|
_numberText = _numberText + str _x;
|
||||||
|
if ((_foreachindex - _modBase) % (_mod) == 0 && _foreachindex != _digitsCount) then {_numberText = _numberText + ",";};
|
||||||
|
} foreach _digits;
|
||||||
|
|
||||||
|
_numberText
|
||||||
@@ -627,6 +627,8 @@ call compile preprocessFileLineNumbers "\z\addons\dayz_code\traps\init.sqf";
|
|||||||
call compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\psrnd.sqf"; // pseudo random for plantSpanwer
|
call compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\psrnd.sqf"; // pseudo random for plantSpanwer
|
||||||
|
|
||||||
// EPOCH ADDITIONS
|
// EPOCH ADDITIONS
|
||||||
|
BIS_fnc_numberDigits = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_numberDigits.sqf";
|
||||||
|
BIS_fnc_numberText = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_numberText.sqf";
|
||||||
local_lockUnlock = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_lockUnlock.sqf"; //When vehicle is local to unit perform locking vehicle
|
local_lockUnlock = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_lockUnlock.sqf"; //When vehicle is local to unit perform locking vehicle
|
||||||
local_gutObjectZ = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_gutObjectZ.sqf"; //Generated on the server (or local to unit) when gutting an object
|
local_gutObjectZ = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_gutObjectZ.sqf"; //Generated on the server (or local to unit) when gutting an object
|
||||||
local_spawnObjects = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_spawnObjects.sqf";
|
local_spawnObjects = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_spawnObjects.sqf";
|
||||||
|
|||||||
Reference in New Issue
Block a user