diff --git a/language.version b/language.version index 837b1d3d4..838d28312 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r789 \cu(Sat 11 Mar 01:06:32 CET 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r789 \cu(2023-03-11 01:06:32)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r790 \cu(Sat 11 Mar 01:07:15 CET 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r790 \cu(2023-03-11 01:07:15)\c-"; diff --git a/zscript/dlc1/swwm_mister_fx.zsc b/zscript/dlc1/swwm_mister_fx.zsc index f81147c72..2ede28567 100644 --- a/zscript/dlc1/swwm_mister_fx.zsc +++ b/zscript/dlc1/swwm_mister_fx.zsc @@ -964,7 +964,6 @@ Class MisterGrenade : Actor +BOUNCEONFLOORS; +BOUNCEONCEILINGS; +THRUACTORS; - +DONTBOUNCEONSKY; +CANBOUNCEWATER; } diff --git a/zscript/dlc1/swwm_notashotgun_fx.zsc b/zscript/dlc1/swwm_notashotgun_fx.zsc index 05e2dcc62..aa447be69 100644 --- a/zscript/dlc1/swwm_notashotgun_fx.zsc +++ b/zscript/dlc1/swwm_notashotgun_fx.zsc @@ -330,6 +330,7 @@ Class QuadProj : Actor +NODAMAGETHRUST; +HITMASTER; +NOFRICTION; + +SKYEXPLODE; RenderStyle "Add"; } diff --git a/zscript/swwm_gesture_fx.zsc b/zscript/swwm_gesture_fx.zsc index d87498a4a..3d7aa1ad0 100644 --- a/zscript/swwm_gesture_fx.zsc +++ b/zscript/swwm_gesture_fx.zsc @@ -99,6 +99,7 @@ Class LoveHeart : Actor +PAINLESS; +NODAMAGETHRUST; +NOFRICTION; + +SKYEXPLODE; } override int DoSpecialDamage( Actor target, int damage, Name damagetype ) diff --git a/zscript/weapons/swwm_blazeit_fx.zsc b/zscript/weapons/swwm_blazeit_fx.zsc index 5ffe0668a..ab62e2b7a 100644 --- a/zscript/weapons/swwm_blazeit_fx.zsc +++ b/zscript/weapons/swwm_blazeit_fx.zsc @@ -198,6 +198,7 @@ Class HellblazerMissile : Actor +FORCERADIUSDMG; +NODAMAGETHRUST; +HITTRACER; + +SKYEXPLODE; } override void PostBeginPlay() @@ -392,7 +393,6 @@ Class HellblazerMissile2 : HellblazerMissile +BOUNCEONCEILINGS; +ALLOWBOUNCEONACTORS; +DONTBOUNCEONSHOOTABLES; - +DONTBOUNCEONSKY; +CANBOUNCEWATER; +INTERPOLATEANGLES; +ROLLSPRITE; diff --git a/zscript/weapons/swwm_danmaku_fx.zsc b/zscript/weapons/swwm_danmaku_fx.zsc index 391a52aaf..82eff0a69 100644 --- a/zscript/weapons/swwm_danmaku_fx.zsc +++ b/zscript/weapons/swwm_danmaku_fx.zsc @@ -147,7 +147,6 @@ Class EvisceratorChunk : Actor +BOUNCEONCEILINGS; +ALLOWBOUNCEONACTORS; +NODAMAGETHRUST; - +DONTBOUNCEONSKY; +CANBOUNCEWATER; +INTERPOLATEANGLES; +ROLLSPRITE; @@ -402,6 +401,7 @@ Class EvisceratorProj : Actor +HITTRACER; +FORCERADIUSDMG; +NODAMAGETHRUST; + +SKYEXPLODE; } override void PostBeginPlay() { diff --git a/zscript/weapons/swwm_sparkyboi_fx.zsc b/zscript/weapons/swwm_sparkyboi_fx.zsc index b34fe6e7f..ed368936e 100644 --- a/zscript/weapons/swwm_sparkyboi_fx.zsc +++ b/zscript/weapons/swwm_sparkyboi_fx.zsc @@ -410,6 +410,7 @@ Class BiosparkBall : Actor +EXPLODEONWATER; +FORCEXYBILLBOARD; +NOFRICTION; + +SKYEXPLODE; } override void PostBeginPlay() { @@ -1527,7 +1528,6 @@ Class BiosparkCore : Actor BounceType "Hexen"; +CANBOUNCEWATER; +USEBOUNCESTATE; - +DONTBOUNCEONSKY; +NODAMAGETHRUST; +NOTELEPORT; +INTERPOLATEANGLES; diff --git a/zscript/weapons/swwm_splode_fx.zsc b/zscript/weapons/swwm_splode_fx.zsc index b5d895707..e9217a24c 100644 --- a/zscript/weapons/swwm_splode_fx.zsc +++ b/zscript/weapons/swwm_splode_fx.zsc @@ -129,7 +129,6 @@ Class ExplodiumMagProj : Actor +ALLOWBOUNCEONACTORS; +DONTBOUNCEONSHOOTABLES; +CANBOUNCEWATER; - +DONTBOUNCEONSKY; +USEBOUNCESTATE; BounceFactor 0.4; WallBounceFactor 0.4; @@ -284,6 +283,7 @@ Class ExplodiumMagAttach : ExplodiumMagProj { +MOVEWITHSECTOR; +EXPLODEONWATER; + +SKYEXPLODE; -BOUNCEONFLOORS; -BOUNCEONCEILINGS; -BOUNCEONWALLS; diff --git a/zscript/weapons/swwm_tastytreat_fx.zsc b/zscript/weapons/swwm_tastytreat_fx.zsc index 8d02af09b..cf5ce56b5 100644 --- a/zscript/weapons/swwm_tastytreat_fx.zsc +++ b/zscript/weapons/swwm_tastytreat_fx.zsc @@ -465,6 +465,7 @@ Class CandyGunProj : Actor +FORCEXYBILLBOARD; +FOILINVUL; +EXPLODEONWATER; + +SKYEXPLODE; } override void PostBeginPlay() { @@ -609,7 +610,6 @@ Class CandyMagProj : Actor +ALLOWBOUNCEONACTORS; +DONTBOUNCEONSHOOTABLES; +CANBOUNCEWATER; - +DONTBOUNCEONSKY; +USEBOUNCESTATE; BounceFactor 0.4; WallBounceFactor 0.4;