OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Less abrupt bubble popping using waterdepth check.

Browse source
This commit is contained in:
Mari the Deer 2023-09-24 18:44:16 +02:00
commit aa22b7d3b5
2 changed files with 4 additions and 4 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="\cyDEMOLITIONIST \cw1.3pre r958 \cu(Sun 24 Sep 18:43:53 CEST 2023)\c-";
SWWM_SHORTVER="\cw1.3pre r958 \cu(2023-09-24 18:43:53)\c-";
SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r959 \cu(Sun 24 Sep 18:44:16 CEST 2023)\c-";
SWWM_SHORTVER="\cw1.3pre r959 \cu(2023-09-24 18:44:16)\c-";

4
zscript/swwm_common_fx.zsc
View file

@ -269,7 +269,7 @@ Class SWWMBubble : SWWMNonInteractiveActor
ang = FRandom[Puff](0,360);
pt = FRandom[Puff](-90,90);
vel += SWWMUtility.Vec3FromAngles(ang,pt)*FRandom[Puff](0.2,0.8);
if ( waterlevel <= 0 ) Destroy();
if ( (waterlevel <= 0) || (waterdepth < (scale.y*9.)) ) Destroy();
SetState(ResolveState("Spawn")+Random[Puff](0,19));
}
override void Tick()
@ -322,7 +322,7 @@ Class SWWMBubble : SWWMNonInteractiveActor
newpos.z = clamp(newpos.z,floorz,ceilingz);
SetOrigin(newpos,true);
UpdateWaterLevel();
if ( (waterlevel <= 0) || !Random[Puff](0,100) ) Destroy();
if ( (waterlevel <= 0) || (waterdepth < (scale.y*9.)) || !Random[Puff](0,100) ) Destroy();
if ( !CheckNoDelay() || (tics == -1) ) return;
if ( tics > 0 ) tics--;
while ( !tics )