diff --git a/language.version b/language.version
index 55ce61373..2daf15ef5 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1198 \cu(vie 14 mar 2025 15:59:42 CET)\c-";
-SWWM_SHORTVER="\cw1.3pre r1198 \cu(2025-03-14 15:59:42)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1200 \cu(vie 14 mar 2025 16:23:20 CET)\c-";
+SWWM_SHORTVER="\cw1.3pre r1200 \cu(2025-03-14 16:23:20)\c-";
diff --git a/zscript/swwm_common_fx.zsc b/zscript/swwm_common_fx.zsc
index 5b3bf3668..e492fedc7 100644
--- a/zscript/swwm_common_fx.zsc
+++ b/zscript/swwm_common_fx.zsc
@@ -1400,11 +1400,18 @@ Class SWWMBulletTrail : LineTracer
 			b.target = target;
 			b.A_CheckTerrain();
 		}
+		Vector3 ppos;
+		SWWMAnimSprite b;
+		bool bInWater;
 		for ( int i=5; i<t.Results.Distance; i+=10 )
 		{
 			if ( Random[Boolet](0,bubblesparse) ) continue;
 			if ( !Random[Boolet](0,i/100) ) continue;	// fall off w/ distance
-			let b = SWWMAnimSprite.SpawnAt(smoky?'SWWMHalfSmoke':'SWWMHalfBubble',level.Vec3Offset(pos,dir*i));
+			ppos = level.Vec3Offset(pos,dir*i);
+			bInWater = SWWMUtility.PointInWater(ppos);
+			if ( smoky && !bInWater ) b = SWWMAnimSprite.SpawnAt('SWWMHalfSmoke',ppos);
+			else if ( !smoky && bInWater ) b = SWWMAnimSprite.SpawnAt('SWWMHalfBubble',ppos);
+			else continue;
 			b.Scale *= FRandom[Boolet](.4,.6);
 		}
 		t.Destroy();
diff --git a/zscript/utility/swwm_utility_map.zsc b/zscript/utility/swwm_utility_map.zsc
index 9768026f7..dd50d49c1 100644
--- a/zscript/utility/swwm_utility_map.zsc
+++ b/zscript/utility/swwm_utility_map.zsc
@@ -599,6 +599,35 @@ extend Class SWWMUtility
 		return HitNormal;
 	}
 
+	static bool PointInWater( Vector3 p )
+	{
+		Sector s = level.PointInSector(p.xy);
+		if ( s.moreflags&Sector.SECMF_UNDERWATER ) // check underwater sector
+			return true;
+		else if ( s.heightsec && (s.heightsec.moreflags&Sector.SECMF_UNDERWATERMASK) ) // check height transfer
+		{
+			let hsec = s.heightsec;
+			double fh = hsec.floorplane.ZAtPoint(p.xy);
+			if ( p.z <= fh )
+				return true;
+			if ( !(hsec.moreflags&Sector.SECMF_FAKEFLOORONLY) && (p.z > hsec.ceilingplane.ZAtPoint(p.xy)) )
+				return true;
+		}
+		else // check 3D floors
+		{
+			for ( int i=0; i<s.Get3DFloorCount(); i++ )
+			{
+				let ff = s.Get3DFloor(i);
+				if ( !(ff.flags&F3DFloor.FF_EXISTS) || (ff.flags&F3DFloor.FF_SOLID) || !(ff.flags&F3DFloor.FF_SWIMMABLE) ) continue;
+				double ff_bottom = ff.bottom.ZAtPoint(p.xy);
+				double ff_top = ff.top.ZAtPoint(p.xy);
+				if ( (ff_top <= p.z) || (ff_bottom > p.z) ) continue;
+				return true;
+			}
+		}
+		return false;
+	}
+
 	static bool, TextureID DefaceTexture( TextureID checkme )
 	{
 		String tn = TexMan.GetName(checkme);