diff --git a/language.version b/language.version index 5823e1bba..6e9a6344f 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1pre r10 \cu(Tue 7 Sep 00:44:35 CEST 2021)\c-"; -SWWM_SHORTVER="\cw1.1pre r10 \cu(2021-09-07 00:44:35)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw1.1pre r11 \cu(Tue 7 Sep 00:51:56 CEST 2021)\c-"; +SWWM_SHORTVER="\cw1.1pre r11 \cu(2021-09-07 00:51:56)\c-"; diff --git a/zscript/handler/swwm_handler_playerevents.zsc b/zscript/handler/swwm_handler_playerevents.zsc index d55fb5f7d..0972559e9 100644 --- a/zscript/handler/swwm_handler_playerevents.zsc +++ b/zscript/handler/swwm_handler_playerevents.zsc @@ -132,6 +132,8 @@ extend Class SWWMHandler if ( !SWWMWeapon(i) ) continue; SWWMWeapon(i).hastravelled = false; } + // cap health to 200 + if ( p.Health > 200 ) p.Health = p.mo.Health = 200; } override void PlayerRespawned( PlayerEvent e ) diff --git a/zscript/items/swwm_powerups.zsc b/zscript/items/swwm_powerups.zsc index b2576e22c..5e31ea59c 100644 --- a/zscript/items/swwm_powerups.zsc +++ b/zscript/items/swwm_powerups.zsc @@ -3500,6 +3500,7 @@ Class DivineSpriteEffect : Inventory { Inventory.Icon "graphics/HUD/Icons/I_Divine.png"; DivineSpriteEffect.HealTimer 1750; + Inventory.InterHubAmount 0; +INVENTORY.UNDROPPABLE; +INVENTORY.UNTOSSABLE; } @@ -3517,12 +3518,6 @@ Class DivineSpriteEffect : Inventory return Color(int(64*alph),255,255,255); } - override void Travelled() - { - Super.Travelled(); - bHealDone = true; - } - override void DoEffect() { Super.DoEffect();