From aa7fd5d9b0caacd580fd59e3f93dff02a4007af5 Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Tue, 20 May 2025 12:05:47 +0200
Subject: [PATCH] (Try to) reduce bullet trail perf hit for some hitscan
 weapons.

---
 language.version                      | 4 ++--
 zscript/dlc/swwm_heavymahsheengun.zsc | 8 ++++++--
 zscript/swwm_common_fx.zsc            | 2 +-
 zscript/weapons/swwm_cbt.zsc          | 5 ++++-
 zscript/weapons/swwm_shot.zsc         | 7 +++++--
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/language.version b/language.version
index 4369b86de..4457ebcf8 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1217 \cu(mar 20 may 2025 12:05:32 CEST)\c-";
-SWWM_SHORTVER="\cw1.3pre r1217 \cu(2025-05-20 12:05:32)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1218 \cu(mar 20 may 2025 12:05:47 CEST)\c-";
+SWWM_SHORTVER="\cw1.3pre r1218 \cu(2025-05-20 12:05:47)\c-";
diff --git a/zscript/dlc/swwm_heavymahsheengun.zsc b/zscript/dlc/swwm_heavymahsheengun.zsc
index bbb2fbc6e..78fcf4903 100644
--- a/zscript/dlc/swwm_heavymahsheengun.zsc
+++ b/zscript/dlc/swwm_heavymahsheengun.zsc
@@ -174,10 +174,14 @@ Class HeavyMahSheenGun : SWWMWeapon
 			b.target = self;
 			b.A_CheckTerrain();
 		}
+		Vector3 ppos;
 		for ( int i=5; i<st.Results.Distance; i+=10 )
 		{
-			if ( !Random[Boolet](0,2) ) continue;
-			let b = SWWMAnimSprite.SpawnAt('SWWMHalfBubble',level.Vec3Offset(origin,dir*i));
+			if ( Random[Boolet](0,2+invoker.firespeed*3) ) continue;
+			if ( Random[Boolet](0,i/100) ) continue;	// fall off w/ distance
+			ppos = level.Vec3Offset(origin,dir*i);
+			if ( !SWWMUtility.PointInWater(ppos) ) continue;
+			let b = SWWMAnimSprite.SpawnAt('SWWMHalfBubble',ppos);
 			b.Scale *= FRandom[Boolet](.1,.3);
 		}
 		foreach ( hit:st.HitList )
diff --git a/zscript/swwm_common_fx.zsc b/zscript/swwm_common_fx.zsc
index e492fedc7..4df271360 100644
--- a/zscript/swwm_common_fx.zsc
+++ b/zscript/swwm_common_fx.zsc
@@ -1406,7 +1406,7 @@ Class SWWMBulletTrail : LineTracer
 		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
+			if ( Random[Boolet](0,i/100) ) continue;	// fall off w/ distance
 			ppos = level.Vec3Offset(pos,dir*i);
 			bInWater = SWWMUtility.PointInWater(ppos);
 			if ( smoky && !bInWater ) b = SWWMAnimSprite.SpawnAt('SWWMHalfSmoke',ppos);
diff --git a/zscript/weapons/swwm_cbt.zsc b/zscript/weapons/swwm_cbt.zsc
index 5727b9e24..db918a55a 100644
--- a/zscript/weapons/swwm_cbt.zsc
+++ b/zscript/weapons/swwm_cbt.zsc
@@ -86,11 +86,14 @@ Class Wallbuster : SWWMWeapon
 			b.target = self;
 			b.A_CheckTerrain();
 		}
+		Vector3 ppos;
 		for ( int i=5; i<t.Results.Distance; i+=10 )
 		{
 			if ( Random[Boolet](0,bc) ) continue;
 			if ( Random[Boolet](0,i/100) ) continue;	// fall off w/ distance
-			let b = SWWMAnimSprite.SpawnAt('SWWMHalfBubble',level.Vec3Offset(origin,dir*i));
+			ppos = level.Vec3Offset(origin,dir*i);
+			if ( !SWWMUtility.PointInWater(ppos) ) continue;
+			let b = SWWMAnimSprite.SpawnAt('SWWMHalfBubble',ppos);
 			b.Scale *= FRandom[Boolet](.1,.3);
 		}
 		foreach( hit:t.HitList )
diff --git a/zscript/weapons/swwm_shot.zsc b/zscript/weapons/swwm_shot.zsc
index bf028ff39..a168c91b0 100644
--- a/zscript/weapons/swwm_shot.zsc
+++ b/zscript/weapons/swwm_shot.zsc
@@ -165,11 +165,14 @@ Class Spreadgun : SWWMWeapon
 			b.target = self;
 			b.A_CheckTerrain();
 		}
+		Vector3 ppos;
 		for ( int i=5; i<t.Results.Distance; i+=10 )
 		{
 			if ( Random[Boolet](0,bc) ) continue;
 			if ( Random[Boolet](0,i/100) ) continue;	// fall off w/ distance
-			let b = SWWMAnimSprite.SpawnAt('SWWMHalfBubble',level.Vec3Offset(origin,dir*i));
+			ppos = level.Vec3Offset(origin,dir*i);
+			if ( !SWWMUtility.PointInWater(ppos) ) continue;
+			let b = SWWMAnimSprite.SpawnAt('SWWMHalfBubble',ppos);
 			b.Scale *= FRandom[Boolet](.1,.3);
 		}
 		foreach( hit:t.HitList )
@@ -294,7 +297,7 @@ Class Spreadgun : SWWMWeapon
 				st.shootthroughlist.Clear();
 				st.waterhitlist.Clear();
 				st.Trace(origin,level.PointInSector(origin.xy),dir,8000.,0,ignore:self);
-				ProcessTraceHit(st,origin,dir,10,7000,bc:3);
+				ProcessTraceHit(st,origin,dir,10,7000,bc:5);
 			}
 			for ( int i=0; i<16; i++ )
 			{