OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fix explodium/candy mags disappearing in water.

Browse source
This commit is contained in:
Mari the Deer 2021-03-12 16:05:39 +01:00
commit 5f44dcd530
6 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
language.version
View file

@ -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-";

2
zscript/weapons/swwm_blazeit_fx.zsc
View file

@ -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;

1
zscript/weapons/swwm_deathlydeathcannon_fx.zsc
View file

@ -172,6 +172,7 @@ Class YnykronImpactArm : Actor
+BOUNCEONWALLS;
+BOUNCEONFLOORS;
+BOUNCEONCEILINGS;
+CANBOUNCEWATER;
+NODAMAGETHRUST;
+FORCERADIUSDMG;
-NOGRAVITY;

1
zscript/weapons/swwm_shot_fx.zsc
View file

@ -170,6 +170,7 @@ Class DragonBreathArm : Actor
+BOUNCEONWALLS;
+BOUNCEONFLOORS;
+BOUNCEONCEILINGS;
+CANBOUNCEWATER;
+USEBOUNCESTATE;
+NODAMAGETHRUST;
+FORCERADIUSDMG;

5
zscript/weapons/swwm_splode_fx.zsc
View file

@ -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;
}

5
zscript/weapons/swwm_tastytreat_fx.zsc
View file

@ -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;