diff --git a/language.version b/language.version index f875303ad..b20f23501 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r348 \cu(Thu 11 Mar 22:05:59 CET 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r348 \cu(2021-03-11 22:05:59)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r349 \cu(Fri 12 Mar 16:05:39 CET 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r349 \cu(2021-03-12 16:05:39)\c-"; diff --git a/zscript/weapons/swwm_blazeit_fx.zsc b/zscript/weapons/swwm_blazeit_fx.zsc index ae5a381f4..349e2b7ad 100644 --- a/zscript/weapons/swwm_blazeit_fx.zsc +++ b/zscript/weapons/swwm_blazeit_fx.zsc @@ -1031,6 +1031,7 @@ Class HellblazerRavagerArm : Actor +BOUNCEONWALLS; +BOUNCEONFLOORS; +BOUNCEONCEILINGS; + +CANBOUNCEWATER; +USEBOUNCESTATE; +NODAMAGETHRUST; +FORCERADIUSDMG; @@ -1196,6 +1197,7 @@ Class HellblazerWarheadArm : Actor +BOUNCEONWALLS; +BOUNCEONFLOORS; +BOUNCEONCEILINGS; + +CANBOUNCEWATER; +NODAMAGETHRUST; +FORCERADIUSDMG; -NOGRAVITY; diff --git a/zscript/weapons/swwm_deathlydeathcannon_fx.zsc b/zscript/weapons/swwm_deathlydeathcannon_fx.zsc index afc8c6393..8fb76fc0f 100644 --- a/zscript/weapons/swwm_deathlydeathcannon_fx.zsc +++ b/zscript/weapons/swwm_deathlydeathcannon_fx.zsc @@ -172,6 +172,7 @@ Class YnykronImpactArm : Actor +BOUNCEONWALLS; +BOUNCEONFLOORS; +BOUNCEONCEILINGS; + +CANBOUNCEWATER; +NODAMAGETHRUST; +FORCERADIUSDMG; -NOGRAVITY; diff --git a/zscript/weapons/swwm_shot_fx.zsc b/zscript/weapons/swwm_shot_fx.zsc index 5636a9a94..a66ddd3a0 100644 --- a/zscript/weapons/swwm_shot_fx.zsc +++ b/zscript/weapons/swwm_shot_fx.zsc @@ -170,6 +170,7 @@ Class DragonBreathArm : Actor +BOUNCEONWALLS; +BOUNCEONFLOORS; +BOUNCEONCEILINGS; + +CANBOUNCEWATER; +USEBOUNCESTATE; +NODAMAGETHRUST; +FORCERADIUSDMG; diff --git a/zscript/weapons/swwm_splode_fx.zsc b/zscript/weapons/swwm_splode_fx.zsc index b866bc67a..def2020f4 100644 --- a/zscript/weapons/swwm_splode_fx.zsc +++ b/zscript/weapons/swwm_splode_fx.zsc @@ -39,6 +39,7 @@ Class ExplodiumMagArm : Actor +BOUNCEONWALLS; +BOUNCEONFLOORS; +BOUNCEONCEILINGS; + +CANBOUNCEWATER; +NODAMAGETHRUST; +FORCERADIUSDMG; -NOGRAVITY; @@ -132,6 +133,8 @@ Class ExplodiumMagProj : Actor +BOUNCEONFLOORS; +BOUNCEONCEILINGS; +BOUNCEONWALLS; + +CANBOUNCEWATER; + +DONTBOUNCEONSKY; +USEBOUNCESTATE; BounceFactor 0.4; WallBounceFactor 0.4; @@ -279,9 +282,11 @@ Class ExplodiumMagAttach : ExplodiumMagProj default { +MOVEWITHSECTOR; + +EXPLODEONWATER; -BOUNCEONFLOORS; -BOUNCEONCEILINGS; -BOUNCEONWALLS; + -CANBOUNCEWATER; -USEBOUNCESTATE; Speed 15; } diff --git a/zscript/weapons/swwm_tastytreat_fx.zsc b/zscript/weapons/swwm_tastytreat_fx.zsc index da5c19a58..65083299d 100644 --- a/zscript/weapons/swwm_tastytreat_fx.zsc +++ b/zscript/weapons/swwm_tastytreat_fx.zsc @@ -348,6 +348,7 @@ Class CandyMagArm : Actor +BOUNCEONWALLS; +BOUNCEONFLOORS; +BOUNCEONCEILINGS; + +CANBOUNCEWATER; +NODAMAGETHRUST; +FORCERADIUSDMG; -NOGRAVITY; @@ -528,6 +529,8 @@ Class CandyGunProj : Actor +BOUNCEONFLOORS; +BOUNCEONCEILINGS; +BOUNCEONWALLS; + +CANBOUNCEWATER; + +DONTBOUNCEONSKY; +USEBOUNCESTATE; BounceFactor 0.3; WallBounceFactor 0.3; @@ -663,6 +666,8 @@ Class CandyMagProj : Actor +BOUNCEONFLOORS; +BOUNCEONCEILINGS; +BOUNCEONWALLS; + +CANBOUNCEWATER; + +DONTBOUNCEONSKY; +USEBOUNCESTATE; BounceFactor 0.4; WallBounceFactor 0.4;