diff --git a/language.version b/language.version index 6ceb2fec9..e63f78021 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r719 \cu(Fri 30 Dec 11:38:33 CET 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r719 \cu(2022-12-30 11:38:33)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r720 \cu(Fri 30 Dec 23:16:16 CET 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r720 \cu(2022-12-30 23:16:16)\c-"; diff --git a/zscript/player/swwm_player_fx.zsc b/zscript/player/swwm_player_fx.zsc index 46d226d72..02be8064f 100644 --- a/zscript/player/swwm_player_fx.zsc +++ b/zscript/player/swwm_player_fx.zsc @@ -13,7 +13,7 @@ Class SWWMMagItem play if ( !item || item.Owner || !item.bSPECIAL || item.bINVISIBLE || !SWWMUtility.SphereIntersect(target,item.pos,800) || !target.CheckSight(item,SF_IGNOREVISIBILITY|SF_IGNOREWATERBOUNDARY) ) return true; Class cls = item.GetClass(); if ( item is 'Ammo' ) cls = Ammo(item).GetParentAmmo(); - else if ( item is 'MaGammo' ) cls = MagAmmo(item).GetParentMagAmmo(); + else if ( item is 'MagAmmo' ) cls = MagAmmo(item).GetParentMagAmmo(); let oi = target.FindInventory(cls); if ( !item.bALWAYSPICKUP && oi && (oi.Amount >= oi.MaxAmount) ) return true; if ( (item is 'SWWMWeapon') && SWWMWeapon(item).HasSwapWeapon(target) && swwm_swapweapons ) return true; @@ -39,6 +39,8 @@ Class SWWMMagItem play if ( !item ) return; if ( item.bSPECIAL ) item.bNOGRAVITY = item.default.bNOGRAVITY; item.bDROPOFF = item.default.bDROPOFF; + item.bSLIDESONWALLS = item.default.bSLIDESONWALLS; + item.bNOBLOCKMONST = item.default.bNOBLOCKMONST; item.A_StopSound(CHAN_AMBEXTRA); } } diff --git a/zscript/player/swwm_player_tick.zsc b/zscript/player/swwm_player_tick.zsc index 9c3c22031..9a617dc12 100644 --- a/zscript/player/swwm_player_tick.zsc +++ b/zscript/player/swwm_player_tick.zsc @@ -81,7 +81,9 @@ extend Class Demolitionist nmi.next = magitem; i.A_StartSound("misc/magitem",CHAN_AMBEXTRA,CHANF_LOOP,.2,1.,.5); i.bNOGRAVITY = true; - i.bDROPOFF = true; // required so items can cross over certain lines + i.bDROPOFF = true; + i.bSLIDESONWALLS = true; + i.bNOBLOCKMONST = true; magitem = nmi; magitem_cnt++; }