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

Add better sound muted status UI icon and background

Browse Source 
Icon contributed by Tugodoomer and AlexAFlorov. See
https://github.com/DayZMod/DayZ/issues/625 for details
This commit is contained in:
ebaydayz
2016-07-20 15:24:31 -04:00
parent d0a2260fb1
commit f314a39e43
11 changed files with 43 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGE LOG 1.0.6.txt
View File

@@ -12,7 +12,7 @@
[NEW] Added "RedRyder" and "350Rnd_BB_Magazine" to loot pile. #1456 #1457 @Namindu
[NEW] Added action to lock and unlock vehicles from inside #1103 @pj999 @ebaydayz
[NEW] Autorun hotkey (0 = Toggle auto run) @ebaydayz
[NEW] Earplugs hotkey and status UI icon (F1 = Lower volume). Automatically disabled when exiting a vehicle. @ebaydayz
[NEW] Mute sound hotkey and status UI icon (F1 = Lower sound effects volume). Automatically disabled when exiting a vehicle. @ebaydayz
[NEW] Snap building, use DZE_modularBuild = true; in init.sqf to enable. @raymix
[NEW] Auto login when a player joins the server, default 10 seconds, requires description.ext update in the mission (disable in description.ext by setting defValueParam1 = 31;) @icomrade
[NEW] Many new configuration options are available for admins. See dayz_code\configVariables.sqf and mission\init.sqf for descriptions. @ebaydayz

22
SQF/dayz_code/Configs/RscDisplay/RscPlayerUI.hpp
View File

@@ -216,10 +216,19 @@ class RscTitles
h = 0.10;
colorText[] = {1,1,1,1};
};
class RscPicture_1904: RscPictureGUI
{
idc = 1904;
text = "\z\addons\dayz_code\gui\status\status_bg.paa";
x = 0.955313 * safezoneW + safezoneX;
y = 0.51 * safezoneH + safezoneY;
w = 0.075;
h = 0.10;
};
class RscPicture_1204: RscPictureGUI
{
idc = 1204;
text = "\z\addons\dayz_code\gui\status_epoch\status_audio_muted.paa"; // was previously status_connection_ca, not used
text = "\z\addons\dayz_code\gui\status\status_sound_muted.paa"; // previously status_connection_ca which is not used
x = 0.955313 * safezoneW + safezoneX;
y = 0.51 * safezoneH + safezoneY;
w = 0.075;
@@ -427,10 +436,19 @@ class RscTitles
h = 0.10;
colorText[] = {1,1,1,1};
};
class RscPicture_1904: RscPictureGUI
{
idc = 1904;
//text = "\z\addons\dayz_code\gui\status\status_bg.paa";
x = 0.955313 * safezoneW + safezoneX;
y = 0.51 * safezoneH + safezoneY;
w = 0.075;
h = 0.10;
};
class RscPicture_1204: RscPictureGUI
{
idc = 1204;
text = "\z\addons\dayz_code\gui\status_epoch\status_audio_muted.paa"; // was previously status_connection_ca, not used
text = "\z\addons\dayz_code\gui\status\status_sound_muted.paa"; // previously status_connection_ca which is not used
x = 0.955313 * safezoneW + safezoneX;
y = 0.51 * safezoneH + safezoneY;
w = 0.075;

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

@@ -56,7 +56,7 @@ if (isNil "keyboard_keys") then {
_handled = true;
};
_muteSound = {
call player_muteSound;
call player_toggleSoundMute;
_handled = true;
};
_rifle = {

11
SQF/dayz_code/compile/player_muteSound.sqf → SQF/dayz_code/compile/player_toggleSoundMute.sqf
View File

@@ -1,18 +1,21 @@
private ["_control","_display"];
private ["_background","_icon","_display"];
disableSerialization;
_display = uiNamespace getVariable "DAYZ_GUI_display";
if (!isNil "_display") then {
_control = _display displayCtrl 1204;
_background = _display displayCtrl 1904;
_icon = _display displayCtrl 1204;
if (dayz_soundMuted) then {
dayz_soundMuted = false;
1 fadeSound 1;
_control ctrlShow false;
_background ctrlShow false;
_icon ctrlShow false;
} else {
dayz_soundMuted = true;
1 fadeSound 0.25;
_control ctrlShow true;
_background ctrlShow true;
_icon ctrlShow true;
};
};

6
SQF/dayz_code/compile/player_updateGui.sqf
View File

@@ -45,10 +45,12 @@ _ctrlTemp = _display displayCtrl 1306;
_ctrlEar = _display displayCtrl 1304;
_ctrlEye = _display displayCtrl 1305;
_ctrlFracture = _display displayCtrl 1203;
_ctrlMuteBackground = _display displayCtrl 1904;
_ctrlMuteIcon = _display displayCtrl 1204;
if (!dayz_soundMuted) then {
_control = _display displayCtrl 1204; //muted speaker icon
_control ctrlShow false;
_ctrlMuteBackground ctrlShow false;
_ctrlMuteIcon ctrlShow false;
};
//Food/Water/Blood

6
SQF/dayz_code/compile/player_updateGuiDark.sqf
View File

@@ -45,10 +45,12 @@ _ctrlEye = _display displayCtrl 1305;
//_ctrlHumanity = _display displayCtrl 1207;
_ctrlCombat = _display displayCtrl 1307;
_ctrlFracture = _display displayCtrl 1203;
_ctrlMuteBackground = _display displayCtrl 1904;
_ctrlMuteIcon = _display displayCtrl 1204;
if (!dayz_soundMuted) then {
_control = _display displayCtrl 1204; //muted speaker icon
_control ctrlShow false;
_ctrlMuteBackground ctrlShow false;
_ctrlMuteIcon ctrlShow false;
};
//Food/Water/Blood

6
SQF/dayz_code/compile/player_updateGuiEpoch.sqf
View File

@@ -36,10 +36,12 @@ _ctrlEye = _display displayCtrl 1305;
//_ctrlHumanity = _display displayCtrl 1207;
_ctrlCombat = _display displayCtrl 1307;
_ctrlFracture = _display displayCtrl 1203;
_ctrlMuteBackground = _display displayCtrl 1904;
_ctrlMuteIcon = _display displayCtrl 1204;
if (!dayz_soundMuted) then {
_control = _display displayCtrl 1204; //muted speaker icon
_control ctrlShow false;
_ctrlMuteBackground ctrlShow false;
_ctrlMuteIcon ctrlShow false;
};
//Food/Water/Blood

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

@@ -7,7 +7,7 @@ _position = _this select 1;
_unit = _this select 2;
if (_unit == player) then {
if (dayz_soundMuted) then {call player_muteSound;}; // Automatically disable sound mute on vehicle exit
if (dayz_soundMuted) then {call player_toggleSoundMute;}; // Automatically disable sound mute on vehicle exit
_buildables = count ((getposATL _vehicle) nearObjects ["DZ_buildables", 3]);
if (_buildables > 0) then {

BIN
SQF/dayz_code/gui/status/status_sound_muted.paa Normal file
View File

Binary file not shown.

BIN
SQF/dayz_code/gui/status_epoch/status_audio_muted.paa
View File

Binary file not shown.

2
SQF/dayz_code/init/compiles.sqf
View File

@@ -120,7 +120,7 @@ if (!isDedicated) then {
player_sharpen = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_sharpen.sqf";
//ui
player_muteSound = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_muteSound.sqf";
player_toggleSoundMute = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_toggleSoundMute.sqf";
player_selectSlot = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\ui_selectSlot.sqf";
player_gearSet = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_gearSet.sqf";
ui_changeDisplay = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\ui_changeDisplay.sqf";