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 combat icon + toggle for Vanilla UI

Browse Source
This commit is contained in:
icomrade
2016-07-25 20:55:36 -04:00
parent 66e35d1629
commit fbc7754750
3 changed files with 51 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -253,6 +253,25 @@ class RscTitles
w = 0.075;
h = 0.10;
};
class RscPicture_1209: RscPictureGUI
{
idc = 1209;
//text = "\z\addons\dayz_code\gui\status\status_combat_border_CA.paa";
x = "0.955313 * safezoneW + safezoneX";
y = "0.65 * safezoneH + safezoneY";
w = 0.06;
h = 0.08;
};
class RscPicture_1909: RscPictureGUI
{
idc = 1909;
//text = "\z\addons\dayz_code\gui\status\status_bg.paa";
x = "0.955313 * safezoneW + safezoneX";
y = "0.65 * safezoneH + safezoneY";
w = 0.06;
h = 0.08;
};
};
class Controls {
class RscPicture_1301: RscPictureGUI
@@ -328,6 +347,14 @@ class RscTitles
w = 0.075;
h = 0.10;
};
class RscPicture_1308 : RscPictureGUI {
idc = 1308;
//text = "\z\addons\dayz_code\gui\status\status_combat_inside_ca.paa";
x = "0.955313 * safezoneW + safezoneX";
y = "0.65 * safezoneH + safezoneY";
w = 0.06;
h = 0.08;
};
};
};

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

@@ -1,7 +1,5 @@
//private ["_display","_ctrlBloodOuter","_ctrlBlood","_ctrlBleed","_bloodVal","_ctrlFood","_ctrlThirst","_thirstVal","_foodVal","_ctrlTemp","_ctrlFoodBorder","_ctrlThirstBorder","_ctrlTempBorder","_tempVal","_array","_ctrlEar","_ctrlEye","_ctrlFracture","_visual","_audible","_uiNumber","_bloodText","_blood","_thirstLvl","_foodLvl","_tempImg","_bloodLvl","_tempLvl","_thirst","_food","_temp"];
private ["_flash","_array","_bloodText","_tempText","_tempImg","_uiNumber","_blood","_foodLvl","_thirstLvl","_audible","_visual","_bloodType","_rhFactor","_ctrlBloodType", "_bloodTestdone",
"_string","_humanityTarget","_distance","_size","_friendlies","_id","_rID","_rfriendlies","_rfriendlyTo","_color","_targetControl"];
private ["_array","_combatVal","_ctrlCombatBorder","_ctrlCombat","_uiNumber","_bloodText","_blood","_bloodType","_rhFactor","_thirstLvl","_foodLvl","_tempImg","_tempText","_visual","_audible","_id","_rID","_color","_string","_humanity","_size","_friendlies","_rfriendlies","_rfriendlyTo","_distance","_targetControl","_flash","_foodVal","_thirstVal","_tempVal","_display","_ctrlBloodOuter","_ctrlFoodBorder","_ctrlThirstBorder","_ctrlTempBorder","_ctrlBlood","_ctrlBloodType","_ctrlBleed","_bloodVal","_ctrlFood","_ctrlThirst","_ctrlTemp","_ctrlEar","_ctrlEye","_ctrlFracture","_ctrlMuteBackground","_ctrlMuteIcon","_thirst","_food","_temp","_bloodLvl","_tempLvl","_bloodTestdone","_humanityTarget"];
disableSerialization;
_flash = {
if (ctrlShown _this) then {
@@ -11,8 +9,6 @@ _flash = {
};
};
disableSerialization;
_foodVal = 1 - (dayz_hunger / SleepFood);
_thirstVal = 1 - (dayz_thirst / SleepWater);
_tempVal = 1 - ((dayz_temperatur - dayz_temperaturmin)/(dayz_temperaturmax - dayz_temperaturmin)); // Normalise to [0,1]
@@ -35,6 +31,17 @@ _ctrlFoodBorder ctrlSetTextColor [1,1,1,1];
_ctrlThirstBorder ctrlSetTextColor [1,1,1,1];
_ctrlTempBorder ctrlSetTextColor [1,1,1,1];
if (DZE_VanillaUICombatIcon) then {
_combatVal = if (player getVariable["combattimeout",0] >= diag_tickTime) then {0} else {1};
_ctrlCombatBorder = _display displayCtrl 1209;
_ctrlCombat = _display displayCtrl 1308;
_ctrlCombatBG = _display displayCtrl 1909;
_ctrlCombatBorder ctrlSetTextColor [1,1,1,1];
_ctrlCombat ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_combatVal))),(Dayz_GUI_G * _combatVal),(Dayz_GUI_B * _combatVal), 0.5];
_ctrlCombatBorder ctrlSetText ("\z\addons\dayz_code\gui\status\status_combat_border_CA.paa");
_ctrlCombat ctrlSetText ("\z\addons\dayz_code\gui\status\status_combat_inside_ca.paa");
_ctrlCombatBG ctrlSetText ("\z\addons\dayz_code\gui\status\status_bg.paa");
};
_ctrlBlood = _display displayCtrl 1300;
_ctrlBloodType = _display displayCtrl 1307;
_ctrlBleed = _display displayCtrl 1303;
@@ -183,6 +190,16 @@ else {
};
// Flashing
if (DZE_VanillaUICombatIcon) then {
if (_combatVal == 0) then {
_ctrlCombat call _flash;
} else {
if (!ctrlShown _ctrlCombat) then {
_ctrlCombat ctrlShow true;
};
};
};
if (_bloodVal < 0.2) then {
_ctrlBlood call _flash;
} else {

1
SQF/dayz_code/configVariables.sqf
View File

@@ -39,6 +39,7 @@ DZE_HeliLift = true; // Enable Epoch heli lift system
DZE_RestrictSkins = []; // Clothes that players are not allowed to wear. i.e. ["Skin_GUE_Soldier_CO_DZ","Skin_GUE_Soldier_2_DZ"] etc.
DZE_TRADER_SPAWNMODE = false; // Vehicles purchased at traders will be parachuted in
DZE_UI = "vanilla"; //"vanilla","epoch","dark" UI status icons style. Dark accommodates color blind people.
DZE_VanillaUICombatIcon = true; //Display or hide combat UI icon if using DZE_UI = "vanilla"; otherwise it has no affect.
MaxAmmoBoxes = 3; // Max number of random Supply_Crate_DZE to spawn around the map
MaxMineVeins = 50; // Max number of random mine veins to spawn around the map
timezoneswitch = 0; // Changes murderMenu times with this offset in hours.