From 49f90f6c18c9b697ea2bd4eccf97c301f474ab6e Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Mon, 12 Sep 2022 23:14:07 +0200 Subject: [PATCH] On-screen text for Sheen fire speed changes. --- language.def_base | 3 +++ language.version | 4 ++-- zscript/dlc1/swwm_heavymahsheengun.zsc | 13 +++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/language.def_base b/language.def_base index cf42ba93f..f323a6b05 100644 --- a/language.def_base +++ b/language.def_base @@ -700,6 +700,9 @@ SWWM_WIDESPREAD = "Wide Spread Mode"; SWWM_TIGHTSPREAD = "Tight Spread Mode"; SWWM_YNYKRONFORWARD = "Beam Mode"; // desya / forward SWWM_YNYKRONBACKWARD = "Vortex Mode"; // busa / backward +SWWM_SHEENSPEED1 = "300 RPM"; +SWWM_SHEENSPEED2 = "700 RPM"; +SWWM_SHEENSPEED3 = "2100 RPM"; SWWM_MRMODE1 = "Precision Shot"; SWWM_MRMODE2 = "Cluster Shot"; SWWM_MRMODE3 = "Stream Shot"; diff --git a/language.version b/language.version index 81c0dd7fc..28dd38cae 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r440 \cu(Mon 12 Sep 22:10:53 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r440 \cu(2022-09-12 22:10:53)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r441 \cu(Mon 12 Sep 23:14:07 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r441 \cu(2022-09-12 23:14:07)\c-"; diff --git a/zscript/dlc1/swwm_heavymahsheengun.zsc b/zscript/dlc1/swwm_heavymahsheengun.zsc index 494acfe24..a28ff808a 100644 --- a/zscript/dlc1/swwm_heavymahsheengun.zsc +++ b/zscript/dlc1/swwm_heavymahsheengun.zsc @@ -11,6 +11,8 @@ Class HeavyMahSheenGun : SWWMWeapon int tcol; // for random bool initialized; + ui int lastfirespeed; + transient ui SmoothDynamicValueInterpolator HeatInter; transient SpreadSlugTracer st; @@ -19,6 +21,17 @@ Class HeavyMahSheenGun : SWWMWeapon Super.HudTick(); if ( !HeatInter ) HeatInter = SmoothDynamicValueInterpolator.Create(barrelheat,.5,1.,25.); HeatInter.Update(barrelheat); + if ( lastfirespeed && (lastfirespeed != firespeed+1) && (Owner.player == players[consoleplayer]) ) + { + let bar = SWWMStatusBar(statusbar); + if ( bar ) + { + bar.ntagstr = StringTable.Localize("$SWWM_SHEENSPEED"..(firespeed+1)); + bar.ntagtic = level.totaltime; + bar.ntagcol = nametagcolor; + } + } + lastfirespeed = firespeed+1; } action void A_DropCasing()