From 3eed92fe5e54f5bf60891a5bb682eb87d8aff182 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Wed, 18 Mar 2020 13:04:19 +0100 Subject: [PATCH] Generic display for third-party weapons. Disable custom bobbing for third-party weapons (since this may cause visual glitches). Spiced up teleport fog with some sparkles. --- graphics/HUD/GenericAmmoBoxL.png | Bin 0 -> 115 bytes graphics/HUD/GenericAmmoBoxM.png | Bin 0 -> 95 bytes graphics/HUD/GenericAmmoBoxR.png | Bin 0 -> 256 bytes sprites/BLPFC0.png | Bin 0 -> 3613 bytes zscript/swwm_common.zsc | 45 ++++++++++++++++++++++++++++-- zscript/swwm_hud.zsc | 39 ++++++++++++++++++++++++-- zscript/swwm_inter.zsc | 46 +++++++++++++++++++++++++++++++ zscript/swwm_player.zsc | 3 ++ 8 files changed, 128 insertions(+), 5 deletions(-) create mode 100644 graphics/HUD/GenericAmmoBoxL.png create mode 100644 graphics/HUD/GenericAmmoBoxM.png create mode 100644 graphics/HUD/GenericAmmoBoxR.png create mode 100644 sprites/BLPFC0.png diff --git a/graphics/HUD/GenericAmmoBoxL.png b/graphics/HUD/GenericAmmoBoxL.png new file mode 100644 index 0000000000000000000000000000000000000000..0fde3042142c6e75dd4fbb342ee2b9e1b3a6fbe2 GIT binary patch literal 115 zcmeAS@N?(olHy`uVBq!ia0y~yU|?ooVBqIqV_;xVd{ugcfq}uw)5S4_<9f2si~Ilo zA3Vy;0|tDYU;j%=NSre;Fqo5=`L(A#eZy literal 0 HcmV?d00001 diff --git a/graphics/HUD/GenericAmmoBoxM.png b/graphics/HUD/GenericAmmoBoxM.png new file mode 100644 index 0000000000000000000000000000000000000000..a0ac05e43030454dfec3d887614a875ab062a756 GIT binary patch literal 95 zcmeAS@N?(olHy`uVBq!ia0y~yU|?flVBqHfk;f13YhYktQ1f(g43W5;T;j3f|M>=1 x10w^2IS17a9%*3iiQ#l(I8D9VZ literal 0 HcmV?d00001 diff --git a/graphics/HUD/GenericAmmoBoxR.png b/graphics/HUD/GenericAmmoBoxR.png new file mode 100644 index 0000000000000000000000000000000000000000..201d761b78f70dbd3a34d5164759890dc3982165 GIT binary patch literal 256 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 literal 0 HcmV?d00001 diff --git a/zscript/swwm_common.zsc b/zscript/swwm_common.zsc index 7ecf17086..ad0c57d9c 100644 --- a/zscript/swwm_common.zsc +++ b/zscript/swwm_common.zsc @@ -1160,9 +1160,35 @@ Class TeleLight : PaletteLight } } +Class SWWMTeleportSparkle : Actor +{ + Default + { + RenderStyle "Add"; + Scale 0.3; + Radius 0.1; + Height 0; + +NOGRAVITY; + +NOBLOCKMAP; + +DONTSPLASH; + +ROLLSPRITE; + +ROLLCENTER; + +FORCEXYBILLBOARD; + } + States + { + Spawn: + BLPF C 1 Bright + { + A_SetScale(scale.x*specialf1); + A_FadeOut(specialf2); + } + Wait; + } +} + Class SWWMTeleportFog : Actor { - Default { +NOGRAVITY; @@ -1192,7 +1218,22 @@ Class SWWMTeleportFog : Actor s.scale *= 3.*alpha; s.alpha *= alpha; } - A_FadeOut(); + numpt = int(Random[ExploS](4,8)); + for ( int i=0; i