diff --git a/SQF/dayz_code/Configs/RscDisplay/safegui.hpp b/SQF/dayz_code/Configs/RscDisplay/safegui.hpp index 688a1c9e9..a6e8c3f1f 100644 --- a/SQF/dayz_code/Configs/RscDisplay/safegui.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/safegui.hpp @@ -128,7 +128,7 @@ class SafeKeyPad colorBackground[] = {0,0,0,0}; colorBackgroundActive[] = {0,0,0,0}; action = "dayz_combination = dayz_combination + str(1);"; - soundClick[] = {"\dayz_sfx\action\cell\dtmf_1.ogg",0.5,1}; + onButtonClick = "[player,""keypad_tick"",0,false] call dayz_zombieSpeak"; }; class b4: RscButton { @@ -144,7 +144,7 @@ class SafeKeyPad colorBackground[] = {0,0,0,0}; colorBackgroundActive[] = {0,0,0,0}; action = "dayz_combination = dayz_combination + str(4);"; - soundClick[] = {"\dayz_sfx\action\cell\dtmf_4.ogg",0.5,1}; + onButtonClick = "[player,""keypad_tick"",0,false] call dayz_zombieSpeak"; }; class b7: RscButton { @@ -160,7 +160,7 @@ class SafeKeyPad colorBackground[] = {0,0,0,0}; colorBackgroundActive[] = {0,0,0,0}; action = "dayz_combination = dayz_combination + str(7);"; - soundClick[] = {"\dayz_sfx\action\cell\dtmf_7.ogg",0.5,1}; + onButtonClick = "[player,""keypad_tick"",0,false] call dayz_zombieSpeak"; }; class b2: RscButton { @@ -176,7 +176,7 @@ class SafeKeyPad colorBackground[] = {0,0,0,0}; colorBackgroundActive[] = {0,0,0,0}; action = "dayz_combination = dayz_combination + str(2);"; - soundClick[] = {"\dayz_sfx\action\cell\dtmf_2.ogg",0.5,1}; + onButtonClick = "[player,""keypad_tick"",0,false] call dayz_zombieSpeak"; }; class b8: RscButton { @@ -192,7 +192,7 @@ class SafeKeyPad colorBackground[] = {0,0,0,0}; colorBackgroundActive[] = {0,0,0,0}; action = "dayz_combination = dayz_combination + str(8);"; - soundClick[] = {"\dayz_sfx\action\cell\dtmf_8.ogg",0.5,1}; + onButtonClick = "[player,""keypad_tick"",0,false] call dayz_zombieSpeak"; }; class b5: RscButton { @@ -208,7 +208,7 @@ class SafeKeyPad colorBackground[] = {0,0,0,0}; colorBackgroundActive[] = {0,0,0,0}; action = "dayz_combination = dayz_combination + str(5);"; - soundClick[] = {"\dayz_sfx\action\cell\dtmf_5.ogg",0.5,1}; + onButtonClick = "[player,""keypad_tick"",0,false] call dayz_zombieSpeak"; }; class b3: RscButton { @@ -224,7 +224,7 @@ class SafeKeyPad colorBackground[] = {0,0,0,0}; colorBackgroundActive[] = {0,0,0,0}; action = "dayz_combination = dayz_combination + str(3);"; - soundClick[] = {"\dayz_sfx\action\cell\dtmf_3.ogg",0.5,1}; + onButtonClick = "[player,""keypad_tick"",0,false] call dayz_zombieSpeak"; }; class b6: RscButton { @@ -240,7 +240,7 @@ class SafeKeyPad colorBackground[] = {0,0,0,0}; colorBackgroundActive[] = {0,0,0,0}; action = "dayz_combination = dayz_combination + str(6);"; - soundClick[] = {"\dayz_sfx\action\cell\dtmf_6.ogg",0.5,1}; + onButtonClick = "[player,""keypad_tick"",0,false] call dayz_zombieSpeak"; }; class b9: RscButton { @@ -256,7 +256,7 @@ class SafeKeyPad colorBackground[] = {0,0,0,0}; colorBackgroundActive[] = {0,0,0,0}; action = "dayz_combination = dayz_combination + str(9);"; - soundClick[] = {"\dayz_sfx\action\cell\dtmf_9.ogg",0.5,1}; + onButtonClick = "[player,""keypad_tick"",0,false] call dayz_zombieSpeak"; }; class b0: RscButton { @@ -272,7 +272,7 @@ class SafeKeyPad colorBackground[] = {0,0,0,0}; colorBackgroundActive[] = {0,0,0,0}; action = "dayz_combination = dayz_combination + str(0);"; - soundClick[] = {"\dayz_sfx\action\cell\dtmf_9.ogg",0.5,1}; + onButtonClick = "[player,""keypad_tick"",0,false] call dayz_zombieSpeak"; }; class bcancel: RscButton @@ -288,8 +288,7 @@ class SafeKeyPad colorText[] = {1,0.1,0.1,1}; colorBackground[] = {0,0,0,0}; colorBackgroundActive[] = {0,0,0,0}; - soundClick[] = {"\dayz_sfx\action\cell\dtmf_star.ogg",0.6,1}; - onButtonClick = "keypadCancel = true; ((ctrlParent (_this select 0)) closeDisplay 3000);"; + onButtonClick = "[player,""keypad_tick"",0,false] call dayz_zombieSpeak; keypadCancel = true; ((ctrlParent (_this select 0)) closeDisplay 3000);"; }; class benter: RscButton { @@ -304,8 +303,7 @@ class SafeKeyPad colorText[] = {0,1,0,1}; colorBackground[] = {0,0,0,0}; colorBackgroundActive[] = {0,0,0,0}; - onButtonClick = "keypadCancel = false; ((ctrlParent (_this select 0)) closeDisplay 3000); if(!isNull dayz_selectedVault and (typeOf dayz_selectedVault) in DZE_LockedStorage) then {dayz_selectedVault spawn player_unlockVault;};"; - soundClick[] = {"\dayz_sfx\action\cell\dtmf_hash.ogg",0.6,1}; + onButtonClick = "[player,""keypad_tick"",0,false] call dayz_zombieSpeak; keypadCancel = false; ((ctrlParent (_this select 0)) closeDisplay 3000); if(!isNull dayz_selectedVault and (typeOf dayz_selectedVault) in DZE_LockedStorage) then {dayz_selectedVault spawn player_unlockVault;};"; }; }; }; diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayBackpackInfo.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayBackpackInfo.sqf index c6e5f623b..d2ab524f5 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayBackpackInfo.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayBackpackInfo.sqf @@ -39,8 +39,7 @@ if (Z_SingleCurrency) then { "%11: %3
" + "%13: %6 %4
" + "%12: %5 %7
" + - "%14: %8
" + - "%15: %9
", + "%16: %8 %9
", _picture, _display, _class, @@ -54,8 +53,9 @@ if (Z_SingleCurrency) then { localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", localize "STR_EPOCH_PLAYER_291", - localize "STR_EPOCH_WEPS", - localize "STR_EPOCH_MAGS" + "\z\addons\dayz_code\gui\gear\gear_ui_slots_weapons_white.paa", + "\z\addons\dayz_code\gui\gear\gear_ui_slots_items_white.paa", + localize "STR_EPOCH_CARGO_SPACE" ]; } else { _picSell = ""; @@ -75,8 +75,7 @@ if (Z_SingleCurrency) then { "%11: %3
" + "%13: %6 %4
" + "%12: %5 %7
" + - "%14: %8
" + - "%15: %9
", + "%18: %8 %9
", _picture, _display, _class, @@ -90,10 +89,11 @@ if (Z_SingleCurrency) then { localize "STR_EPOCH_CLASS", localize "STR_EPOCH_PLAYER_292", localize "STR_EPOCH_PLAYER_291", - localize "STR_EPOCH_WEPS", - localize "STR_EPOCH_MAGS", + "\z\addons\dayz_code\gui\gear\gear_ui_slots_weapons_white.paa", + "\z\addons\dayz_code\gui\gear\gear_ui_slots_items_white.paa", _picSell, - _picBuy + _picBuy, + localize "STR_EPOCH_CARGO_SPACE" ]; }; diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayItemInfo.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayItemInfo.sqf index e1b50091b..d4747e61f 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayItemInfo.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayItemInfo.sqf @@ -1,4 +1,4 @@ -private ['_item','_picture','_class','_display','_buyPrice','_sellPrice','_formattedText','_buyCurrency','_sellCurrency','_compatible','_weapon','_attach','_config','_compatibleText','_type','_text']; +private ["_item","_picture","_class","_display","_buyPrice","_sellPrice","_formattedText","_buyCurrency","_sellCurrency","_compatible","_weapon","_attach","_config","_compatibleText","_type","_text","_displayText"]; #include "defines.hpp" _item = _this select 0; @@ -50,6 +50,8 @@ _compatibleText = ""; }; } forEach _compatible; +_displayText = getText(configFile >> "CfgMagazines" >> _class >> "descriptionShort"); + if (Z_SingleCurrency) then { _formattedText = format [ "
" + @@ -72,13 +74,13 @@ if (Z_SingleCurrency) then { } else { _picSell = ""; if (_sellPrice >= 0) then { - _picSell = getText (configFile >> 'CfgMagazines' >> _sellCurrency >> 'picture'); - _sellCurrency = getText (configFile >> 'CfgMagazines' >> _sellCurrency >> 'displayName'); + _picSell = getText (configFile >> "CfgMagazines" >> _sellCurrency >> "picture"); + _sellCurrency = getText (configFile >> "CfgMagazines" >> _sellCurrency >> "displayName"); }; _picBuy = ""; if (_buyPrice >= 0) then { - _picBuy = getText (configFile >> 'CfgMagazines' >> _buyCurrency >> 'picture'); - _buyCurrency = getText (configFile >> 'CfgMagazines' >> _buyCurrency >> 'displayName'); + _picBuy = getText (configFile >> "CfgMagazines" >> _buyCurrency >> "picture"); + _buyCurrency = getText (configFile >> "CfgMagazines" >> _buyCurrency >> "displayName"); }; _formattedText = format [ "
" + @@ -105,9 +107,16 @@ if (Z_SingleCurrency) then { if (count _compatible > 0) then { _formattedText = _formattedText + format [ - "%1: %2" + "%1: %2
" ,localize "STR_EPOCH_COMPATIBLE",_compatibleText ]; }; +if (_displayText != "") then { + _formattedText = _formattedText + format [ + "%1: %2" + ,localize "STR_EPOCH_DESCRIPTION",_displayText + ]; +}; + (findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_ITEMINFO) ctrlSetStructuredText parseText _formattedText; diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayVehicleInfo.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayVehicleInfo.sqf index 763e54ef6..f81917288 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayVehicleInfo.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayVehicleInfo.sqf @@ -103,8 +103,6 @@ _weapons2 = []; }; } forEach _weapons; -if (count _weapons2 < 1) then {_weapons2 = [localize "STR_EPOCH_NONE"];}; - _wepText = ""; { if (_forEachIndex > 0) then { @@ -121,10 +119,9 @@ if (Z_SingleCurrency) then { "%11: %3
" + "%13: %6 %7
" + "%12: %5 %7
" + - "%14: %8 %9 %4
" + + "%14: %8 %9 %4
" + "%17: %18 %24: %25
" + // Armor / Seats - "%21 %22: %23 %19: %20
" + // MaxSpeed / Fuel - "%26: %27", + "%21 %22: %23 %19: %20
", // MaxSpeed / Fuel _picture, _display, _class, @@ -150,8 +147,6 @@ if (Z_SingleCurrency) then { _maxSpeed, localize "STR_EPOCH_SEATS", _seats, - localize "STR_EPOCH_WEAPONS", - _wepText, "\z\addons\dayz_code\gui\gear\gear_ui_slots_backpacks_white.paa" ]; } else { @@ -172,10 +167,9 @@ if (Z_SingleCurrency) then { "%14: %3
" + "%16: %6 %7
" + "%15: %5 %10
" + - "%17: %8 %9 %4
" + + "%17: %8 %9 %4
" + "%20: %21 %27: %28
" + // Armor / Seats - "%24 %25: %26 %22: %23
" + // MaxSpeed / Fuel - "%29: %30", + "%24 %25: %26 %22: %23
", // MaxSpeed / Fuel _picture, _display, _class, @@ -204,10 +198,15 @@ if (Z_SingleCurrency) then { _maxSpeed, localize "STR_EPOCH_SEATS", _seats, - localize "STR_EPOCH_WEAPONS", - _wepText, "\z\addons\dayz_code\gui\gear\gear_ui_slots_backpacks_white.paa" ]; }; +if (count _weapons2 > 0) then { + _formattedText = _formattedText + format [ + "%1: %2
", + localize "STR_EPOCH_WEAPONS",_wepText + ]; +}; + (findDisplay Z_AT_DIALOGWINDOW displayCtrl Z_AT_ITEMINFO) ctrlSetStructuredText parseText _formattedText; diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayWeaponInfo.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayWeaponInfo.sqf index 6ff3e52c2..d4f5a4ebe 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayWeaponInfo.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_displayWeaponInfo.sqf @@ -119,7 +119,7 @@ _parentClasses = [(configFile >> "CfgWeapons" >> _class),true] call BIS_fnc_retu if !("ItemCore" in _parentClasses or "Binocular" in _parentClasses) then { _formattedText = _formattedText + format [ "%1: %2
" + - "%3: %4" + "%3: %4
" ,localize "STR_EPOCH_ATTACHMENTS",_attachText,localize "STR_EPOCH_MAGS",_magText ]; }; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index afffdc4fb..a724f3669 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -15904,6 +15904,16 @@ совместимый Kompatibilní + + Description + Descripción + Descrizione + Leírás + Opis + Описание + Beschreibung + Popis + Player Joueur diff --git a/SQF/dayz_sfx/action/cell/dtmf_0.ogg b/SQF/dayz_sfx/action/cell/dtmf_0.ogg deleted file mode 100644 index ba54d4793..000000000 Binary files a/SQF/dayz_sfx/action/cell/dtmf_0.ogg and /dev/null differ diff --git a/SQF/dayz_sfx/action/cell/dtmf_0.wav b/SQF/dayz_sfx/action/cell/dtmf_0.wav deleted file mode 100644 index 3bc883950..000000000 Binary files a/SQF/dayz_sfx/action/cell/dtmf_0.wav and /dev/null differ diff --git a/SQF/dayz_sfx/action/cell/dtmf_1.ogg b/SQF/dayz_sfx/action/cell/dtmf_1.ogg deleted file mode 100644 index 4d4f960d7..000000000 Binary files a/SQF/dayz_sfx/action/cell/dtmf_1.ogg and /dev/null differ diff --git a/SQF/dayz_sfx/action/cell/dtmf_1.wav b/SQF/dayz_sfx/action/cell/dtmf_1.wav deleted file mode 100644 index ca18e73e8..000000000 Binary files a/SQF/dayz_sfx/action/cell/dtmf_1.wav and /dev/null differ diff --git a/SQF/dayz_sfx/action/cell/dtmf_2.ogg b/SQF/dayz_sfx/action/cell/dtmf_2.ogg deleted file mode 100644 index 69eafc532..000000000 Binary files a/SQF/dayz_sfx/action/cell/dtmf_2.ogg and /dev/null differ diff --git a/SQF/dayz_sfx/action/cell/dtmf_2.wav b/SQF/dayz_sfx/action/cell/dtmf_2.wav deleted file mode 100644 index c0e8f76b4..000000000 Binary files a/SQF/dayz_sfx/action/cell/dtmf_2.wav and /dev/null differ diff --git a/SQF/dayz_sfx/action/cell/dtmf_3.ogg b/SQF/dayz_sfx/action/cell/dtmf_3.ogg deleted file mode 100644 index 39b111e51..000000000 Binary files a/SQF/dayz_sfx/action/cell/dtmf_3.ogg and /dev/null differ diff --git a/SQF/dayz_sfx/action/cell/dtmf_3.wav b/SQF/dayz_sfx/action/cell/dtmf_3.wav deleted file mode 100644 index 381af7fc8..000000000 Binary files a/SQF/dayz_sfx/action/cell/dtmf_3.wav and /dev/null differ diff --git a/SQF/dayz_sfx/action/cell/dtmf_4.ogg b/SQF/dayz_sfx/action/cell/dtmf_4.ogg deleted file mode 100644 index 2085a114c..000000000 Binary files a/SQF/dayz_sfx/action/cell/dtmf_4.ogg and /dev/null differ diff --git a/SQF/dayz_sfx/action/cell/dtmf_4.wav b/SQF/dayz_sfx/action/cell/dtmf_4.wav deleted file mode 100644 index 98c867d7e..000000000 Binary files a/SQF/dayz_sfx/action/cell/dtmf_4.wav and /dev/null differ diff --git a/SQF/dayz_sfx/action/cell/dtmf_5.ogg b/SQF/dayz_sfx/action/cell/dtmf_5.ogg deleted file mode 100644 index b0ea2bbf4..000000000 Binary files a/SQF/dayz_sfx/action/cell/dtmf_5.ogg and /dev/null differ diff --git a/SQF/dayz_sfx/action/cell/dtmf_5.wav b/SQF/dayz_sfx/action/cell/dtmf_5.wav deleted file mode 100644 index 5f62587ae..000000000 Binary files a/SQF/dayz_sfx/action/cell/dtmf_5.wav and /dev/null differ diff --git a/SQF/dayz_sfx/action/cell/dtmf_6.ogg b/SQF/dayz_sfx/action/cell/dtmf_6.ogg deleted file mode 100644 index f4fe13cc1..000000000 Binary files a/SQF/dayz_sfx/action/cell/dtmf_6.ogg and /dev/null differ diff --git a/SQF/dayz_sfx/action/cell/dtmf_6.wav b/SQF/dayz_sfx/action/cell/dtmf_6.wav deleted file mode 100644 index 2cc1ca3ae..000000000 Binary files a/SQF/dayz_sfx/action/cell/dtmf_6.wav and /dev/null differ diff --git a/SQF/dayz_sfx/action/cell/dtmf_7.ogg b/SQF/dayz_sfx/action/cell/dtmf_7.ogg deleted file mode 100644 index 406f3383d..000000000 Binary files a/SQF/dayz_sfx/action/cell/dtmf_7.ogg and /dev/null differ diff --git a/SQF/dayz_sfx/action/cell/dtmf_7.wav b/SQF/dayz_sfx/action/cell/dtmf_7.wav deleted file mode 100644 index 54d9fe638..000000000 Binary files a/SQF/dayz_sfx/action/cell/dtmf_7.wav and /dev/null differ diff --git a/SQF/dayz_sfx/action/cell/dtmf_8.ogg b/SQF/dayz_sfx/action/cell/dtmf_8.ogg deleted file mode 100644 index d54badd8c..000000000 Binary files a/SQF/dayz_sfx/action/cell/dtmf_8.ogg and /dev/null differ diff --git a/SQF/dayz_sfx/action/cell/dtmf_8.wav b/SQF/dayz_sfx/action/cell/dtmf_8.wav deleted file mode 100644 index 1e42bc1d6..000000000 Binary files a/SQF/dayz_sfx/action/cell/dtmf_8.wav and /dev/null differ diff --git a/SQF/dayz_sfx/action/cell/dtmf_9.ogg b/SQF/dayz_sfx/action/cell/dtmf_9.ogg deleted file mode 100644 index 858a63b8e..000000000 Binary files a/SQF/dayz_sfx/action/cell/dtmf_9.ogg and /dev/null differ diff --git a/SQF/dayz_sfx/action/cell/dtmf_9.wav b/SQF/dayz_sfx/action/cell/dtmf_9.wav deleted file mode 100644 index ab5831d03..000000000 Binary files a/SQF/dayz_sfx/action/cell/dtmf_9.wav and /dev/null differ diff --git a/SQF/dayz_sfx/action/cell/dtmf_hash.ogg b/SQF/dayz_sfx/action/cell/dtmf_hash.ogg deleted file mode 100644 index 6f2914b4b..000000000 Binary files a/SQF/dayz_sfx/action/cell/dtmf_hash.ogg and /dev/null differ diff --git a/SQF/dayz_sfx/action/cell/dtmf_hash.wav b/SQF/dayz_sfx/action/cell/dtmf_hash.wav deleted file mode 100644 index 86d7c52a1..000000000 Binary files a/SQF/dayz_sfx/action/cell/dtmf_hash.wav and /dev/null differ diff --git a/SQF/dayz_sfx/action/cell/dtmf_star.ogg b/SQF/dayz_sfx/action/cell/dtmf_star.ogg deleted file mode 100644 index 8dc60cefc..000000000 Binary files a/SQF/dayz_sfx/action/cell/dtmf_star.ogg and /dev/null differ diff --git a/SQF/dayz_sfx/action/cell/dtmf_star.wav b/SQF/dayz_sfx/action/cell/dtmf_star.wav deleted file mode 100644 index fba325614..000000000 Binary files a/SQF/dayz_sfx/action/cell/dtmf_star.wav and /dev/null differ