From 23a5584b5283df9478f3042b06326d727c373cb6 Mon Sep 17 00:00:00 2001 From: icomrade Date: Tue, 26 Jul 2016 12:52:28 -0400 Subject: [PATCH] Fix up combat icon + update changelog --- CHANGE LOG 1.0.6.txt | 1 + SQF/dayz_code/Configs/RscDisplay/RscPlayerUI.hpp | 4 ++-- SQF/dayz_code/compile/player_updateGui.sqf | 10 +++++----- .../gui/status/status_combat_border_new_CA.paa | Bin 0 -> 5625 bytes .../gui/status/status_combat_inside_new_ca.paa | Bin 0 -> 5625 bytes 5 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 SQF/dayz_code/gui/status/status_combat_border_new_CA.paa create mode 100644 SQF/dayz_code/gui/status/status_combat_inside_new_ca.paa diff --git a/CHANGE LOG 1.0.6.txt b/CHANGE LOG 1.0.6.txt index c4e5b172a..ea0bd1ba7 100644 --- a/CHANGE LOG 1.0.6.txt +++ b/CHANGE LOG 1.0.6.txt @@ -8,6 +8,7 @@ [NEW] Players can carry more than one primary weapon which allows the abillity to hide one on their back, configure using DZE_TwoPrimaries. See configVariables.sqf for details @icomrade [NEW] Optional news/rules feed on player login, set dayz_enableRules in init.sqf [NEW] Status UI icons are toggleable between "vanilla","epoch","dark" set DZE_UI in init.sqf @ebaydayz +[NEW] If using the vanilla UI you may enable or disable the combat icon with DZE_VanillaUICombatIcon = true/false; @icomrade [NEW] Anzio 20mm sniper and RedRyder BB Gun by @arma2WillRobinson [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 diff --git a/SQF/dayz_code/Configs/RscDisplay/RscPlayerUI.hpp b/SQF/dayz_code/Configs/RscDisplay/RscPlayerUI.hpp index e2ec389da..54bd5e4a1 100644 --- a/SQF/dayz_code/Configs/RscDisplay/RscPlayerUI.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/RscPlayerUI.hpp @@ -256,7 +256,7 @@ class RscTitles class RscPicture_1209: RscPictureGUI { idc = 1209; - //text = "\z\addons\dayz_code\gui\status\status_combat_border_CA.paa"; + //text = "\z\addons\dayz_code\gui\status\status_bg.paa"; x = "0.955313 * safezoneW + safezoneX"; y = "0.65 * safezoneH + safezoneY"; w = 0.06; @@ -265,7 +265,7 @@ class RscTitles class RscPicture_1909: RscPictureGUI { idc = 1909; - //text = "\z\addons\dayz_code\gui\status\status_bg.paa"; + //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; diff --git a/SQF/dayz_code/compile/player_updateGui.sqf b/SQF/dayz_code/compile/player_updateGui.sqf index 88317f270..3f9fb912d 100644 --- a/SQF/dayz_code/compile/player_updateGui.sqf +++ b/SQF/dayz_code/compile/player_updateGui.sqf @@ -33,13 +33,13 @@ _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; + _ctrlCombatBorder = _display displayCtrl 1909; _ctrlCombat = _display displayCtrl 1308; - _ctrlCombatBG = _display displayCtrl 1909; + _ctrlCombatBG = _display displayCtrl 1209; _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"); + _ctrlCombat ctrlSetTextColor [(Dayz_GUI_R + (0.3 * (1-_combatVal))),(Dayz_GUI_G * _combatVal),(Dayz_GUI_B * _combatVal), 1]; + _ctrlCombatBorder ctrlSetText ("\z\addons\dayz_code\gui\status\status_combat_border_new_CA.paa"); + _ctrlCombat ctrlSetText ("\z\addons\dayz_code\gui\status\status_combat_inside_new_ca.paa"); _ctrlCombatBG ctrlSetText ("\z\addons\dayz_code\gui\status\status_bg.paa"); }; _ctrlBlood = _display displayCtrl 1300; diff --git a/SQF/dayz_code/gui/status/status_combat_border_new_CA.paa b/SQF/dayz_code/gui/status/status_combat_border_new_CA.paa new file mode 100644 index 0000000000000000000000000000000000000000..8d7657a0d69bf53cccca3440bc14aea2590eaa25 GIT binary patch literal 5625 zcmeI0e@t6d6vuB%`8^ykO15-WlD%PM!|5~+h%SO-g%@N5Y?^ArMqf!C(5f+rQTGS1 zhDkEW+M!8-W7$okc z4gKWad(QWsd+)i2m;9irs=|D*%2J^tgv`v$=oi>pQLFF+coeRxc+I4+2EGcvZZg%C z!|zV`p3EksKaY@4^@PmBH?gOjloJ9L{&^IK_*?n=nE#*gaE>vzLA<*g*WVdnSw!*) z$PJ?`D|#Zpc~ohXw0ys;H_M~U9c5nb-%dfF;Ag1M0UQzL+mUfkFUJ7he{oQgj=;qu=VX`0r+c%o)FZhKdv5D)k(AL(yqSK1{dT6jQ;t$+Jj*o|x z!sJ!+PZ@iD=WNJmSgwEk_|3*TTaTj@KB&Kgo;Th)ADBjt*K55f%0sM$ufL9lat!cU zu7CXajppQq^XJo{-hPsPMo2%y`F)x>HJv%U?EEjn`j>P#N^rcHhKi%XEWV$TNd=tm z*!kb+`TonllaM@;QGoiJsbxe+_ePM-bjQmP)%lGd|2e%c?^Er6oh4+9hKxx#KED5E zV~veDqN0nhmxcDu|6Fs*vs(R4;~nxYX6NIZ>15!B)LDq*Q=1{#iP^k;Yc_DT%sE@x zf8;dJ#~Ns#?TzKf%aC8AtdFGvIichK-TSfgh1q zvUd*7g8?L9e>-g%5=bn+9;L20b}wN&UCK7vVpH$G0D)ks&QpLA`5V^4^_s(7#)vnT zuTqqF)phgut)xE*`WHyC^{~;J+nyux(>Nci2PPMc-ES+|TkrM;0%BG1u#NvTHCKJA z8TD%FAsKbKXOR=tL&^2idC~y4M@hA|(5mJ2O``VJyT6q-$uEkIJviT^!Qg@D6tl;Dfy0^GVdcS*b@@3qODDG-QmVPtBp;twj1&_%L@KS+|%^s*zKH z=cN7l$ky>5`-tf`0ogs)8;Eqp?zcqsJ?j4N(IZZ%=XiebDEU-XZ+FKr4a z3q3rr1+GBkN3H*{zr_e_*7z5Y0z#BG42#c3$t<|U;F#Y11^w$sa);X+GI<)%e8Osd zs%^g-4y*c~B`m2^$oUrSyDu%h1}!~L+?&pKeTVH2J06-+v2{dr@-p?wE0ET_M*eSE zQK5*iE~MpH*|PJBDBD#2o(fW9WW4VO?7!A{Pmr$%U6Pkyb9ytp zrucICYjf|!v+ipq7r$24>R<3Mhq`RMKx(=R59Mlce)=Jpyy~^Z1liZ{oGr}DvbFkO z>-cQtRiK7E(*`mvo+gxCbO=~g-7oS0zfGOWGFx9Q#{T)%;j1^jtFJD)$X~uaC%18X zsqbVq?N)6Q?c39zy{qDsk51IyO1pOh{e3|0_-;%7ThI%4}?_Br)j&90`c0gUUX1p@_W@(y(_t!y2g?Mfggp!vGZ4Ml^ GsP1oVNia76 literal 0 HcmV?d00001 diff --git a/SQF/dayz_code/gui/status/status_combat_inside_new_ca.paa b/SQF/dayz_code/gui/status/status_combat_inside_new_ca.paa new file mode 100644 index 0000000000000000000000000000000000000000..8fa6c41c65ae14bdabb1057e89f0c653a0cebc38 GIT binary patch literal 5625 zcmeI0Z){Ul6u{5gGFRkD$Dd~1Kf0|04S(EVj_D+}8Fqbhod%aNk&&(oWRjH-6Bk5` z?KTD#)b6QcLTkuULx!O3SSn_5r$RL&(F7Kwh3x|n;y1qdfoP1udl~1xGDCD3$u#aI zFY9mT+v?bP;djyycLE_$23?V3Jtk{naRO!CZdEBlI_O_LvGuUO&uuW$-)V2$z?~ zh5jdZ`VRdyt;yz=J20#I>uUFjx~>yz8$wKi6;hyJtO)$EV7ay zIWhwlhe6bfLTtaj(eD)cCX8hk%LX&)ODG#E>l7<-HaZk3P$Nk!`0EuG?I^`nO`V_NG`D*YvUDi_OQwhC3~A9 z;$uX+!s6db@&c5V`l{e4@gP`#VRGUBbjQ#0`FwlJdg>3sUkX;`2C;;CDaWqPzr_5} zm0lJ0P-4lz_9xQM$FyM5=eh5EJcK*k#dQ~j|LvYFERo}qYPeNALmkHTqW?mQLGoi23GSDm-P!Gj&)@t%k!U8rwYd zM}H_TYh1){g4}1hIxG<{!2wUDrs@K*4duQHhg+;)1QVDYsrlsd6gkv-qQirsq&JwL z_EX0*Q?`SR=bISs3DmcZvyw#i2C%LLX*TgCEHtH_5iO2O3lEyh^hcr@=n zn-95cKRy;~$)WkpMcd8guc+%Wg3l>|b!vTJ`=!MZSNG$EXOD%Feo3s?na;;-x6i~~ z?&5Nn7>|UP6$_-Y|K>N)Cgij2@0|U~2vGjc#pB-<4>Onn_!oxBXSSwk4ZpU?Y8hL0 znr-8ekSOabhZx7c*O7l&0nT|H#APQrhti3+eZl!1(H?pKudfxy=&9qK&(0j|+9%2e z+WUX>QIEoBo?;^FO(er=!YII(r;+Qh|y z+WT%pONZEd(s=YMJu#MiozOnAXBqLA>n@&b z*s7c&t_pDd4fnM_H6AWlcrceZGInMHk>|xuUQ{AT*r^J8jxz$A* zyd?ii`@8>mQ1bO7jqdJV^;j_CfUGpIW>Ehn`y)%y?;zgV9$VFPM?QM6T_;$w;lCSxocw9L= zVIV#$uiCil$G$&^!_eBlqHav2NfBJ=NliO*A-me8gmDm}y$9uao-FIt%%s@Z;2q9gXPn-$-lBXWR7Jl}qC%s!ebm-Vh TVDVgV03!BVtvS?e(z`zae)cxP literal 0 HcmV?d00001