From dda1c7f072945b7bbd1a3698e360f63afc5af333 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Thu, 15 Sep 2022 14:05:21 +0200 Subject: [PATCH] A tiny fix for decals from bouncing projectiles. --- language.version | 4 ++-- zscript/dlc1/swwm_dlcweapons_canvas.zsc | 4 ++-- zscript/dlc1/swwm_mister_fx.zsc | 3 +++ zscript/weapons/swwm_splode_fx.zsc | 3 +++ zscript/weapons/swwm_tastytreat_fx.zsc | 3 +++ 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/language.version b/language.version index 04da6b033..7b5600c2c 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r460 \cu(Thu 15 Sep 13:46:46 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r460 \cu(2022-09-15 13:46:46)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r461 \cu(Thu 15 Sep 14:05:21 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r461 \cu(2022-09-15 14:05:21)\c-"; diff --git a/zscript/dlc1/swwm_dlcweapons_canvas.zsc b/zscript/dlc1/swwm_dlcweapons_canvas.zsc index c4e1e9aff..4acfa7d21 100644 --- a/zscript/dlc1/swwm_dlcweapons_canvas.zsc +++ b/zscript/dlc1/swwm_dlcweapons_canvas.zsc @@ -208,11 +208,11 @@ extend Class MisterRifle DrawWindowFrame(200-fw/2,72+8,fw,fh); if ( gchambered ) { - TouchScreen.DrawTexture(MortalIcons[1],false,200-fw/2,72+8,DTA_SrcY,gfired*32,DTA_SrcHeight,32,DTA_DestHeight,32); + TouchScreen.DrawTexture(MortalIcons[1],false,200-fw/2,72+8,DTA_SrcY,gfired*32,DTA_SrcHeight,32,DTA_DestHeight,32,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_Alpha,alph*.8,DTA_LegacyRenderStyle,STYLE_AddStencil,DTA_FillColor,0xFFFFFFFF); + TouchScreen.DrawTexture(MortalIcons[1],false,200-fw/2,72+8,DTA_SrcY,gfired*32,DTA_SrcHeight,32,DTA_DestHeight,32,DTA_Alpha,alph*.8,DTA_LegacyRenderStyle,STYLE_AddStencil,DTA_FillColor,gfired?0xFF808080:0xFFFFFFFF); } } if ( lowammotic && (lowammotic > gametic) ) diff --git a/zscript/dlc1/swwm_mister_fx.zsc b/zscript/dlc1/swwm_mister_fx.zsc index beddd2a24..7dbcde622 100644 --- a/zscript/dlc1/swwm_mister_fx.zsc +++ b/zscript/dlc1/swwm_mister_fx.zsc @@ -619,6 +619,9 @@ Class MisterGrenade : Actor // direct hit from main grenade if ( !bAMBUSH && (vel dot oldvel < .5) ) { + // ensure we can leave a decal + angle += 180; + pitch = -pitch; ExplodeMissile(); return; } diff --git a/zscript/weapons/swwm_splode_fx.zsc b/zscript/weapons/swwm_splode_fx.zsc index 4e3475360..8ba5b8dda 100644 --- a/zscript/weapons/swwm_splode_fx.zsc +++ b/zscript/weapons/swwm_splode_fx.zsc @@ -215,6 +215,9 @@ Class ExplodiumMagProj : Actor A_StartSound("explodium/mag"); return; } + // ensure we can leave a decal + angle += 180; + pitch = -pitch; ExplodeMissile(); } States diff --git a/zscript/weapons/swwm_tastytreat_fx.zsc b/zscript/weapons/swwm_tastytreat_fx.zsc index be19de8b6..3a56d42df 100644 --- a/zscript/weapons/swwm_tastytreat_fx.zsc +++ b/zscript/weapons/swwm_tastytreat_fx.zsc @@ -748,6 +748,9 @@ Class CandyMagProj : Actor A_StartSound("explodium/mag"); return; } + // ensure we can leave a decal + angle += 180; + pitch = -pitch; ExplodeMissile(); } States