From 9a6b71e751fd00310d8d507e6579d6edc4095fb6 Mon Sep 17 00:00:00 2001
From: Marisa the Magician <marisa@sayachan.org>
Date: Wed, 28 Sep 2022 22:38:48 +0200
Subject: [PATCH] Remove self-damage from Overpressure beam. It's annoying.

---
 language.version                | 4 ++--
 zscript/dlc1/swwm_mister_fx.zsc | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/language.version b/language.version
index a65e14a8b..e8a5f89ae 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r526 \cu(Wed 28 Sep 22:26:56 CEST 2022)\c-";
-SWWM_SHORTVER="\cw1.3pre r526 \cu(2022-09-28 22:26:56)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r527 \cu(Wed 28 Sep 22:38:48 CEST 2022)\c-";
+SWWM_SHORTVER="\cw1.3pre r527 \cu(2022-09-28 22:38:48)\c-";
diff --git a/zscript/dlc1/swwm_mister_fx.zsc b/zscript/dlc1/swwm_mister_fx.zsc
index 14a4082ba..adaaac230 100644
--- a/zscript/dlc1/swwm_mister_fx.zsc
+++ b/zscript/dlc1/swwm_mister_fx.zsc
@@ -879,7 +879,6 @@ Class MisterRailBeam : Actor
 		if ( isFrozen() ) return;
 		A_SetScale(scale.x*.85,scale.y);
 		A_FadeOut(.05);
-		if ( frame == 1 ) return;
 		if ( !cbt ) cbt = new("CandyBeamTracer");
 		cbt.hitlist.Clear();
 		Vector3 dir = SWWMUtility.Vec3FromAngles(angle,pitch-90);
@@ -887,7 +886,7 @@ Class MisterRailBeam : Actor
 		cbt.Trace(pos,CurSector,dir,scale.y,0);
 		for ( int i=0; i<cbt.hitlist.Size(); i++ )
 		{
-			if ( !cbt.hitlist[i].hitactor ) continue;
+			if ( !cbt.hitlist[i].hitactor || (cbt.hitlist[i].hitactor == target) ) continue;
 			SWWMUtility.DoKnockback(cbt.hitlist[i].hitactor,cbt.hitlist[i].x,12000);
 			let p = SWWMPuff.Setup(cbt.hitlist[i].hitlocation,cbt.hitlist[i].x,self,target,cbt.hitlist[i].hitactor);
 			cbt.hitlist[i].hitactor.DamageMobj(p,target,44,'Mortal',DMG_THRUSTLESS|DMG_INFLICTOR_IS_PUFF);