From c6b77dfffdb2709a298e627a5883fc5546872610 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Fri, 31 Aug 2018 15:28:49 +0200 Subject: [PATCH] Initial work towards Heretic compat. Bump ZScript version to 3.6. --- graphics/hud/GKey.png | Bin 1246 -> 645 bytes graphics/hud/YKey.png | Bin 0 -> 1246 bytes zscript.txt | 3 ++- zscript/compat.zsc | 3 +++ zscript/uthud.zsc | 9 ++++++--- 5 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 graphics/hud/YKey.png create mode 100644 zscript/compat.zsc diff --git a/graphics/hud/GKey.png b/graphics/hud/GKey.png index 0989b5f4358ea52c71534c27ca18a276d07a9667..ccae3fdae632f5adfba834002f5fe9c19e445db2 100644 GIT binary patch literal 645 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4rT@hhPm4t-!L#Rcm()_xc;XSI9EIO1p@gnPb5^;Fx^xM;#6?j}- zv$s}chN}Gkzufp$gkVuJZ@)tOX3mxfk&4Zp{-G&b{Vy5MnDg`OloH?bGL40PyPg@k zC-}0e%{Sc7bcFFrRU@P5i?2-FS{qh9pWeXL@Jl1YDdB?f113Lzh7*pz-s)au*}=Tw zRJ8+_&Z?hm9*nZir#T{Y88>zAKH%=%U@_xcooi4=Lm|UjB~gaW>{4w078U|2ZR#8N z7EENhcfeYrlqE&vK=(->hY1pFfe&<-Bnt?zv`ua(Wbo%@tQ1;mv1ZGG&I4-C^%>g_ zs6Ka8y`ar8L!*F4obh!-+6FJiPmP6MjZ-TFM4mUKad1?yiyU4g7U9a|lEBibsN!&K z#-T)Q!6o6((im!0@>!yp_&=|gTzoM|;YRpQkuyU4WkLt{@jnlfoZi>T5?$ODA>ZxX zUh^e9%5KBLdHYT}8Xv6IH3+%kuD3>_pxi@`D@yvBPGL8n*GmtkIR~e9#jbhDk@)@N z#5a#!-ZmcBuAf{}VdG?4u>4P4><^8w+tbyGp6&d8^UTY_P9_uXqs#Wru5dN{QnWJi z-1q3~9}f!q&*Q3x$1G(LR delta 1226 zcmZo=y~jC0rJl3EBeIx*fm;}a85w5Hkzin8lnU?(ab;j&5EBzqQc^N9GBPzawYIi) zaB%SS^z`-h4Gatn4GoQoii(YmO-M*cPEO9u%*@HjDJUo?Dk>^1Ev>1ksjshZY;0_9 zZfzgoP!qll#r%#_gbLPz1vuDqpTR(TvqD6}rFJ8KI>GI{vSFT*S zX3d%n8#Zj(v}wzhEnBy4-L`GpjvYI8?%cV1_wGG=_UzrecmMwVhYlS&eE9H@BS(%N zJ$mfeu@fgwoH}*t+_`fXE?l^H@#2*$SFT;VcK!PG8#iv;x^?UJ?c4Y6-MfGP{(}b( z9zTBk-HPoF=3{_^F^ z*RNl{ef#$P`}ZF|e*F6N>-X>9fB*jd_wV2T|NrmJU@c)_V2CXV@(X4VQ!+BOviI~2 z42_CSNY2P9C@ih6Z)|Su?CP5^b^6TNa~CaMx_srD4V$)X*|uZH?mc_+!t5K*{~jk}%5-&w4MX*q}xC_U*PfDWCexG@&tl>(g>ki>vR=8gIT#o+oOm z;5Og?(w#J;otq8yUGskidorsh-cyJml0?v3c2h6E-zIw$nQvF`3cO za*=3{=w6k$y=$K?e-gzS75ZQy?{`-P=VG%~X)}Xk_7DsHT$g_^iKz{7q&~F=yWdPcbeFy+xV< z5@N?^A4m@1%GjYS)yd;l{8gYyUQw*>K;XZKXLVlAG8evXDdl-6^XKopb<(_rZs+4f z7hT^ldy%_yO+|~}u7*Iivc}WVGE?tH*DI_{Tr~CAEH`-xfs655zwN47W#ACD?Pd6+ zsfE9erabSo6TG?b{**OmF6t|4o3fob<<#i7w(#e)!;{xDJ-7Ca`MRN|vtIjg=AOBk z&JK|__WSEOvsPrZuTz~HFzr-{s_7Lo+rp(cu4l|$x2a9*VyS4zoKQ{g^DS+jm(NTs zSnK_;{#u8~+k}{<*)gY<-{iCL^E!39kS*tgq1ydT7v@bg(R7zQm-13dD63#K`8wg0|Nttr>mdKI;Vst E052zkwEzGB diff --git a/graphics/hud/YKey.png b/graphics/hud/YKey.png new file mode 100644 index 0000000000000000000000000000000000000000..0989b5f4358ea52c71534c27ca18a276d07a9667 GIT binary patch literal 1246 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4rT@hhPm4t-!L#Ra29w(7Bet#3xhBt!>lCF-M)SM-o1PG@85s$;KAd^kDokw^6c5O=g*(Nc=6)Zt5>gIzkc)P z&D*zc-@SYH{{8!pA3uKj^y%~G&tJZL`TF(iw{PFRfB*jD$B$pXe*OOa`|sbs|Ni~^ z|NsBJ8LTA?3=FX)L4LsuVoFA)R`#C0fuT{c3CS5b1%;*6^^MJ~on3tsrcR$Zd+wse zOP8-)vtiSgE!%eN*u7`Z{zHe496fg8u;`{%7%eNKzeZOBi_q_Z6?zwjyl@{5rdH-~i;Lk0+kM$PapYzaS zs=vF$>{l}ny(E^2Z0y;ec`(L_~X0&s&p}uSW&tOkxwde?sj0@p5{$IUb zc8Z6b+A20LdvC&~#>aMg$0H^)8d@$A?GfFp61R8l)8$X1SffH8Ead&}s-S%Sq3d70 z#SgPK$eud%+ciR7+sPqT`O`y@N4J{xtR*G9*r#A3)NIo z9-sABkiW^yDdy~(;3>vsp|?mgKtk;J>;uUGTp2r*r8;@sioXgp$t#N09SHmv@vP3v zS?0pmEu}mUW&Zq~w@#Y3(CvJj=%VWzW-oGguBmA8+tm=rR@QhrT4w6qXoZ!Di>4l% z3>?C?y$qi;weZ)`l;@pxf;Si5pR(r6MSVqWQ?@gwoEjb17XF-e zc=CFt=hnV4UpLfr)@wh`+%q@R*&))#et$h@){2bwb*gg%rkyHLHN9eHTe$Sb^^Cde zHnnM8EENrz6RPQbzNO9c@|mdxYrP*{>kxUH5VJHp=G5|=d^Ubwr%o5L<(x27yT9qe zyon~7?vm$HUP@`4ntaGmN!wT=+ej%_#(GoG0gn?MNn28qnXY&BbgCWOq@$Bqvh3-q zB$d?1Y{wrji4pBtkdyP^h0p2Gqk$9V3iYW<=1We;TF;JxizBd_H92Jc92 zvxMklG6IwLvb;GR(UiQ`tyA7;T4LDxjgDc*v?BNVrTHH_RT;2eIBtUAyo>ce*eku7 W3oi(zA7fx(VDNPHb6Mw<&;$UV(1HH| literal 0 HcmV?d00001 diff --git a/zscript.txt b/zscript.txt index de3b75b..b7effe9 100644 --- a/zscript.txt +++ b/zscript.txt @@ -1,4 +1,4 @@ -version "3.5" +version "3.6" #include "zscript/mk_matrix.zsc" #include "zscript/mk_coordutil.zsc" @@ -21,3 +21,4 @@ version "3.5" #include "zscript/armoritems.zsc" #include "zscript/powerups.zsc" #include "zscript/uthud.zsc" +#include "zscript/compat.zsc" diff --git a/zscript/compat.zsc b/zscript/compat.zsc new file mode 100644 index 0000000..4f6ea5f --- /dev/null +++ b/zscript/compat.zsc @@ -0,0 +1,3 @@ +// TODO Heretic keys + +// TODO Alternative player classes used for compatibility with Heretic, Hexen, Strife and Chex diff --git a/zscript/uthud.zsc b/zscript/uthud.zsc index 67236ee..843ede2 100644 --- a/zscript/uthud.zsc +++ b/zscript/uthud.zsc @@ -23,7 +23,7 @@ Class ViewTracer : LineTracer Class UTHud : BaseStatusBar { - TextureID AmmoBar, Boxes[4], Keys[4], BigNum[12], Flash, Slots[10], Icons[14], Uses[14], Man[5], Woman[5], WeaponBox; + TextureID AmmoBar, Boxes[4], Keys[5], BigNum[12], Flash, Slots[10], Icons[14], Uses[14], Man[5], Woman[5], WeaponBox; Class IconClasses[14]; double HScale; Color tintcolor, bgcolor; @@ -64,8 +64,9 @@ Class UTHud : BaseStatusBar Boxes[3] = TexMan.CheckForTexture("FragBox",TexMan.Type_Any); Keys[0] = TexMan.CheckForTexture("RKey",TexMan.Type_Any); Keys[1] = TexMan.CheckForTexture("BKey",TexMan.Type_Any); - Keys[2] = TexMan.CheckForTexture("GKey",TexMan.Type_Any); + Keys[2] = TexMan.CheckForTexture("YKey",TexMan.Type_Any); Keys[3] = TexMan.CheckForTexture("Skul",TexMan.Type_Any); + Keys[4] = TexMan.CheckForTexture("GKey",TexMan.Type_Any); // Heretic compat BigNum[0] = TexMan.CheckForTexture("Big0",TexMan.Type_Any); BigNum[1] = TexMan.CheckForTexture("Big1",TexMan.Type_Any); BigNum[2] = TexMan.CheckForTexture("Big2",TexMan.Type_Any); @@ -508,6 +509,7 @@ Class UTHud : BaseStatusBar private void DrawKeys() { + if ( gameinfo.gametype&(GAME_Hexen|GAME_Strife) ) return; // no key display for these ATM (will do eventually) bool locks[6]; for ( int i=0; i<6; i++ ) locks[i] = CPlayer.mo.CheckKeys(i+1,false,true); int nrows = 0, nrowss = 0; @@ -518,7 +520,8 @@ Class UTHud : BaseStatusBar CurY -= max(0,nrows-1)*4*hudsize*HScale; if ( locks[0] ) { - UTDrawTintedTex(Keys[0],hudsize,min(opacity,15),Color("Red")); + if ( gameinfo.gametype&GAME_Heretic ) UTDrawTintedTex(Keys[4],hudsize,min(opacity,15),Color("Green")); + else UTDrawTintedTex(Keys[0],hudsize,min(opacity,15),Color("Red")); CurY += 72*hudsize*HScale; } if ( locks[1] )