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

Fix Adv Trade localized string spacing

Browse Source
This commit is contained in:
ebaydayz
2016-05-02 19:51:48 -04:00
parent 8d82693c1b
commit d361abaec3
7 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/Configs/RscDisplay/advancedTrading.hpp
View File

@@ -459,7 +459,7 @@ class AdvancedTrading
}; };
class RscText_AT_InfoLabel: ZSC_RscText class RscText_AT_InfoLabel: ZSC_RscText
{ {
idc = -1; idc = 7488;
text = $STR_EPOCH_TRADE_DETAILS; text = $STR_EPOCH_TRADE_DETAILS;
x = 0.60 * safezoneW + safezoneX; x = 0.60 * safezoneW + safezoneX;
y = 0.38 * safezoneH + safezoneY; y = 0.38 * safezoneH + safezoneY;

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

@@ -236,12 +236,12 @@ if(_selection == 0) then{ //backpack
if( _allowedWeapons >= _toBuyWeaps)then{ if( _allowedWeapons >= _toBuyWeaps)then{
_check1 = true; _check1 = true;
} else { } else {
systemChat format[localize "STR_EPOCH_TRADE_BAG_WEPS", _allowedMags]; systemChat format[localize "STR_EPOCH_TRADE_BAG_WEPS", _allowedWeapons];
}; };
if( _allowedMags >= _toBuyMags)then{ if( _allowedMags >= _toBuyMags)then{
_check2 = true; _check2 = true;
} else { } else {
systemChat format[localize "STR_EPOCH_TRADE_BAG_MAGS", _allowedWeapons]; systemChat format[localize "STR_EPOCH_TRADE_BAG_MAGS", _allowedMags];
}; };
if( _allowedBackpacks >= _toBuyBags)then{ if( _allowedBackpacks >= _toBuyBags)then{
_check3 = true; _check3 = true;

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

@@ -47,7 +47,7 @@ _formattedText = format [
"<t color='#33BFFF'>%12: </t><t color='#ffffff'>%5 %7</t><br />" + "<t color='#33BFFF'>%12: </t><t color='#ffffff'>%5 %7</t><br />" +
"<t color='#33BFFF'>%13: </t><t color='#ffffff'>%6 %4</t><br />" + "<t color='#33BFFF'>%13: </t><t color='#ffffff'>%6 %4</t><br />" +
"<t color='#33BFFF'>%14: </t><t color='#ffffff'>%8</t><br />" + "<t color='#33BFFF'>%14: </t><t color='#ffffff'>%8</t><br />" +
"<t color='#33BFFF'>%15:</t><t color='#ffffff'>%9</t><br />" "<t color='#33BFFF'>%15: </t><t color='#ffffff'>%9</t><br />"
, _picture, _display, _class, _buyCurrency , _sellPrice, _buyPrice, _sellCurrency, _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" , _picture, _display, _class, _buyCurrency , _sellPrice, _buyPrice, _sellCurrency, _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"
]; ];

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

@@ -106,5 +106,6 @@ createDialog "AdvancedTrading";
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_REMOVEALLSELLITEMBUTTON) ctrlSetText " << "; (findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_REMOVEALLSELLITEMBUTTON) ctrlSetText " << ";
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_REMOVEBUYITEMBUTTON) ctrlSetText " < "; (findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_REMOVEBUYITEMBUTTON) ctrlSetText " < ";
(findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_REMOVEALLBUYITEMBUTTON) ctrlSetText " << "; (findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_REMOVEALLBUYITEMBUTTON) ctrlSetText " << ";
(findDisplay Z_AT_DIALOGWINDOW displayCtrl 7488) ctrlSetText " " + localize "STR_EPOCH_TRADE_DETAILS";
call Z_ChangeBuySell; call Z_ChangeBuySell;

2
SQF/dayz_code/compile/fn_damageActions.sqf
View File

@@ -211,7 +211,7 @@ if (isPlayer cursorTarget) then {
}; };
if (_unit isKindOf "Man") then { if (_unit isKindOf "Man") then {
// should only fire if cursor target is man and not vehicle // should only fire if cursor target is man and not vehicle
_charID = _unit getVariable ["CharacterID", 0]; _charID = _unit getVariable ["CharacterID","0"];
_friendlies = player getVariable ["friendlies", []]; _friendlies = player getVariable ["friendlies", []];
if !(_charID in _friendlies) then { if !(_charID in _friendlies) then {
r_action = true; r_action = true;

2
SQF/dayz_code/compile/fn_gearMenuChecks.sqf
View File

@@ -15,7 +15,7 @@ if ((vehicle player) == player) then {
if (DZE_BackpackAntiTheft) then { if (DZE_BackpackAntiTheft) then {
_friendlies = player getVariable ["friendlies",[]]; _friendlies = player getVariable ["friendlies",[]];
_rcharID = _cTarget getVariable ["CharacterID","0"]; _rcharID = _cTarget getVariable ["CharacterID","0"];
if (!canbuild && {_cTarget isKindOf "Man"} && {alive _cTarget} && {!((typeOf _cTarget) in serverTraders)} && {!(_rcharID in _friendlies)} && {(player distance _cTarget) < 12}) then { if (!canbuild && {_cTarget isKindOf "Man"} && {alive _cTarget} && {isPlayer _cTarget} && {!(_rcharID in _friendlies)} && {(player distance _cTarget) < 12}) then {
localize "STR_EPOCH_PLAYER_316" call dayz_rollingMessages; localize "STR_EPOCH_PLAYER_316" call dayz_rollingMessages;
_display closeDisplay 1; _display closeDisplay 1;
}; };

24
SQF/dayz_code/stringtable.xml
View File

@@ -15651,12 +15651,12 @@
<Russian>Нет ничего на продажу</Russian> <Russian>Нет ничего на продажу</Russian>
</Key> </Key>
<Key ID="STR_EPOCH_TRADE_DETAILS"> <Key ID="STR_EPOCH_TRADE_DETAILS">
<English> Details</English> <English>Details</English>
<German> Einzelheiten</German> <German>Einzelheiten</German>
<Russian> Детали</Russian> <Russian>Детали</Russian>
<Spanish> Detalles</Spanish> <Spanish>Detalles</Spanish>
<French> Détails</French> <French>Détails</French>
<Czech> Podrobnosti</Czech> <Czech>Podrobnosti</Czech>
</Key> </Key>
<Key ID="STR_EPOCH_TRADE_STUPID"> <Key ID="STR_EPOCH_TRADE_STUPID">
<English>I'm not stupid.</English> <English>I'm not stupid.</English>
@@ -15818,16 +15818,16 @@
<Czech>Třída</Czech> <Czech>Třída</Czech>
</Key> </Key>
<Key ID="STR_EPOCH_MAGS"> <Key ID="STR_EPOCH_MAGS">
<English>Mags: </English> <English>Mags</English>
<Russian>Магазинов: </Russian> <Russian>Магазинов</Russian>
</Key> </Key>
<Key ID="STR_EPOCH_WEPS"> <Key ID="STR_EPOCH_WEPS">
<English>Weps: </English> <English>Weps</English>
<Russian>Оружия: </Russian> <Russian>Оружия</Russian>
</Key> </Key>
<Key ID="STR_EPOCH_BAGS"> <Key ID="STR_EPOCH_BAGS">
<English>Bags: </English> <English>Bags</English>
<Russian>Рюкзаков: </Russian> <Russian>Рюкзаков</Russian>
</Key> </Key>
<Key ID="STR_EPOCH_YOUR_GEAR"> <Key ID="STR_EPOCH_YOUR_GEAR">
<English>your gear</English> <English>your gear</English>