From 5ce6c2fe6ea48c98e58df5782d40a15a9c93dcb5 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Sat, 1 Jul 2023 14:11:17 +0200 Subject: [PATCH] Small visual tweaks to Mortal Rifle canvas. --- language.version | 4 ++-- models/canvas/MortalGrenadeIcons.png | Bin 937 -> 1012 bytes zscript/dlc1/swwm_dlcweapons_canvas.zsc | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/language.version b/language.version index fe3ca25ec..61b32e507 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r814 \cu(Sat 1 Jul 14:10:50 CEST 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r814 \cu(2023-07-01 14:10:50)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r816 \cu(Sat 1 Jul 14:11:47 CEST 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r816 \cu(2023-07-01 14:11:47)\c-"; diff --git a/models/canvas/MortalGrenadeIcons.png b/models/canvas/MortalGrenadeIcons.png index 6ee03408a4c948cbe5269fd01d802b47b2ab65f6..e4df08419b86d9e3b8544e166f90e6307d5a8d9c 100644 GIT binary patch delta 1001 zcmZ3<{)K&lWIY=L1H+|j_4N!4%)32Z978H@y`AIlArdHae82JUXYsqO*QQx&Y~p_B zwfgR{RKBu|e%Foc;w}*!N&x|fqNnRseGcf@ctdg13kgSQky35{MS3iExAdNI>EbFs zE4uiWo*+lly2WqyRqp5Cb9;~Z=V!IgzSo`EQ_0{cz@n&eNpO3;JbQuQfk=ix2HyW& ziYNZA{rzvV@}yP#2R3MF+8&?D=^M821kWa&#T$0+dHi67{i9bY@6GJ5Ja)dyo?tQg zFyIIcEtiQ|8FFW?&!ksg4H6CQympr@7n(Vx-Hm2FVcS-|LqAwoyJ{d3#%NaBy&%(!>YP7V&#G z8hxnZv8dzQiUSDbK=D-~i8+ozh z9=mnRMsz$1!nxq8WMAHfHCl*DEL3 zxwtP1>08 z^KV@uYs8ITk=vxDbOVbUTBlAG-Mw_FYXoCl?Z01{3Nr6ROquq~nm=E@K&JgR-wD0f z&(l8Zd)EgvE_(S}Yd7bEWmjh0Ida4$GdbBgf^nPK>HBKa@9h^1ZCLBH&|v22r!8}t z7!v-x++1%xvtWt#r8_Zyp9k=-VV97Xk~(!`+u5h$jz0x%{rLF$d)cp#lW#xmEehPi z!N6eewKS-zpkTwEJ$rPPFfdH`|KsD^*6QzhQ^KxuE#hQg_&IatOzypV_b%PJ(^8R@ zq2YRVcK5fnv%}Nk_w49@|2qCah-_Ed8;#w*jCo$NAFbw}zg^$=_)K4KZ(?R9r_CPK zDSa!>+A$pFd>-U~$ddnb*8!V*EQdJ~9(X(?(|zI^)h>FwLMPoF-0@ZiC%Teq%VyLR>J)l;WVojiH+#EBCdHf)%)@YdqR zi)YTeHhtEmX)`ZQn0ji`H@1`i8>#CIWiu zB3e4U>grrdD%=Xn-0~`%3W}VvGVGF~tipoKd~A%Y3=9lcJnv3mU|`TJ3GxeOVC3Xc zQPngyv3H0lZJsf6nN#3nTVh?X!7i;Bw1UMiNwWB8FxZQeoV0_n$`TRw8Askuof3vhER*zj1# z*jh|vwyMCU-(nLC{OxC|8^1sE{p0Og!Am3Rg0_9oRi7fo0EKHi^carh@Z>lm&}V%LXvD z1~+y*QPg>J#e#A9@`Gy{ln-$3Xk?ts7(R)~GIfRM3C*Ad78(mCbSzS1?Rge(e@W!BD!(3$q}xIvSxo92IZrAvSLU6%Zk_qZhZ z(Pw|dtSt>QD;aG+D_${UHm>K-kamjhd1IU4-?+BTSigXy&qycuoPABgR>doULRFyT N@9FC2vd$@?2>?2!YFq#S diff --git a/zscript/dlc1/swwm_dlcweapons_canvas.zsc b/zscript/dlc1/swwm_dlcweapons_canvas.zsc index 8c578ec26..33804e25a 100644 --- a/zscript/dlc1/swwm_dlcweapons_canvas.zsc +++ b/zscript/dlc1/swwm_dlcweapons_canvas.zsc @@ -200,7 +200,7 @@ extend Class MisterRifle fw = 64; fh = 32; DrawWindowFrame(200-fw/2,72-(fh+8),fw,fh); - TouchScreen.DrawTexture(MortalIcons[0],false,200-fw/2,72-(fh+8),DTA_SrcY,firemode*32,DTA_SrcHeight,32,DTA_DestHeight,32,DTA_SrcX,0,DTA_SrcWidth,64,DTA_DestWidth,64); + TouchScreen.DrawTexture(MortalIcons[0],false,200-fw/2,72-(fh+8),DTA_SrcY,firemode*32,DTA_SrcHeight,32,DTA_DestHeight,32,DTA_SrcX,0,DTA_SrcWidth,64,DTA_DestWidth,64,DTA_ColorOverlay,(!chambered||fired)?0x80000000:0x00000000); if ( firemodeflash && (gametic < firemodeflash) ) { double alph = clamp((firemodeflash-(gametic+e.fractic))/15.,0.,1.)**2.; @@ -208,14 +208,13 @@ extend Class MisterRifle } str = StringTable.Localize("$SWWM_MRMODE"..(firemode+1)); DrawWindowFrame(200-fw/2,72+8,fw,fh); - if ( gchambered ) + TouchScreen.DrawTexture(MortalIcons[1],false,200-fw/2,72+8,DTA_SrcY,0,DTA_SrcHeight,32,DTA_DestHeight,32,DTA_SrcX,0,DTA_SrcWidth,64,DTA_DestWidth,64,DTA_ColorOverlay,(!gchambered||gfired)?0x80000000:0x00000000); + TouchScreen.DrawTexture(MortalIcons[1],false,200-fw/2,72+8,DTA_SrcY,32,DTA_SrcHeight,32,DTA_DestHeight,32,DTA_SrcX,0,DTA_SrcWidth,64,DTA_DestWidth,64,DTA_ColorOverlay,gchambered?0x00000000:0x80000000); + if ( grenadeflash && (gametic < grenadeflash) ) { - TouchScreen.DrawTexture(MortalIcons[1],false,200-fw/2,72+8,DTA_SrcY,gfired*32,DTA_SrcHeight,32,DTA_DestHeight,32,DTA_SrcX,0,DTA_SrcWidth,64,DTA_DestWidth,64,DTA_ColorOverlay,gfired?0x80000000:0x00000000); - if ( grenadeflash && (gametic < grenadeflash) ) - { - double alph = clamp((grenadeflash-(gametic+e.fractic))/15.,0.,1.)**2.; - TouchScreen.DrawTexture(MortalIcons[1],false,200-fw/2,72+8,DTA_SrcY,gfired*32,DTA_SrcHeight,32,DTA_DestHeight,32,DTA_SrcX,64,DTA_SrcWidth,64,DTA_DestWidth,64,DTA_Alpha,alph*(gfired?.4:.8),DTA_LegacyRenderStyle,STYLE_Add); - } + double alph = clamp((grenadeflash-(gametic+e.fractic))/15.,0.,1.)**2.; + TouchScreen.DrawTexture(MortalIcons[1],false,200-fw/2,72+8,DTA_SrcY,0,DTA_SrcHeight,32,DTA_DestHeight,32,DTA_SrcX,64,DTA_SrcWidth,64,DTA_DestWidth,64,DTA_Alpha,alph*((!gchambered||gfired)?.4:.8),DTA_LegacyRenderStyle,STYLE_Add); + TouchScreen.DrawTexture(MortalIcons[1],false,200-fw/2,72+8,DTA_SrcY,32,DTA_SrcHeight,32,DTA_DestHeight,32,DTA_SrcX,64,DTA_SrcWidth,64,DTA_DestWidth,64,DTA_Alpha,alph*(gchambered?.8:.4),DTA_LegacyRenderStyle,STYLE_Add); } if ( lowammotic && (lowammotic > gametic) ) { @@ -277,8 +276,9 @@ extend Class MisterRifle int dg2 = (ingun%10); AmmoLed.DrawTexture(AmmoLedFont,false,24,0,DTA_SrcX,dg1*8,DTA_SrcWidth,8,DTA_DestWidth,8,DTA_Color,dg1?blink?0xFF400080:0xFF8000FF:blink?0xFF200040:0xFF400080); AmmoLed.DrawTexture(AmmoLedFont,false,32,0,DTA_SrcX,dg2*8,DTA_SrcWidth,8,DTA_DestWidth,8,DTA_Color,(dg1||dg2)?blink?0xFF400080:0xFF8000FF:blink?0xFF200040:0xFF400080); - if ( gchambered ) AmmoLed.DrawTexture(AmmoLedFont,false,52,0,DTA_SrcX,80+8*gfired,DTA_SrcWidth,8,DTA_DestWidth,8,DTA_Color,gfired?0xFF400080:0xFF8000FF); - AmmoLed.DrawTexture(AmmoLedFont,false,4,0,DTA_SrcX,96+firemode*8,DTA_SrcWidth,8,DTA_DestWidth,8,DTA_Color,0xFF8000FF); + AmmoLed.DrawTexture(AmmoLedFont,false,52,0,DTA_SrcX,80,DTA_SrcWidth,8,DTA_DestWidth,8,DTA_Color,(!gchambered||gfired)?0xFF400080:0xFF8000FF); + AmmoLed.DrawTexture(AmmoLedFont,false,52,0,DTA_SrcX,88,DTA_SrcWidth,8,DTA_DestWidth,8,DTA_Color,gchambered?0xFF8000FF:0xFF400080); + AmmoLed.DrawTexture(AmmoLedFont,false,4,0,DTA_SrcX,96+firemode*8,DTA_SrcWidth,8,DTA_DestWidth,8,DTA_Color,(chambered&&!fired)?0xFF8000FF:0xFF400080); } }