diff --git a/language.version b/language.version index 5f258b556..49760ca28 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r311 \cu(Fri 12 Aug 16:34:02 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r311 \cu(2022-08-12 16:34:02)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r312 \cu(Fri 12 Aug 16:58:13 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r312 \cu(2022-08-12 16:58:13)\c-"; diff --git a/zscript/dlc1/swwm_hammertime.zsc b/zscript/dlc1/swwm_hammertime.zsc index b3b25c63e..87d2a4a6d 100644 --- a/zscript/dlc1/swwm_hammertime.zsc +++ b/zscript/dlc1/swwm_hammertime.zsc @@ -130,14 +130,14 @@ Class ItamexHammer : SWWMWeapon action void A_AltCharge() { - invoker.charge = min(100.,invoker.charge*1.05+1.); + invoker.charge = min(100.,invoker.charge+SWWMUtility.Lerp(2.,.5,(invoker.charge/100.)**.5)); double vibe = (invoker.charge/100.)**2.; A_WeaponOffset(FRandom[Hammer](-.5,.5)*vibe,32+FRandom[Hammer](-.5,.5)*vibe,WOF_INTERPOLATE); } action State A_AltHold() { - invoker.charge = min(100.,invoker.charge*1.05+1.); + invoker.charge = min(100.,invoker.charge+SWWMUtility.Lerp(2.,.5,(invoker.charge/100.)**.5)); double vibe = (invoker.charge/100.)**2.; A_WeaponOffset(FRandom[Hammer](-.5,.5)*vibe,32+FRandom[Hammer](-.5,.5)*vibe,WOF_INTERPOLATE); if ( !(player.cmd.buttons&BT_ALTATTACK) )