From 97004f0652149fabfbe9f582ac022c169e98d6e0 Mon Sep 17 00:00:00 2001 From: Neciota Date: Mon, 8 Jul 2019 22:43:31 +0200 Subject: [PATCH 1/8] Adds icon and postInit Adds German, British, Spanish, French ranks. Also adds postInit code that loops through all factions and checks if ranks have been set there in there for easy, permanent customistability. --- addons/nametags/CfgFactionClasses.hpp | 65 ++++++++++++++++++ .../nametags/UI/icons_france/captain_gs.paa | Bin 0 -> 1767 bytes .../nametags/UI/icons_france/colonel_gs.paa | Bin 0 -> 2073 bytes .../nametags/UI/icons_france/corporal_gs.paa | Bin 0 -> 3310 bytes .../UI/icons_france/lieutenant_gs.paa | Bin 0 -> 1758 bytes addons/nametags/UI/icons_france/major_gs.paa | Bin 0 -> 1874 bytes .../nametags/UI/icons_france/private_gs.paa | Bin 0 -> 1523 bytes .../nametags/UI/icons_france/sergeant_gs.paa | Bin 0 -> 2819 bytes .../nametags/UI/icons_germany/captain_gs.paa | Bin 0 -> 2922 bytes .../nametags/UI/icons_germany/colonel_gs.paa | Bin 0 -> 3634 bytes .../nametags/UI/icons_germany/corporal_gs.paa | Bin 0 -> 2472 bytes .../UI/icons_germany/lieutenant_gs.paa | Bin 0 -> 3356 bytes addons/nametags/UI/icons_germany/major_gs.paa | Bin 0 -> 3279 bytes .../nametags/UI/icons_germany/private_gs.paa | Bin 0 -> 1523 bytes .../nametags/UI/icons_germany/sergeant_gs.paa | Bin 0 -> 2376 bytes addons/nametags/UI/icons_spain/captain_gs.paa | Bin 0 -> 3031 bytes addons/nametags/UI/icons_spain/colonel_gs.paa | Bin 0 -> 2547 bytes .../nametags/UI/icons_spain/corporal_gs.paa | Bin 0 -> 1679 bytes .../nametags/UI/icons_spain/lieutenant_gs.paa | Bin 0 -> 2575 bytes addons/nametags/UI/icons_spain/major_gs.paa | Bin 0 -> 2640 bytes addons/nametags/UI/icons_spain/private_gs.paa | Bin 0 -> 1627 bytes .../nametags/UI/icons_spain/sergeant_gs.paa | Bin 0 -> 2240 bytes addons/nametags/UI/icons_uk/captain_gs.paa | Bin 0 -> 3313 bytes addons/nametags/UI/icons_uk/colonel_gs.paa | Bin 0 -> 2555 bytes addons/nametags/UI/icons_uk/corporal_gs.paa | Bin 0 -> 1819 bytes addons/nametags/UI/icons_uk/lieutenant_gs.paa | Bin 0 -> 3341 bytes addons/nametags/UI/icons_uk/major_gs.paa | Bin 0 -> 1750 bytes addons/nametags/UI/icons_uk/private_gs.paa | Bin 0 -> 1523 bytes addons/nametags/UI/icons_uk/sergeant_gs.paa | Bin 0 -> 1842 bytes addons/nametags/XEH_postInit.sqf | 33 +++++++++ addons/nametags/config.cpp | 1 + 31 files changed, 99 insertions(+) create mode 100644 addons/nametags/CfgFactionClasses.hpp create mode 100644 addons/nametags/UI/icons_france/captain_gs.paa create mode 100644 addons/nametags/UI/icons_france/colonel_gs.paa create mode 100644 addons/nametags/UI/icons_france/corporal_gs.paa create mode 100644 addons/nametags/UI/icons_france/lieutenant_gs.paa create mode 100644 addons/nametags/UI/icons_france/major_gs.paa create mode 100644 addons/nametags/UI/icons_france/private_gs.paa create mode 100644 addons/nametags/UI/icons_france/sergeant_gs.paa create mode 100644 addons/nametags/UI/icons_germany/captain_gs.paa create mode 100644 addons/nametags/UI/icons_germany/colonel_gs.paa create mode 100644 addons/nametags/UI/icons_germany/corporal_gs.paa create mode 100644 addons/nametags/UI/icons_germany/lieutenant_gs.paa create mode 100644 addons/nametags/UI/icons_germany/major_gs.paa create mode 100644 addons/nametags/UI/icons_germany/private_gs.paa create mode 100644 addons/nametags/UI/icons_germany/sergeant_gs.paa create mode 100644 addons/nametags/UI/icons_spain/captain_gs.paa create mode 100644 addons/nametags/UI/icons_spain/colonel_gs.paa create mode 100644 addons/nametags/UI/icons_spain/corporal_gs.paa create mode 100644 addons/nametags/UI/icons_spain/lieutenant_gs.paa create mode 100644 addons/nametags/UI/icons_spain/major_gs.paa create mode 100644 addons/nametags/UI/icons_spain/private_gs.paa create mode 100644 addons/nametags/UI/icons_spain/sergeant_gs.paa create mode 100644 addons/nametags/UI/icons_uk/captain_gs.paa create mode 100644 addons/nametags/UI/icons_uk/colonel_gs.paa create mode 100644 addons/nametags/UI/icons_uk/corporal_gs.paa create mode 100644 addons/nametags/UI/icons_uk/lieutenant_gs.paa create mode 100644 addons/nametags/UI/icons_uk/major_gs.paa create mode 100644 addons/nametags/UI/icons_uk/private_gs.paa create mode 100644 addons/nametags/UI/icons_uk/sergeant_gs.paa diff --git a/addons/nametags/CfgFactionClasses.hpp b/addons/nametags/CfgFactionClasses.hpp new file mode 100644 index 00000000000..9e841e620af --- /dev/null +++ b/addons/nametags/CfgFactionClasses.hpp @@ -0,0 +1,65 @@ +class CfgFactionClasses { + class OPF_F { + ace_nametags_private = "\z\ace\addons\nametags\UI\icons_russia\private_gs.paa"; + ace_nametags_corporal = "\z\ace\addons\nametags\UI\icons_russia\corporal_gs.paa"; + ace_nametags_sergeant = "\z\ace\addons\nametags\UI\icons_russia\sergeant_gs.paa"; + ace_nametags_lieutenant = "\z\ace\addons\nametags\UI\icons_russia\lieutenant_gs.paa"; + ace_nametags_captain = "\z\ace\addons\nametags\UI\icons_russia\captain_gs.paa"; + ace_nametags_major = "\z\ace\addons\nametags\UI\icons_russia\major_gs.paa"; + ace_nametags_colonel = "\z\ace\addons\nametags\UI\icons_russia\colonel_gs.paa"; + }; + class OPF_G_F { + ace_nametags_private = "\z\ace\addons\nametags\UI\icons_spain\private_gs.paa"; + ace_nametags_corporal = "\z\ace\addons\nametags\UI\icons_spain\corporal_gs.paa"; + ace_nametags_sergeant = "\z\ace\addons\nametags\UI\icons_spain\sergeant_gs.paa"; + ace_nametags_lieutenant = "\z\ace\addons\nametags\UI\icons_spain\lieutenant_gs.paa"; + ace_nametags_captain = "\z\ace\addons\nametags\UI\icons_spain\captain_gs.paa"; + ace_nametags_major = "\z\ace\addons\nametags\UI\icons_spain\major_gs.paa"; + ace_nametags_colonel = "\z\ace\addons\nametags\UI\icons_spain\colonel_gs.paa"; + }; + class OPF_T_F { + ace_nametags_private = "\z\ace\addons\nametags\UI\icons_russia\private_gs.paa"; + ace_nametags_corporal = "\z\ace\addons\nametags\UI\icons_russia\corporal_gs.paa"; + ace_nametags_sergeant = "\z\ace\addons\nametags\UI\icons_russia\sergeant_gs.paa"; + ace_nametags_lieutenant = "\z\ace\addons\nametags\UI\icons_russia\lieutenant_gs.paa"; + ace_nametags_captain = "\z\ace\addons\nametags\UI\icons_russia\captain_gs.paa"; + ace_nametags_major = "\z\ace\addons\nametags\UI\icons_russia\major_gs.paa"; + ace_nametags_colonel = "\z\ace\addons\nametags\UI\icons_russia\colonel_gs.paa"; + }; + class OPF_V_F { + ace_nametags_private = "\z\ace\addons\nametags\UI\icons_russia\private_gs.paa"; + ace_nametags_corporal = "\z\ace\addons\nametags\UI\icons_russia\corporal_gs.paa"; + ace_nametags_sergeant = "\z\ace\addons\nametags\UI\icons_russia\sergeant_gs.paa"; + ace_nametags_lieutenant = "\z\ace\addons\nametags\UI\icons_russia\lieutenant_gs.paa"; + ace_nametags_captain = "\z\ace\addons\nametags\UI\icons_russia\captain_gs.paa"; + ace_nametags_major = "\z\ace\addons\nametags\UI\icons_russia\major_gs.paa"; + ace_nametags_colonel = "\z\ace\addons\nametags\UI\icons_russia\colonel_gs.paa"; + }; + class IND_C_F { + ace_nametags_private = "\z\ace\addons\nametags\UI\icons_russia\private_gs.paa"; + ace_nametags_corporal = "\z\ace\addons\nametags\UI\icons_russia\corporal_gs.paa"; + ace_nametags_sergeant = "\z\ace\addons\nametags\UI\icons_russia\sergeant_gs.paa"; + ace_nametags_lieutenant = "\z\ace\addons\nametags\UI\icons_russia\lieutenant_gs.paa"; + ace_nametags_captain = "\z\ace\addons\nametags\UI\icons_russia\captain_gs.paa"; + ace_nametags_major = "\z\ace\addons\nametags\UI\icons_russia\major_gs.paa"; + ace_nametags_colonel = "\z\ace\addons\nametags\UI\icons_russia\colonel_gs.paa"; + }; + class IND_F { + ace_nametags_private = "\z\ace\addons\nametags\UI\icons_germany\private_gs.paa"; + ace_nametags_corporal = "\z\ace\addons\nametags\UI\icons_germany\corporal_gs.paa"; + ace_nametags_sergeant = "\z\ace\addons\nametags\UI\icons_germany\sergeant_gs.paa"; + ace_nametags_lieutenant = "\z\ace\addons\nametags\UI\icons_germany\lieutenant_gs.paa"; + ace_nametags_captain = "\z\ace\addons\nametags\UI\icons_germany\captain_gs.paa"; + ace_nametags_major = "\z\ace\addons\nametags\UI\icons_germany\major_gs.paa"; + ace_nametags_colonel = "\z\ace\addons\nametags\UI\icons_germany\colonel_gs.paa"; + }; + class IND_G_F { + ace_nametags_private = "\z\ace\addons\nametags\UI\icons_spain\private_gs.paa"; + ace_nametags_corporal = "\z\ace\addons\nametags\UI\icons_spain\corporal_gs.paa"; + ace_nametags_sergeant = "\z\ace\addons\nametags\UI\icons_spain\sergeant_gs.paa"; + ace_nametags_lieutenant = "\z\ace\addons\nametags\UI\icons_spain\lieutenant_gs.paa"; + ace_nametags_captain = "\z\ace\addons\nametags\UI\icons_spain\captain_gs.paa"; + ace_nametags_major = "\z\ace\addons\nametags\UI\icons_spain\major_gs.paa"; + ace_nametags_colonel = "\z\ace\addons\nametags\UI\icons_spain\colonel_gs.paa"; + }; +}; \ No newline at end of file diff --git a/addons/nametags/UI/icons_france/captain_gs.paa b/addons/nametags/UI/icons_france/captain_gs.paa new file mode 100644 index 0000000000000000000000000000000000000000..b9cceddc05e8c81868ee27e90c67b31859f30dc7 GIT binary patch literal 1767 zcmd5-Pe>F|82{dz+1+uS-6yuYsaQ&v3PFYF;3anp+zyKNmx59WIz_AzN*C9`LsK52 z4sIfaMVC%efk;UxSP%#v%7cN3NGf&c&mk=q-`9J-nRSQ2^5#6=y!n3L_xWfYf`lZnO#DHAcJe5#?LIWC?pF^7a=*$2?-2N)1@ zT+9z*{@)dcIF#t1AyBqCJc5LGEMRR0O_`|y1AYMsQ^Sypzo4ZDtPP}H!4|UsAC
%I3Dg~XVGl3k zcU3|~YVikC)(L5_;93dlgPbhpr|l2=hSTlU0~M}~h!bj5gbEV*=Zl0fzRq{K&<$mT z5q>`EiIMRPM04@|RTPy}t|&_MR7nwkS4-~*@8a(~8>X9GP@Ga~b?48>nUbEo>_RjR zU;A^Z3HsjQbWOgCv$-y`b=?c~*;$C>U0vogF;CIz5q9j?vW>t@ z&G!JY5-K51w)=Ysi$l5_ot+L-7QuSwn>4k+0iIH4DlRH-5=KM(sC*iI9ey_V+00qEXo4L&~xm@hf;I(I!+%J$T%)V*^z+pmfM(-3cDA%RJ1Z*aDD$e zzK&HG#^_0roD+C&ksOJq^(A9 zxG6$3;aOBPg<8O(5u$<-gwVAqQ4)blq6r4k3i2?GsKpX3o#V{Cd%N3z?qqV$`R1JO zJZ5Hx^YZfW;>XIDgf##d92`7h>Py25l#cSJ^z!ihxk@K;Dt*!1xs|$2m`wmDRwG(7~t_#;s9qOfP`wgB&&p# zat1d=iD*^PKDI-OGVWW$^D7e(wLjKT$ZpIVE}Ae81J1KIjgLcx%Gjvg&V9R;Rh#Wg zqi;cWD^K<`qVH3l-H{A=C_fGpPuh@0#?SDH-6P3%oQKl$BguCB5a6X3MW3C#PYL1@ zykKPzwLVb4U9?d4vu!0!cA=l}4w2FxKO}X^(yM9kIRZWln9)}09%Br{ho+oQSL zS->+UC7?9rIt2=+=a@ECmZ4YEp->-5c6|X9lSK(n!kVu;t9kL$3CJW{&5KuCWbtd% zeD_8E_BI5I3ui zQU4pltGjlGq^t)r+PSMui9C=ObA5D6iLt;`ctA`Nk+5o$=3{#LnHnam(?bCN(mr`6F8`vZJ+~4EOh&)B!P8RmM1{pK!nCSN zR4R8GahK7ZnasQ_4AKqSI$FY-+@q@TUDPrPkTH{K>T&$na`%cyVd~5)la&^P%^61O zw|k|Jy17r4b){a-G?lK}6?EK}w=IQ6^tJczRapvySB!DjMzdnmCt8PaBnu!Y$9{nQ zavM73uJ|0ryk5Cg-;9=bVtX#_cn#asNv+lCwU!cz9j>K+skP6Z)eJGk1yz;L?5^GOz*hAfAxGLzGhxdwbF?HwR z9^5cQ-3_<}FHv{n8r%`|G~gFe4|%soAZnn&Sdb6t0lYzk1mZU@Lxy7k-kyL>^E1YCG`c3Hjh#@AiM;2;Hp! literal 0 HcmV?d00001 diff --git a/addons/nametags/UI/icons_france/corporal_gs.paa b/addons/nametags/UI/icons_france/corporal_gs.paa new file mode 100644 index 0000000000000000000000000000000000000000..b6f5b6a2ca0f5943847a008975c229053d751e59 GIT binary patch literal 3310 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 literal 0 HcmV?d00001 diff --git a/addons/nametags/UI/icons_france/private_gs.paa b/addons/nametags/UI/icons_france/private_gs.paa new file mode 100644 index 0000000000000000000000000000000000000000..abb2251112da6443c89b8ddb2ce484bdae085ffd GIT binary patch literal 1523 zcmZo@aCdhMadr=LWMO~+Fh9c47sUS$1R%bVF<)hCl!Rb1-l)h+#7dR5r6PurP2#C0RIu0so%~ aSVVI|M3{jN`OnC}$iNQf1I_vmDUtyL!(4*^ literal 0 HcmV?d00001 diff --git a/addons/nametags/UI/icons_france/sergeant_gs.paa b/addons/nametags/UI/icons_france/sergeant_gs.paa new file mode 100644 index 0000000000000000000000000000000000000000..afa48f04c8702a43160166e770b26733bccfea58 GIT binary patch literal 2819 zcmd5;YgAO%6+ZXQFg%^Znh>0hBjAXNSO}I1xd_!R%qz-AZec=Nr!^5 zsn(L-hOtsfZb;HD$?JVVEQtLcaJkdaz9U_ZzQLWR%KmnO(90`UZCuy&W&jzMy{+7d?eK2EdFQryP^ zlHKz9>8KQn0s*tpu!>u$>((LM@RCZ>2XvvvC?On!$E|>u>OO@VN_!F|q;%~^0fu*k zzGUzwcHD*OLkZ@(KgaqIC?f}`I|kc&m)l+Q20*@N3l>$AJbC~nxro>pkGq2?-|)j0 znn8lu@7wRIp(I40kpJQsCA5e|A<0YzdcC?520M5XtcEily;EEG3Q5Iv)2=ld| zt#o-2%-a@6T*oYRxD4-i;r?h|7}1L@=zYV;XDn1A3*BkHyg8y3ACpB+aJoGgdC(swRgUz${gv7wo@T7G?T%4LKZvwZN43vbI#EhRVqDes|i zn+x|!t3R80L&LA9J~-cCA8nM!9f)y$F(149peb3t0_{3p_K7hx_mPH2XLVt1!^moA zd*>!K2a zbApUSQY=^VD>>y_S4$-21@@S;Otbek=8{-jve$r9Ed^Z4vl+ zfvXDiWwSnuE8jB=+lOf*-is{{RR>BDYr27EN4`*h0+U)!=33kfYON?4jd4|{i`uc0 ztm@0Wx=ui!Xp!+1cBF8I4zbhyO-goc3lXcCU;&M`3<~R za)(E06&?a7{D|M@ZPi7cj57b9JZ@T&YM(2s|S$HlaXVdJz9~+!+yHM-((ULI1uN4+Yy1FOQTPrjn0 za#gRw<3BZ5qsg_S2b*Q&FnZuhgBC5%%Z4{!?0=fPja)LE{)=dC8PDwJi*uhtHCoat1+uw7tEtmpG1a0CP0L`Z=jBr4SkOiH{FR?tG++)L6})+; zB8)Dj+O_ym+a|jj1p0EleYXdWmfJn24M6r{C zIAbsEgysZvC?=>hrgr3EXpw3Nt&dG)akj_FGga)#RIPcYV;lxL6{St@q%_!IQKEKD zoxAVE4UJQ;27;=eG@&~Q54~4We$0{p?v22!Pvi6QrXE)wG-JhduC!R zCLv z{w8IYcnaPPu>y^v{Ra6l%%4pMsYJo5ritmGV$xAXw3vR07EnH!;>Gkn+D`A&)rm5q zGjxxZQuc9rwpP4L4>pKhL|L?qn&{jG#L?;_Y?shZ^HX3ATYL7TL`;83sgmbvj);xj z^chqw3J1EDBPE+y)5-ejS|OY|l_P4TZNXzYfbq)VUXE|csNCp0=p^Yq$bwBoR?LdU zGuA43!1ha#L8QhQnhn8D5Tqe8h`yDs(A-Wn6rf~#>FEhNKqu*hf;~0SUqyD5dTFPL zb}3i|?W0G}otT?o5XRCWYJ5y@S2EF(d|2`jLobn>$=N8zPSi6RN{$M)(nRM)wt~K< uB@kH^DQ~me((6{Plg3X`T6T>2(eFeyou*HbrdL5)mP|63`P-l7)Bga-&`_BG literal 0 HcmV?d00001 diff --git a/addons/nametags/UI/icons_germany/captain_gs.paa b/addons/nametags/UI/icons_germany/captain_gs.paa new file mode 100644 index 0000000000000000000000000000000000000000..cf99a2cb4028881560944e4e65ead6f2dc6a71d5 GIT binary patch literal 2922 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 literal 0 HcmV?d00001 diff --git a/addons/nametags/UI/icons_germany/colonel_gs.paa b/addons/nametags/UI/icons_germany/colonel_gs.paa new file mode 100644 index 0000000000000000000000000000000000000000..d46b75527c4c729585a01dd20f8e659757410c88 GIT binary patch literal 3634 zcma)9d014}6~Aw07(kFWB3h%!7F?Pd;WLC7H8K*S)--~3siLjKB{6EEaYaOCq?DMH z5@HM{R^t*vQWL8paiLYgxFlayFiot9%I3lT^d+r%`ZFg_PBd%(R;`Wq z72?l=6rcf-4*H5wjeB&5iWPL2Vs2tT>q~nj)6D@; zcG1cpsG3_lsSYk5_X*Ym6G&=1OV}4DRCm9BY65Swm~Ajc(Cf zBJVt^WoHumbZ3(`t|Y@7@2X#CvjR3Wx$^N?X}7_W ztefXvwHB_`OT|aFH}O9iBzCSx`&E(eLR*ekp4IN!nkDvjyCS_{hN50rx#0p`Q*Wn> zJgkSKSeX$c@9UNj+dmii|2f4OW^2*6_(9}{OIfX zaEQXMAa2UL0D50yaE?N%a_*THO!3k-FwgTD3x*blV`50Oap$k-Jl5wcK;(^}sI?;Dua>q>}SdQ77mRBPYX-&n2qSNt2#aH*Qu4~Yq?KBD!lps;!x41UZF!Yh`HYUIpS7?LHq!wPNIdC5Y(8b6Ln~X4D)`ln zA6c)?cU5hLof@t0yHBjeD(9~wqMt_luDqJp2OajvFTZG_vQxCCHMzRY{j4>=Z@Fs@ z&KYN?-M!cGi)9EnkUzb^I40)mSw zdE{ITUBf@{FmXYLA-sB$YqWcJOXh}3`aUb~-&9>`UD~myB`WNQFZI3u;T)$D#9bpC zJ24h5%^m9U&I<2;;82E7DU_^zZX5j*x8M1bdibMGYo59(WSCYpmsR{cM$t#LCmXRh z${j<;tRH4A0XeMMZdYFWD7SCiaj%chefmi7e(g)i^{3Potu>;s#5k-SYF35mB9&od z?%=dSgfGwxcE{miL2bTHEUPHu*~-nolJ$eDw0nS!ww%k%{yTn$Z+E4I0yXHHqKU8E zlfLN4lAG;#62+OHwo~i&FdwT{P>v{QE{r{jXV6g_oO8pFD9ITiI?BN-H*pu-@hE=QMoSEf@Be59OA6tiSOdVI2w$P*1wx;qWt7iS5wSA@T z9&8a&5fzP`+L{sS;bw+niu!8nG;5~3E7X67dpt)}Z|KsKIQ z|A={Qi5@LU&P@wMMK4TNb+XY{ji4LMHYRo%1>9Tj zSfofzzK<7lprSOXp0wZ zxPH;l5A!_aOrP;M-6Hy-gJBf=-$YiZPL3b41dZ_~3v(L|BdE&~gC7furQ$eTrY+7s zA(}39@&j3Ujmp$ZGg#-DMOMf!;V5OdIn1u+pr0{JqnV!wPwi(8ix=-QTo!YbhjRE# zMpy@KpwS#oQ<`0qJeHV8z#MUb%_IKys7F^a#zjBW&Km7x4!`7}`5yAQk!)wr{9|>DX-&!c?{d=nk{&iITG%22E7(5 zr%oM;Ep2V)Q!Ke(EQ!`uQZw$eLkpc+((F$u0TJ~Jv>>0H95d#(->XBuz<53QnMNVpjAm+Jtr4zqOd&M_#P#PF}d~VfdJX-!(%Z1@M@>c(nq<_B6*<<>o zytK`tlf^n?r7`*&Oh8K*jU0mY+0lzwx6mX8E6gTg5!Fg1glwcEvZEd?lj!C-B#=Ud=H z?nIk*I9>m@F!4$H;Qo9yLh#r4L|aUUxXQt;82)ka3|?wa5SJ3fivsVRlUX~ee9xP) zPUZ@%IODyAn0K#YSv}KYZf2Si|evqFvT>+N)jPn16+*cskEkHJZmzZz1$- Jj_bM3{TI}y`2zp| literal 0 HcmV?d00001 diff --git a/addons/nametags/UI/icons_germany/corporal_gs.paa b/addons/nametags/UI/icons_germany/corporal_gs.paa new file mode 100644 index 0000000000000000000000000000000000000000..a02673671d4be263f0d5f54f51fd3024443f240a GIT binary patch literal 2472 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 aSVVI|M3{jN`OnC}$iNQf1I_vmDUtyL!(4*^ literal 0 HcmV?d00001 diff --git a/addons/nametags/UI/icons_germany/sergeant_gs.paa b/addons/nametags/UI/icons_germany/sergeant_gs.paa new file mode 100644 index 0000000000000000000000000000000000000000..b3b855ef56c9241fb246cc2282100c295460cd47 GIT binary patch literal 2376 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 E0K__J9smFU literal 0 HcmV?d00001 diff --git a/addons/nametags/UI/icons_spain/corporal_gs.paa b/addons/nametags/UI/icons_spain/corporal_gs.paa new file mode 100644 index 0000000000000000000000000000000000000000..af3a9a7cbc2cce4f572310ae777606a8ae59466f GIT binary patch literal 1679 zcmeHIO=uHA6#iy*v)OFYOb-eoN>UXC5h8diYB!3>r6GqFX}##dXu*R=E2T12q4)!$ zUKF7S1<%r6ixf{PN}--SRCDkmf?)9y(Rt2fc9TuLw1?i@;mywb=6gT$9>Yjkt(Hem zSI?GR0IgPQyseLwYepyi8NFH_t{9zZG5ScQQV;c7YMIg-^C>`hz!@zQTBfvY?h6s( zrvrz;MR)Wl2Hp}7q?lj=W=f9#K(ZR!R3O zge-O38P#T=OnfU2D--(JSVt{SD`lq;9 zvaSM;ZBq)jxbQMOijtz)8G2)tJij+f&&d`l=Pb&wT{=56L4^exA!)fh&&O>km)oQ! z6A?S3>T2M6>~YkPbXzPdCgrjFqIwc@*p=0*kyl;*&Z)i3>ouZ&^rHbhG9B?UxAhdT zf66?``{UsC(kA?_b|@teqni#@=% w$KVcQE`6ryuN+O9rkfn>#`+&34vrjff-%qnEne0S3)9a@8gSIPvCdoZ7q%$I!~g&Q literal 0 HcmV?d00001 diff --git a/addons/nametags/UI/icons_spain/lieutenant_gs.paa b/addons/nametags/UI/icons_spain/lieutenant_gs.paa new file mode 100644 index 0000000000000000000000000000000000000000..5ce43d74376f23e5bd5fa5d462adc706c0169870 GIT binary patch literal 2575 zcmd^BeNa@_6+idw+sCrN-UrxaHHzzkEyF0%l|l z=IwUl_%Wu&IHqHb6+}r4PBl(aJ0eO$tRL70r)H?>BteK%uqJ#Mh>_iQPVb|We*M!< zr~l>NIWzbC-g)QU^SkGrd&1$eGJoaLvMRp}0231v&S|~c|FEHx7=~WvFE2H8CdANJ zmzGxe#5ydbLIK!j0oWK1a9PN(kf@OVZur0lm(5@zkoZ65zbFR$)dCtt$Vn_=EQMC4 zCLVHG$c0`zUz&hJCFHX6bfp4q2kqQv{cZFiJJ%#fuilS#2M;IC!l6Hs!@&++N{_{~;LncCuI{DS+P&5G{Q zl<2jYjAyNw(QOV`le@Bo>9WAH6J|?Xhu6V)>GA-_r?UilA+Tg=G1q@e%&^&=6=e8g zfWNmy>@4&EK8pMCeGk`C7VB@sHr{tDUhMp~8-GaccqdlO_qpH4gIJ6D+#5Acs?(cs zyx%R{9P*9g8(8}c7LeR%-DrpLQ6u`BzJ6?`XX-FBm>ey~y1Xx#KvS}Bc&CBWIM^w7E3bLb(nqakD_4?c(I)~|{gF7RVKh8v=o z9bAYR_ynG5+rjrN8^_a)YW|xfP0ih5#{2{7>D4%1%p2vl^^j4>8{&3FmwUMW5;ZQ$ z6ZAa!lHjDwU?H$9vZ@UxydB^fxM`ZHNS6R>WkKuDR9M?>fm+7l@t<>eQm!x3 zW9#>>Uo(9s$M&wt`~DSN5{4f${`FThB~l-&kC@-y|0q{{ z?L@OLGJ*c@Xxm_GMEKN#x8a3(1qT*)hZwi{hBYR?zEn^9!yag6TzWGf_GZfM+Pv95tguXOOjs?rMRw{z$h(e=f9H4cADs!aS_dHQNqqW>JN z`eoII;5{NII3ZX1Ka}%{=@KYOV`i-OSWPM;MX$2OxlE&2MT*VxD9R(w#N$|#Eh~5` zs;~ChD)AJWN6O_IY_GFDL3$L|YylZxr~A=+wy=#;6p#Iq8UU-a;qeyREFz?+9>k-) z;+8viKB-UY5({j_N{Uhe;!G!}-a;@**Kt!im(-`7X8Qg4^z=FSUApE|nn(2qCzFb2 zB~eKfn|;bPd<>mhQ>tD{E!e+KK}%eeuHep?(~C~pPM6;T#;KnU<8lK0aK1-9OoQ_* zF$!J9U3vwo@1}%QtiTuOsvQcK#SMDkdpIBF52lU8a#HwTIg7 zhSmK}Ugg|>K)w5jOWf8Y#S814otP_|7 z7OV?;jIWn=QSEDViE6`2tqp$t8tvL+#z;P> zcd(&FX|Rb5i*$6dftx_)0Sn-LMeH*U&Bz8IW$r(-qr!tzL>92XN`TLdhDV7X19XSb zy%TnVctQx2Ll^1n9m$sSPv literal 0 HcmV?d00001 diff --git a/addons/nametags/UI/icons_spain/major_gs.paa b/addons/nametags/UI/icons_spain/major_gs.paa new file mode 100644 index 0000000000000000000000000000000000000000..a3844c8ce2760757e24076ec4fa1c72d367fb2c8 GIT binary patch literal 2640 zcmb_ee^3?29pAh6-o0P&7M_Sm5s*-VV8K99MDloG0x{7_u(8HTqci>(umqz6l?nlZ z4xy&TrZaY^+DJ*X$}o-EL}N#dTB|0CDEfyL1Qg8!5qP{`ckga*x4S$<+y2wc^uDuu z_xXH(?B0IAx3_h51qHc3U0AR@R|^0@2$hcG6}d|oCiG&sAa`*-!yIi4FU!wgYNyY2 zwCxZ8IAs7}w~^Y@mS_SXo3{V$vI9HN2tY#s51-1v0Y-l>!ldIM2eUb7(up5R_2Crs zF@}lOjF%CC1Ea4;PB0ui#X*DKKUn z(3da^&zEp;W1NU*rO;XDG;74fyJ->Bn~3Fvs2Ft;>9Duf^@bz4>H~AUv45)ET@6Qs z_^$h5g~lsp2T69nA=dg2EA6+^LUCysbsf&a-9JzjSC_kOgw%hxVj$syMMafK+UR4B zAV-RetPtz{ZT>FYt|TP)&ton`la9SBVQD(@hrzg@?DC+5dGgpMp6TjW+RxbNok^YP zc*F*Jw{WiQ0q!>(j9)Zd$w)r##nn#?KU?IOzX3)u%Z?y?r-(UcvMwvmdtA?~>+h^R zpGWUZ;@5dzIJ=%cm~_4dMm93Gd3g=vwE2ryPa0O-&0P<(z=`#g=kEK@=E; zUgI|LK|Xb261};v|Lb5D0xTO?jr(dQ_=`X5e^l%ynlf1Z7Weoi`P|LPS=V&lpZ;1o zEIgFt-nxp#_=J5v3=EOF$Mq?mVXHSDw&Ggpy{8Jgq<+OK zHaxTnp*!`S4H`7?q=J|yp8KUVhKdge61V$lJ#sLtruGj2I2Ys2NO(3d1nZ9-yx#lX z;>PEkyr)EUA^gC*oat0M?kYh*ErS_h=DX}?dZI$^5MDeQ}cQWI9wCN$L? zY`u=WO}!CYp{3?fqW^g2gyxf$cJ~+f`OOsi^x0~=eS$BWTX0p*Vp%h+bA>Gp35cSL zP3!)AjZs0GyCLUPOKl)%mP6`&!N`WUaDzE)QV~qyEP1$yku}!UU^HN<`&Qh(fvp@M z0fK|_8N`eLIBJ&hJ{!EyLX?N$uy5akZ!aaUsW)l?ueUH!r@O0`kqJ}wXx@@V`Z&HFg65t z$5JH~i#U>vTR&3dM+@yq0gCo1*UE04d4FTVBtdgOjT2kCvzh}t&~F1T+}5cti>-WK zsC%~Df;0nLrsKgoMFWH3(a#oEW8wlFBdL;eexM594FqW|eaE>e90G=3P56Ip&w)74 z?C1u=={`bYK`cn-|MO4a;^8SC8Vurd(#!|pP%v^lGzosQ8gmofkj#rv?qsi(HdDW;VXj=t=mZ}pK@SJ* z{7$-Y0Hx?QOVjT{y@d>38kmNA`0*bOR(e8hkZ|HM)i0$`8&&izCogh&W?vTi2XpGN z{t#Uf7i`ygJ*uFSkK3=g0sX}%Js(v8CYEbOPL)mmM!b3_)2bzVCM#6>KBhqlBFU zTd=BlbDD+ZZ0av2wSe%FjhcP>KE5P-s!W!kx0Uo!v#Rbr$?q99%4xFrbNRJbW(?`^ zrO)w2m%e=ZDcB#{I6 zc;2U%^uVO)K!j+47Q_MYwHk_T*d~CA(`OQwe4V!cAlo WF2==e^eD(t(F6L$zEe7R*!vfJk*f9p literal 0 HcmV?d00001 diff --git a/addons/nametags/UI/icons_spain/private_gs.paa b/addons/nametags/UI/icons_spain/private_gs.paa new file mode 100644 index 0000000000000000000000000000000000000000..b486dd488c8be47654b506b761c03674495b2beb GIT binary patch literal 1627 zcmeGdyGjE=aCURKT<(%=ny7`ZB0)O^!75;4G}kDKiYWL81}y?X(Beb{t!)I0{D8F( z5EQIMNMR**Rw-1FTqN$TvpMr@RM0Lv%B;d&d9s!g!p^cF2Uomtq zVT6I4TA|Bm^+wl0?cVq&e^{+rXt3go*_mdZ?@^{0Z{zRlg0SnRq$g0xg4LG1R(n3n z&6a$2WgCq8uV0KhN!X6mVfjlvpVLDheZlTNvP+_*EzW z@R8z+lKDYqi$jWWQ5Hf24PpSs9Z&-u?ZRU~aW2Iz^*L8#JjO?<79)-j3Mdf4o_-3{ pLukOsiJ@Jw>*Qvzt5bv^z71Qj1tKouOZX}f1Rr2%2L~E`{}Wj+m|y?^ literal 0 HcmV?d00001 diff --git a/addons/nametags/UI/icons_spain/sergeant_gs.paa b/addons/nametags/UI/icons_spain/sergeant_gs.paa new file mode 100644 index 0000000000000000000000000000000000000000..aa76186ddb2360f088f8138165bf354984e71b9a GIT binary patch literal 2240 zcmd5;ZBSHI7(VCh-Mg3FWzXus4iEwI9!%8!QxnL;Xs9QgfbC7bs%=%K{5GGLqC;ge#Lruy?v@5Wt8+xl~HS@zJ@5|;v zTYq%W*d}ir?5vDdY@hqSNglLu(!3KocoA-wb2%=#2THHV zo07Hkawsnu7s!HBD+J)s9C%a?@sw9xd+2uyyas`#yc2xTW8(l|*nTS}A}C4m%z~?n zctuvde{54<66{UjZ)J6;HATBvIP$gZd%I!(^Zag>2cC826p;;%pbIXK=85*22LHHl z24yjZPArEzPjOJ8cWcjx7BPia%$>Lq`qDY{!Kn?mO2|hYT^WOr}igW_mvMB{p)~l3TH`ddF8ht>_OZIgwCUcVQXa4<~c^qM~1}2B%jFlk~}x;6lq} zzNe@u@JMyEQwL08I28`S;VQAGK`gsPd7;W3{aNO&soVKcw)S}RDlc~yfOF) zFm92|+2Fjdf2t>j3dOPrT(Kh1KrOquTfkvNxT5+M;j06RK}fkoxm$j0yFC(9(FT%f zK|^8KLtMWjLPA7V7*Y-|kOzhY6kY@zLPTOjGLSU+5C!SKqkfZ!ykFtgku8yo7|&%q z8%Du=jY)~nk~z&Sd<@Ki7=|JY5bnHT0S6<56q;?M31aZ7Mv~#sZQ{t`!ARtCZ6KL2 zMtfa}-|+Sy5sKk^A7TngAqVJRUyPF(uMY<`%Jgqia1YH$GP~Lsv4yg<&~76nuZK;& z<^(}hSdLM38nz&%SGK5yE;?F}2MqzwJ+LQ-=_U9g(3RXMI16o))a74eSFWUDaGKQ9 zq^@e$XYzxV380>>kk6~x!SS%;%m%p`avHf}@O!MVbp<)B>sD8)-V)ZLgQe(gJ*|g# z0x{W~l4EYFK7$^wyf@%a@)}&kp8#ujTWvSgqI&kLZ4zTNFcNB)S((mrE-=HUlT3jE zJaQ&g4|T!VY#r8Ap z2(3Md6rnu??Flu7usWid(_aK(sc^_c51-vwjN3Ggq`6(vygaNQwhD4oYa61KSjiDW z-qfl@j(Sy`jC7->Hp=PRf*AFIbt7>*)~PWG94Tp|FdsX#k1gO$Sh%L0jy6F$HYAdD zmtZP5@M0S2J)vey)wyVo9-$PkV+X9mt|%9EQLlnfiS5`9FX0{8MX?@#6R#Mfd>qeX zknz`z@=sV-A#yS5-@l4Kd?||FsK117e_I{m-m`PNIS->;nvJ75Su!o|MpTGGW)L#2 zi7*po%*KdO2UZGkxC?iK8lOl#3>RV}!gQD>{)&%vF#H+4OlkcLzr!}BG^LT&qf9xA zV{j}}Qf~zjB_feAg!I;uZH&|si0{NwTqToMynd9C%eWR_VWdh0L`E2i);1txFctUV VzTIMSsMvpqjfM`FEFRcg{0XAdR;&O3 literal 0 HcmV?d00001 diff --git a/addons/nametags/UI/icons_uk/captain_gs.paa b/addons/nametags/UI/icons_uk/captain_gs.paa new file mode 100644 index 0000000000000000000000000000000000000000..aeb89e3043fdded00f98d0acaf0ee076f3df576c GIT binary patch literal 3313 zcma)9eOOdg8b9|k&WuRh5e*F$?vff=tD{+KYB;(kwV6$BPfyRTtz@ok+47)EHoAOV zh+HIA!9LbnS4V1BOP|D#%CCjd^4oA!P)rAgPk})gVSoYd`JFwN0Vn_4d!BP=-gDmf zJ@3cwzW2R~l8`X>rC%q!JXc2uX=!Ph*iXMQ_j!$G{L<)zxeFI)w7{oE|8~KG7cBh0 z!sm4(A!~*avN(*8FZn#jr;E@3@3IgJS!^WLM3A&GOos_DI1xU&pVXFALDCJQdlNQ_uE^m(9 zh3@d!7M3m$T8igjm@Op-xRYlNNBJ_LIfb;R%g%L{2KYUwQOxJpTW$hj(c=3Ah4BNX zH@DADeA@z;TERSYSFhy&EUmO>7WV3`P3YYsn5>4&cwzPcdsd7G*WZ#GRP)#H9Hn<` zvJd;h&COF#Nl&R_u4c4%z>LIU*nz4&xQ3I8-`VY5|V#Z!sEDqa4$|fn(T_twa(K(ENi4TOp88^g625C*`F{Gs`g~j+7x8W#4?QgBsuvS8pu*ja+h{XseEv?skJ@-HuCao=oZ?G&RMi>z2h{# z)G#~%oc62XctjO5d}ySt^hmg!2k{{4sdHpZSr-Q?+w*1jv?)AY+F?1Ex%yGXYnr(jvf zD959BP0L>LI;zvwct3E5nw7cVV|fTB3?^GUXPYr`E%j3}&+lGwPw~rHKA{gu;=FV8 zeLQ~8PWA?7VCtG+l}+Ul-D7~AiT6MTM%tfJ^D}Xd4bf`G z0HVE@Luh7F;-y=yo1v`!s5+_u`{tltO;umlvOB;vT$qtGxXCwOPHJWxR^+XN5 z33uw|h|OVtvdTTsuFKE?O3h%x|Pqv^X*KYEjcyk1u69?tr5}J zyu9#7TSQ+T>7`#AvxjfIf2+OtZs}cDxuGV%r@hF7eF&i3j-ZL@H7{b+D(ZXN4Psf7ue5j9 z(1uTn%4w5oSb^t)INe3MbaJoxcAoQ&&3mv`-7p+x^MgQrD?8c{Zq8D6B4zx~i`&NO zi`Epyt8<&_PgttK#vafoNDJopJ2SJA-VNJC>KRg^5D(|Pk!tEIo0s4ZJYhvRy>sflH@(@Inzso#L&vD2`J2R-ICF0duhnynJ| zix#manw;EkyEHF00`Epjer<1l?0raKXKL}wz#hVow)Tjr4~OZbXw5kF(V-|rHGWk_ zOC0iX%;Q4E^B#GZm$D|2+=_R|75ES0CTh#;o_K?`z$eP}(3v|>$J?*3Yt>P4e9!S9 zTZgnZzsz64s5vE%t9Quz=tGnER`2wkdb~H2%%AEzK`J-lAfD8;k!Oq^Y_phd5>q*T zsKv9fd@+6D1NbvTA1FJASbxAj3}q|vHz%DEa6w!=;(Me7@@82)o}S#FWqvcT#oyAr zMW{hFz3@3*u1PCPq#0Is8_IAp-s;36zjg|Fm>xzg>%5sQd-T>Dyq&s}pqXTO`5V@a z&Tes<@08V}wYhb4hUUV$4UF z@>dSdp;(L!5yKE2x|H{$*OA!)ajZ0(%!C&i)$p)ZwlbPGAcToLc{Ou5B1`CqXenLH zxDQ)6*hWQ3rFQ)U_WMYwSU(xtPva_{j^eNy(}z+AY2bL8rAAA3@(Wz%ncjX2E;c_} zijFX!$JrXPFiNV^$D-#|9_7eT`cD-9g+34^rACO@VKHsLfrB(6TH0!wg+x;on$dP@h}}5GhMNs-bQ+$IH%cgL9A`!Nl=*zefHCCG+FM literal 0 HcmV?d00001 diff --git a/addons/nametags/UI/icons_uk/colonel_gs.paa b/addons/nametags/UI/icons_uk/colonel_gs.paa new file mode 100644 index 0000000000000000000000000000000000000000..b0a6e4851f53529809d116f876f76cb4214c8946 GIT binary patch literal 2555 zcmbVOYfzNe89v{)%d%YDvy!+b3t2u1V;D)5swE*!aJ3F(OlrMmTBj2yO~y_-PR67u z61tKvNYFSbBKebPe}trMoWYrbCMMWg#7m`PtWqyP#mmAXcTn!jvgdhwK9*h9^hZ10 zGiUaDpYy)YdpVbRbv-|S^_CyxzqH!S7#kcM)Mn%#ul}JSll&QS{^}R=3|W!WkT>V$ z{m3o9bvajA7&~NTY+D>-N94RJXSbaH+t1D1tS&|pD?EC9OH}xO06~Sv#G{<5k)l5m zWveIpI1zHfSgS!BA46LU6{=1kve;8>rjVU$e3&rH9%0^aO=hCh2oP!E*|?Eh=3W(Fi{2;gyS) zNDVE-S;B)hAEbgi>?5#3b#6@$QyQo)M}$G)C8@5VlF@^ir?;qNAS2TfIL>;c+o=EK#0xySD z{DvQYviKUOu)Q0X&{oP0A5h=Dh6x89@c~PfX($zQCTt{;IztDC$^6 z>;;O+ibREpVy3@g<5Yj^b|66MVHHJEB>b)+%TOEdc64J(w0P z;ym_r1u8nkO?Vxr_lmFQv_Y#R&j{TYziQXn7dzPn5iF?MJt;;#RbKR0p5Y@@Ma>k7 z_p7(s=8Fy$(>>}xo+(V4{*VR4pGxOf9NsJHb7vzM8hHFK_@IYP3E$i9KMw7xJ%K)( zy#=R-Jhg42H^ojk$FT>=&(0bI0`&_A+#R@v(Q1};YoxX{=)O8(ZzT+%4nqi-aBeQ( zf=%yk#G7IajV0RTCG?hcc8D&}Fs_T<;0`D+tc+Bm%wg8*16hOk2E!8#&C_D2(t8X- z447b>tE`^4F9t7lYK4l<%G{&(#AoT7w@7w7TjGQ)Bx*lh9gKPT44Qw|~T4ei6_kUDyzv6+H zATs zQGv|@(dvfd|0fP3<>-u~+#2-Xsz<2=8p3Xke+I>A(PjzE7g~rkrm+`PwpU>)4-X}k zA)S^xW&qd}O2?~IPK_zBrAW+Ut0vOvI{9cH@~e@lNw7F^IF~IPCjVM>t0C7Xo~}(e-lbJce6N#Mju`eEzuK%{Eu3Z}l};b}Ylx8xF2H;>GV!|4Z?xlY5d>eEKr`qzzw+Bo{AM?~|-w zAMWAxF&D2-`k9w?;{c{&Quys8MQlVR8%c)jo2<;r)`b#LD3eyin}+P>kLa*H4zVP- z&1%MHI0}*AvLxUbPUEi&*2IeMVPme9pOSC(4Ww?c?%=Y*ibolcjAmwLi)2rxFv_B* z6n08s$ixb(`rI_u+0{+huCPhjp{a7rGkUj$l#FyNDUzL-?5|iXV>NMH7E7b4NL literal 0 HcmV?d00001 diff --git a/addons/nametags/UI/icons_uk/corporal_gs.paa b/addons/nametags/UI/icons_uk/corporal_gs.paa new file mode 100644 index 0000000000000000000000000000000000000000..2f664f8b3ac806acaddfa402c3182399d717efb5 GIT binary patch literal 1819 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 literal 0 HcmV?d00001 diff --git a/addons/nametags/UI/icons_uk/major_gs.paa b/addons/nametags/UI/icons_uk/major_gs.paa new file mode 100644 index 0000000000000000000000000000000000000000..562ce1599c8eed4b4d0a26197e54a247df9c12c2 GIT binary patch literal 1750 zcmd5-Pe>F|82{dzab0)E-nMKiVmXOLnKV`wwv^76Xhx-2h;*=!3J)GUc<>0P43t)lr#}#?L!!8VfE^-IKxn0d4SOkh=xr7paJaH>@TXT& zA`v;?(#gS+go1=Bv-*kDs$2C%Ed@f|Gkrp+7^hl__>JYj1N1BRZC4H}-`ntK7a z@}aL~bLuNuzmwNCr<7w0ba3jX4!;r+eyJR!y>P3wP7dZu<2;Y`<+C1?Y6>S6)C4;G zn4n7z@H5bnr?w6ux4%ZT!G@FK|NrEDW)uOn1h-OE@a|mDC}btQC1_aSx-!E+Dsx_r z3C-^-=CF8Th|IchjZplJkq}AMP%hji5XF`eFXtK}Hw|YsW zlnf5Cw(4IYm!1=ib19fS`u5P=VTQi_(>Ym2_h-Zy#9$2mp5Y>DoGnv!cnZHSmZ>I) z;WXk5E@H-n`3Pj6VOMWt2&enNK3GfN_p1@PJYtD$b?Jy}Z_CVC*;CdHXuWUMlngDX zr}9>jYpbt#^#d$_mb28=-V|#_@2(?;Aq*V=Klp>a0chjTdMjk&08U^wjU$+-k|*%W z1AK|^5-?gXXJYsbg>k0Y9Q+cKk1m8N;xLR2p#jQ%MR$Zrwih5nwZa$;(FQP$_plbt s48F%N7_Wfc3iofo7+p@1ZlF@Wrt0wswqVC6Dj>*;X)u^PzIo;R2HxTn*#H0l literal 0 HcmV?d00001 diff --git a/addons/nametags/UI/icons_uk/private_gs.paa b/addons/nametags/UI/icons_uk/private_gs.paa new file mode 100644 index 0000000000000000000000000000000000000000..abb2251112da6443c89b8ddb2ce484bdae085ffd GIT binary patch literal 1523 zcmZo@aCdhMadr=LWMO~+Fh9c47sUS$1R%bVF<)hCl!Rb1-l)h+#7dR5r6PurP2#C0RIu0so%~ aSVVI|M3{jN`OnC}$iNQf1I_vmDUtyL!(4*^ literal 0 HcmV?d00001 diff --git a/addons/nametags/UI/icons_uk/sergeant_gs.paa b/addons/nametags/UI/icons_uk/sergeant_gs.paa new file mode 100644 index 0000000000000000000000000000000000000000..e1041d08a930986869334aef6161c217cde16a95 GIT binary patch literal 1842 zcmcgtO=x3P6h8OnC4EhkoFJL#l$sYxEJ4dO#36P{XkKefOBtK$#L`90lp+2N6+_XP zQbYSFgLF|!kP5Sy#VjiLQ|K&Y5EU9+%|fgQiVL*?1s4v};zC5L$8%oVT5#ja_qg|- z@BE*4&f_}H$jDIX@sY_P0|1Dq;^L{HCl4_R9vM1c5UhC#zECI>ZKfSwFR)<43-GcJ z;5%OaHh>tf|Mu8mL(>Bt1iIruW9tQtAzckRhfpIk1f>6AI9T&3&j}3&=S;^J=?Gim zql$1BXHmIk!dO6f9y_tieA@LA`=;m=5vdlp0XGTvV8W2ZHi zcH%XbmpG54R0~TQ%QziWxXAee6jQj&a)o1f9-SgPm2e7e9L63#VVLa{W^sVe7@fWS$d!%Lh^MHsE3BJ4E5kQq{xgI&A} z91sm@)fg|Sh&2RGa15#FuyaXv+Nwx8!zN`eNdjirh#4u)qmv197xolhmON?^*x8{;YPVN0qkk4Gc55(PRfkQSeBU~UtDI96Kl0;!G+8S_el-X;lt6E zHaBxEpfP+uN2%fdq153iaL1t~7jKK=^hmuPtOdBYM^Iz@Y_*T095Hy@YTc}T%!n6T z#>b2!&Hsnt(|7>yd_xq6IAoOjn|s{f+%)^WYc@D!+nlc*vS9!gmGTtyD3A7l@tCJ- zx8;pA+5wxk(t`F?zdWTL0*6 zoPy7yvD0s;gyd_)#EJpqr?c3w@_5;^j z{X!bEf&OGi{{dLk$-zv_soI_#^~ZO{(@ooo)`o)e4zY zIza0MfPmJ)xBntCz> "CfgFactionClasses" >> _faction >> "ace_nametags_private")) then { + getText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_private"); + } else {"\A3\Ui_f\data\GUI\Cfg\Ranks\private_gs.paa"}; + private _corporal = if (isText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_corporal")) then { + getText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_corporal"); + } else {"\A3\Ui_f\data\GUI\Cfg\Ranks\corporal_gs.paa"}; + private _sergeant = if (isText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_sergeant")) then { + getText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_sergeant"); + } else {"\A3\Ui_f\data\GUI\Cfg\Ranks\sergeant_gs.paa"}; + private _lieutenant = if (isText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_lieutenant")) then { + getText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_lieutenant"); + } else {"\A3\Ui_f\data\GUI\Cfg\Ranks\lieutenant_gs.paa"}; + private _captain = if (isText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_captain")) then { + getText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_captain"); + } else {"\A3\Ui_f\data\GUI\Cfg\Ranks\captain_gs.paa"}; + private _major = if (isText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_major")) then { + getText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_major"); + } else {"\A3\Ui_f\data\GUI\Cfg\Ranks\major_gs.paa"}; + private _colonel = if (isText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_colonel")) then { + getText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_colonel"); + } else {"\A3\Ui_f\data\GUI\Cfg\Ranks\colonel_gs.paa"}; + + [_faction, [_private, _corporal, _sergeant, _lieutenant, _captain, _major, _colonel]] call FUNC(setFactionRankIcons); +} forEach ("true" configClasses (configFile >> "CfgFactionClasses")); + + + diff --git a/addons/nametags/config.cpp b/addons/nametags/config.cpp index 0f491efce1c..2db10c7eeb2 100644 --- a/addons/nametags/config.cpp +++ b/addons/nametags/config.cpp @@ -16,6 +16,7 @@ class CfgPatches { #include "CfgEventHandlers.hpp" #include "ACE_Settings.hpp" +#include "CfgFactionClasses.hpp" #include "CfgVehicles.hpp" #include From c543a8c4cb6555ecb3a993ee875fc613bfe25b08 Mon Sep 17 00:00:00 2001 From: Neciota Date: Mon, 8 Jul 2019 23:05:01 +0200 Subject: [PATCH 2/8] Removed white space --- addons/nametags/XEH_postInit.sqf | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/addons/nametags/XEH_postInit.sqf b/addons/nametags/XEH_postInit.sqf index d4df0cfd98b..d80a3213471 100644 --- a/addons/nametags/XEH_postInit.sqf +++ b/addons/nametags/XEH_postInit.sqf @@ -74,7 +74,4 @@ GVAR(showNamesTime) = -10; } else {"\A3\Ui_f\data\GUI\Cfg\Ranks\colonel_gs.paa"}; [_faction, [_private, _corporal, _sergeant, _lieutenant, _captain, _major, _colonel]] call FUNC(setFactionRankIcons); -} forEach ("true" configClasses (configFile >> "CfgFactionClasses")); - - - +} forEach ("true" configClasses (configFile >> "CfgFactionClasses")); \ No newline at end of file From 22166d69f3c188ba5e57e9c9e96ff363b01a7ff8 Mon Sep 17 00:00:00 2001 From: Neciota Date: Mon, 8 Jul 2019 23:39:49 +0200 Subject: [PATCH 3/8] commy2's postInit rewrite Changes faction config entry to array with macros and changes the postInit code to commy2's improved version. --- addons/nametags/CfgFactionClasses.hpp | 56 ++++----------------------- addons/nametags/XEH_postInit.sqf | 31 +++------------ 2 files changed, 12 insertions(+), 75 deletions(-) diff --git a/addons/nametags/CfgFactionClasses.hpp b/addons/nametags/CfgFactionClasses.hpp index 9e841e620af..0ba8ff2b3a0 100644 --- a/addons/nametags/CfgFactionClasses.hpp +++ b/addons/nametags/CfgFactionClasses.hpp @@ -1,65 +1,23 @@ class CfgFactionClasses { class OPF_F { - ace_nametags_private = "\z\ace\addons\nametags\UI\icons_russia\private_gs.paa"; - ace_nametags_corporal = "\z\ace\addons\nametags\UI\icons_russia\corporal_gs.paa"; - ace_nametags_sergeant = "\z\ace\addons\nametags\UI\icons_russia\sergeant_gs.paa"; - ace_nametags_lieutenant = "\z\ace\addons\nametags\UI\icons_russia\lieutenant_gs.paa"; - ace_nametags_captain = "\z\ace\addons\nametags\UI\icons_russia\captain_gs.paa"; - ace_nametags_major = "\z\ace\addons\nametags\UI\icons_russia\major_gs.paa"; - ace_nametags_colonel = "\z\ace\addons\nametags\UI\icons_russia\colonel_gs.paa"; + GVAR(rankIcons)[] = {QPATHTOF(UI\icons_russia\private_gs.paa), QPATHTOF(UI\icons_russia\corporal_gs.paa), QPATHTOF(UI\icons_russia\sergeant_gs.paa), QPATHTOF(UI\icons_russia\lieutenant_gs.paa), QPATHTOF(UI\icons_russia\captain_gs.paa), QPATHTOF(UI\icons_russia\major_gs.paa), QPATHTOF(UI\icons_russia\colonel_gs.paa)}; }; class OPF_G_F { - ace_nametags_private = "\z\ace\addons\nametags\UI\icons_spain\private_gs.paa"; - ace_nametags_corporal = "\z\ace\addons\nametags\UI\icons_spain\corporal_gs.paa"; - ace_nametags_sergeant = "\z\ace\addons\nametags\UI\icons_spain\sergeant_gs.paa"; - ace_nametags_lieutenant = "\z\ace\addons\nametags\UI\icons_spain\lieutenant_gs.paa"; - ace_nametags_captain = "\z\ace\addons\nametags\UI\icons_spain\captain_gs.paa"; - ace_nametags_major = "\z\ace\addons\nametags\UI\icons_spain\major_gs.paa"; - ace_nametags_colonel = "\z\ace\addons\nametags\UI\icons_spain\colonel_gs.paa"; + GVAR(rankIcons)[] = {QPATHTOF(UI\icons_spain\private_gs.paa), QPATHTOF(UI\icons_spain\corporal_gs.paa), QPATHTOF(UI\icons_spain\sergeant_gs.paa), QPATHTOF(UI\icons_spain\lieutenant_gs.paa), QPATHTOF(UI\icons_spain\captain_gs.paa), QPATHTOF(UI\icons_spain\major_gs.paa), QPATHTOF(UI\icons_spain\colonel_gs.paa)}; }; class OPF_T_F { - ace_nametags_private = "\z\ace\addons\nametags\UI\icons_russia\private_gs.paa"; - ace_nametags_corporal = "\z\ace\addons\nametags\UI\icons_russia\corporal_gs.paa"; - ace_nametags_sergeant = "\z\ace\addons\nametags\UI\icons_russia\sergeant_gs.paa"; - ace_nametags_lieutenant = "\z\ace\addons\nametags\UI\icons_russia\lieutenant_gs.paa"; - ace_nametags_captain = "\z\ace\addons\nametags\UI\icons_russia\captain_gs.paa"; - ace_nametags_major = "\z\ace\addons\nametags\UI\icons_russia\major_gs.paa"; - ace_nametags_colonel = "\z\ace\addons\nametags\UI\icons_russia\colonel_gs.paa"; + GVAR(rankIcons)[] = {QPATHTOF(UI\icons_russia\private_gs.paa), QPATHTOF(UI\icons_russia\corporal_gs.paa), QPATHTOF(UI\icons_russia\sergeant_gs.paa), QPATHTOF(UI\icons_russia\lieutenant_gs.paa), QPATHTOF(UI\icons_russia\captain_gs.paa), QPATHTOF(UI\icons_russia\major_gs.paa), QPATHTOF(UI\icons_russia\colonel_gs.paa)}; }; class OPF_V_F { - ace_nametags_private = "\z\ace\addons\nametags\UI\icons_russia\private_gs.paa"; - ace_nametags_corporal = "\z\ace\addons\nametags\UI\icons_russia\corporal_gs.paa"; - ace_nametags_sergeant = "\z\ace\addons\nametags\UI\icons_russia\sergeant_gs.paa"; - ace_nametags_lieutenant = "\z\ace\addons\nametags\UI\icons_russia\lieutenant_gs.paa"; - ace_nametags_captain = "\z\ace\addons\nametags\UI\icons_russia\captain_gs.paa"; - ace_nametags_major = "\z\ace\addons\nametags\UI\icons_russia\major_gs.paa"; - ace_nametags_colonel = "\z\ace\addons\nametags\UI\icons_russia\colonel_gs.paa"; + GVAR(rankIcons)[] = {QPATHTOF(UI\icons_russia\private_gs.paa), QPATHTOF(UI\icons_russia\corporal_gs.paa), QPATHTOF(UI\icons_russia\sergeant_gs.paa), QPATHTOF(UI\icons_russia\lieutenant_gs.paa), QPATHTOF(UI\icons_russia\captain_gs.paa), QPATHTOF(UI\icons_russia\major_gs.paa), QPATHTOF(UI\icons_russia\colonel_gs.paa)}; }; class IND_C_F { - ace_nametags_private = "\z\ace\addons\nametags\UI\icons_russia\private_gs.paa"; - ace_nametags_corporal = "\z\ace\addons\nametags\UI\icons_russia\corporal_gs.paa"; - ace_nametags_sergeant = "\z\ace\addons\nametags\UI\icons_russia\sergeant_gs.paa"; - ace_nametags_lieutenant = "\z\ace\addons\nametags\UI\icons_russia\lieutenant_gs.paa"; - ace_nametags_captain = "\z\ace\addons\nametags\UI\icons_russia\captain_gs.paa"; - ace_nametags_major = "\z\ace\addons\nametags\UI\icons_russia\major_gs.paa"; - ace_nametags_colonel = "\z\ace\addons\nametags\UI\icons_russia\colonel_gs.paa"; + GVAR(rankIcons)[] = {QPATHTOF(UI\icons_russia\private_gs.paa), QPATHTOF(UI\icons_russia\corporal_gs.paa), QPATHTOF(UI\icons_russia\sergeant_gs.paa), QPATHTOF(UI\icons_russia\lieutenant_gs.paa), QPATHTOF(UI\icons_russia\captain_gs.paa), QPATHTOF(UI\icons_russia\major_gs.paa), QPATHTOF(UI\icons_russia\colonel_gs.paa)}; }; class IND_F { - ace_nametags_private = "\z\ace\addons\nametags\UI\icons_germany\private_gs.paa"; - ace_nametags_corporal = "\z\ace\addons\nametags\UI\icons_germany\corporal_gs.paa"; - ace_nametags_sergeant = "\z\ace\addons\nametags\UI\icons_germany\sergeant_gs.paa"; - ace_nametags_lieutenant = "\z\ace\addons\nametags\UI\icons_germany\lieutenant_gs.paa"; - ace_nametags_captain = "\z\ace\addons\nametags\UI\icons_germany\captain_gs.paa"; - ace_nametags_major = "\z\ace\addons\nametags\UI\icons_germany\major_gs.paa"; - ace_nametags_colonel = "\z\ace\addons\nametags\UI\icons_germany\colonel_gs.paa"; + GVAR(rankIcons)[] = {QPATHTOF(UI\icons_germany\private_gs.paa), QPATHTOF(UI\icons_germany\corporal_gs.paa), QPATHTOF(UI\icons_germany\sergeant_gs.paa), QPATHTOF(UI\icons_germany\lieutenant_gs.paa), QPATHTOF(UI\icons_germany\captain_gs.paa), QPATHTOF(UI\icons_germany\major_gs.paa), QPATHTOF(UI\icons_germany\colonel_gs.paa)}; }; class IND_G_F { - ace_nametags_private = "\z\ace\addons\nametags\UI\icons_spain\private_gs.paa"; - ace_nametags_corporal = "\z\ace\addons\nametags\UI\icons_spain\corporal_gs.paa"; - ace_nametags_sergeant = "\z\ace\addons\nametags\UI\icons_spain\sergeant_gs.paa"; - ace_nametags_lieutenant = "\z\ace\addons\nametags\UI\icons_spain\lieutenant_gs.paa"; - ace_nametags_captain = "\z\ace\addons\nametags\UI\icons_spain\captain_gs.paa"; - ace_nametags_major = "\z\ace\addons\nametags\UI\icons_spain\major_gs.paa"; - ace_nametags_colonel = "\z\ace\addons\nametags\UI\icons_spain\colonel_gs.paa"; + GVAR(rankIcons)[] = {QPATHTOF(UI\icons_spain\private_gs.paa), QPATHTOF(UI\icons_spain\corporal_gs.paa), QPATHTOF(UI\icons_spain\sergeant_gs.paa), QPATHTOF(UI\icons_spain\lieutenant_gs.paa), QPATHTOF(UI\icons_spain\captain_gs.paa), QPATHTOF(UI\icons_spain\major_gs.paa), QPATHTOF(UI\icons_spain\colonel_gs.paa)}; }; }; \ No newline at end of file diff --git a/addons/nametags/XEH_postInit.sqf b/addons/nametags/XEH_postInit.sqf index d80a3213471..c7fb081eb99 100644 --- a/addons/nametags/XEH_postInit.sqf +++ b/addons/nametags/XEH_postInit.sqf @@ -48,30 +48,9 @@ GVAR(showNamesTime) = -10; //Change ranks based on faction for all factions that have an entry in CfgFactionClasses { - private _pathArray = (str _x) splitString "\/"; - private _faction = _pathArray select (count _pathArray - 1); - - private _private = if (isText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_private")) then { - getText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_private"); - } else {"\A3\Ui_f\data\GUI\Cfg\Ranks\private_gs.paa"}; - private _corporal = if (isText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_corporal")) then { - getText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_corporal"); - } else {"\A3\Ui_f\data\GUI\Cfg\Ranks\corporal_gs.paa"}; - private _sergeant = if (isText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_sergeant")) then { - getText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_sergeant"); - } else {"\A3\Ui_f\data\GUI\Cfg\Ranks\sergeant_gs.paa"}; - private _lieutenant = if (isText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_lieutenant")) then { - getText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_lieutenant"); - } else {"\A3\Ui_f\data\GUI\Cfg\Ranks\lieutenant_gs.paa"}; - private _captain = if (isText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_captain")) then { - getText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_captain"); - } else {"\A3\Ui_f\data\GUI\Cfg\Ranks\captain_gs.paa"}; - private _major = if (isText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_major")) then { - getText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_major"); - } else {"\A3\Ui_f\data\GUI\Cfg\Ranks\major_gs.paa"}; - private _colonel = if (isText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_colonel")) then { - getText (configFile >> "CfgFactionClasses" >> _faction >> "ace_nametags_colonel"); - } else {"\A3\Ui_f\data\GUI\Cfg\Ranks\colonel_gs.paa"}; - - [_faction, [_private, _corporal, _sergeant, _lieutenant, _captain, _major, _colonel]] call FUNC(setFactionRankIcons); + if (isArray (_x >> QGVAR(rankIcons))) then { + private _faction = configName _x; + private _icons = getArray (_x >> QGVAR(rankIcons)); + [_faction, _icons] call FUNC(setFactionRankIcons); + }; } forEach ("true" configClasses (configFile >> "CfgFactionClasses")); \ No newline at end of file From 71a7ef90f7279a27e8b9dda41c7d8532cf2a4361 Mon Sep 17 00:00:00 2001 From: Rik Date: Tue, 9 Jul 2019 15:34:40 +0200 Subject: [PATCH 4/8] Update addons/nametags/CfgFactionClasses.hpp Co-Authored-By: Dedmen Miller --- addons/nametags/CfgFactionClasses.hpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/addons/nametags/CfgFactionClasses.hpp b/addons/nametags/CfgFactionClasses.hpp index 0ba8ff2b3a0..09588317f62 100644 --- a/addons/nametags/CfgFactionClasses.hpp +++ b/addons/nametags/CfgFactionClasses.hpp @@ -1,6 +1,14 @@ class CfgFactionClasses { class OPF_F { - GVAR(rankIcons)[] = {QPATHTOF(UI\icons_russia\private_gs.paa), QPATHTOF(UI\icons_russia\corporal_gs.paa), QPATHTOF(UI\icons_russia\sergeant_gs.paa), QPATHTOF(UI\icons_russia\lieutenant_gs.paa), QPATHTOF(UI\icons_russia\captain_gs.paa), QPATHTOF(UI\icons_russia\major_gs.paa), QPATHTOF(UI\icons_russia\colonel_gs.paa)}; + GVAR(rankIcons)[] = { + QPATHTOF(UI\icons_russia\private_gs.paa), + QPATHTOF(UI\icons_russia\corporal_gs.paa), + QPATHTOF(UI\icons_russia\sergeant_gs.paa), + QPATHTOF(UI\icons_russia\lieutenant_gs.paa), + QPATHTOF(UI\icons_russia\captain_gs.paa), + QPATHTOF(UI\icons_russia\major_gs.paa), + QPATHTOF(UI\icons_russia\colonel_gs.paa) + }; }; class OPF_G_F { GVAR(rankIcons)[] = {QPATHTOF(UI\icons_spain\private_gs.paa), QPATHTOF(UI\icons_spain\corporal_gs.paa), QPATHTOF(UI\icons_spain\sergeant_gs.paa), QPATHTOF(UI\icons_spain\lieutenant_gs.paa), QPATHTOF(UI\icons_spain\captain_gs.paa), QPATHTOF(UI\icons_spain\major_gs.paa), QPATHTOF(UI\icons_spain\colonel_gs.paa)}; @@ -20,4 +28,4 @@ class CfgFactionClasses { class IND_G_F { GVAR(rankIcons)[] = {QPATHTOF(UI\icons_spain\private_gs.paa), QPATHTOF(UI\icons_spain\corporal_gs.paa), QPATHTOF(UI\icons_spain\sergeant_gs.paa), QPATHTOF(UI\icons_spain\lieutenant_gs.paa), QPATHTOF(UI\icons_spain\captain_gs.paa), QPATHTOF(UI\icons_spain\major_gs.paa), QPATHTOF(UI\icons_spain\colonel_gs.paa)}; }; -}; \ No newline at end of file +}; From f2c347c71f212546012aed2a18760c66554a97b2 Mon Sep 17 00:00:00 2001 From: Neciota Date: Tue, 9 Jul 2019 15:59:47 +0200 Subject: [PATCH 5/8] Adjusted arrays to be multi line Also removed white space. --- addons/nametags/CfgFactionClasses.hpp | 62 ++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 7 deletions(-) diff --git a/addons/nametags/CfgFactionClasses.hpp b/addons/nametags/CfgFactionClasses.hpp index 09588317f62..29c9cc51a52 100644 --- a/addons/nametags/CfgFactionClasses.hpp +++ b/addons/nametags/CfgFactionClasses.hpp @@ -11,21 +11,69 @@ class CfgFactionClasses { }; }; class OPF_G_F { - GVAR(rankIcons)[] = {QPATHTOF(UI\icons_spain\private_gs.paa), QPATHTOF(UI\icons_spain\corporal_gs.paa), QPATHTOF(UI\icons_spain\sergeant_gs.paa), QPATHTOF(UI\icons_spain\lieutenant_gs.paa), QPATHTOF(UI\icons_spain\captain_gs.paa), QPATHTOF(UI\icons_spain\major_gs.paa), QPATHTOF(UI\icons_spain\colonel_gs.paa)}; + GVAR(rankIcons)[] = { + QPATHTOF(UI\icons_spain\private_gs.paa), + QPATHTOF(UI\icons_spain\corporal_gs.paa), + QPATHTOF(UI\icons_spain\sergeant_gs.paa), + QPATHTOF(UI\icons_spain\lieutenant_gs.paa), + QPATHTOF(UI\icons_spain\captain_gs.paa), + QPATHTOF(UI\icons_spain\major_gs.paa), + QPATHTOF(UI\icons_spain\colonel_gs.paa) + }; }; class OPF_T_F { - GVAR(rankIcons)[] = {QPATHTOF(UI\icons_russia\private_gs.paa), QPATHTOF(UI\icons_russia\corporal_gs.paa), QPATHTOF(UI\icons_russia\sergeant_gs.paa), QPATHTOF(UI\icons_russia\lieutenant_gs.paa), QPATHTOF(UI\icons_russia\captain_gs.paa), QPATHTOF(UI\icons_russia\major_gs.paa), QPATHTOF(UI\icons_russia\colonel_gs.paa)}; + GVAR(rankIcons)[] = { + QPATHTOF(UI\icons_russia\private_gs.paa), + QPATHTOF(UI\icons_russia\corporal_gs.paa), + QPATHTOF(UI\icons_russia\sergeant_gs.paa), + QPATHTOF(UI\icons_russia\lieutenant_gs.paa), + QPATHTOF(UI\icons_russia\captain_gs.paa), + QPATHTOF(UI\icons_russia\major_gs.paa), + QPATHTOF(UI\icons_russia\colonel_gs.paa) + }; }; class OPF_V_F { - GVAR(rankIcons)[] = {QPATHTOF(UI\icons_russia\private_gs.paa), QPATHTOF(UI\icons_russia\corporal_gs.paa), QPATHTOF(UI\icons_russia\sergeant_gs.paa), QPATHTOF(UI\icons_russia\lieutenant_gs.paa), QPATHTOF(UI\icons_russia\captain_gs.paa), QPATHTOF(UI\icons_russia\major_gs.paa), QPATHTOF(UI\icons_russia\colonel_gs.paa)}; + GVAR(rankIcons)[] = { + QPATHTOF(UI\icons_russia\private_gs.paa), + QPATHTOF(UI\icons_russia\corporal_gs.paa), + QPATHTOF(UI\icons_russia\sergeant_gs.paa), + QPATHTOF(UI\icons_russia\lieutenant_gs.paa), + QPATHTOF(UI\icons_russia\captain_gs.paa), + QPATHTOF(UI\icons_russia\major_gs.paa), + QPATHTOF(UI\icons_russia\colonel_gs.paa) + }; }; class IND_C_F { - GVAR(rankIcons)[] = {QPATHTOF(UI\icons_russia\private_gs.paa), QPATHTOF(UI\icons_russia\corporal_gs.paa), QPATHTOF(UI\icons_russia\sergeant_gs.paa), QPATHTOF(UI\icons_russia\lieutenant_gs.paa), QPATHTOF(UI\icons_russia\captain_gs.paa), QPATHTOF(UI\icons_russia\major_gs.paa), QPATHTOF(UI\icons_russia\colonel_gs.paa)}; + GVAR(rankIcons)[] = { + QPATHTOF(UI\icons_russia\private_gs.paa), + QPATHTOF(UI\icons_russia\corporal_gs.paa), + QPATHTOF(UI\icons_russia\sergeant_gs.paa), + QPATHTOF(UI\icons_russia\lieutenant_gs.paa), + QPATHTOF(UI\icons_russia\captain_gs.paa), + QPATHTOF(UI\icons_russia\major_gs.paa), + QPATHTOF(UI\icons_russia\colonel_gs.paa) + }; }; class IND_F { - GVAR(rankIcons)[] = {QPATHTOF(UI\icons_germany\private_gs.paa), QPATHTOF(UI\icons_germany\corporal_gs.paa), QPATHTOF(UI\icons_germany\sergeant_gs.paa), QPATHTOF(UI\icons_germany\lieutenant_gs.paa), QPATHTOF(UI\icons_germany\captain_gs.paa), QPATHTOF(UI\icons_germany\major_gs.paa), QPATHTOF(UI\icons_germany\colonel_gs.paa)}; + GVAR(rankIcons)[] = { + QPATHTOF(UI\icons_germany\private_gs.paa), + QPATHTOF(UI\icons_germany\corporal_gs.paa), + QPATHTOF(UI\icons_germany\sergeant_gs.paa), + QPATHTOF(UI\icons_germany\lieutenant_gs.paa), + QPATHTOF(UI\icons_germany\captain_gs.paa), + QPATHTOF(UI\icons_germany\major_gs.paa), + QPATHTOF(UI\icons_germany\colonel_gs.paa) + }; }; class IND_G_F { - GVAR(rankIcons)[] = {QPATHTOF(UI\icons_spain\private_gs.paa), QPATHTOF(UI\icons_spain\corporal_gs.paa), QPATHTOF(UI\icons_spain\sergeant_gs.paa), QPATHTOF(UI\icons_spain\lieutenant_gs.paa), QPATHTOF(UI\icons_spain\captain_gs.paa), QPATHTOF(UI\icons_spain\major_gs.paa), QPATHTOF(UI\icons_spain\colonel_gs.paa)}; + GVAR(rankIcons)[] = { + QPATHTOF(UI\icons_spain\private_gs.paa), + QPATHTOF(UI\icons_spain\corporal_gs.paa), + QPATHTOF(UI\icons_spain\sergeant_gs.paa), + QPATHTOF(UI\icons_spain\lieutenant_gs.paa), + QPATHTOF(UI\icons_spain\captain_gs.paa), + QPATHTOF(UI\icons_spain\major_gs.paa), + QPATHTOF(UI\icons_spain\colonel_gs.paa) + }; }; -}; +}; \ No newline at end of file From 62e95908e10ca9b77636b5259ae612fb65308baf Mon Sep 17 00:00:00 2001 From: TWC-Rik <18664259+TWC-Rik@users.noreply.github.com> Date: Sat, 13 Jul 2019 12:45:19 +0200 Subject: [PATCH 6/8] Update addons/nametags/XEH_postInit.sqf Co-Authored-By: commy2 --- addons/nametags/XEH_postInit.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/nametags/XEH_postInit.sqf b/addons/nametags/XEH_postInit.sqf index c7fb081eb99..43a5279f4df 100644 --- a/addons/nametags/XEH_postInit.sqf +++ b/addons/nametags/XEH_postInit.sqf @@ -53,4 +53,4 @@ GVAR(showNamesTime) = -10; private _icons = getArray (_x >> QGVAR(rankIcons)); [_faction, _icons] call FUNC(setFactionRankIcons); }; -} forEach ("true" configClasses (configFile >> "CfgFactionClasses")); \ No newline at end of file +} forEach ("true" configClasses (configFile >> "CfgFactionClasses")); From df7f75b7e8a401876c52a2fc0a03e153ba01eae7 Mon Sep 17 00:00:00 2001 From: TWC-Rik <18664259+TWC-Rik@users.noreply.github.com> Date: Sat, 13 Jul 2019 12:45:25 +0200 Subject: [PATCH 7/8] Update addons/nametags/CfgFactionClasses.hpp Co-Authored-By: commy2 --- addons/nametags/CfgFactionClasses.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/nametags/CfgFactionClasses.hpp b/addons/nametags/CfgFactionClasses.hpp index 29c9cc51a52..8b9c13ee756 100644 --- a/addons/nametags/CfgFactionClasses.hpp +++ b/addons/nametags/CfgFactionClasses.hpp @@ -76,4 +76,4 @@ class CfgFactionClasses { QPATHTOF(UI\icons_spain\colonel_gs.paa) }; }; -}; \ No newline at end of file +}; From a99a9206f56f79c28fc39a59dced62643c8ae929 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Wed, 28 Aug 2019 11:00:00 -0500 Subject: [PATCH 8/8] Add getVar setting, don't overwrite if already set --- addons/nametags/CfgFactionClasses.hpp | 24 +++++++++---------- addons/nametags/XEH_postInit.sqf | 19 ++++++++------- .../functions/fnc_setFactionRankIcons.sqf | 1 + 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/addons/nametags/CfgFactionClasses.hpp b/addons/nametags/CfgFactionClasses.hpp index 8b9c13ee756..0e41b5823fe 100644 --- a/addons/nametags/CfgFactionClasses.hpp +++ b/addons/nametags/CfgFactionClasses.hpp @@ -12,12 +12,12 @@ class CfgFactionClasses { }; class OPF_G_F { GVAR(rankIcons)[] = { - QPATHTOF(UI\icons_spain\private_gs.paa), - QPATHTOF(UI\icons_spain\corporal_gs.paa), - QPATHTOF(UI\icons_spain\sergeant_gs.paa), - QPATHTOF(UI\icons_spain\lieutenant_gs.paa), - QPATHTOF(UI\icons_spain\captain_gs.paa), - QPATHTOF(UI\icons_spain\major_gs.paa), + QPATHTOF(UI\icons_spain\private_gs.paa), + QPATHTOF(UI\icons_spain\corporal_gs.paa), + QPATHTOF(UI\icons_spain\sergeant_gs.paa), + QPATHTOF(UI\icons_spain\lieutenant_gs.paa), + QPATHTOF(UI\icons_spain\captain_gs.paa), + QPATHTOF(UI\icons_spain\major_gs.paa), QPATHTOF(UI\icons_spain\colonel_gs.paa) }; }; @@ -67,12 +67,12 @@ class CfgFactionClasses { }; class IND_G_F { GVAR(rankIcons)[] = { - QPATHTOF(UI\icons_spain\private_gs.paa), - QPATHTOF(UI\icons_spain\corporal_gs.paa), - QPATHTOF(UI\icons_spain\sergeant_gs.paa), - QPATHTOF(UI\icons_spain\lieutenant_gs.paa), - QPATHTOF(UI\icons_spain\captain_gs.paa), - QPATHTOF(UI\icons_spain\major_gs.paa), + QPATHTOF(UI\icons_spain\private_gs.paa), + QPATHTOF(UI\icons_spain\corporal_gs.paa), + QPATHTOF(UI\icons_spain\sergeant_gs.paa), + QPATHTOF(UI\icons_spain\lieutenant_gs.paa), + QPATHTOF(UI\icons_spain\captain_gs.paa), + QPATHTOF(UI\icons_spain\major_gs.paa), QPATHTOF(UI\icons_spain\colonel_gs.paa) }; }; diff --git a/addons/nametags/XEH_postInit.sqf b/addons/nametags/XEH_postInit.sqf index 43a5279f4df..e73794600d5 100644 --- a/addons/nametags/XEH_postInit.sqf +++ b/addons/nametags/XEH_postInit.sqf @@ -46,11 +46,14 @@ GVAR(showNamesTime) = -10; // civilians don't use military ranks ["CIV_F", ["","","","","","",""]] call FUNC(setFactionRankIcons); -//Change ranks based on faction for all factions that have an entry in CfgFactionClasses -{ - if (isArray (_x >> QGVAR(rankIcons))) then { - private _faction = configName _x; - private _icons = getArray (_x >> QGVAR(rankIcons)); - [_faction, _icons] call FUNC(setFactionRankIcons); - }; -} forEach ("true" configClasses (configFile >> "CfgFactionClasses")); +// Change ranks based on faction for all factions that have an entry in CfgFactionClasses +if (missionNamespace getVariable [QGVAR(useFactionIcons), true]) then { + { + if (isArray (_x >> QGVAR(rankIcons))) then { + private _faction = configName _x; + if (!isNil {GVAR(factionRanks) getVariable _faction}) exitWith {}; // don't overwrite if already set + private _icons = getArray (_x >> QGVAR(rankIcons)); + [_faction, _icons] call FUNC(setFactionRankIcons); + }; + } forEach ("true" configClasses (configFile >> "CfgFactionClasses")); +}; diff --git a/addons/nametags/functions/fnc_setFactionRankIcons.sqf b/addons/nametags/functions/fnc_setFactionRankIcons.sqf index fa7975d5e56..e60c295c7d3 100644 --- a/addons/nametags/functions/fnc_setFactionRankIcons.sqf +++ b/addons/nametags/functions/fnc_setFactionRankIcons.sqf @@ -29,6 +29,7 @@ if (isNil QGVAR(factionRanks)) then { }; params [["_faction", "", [""]], ["_icons", [], [[]], [7]]]; +TRACE_2("setFactionRankIcons",_faction,_icons); if !(_faction != "" && {_icons isEqualTypeAll ""}) exitWith {false};