From bcd2577fc7d907879441f2c54082ee897bbb2bbc Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Thu, 27 Feb 2020 14:17:02 +0100
Subject: [PATCH] More noticeable Spreadgun impacts. Lamp is no longer
 shootable.

---
 zscript/swwm_jackhammer.zsc |  2 +-
 zscript/swwm_powerup.zsc    |  3 ---
 zscript/swwm_shot.zsc       | 13 +++++++------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/zscript/swwm_jackhammer.zsc b/zscript/swwm_jackhammer.zsc
index e2838979c..5ccb19a03 100644
--- a/zscript/swwm_jackhammer.zsc
+++ b/zscript/swwm_jackhammer.zsc
@@ -22,7 +22,7 @@ Class PusherImpact : Actor
 		Vector3 x = (cos(angle)*cos(pitch),sin(angle)*cos(pitch),-sin(pitch));
 		for ( int i=0; i<numpt; i++ )
 		{
-			Vector3 pvel = (-x+(FRandom[Pusher](-.8,.8),FRandom[Pusher](-.8,.8),FRandom[Pusher](-.8,.8))).unit()*FRandom[Pusher](.1,1.2);
+			Vector3 pvel = (x+(FRandom[Pusher](-.8,.8),FRandom[Pusher](-.8,.8),FRandom[Pusher](-.8,.8))).unit()*FRandom[Pusher](.1,1.2);
 			let s = Spawn("SWWMSmoke",pos);
 			s.vel = pvel;
 			s.SetShade(Color(1,1,1)*Random[Pusher](128,192));
diff --git a/zscript/swwm_powerup.zsc b/zscript/swwm_powerup.zsc
index faa87b97f..42a90d000 100644
--- a/zscript/swwm_powerup.zsc
+++ b/zscript/swwm_powerup.zsc
@@ -1015,10 +1015,7 @@ Class CompanionLamp : Actor
 	{
 		Tag "$T_LAMP";
 		+NOGRAVITY;
-		+SHOOTABLE;
 		+NOTELEPORT;
-		+NODAMAGE;
-		+NOBLOOD;
 		+DONTSPLASH;
 		+INTERPOLATEANGLES;
 		+LOOKALLAROUND;
diff --git a/zscript/swwm_shot.zsc b/zscript/swwm_shot.zsc
index 5246d1770..019d2dfbe 100644
--- a/zscript/swwm_shot.zsc
+++ b/zscript/swwm_shot.zsc
@@ -225,28 +225,28 @@ Class SpreadImpact : Actor
 		Super.PostBeginPlay();
 		A_StartSound("spreadgun/pellet",CHAN_VOICE,CHANF_DEFAULT,.4,4.);
 		A_SprayDecal("TinyBulletChip",-20);
-		int numpt = Random[Spreadgun](-2,2);
+		int numpt = Random[Spreadgun](2,4);
 		Vector3 x = (cos(angle)*cos(pitch),sin(angle)*cos(pitch),-sin(pitch));
 		for ( int i=0; i<numpt; i++ )
 		{
-			Vector3 pvel = (-x+(FRandom[Spreadgun](-.8,.8),FRandom[Spreadgun](-.8,.8),FRandom[Spreadgun](-.8,.8))).unit()*FRandom[Spreadgun](.1,1.2);
+			Vector3 pvel = (x+(FRandom[Spreadgun](-.8,.8),FRandom[Spreadgun](-.8,.8),FRandom[Spreadgun](-.8,.8))).unit()*FRandom[Spreadgun](.1,1.2);
 			let s = Spawn("SWWMSmoke",pos);
 			s.vel = pvel;
 			s.scale *= .6;
 			s.special1 = Random[Spreadgun](0,1);
 			s.SetShade(Color(1,1,1)*Random[Spreadgun](96,192));
 		}
-		numpt = Random[Spreadgun](-3,3);
+		numpt = Random[Spreadgun](1,3);
 		for ( int i=0; i<numpt; i++ )
 		{
 			Vector3 pvel = (FRandom[Spreadgun](-1,1),FRandom[Spreadgun](-1,1),FRandom[Spreadgun](-1,1)).unit()*FRandom[Spreadgun](2,8);
 			let s = Spawn("SWWMSpark",pos);
 			s.vel = pvel;
 		}
-		numpt = Random[Spreadgun](-2,2);
+		numpt = Random[Spreadgun](2,5);
 		for ( int i=0; i<numpt; i++ )
 		{
-			Vector3 pvel = (FRandom[Spreadgun](-1,1),FRandom[Spreadgun](-1,1),FRandom[Spreadgun](-1,1)).unit()*FRandom[Spreadgun](2,8);
+			Vector3 pvel = (FRandom[Spreadgun](-1,1),FRandom[Spreadgun](-1,1),FRandom[Spreadgun](-1,1)).unit()*FRandom[Spreadgun](1,4);
 			let s = Spawn("SWWMChip",pos);
 			s.vel = pvel;
 		}
@@ -274,9 +274,10 @@ Class SlugImpact : Actor
 		Vector3 x = (cos(angle)*cos(pitch),sin(angle)*cos(pitch),-sin(pitch));
 		for ( int i=0; i<numpt; i++ )
 		{
-			Vector3 pvel = (-x+(FRandom[Spreadgun](-.8,.8),FRandom[Spreadgun](-.8,.8),FRandom[Spreadgun](-.8,.8))).unit()*FRandom[Spreadgun](.1,1.2);
+			Vector3 pvel = (x+(FRandom[Spreadgun](-.4,.4),FRandom[Spreadgun](-.4,.4),FRandom[Spreadgun](-.4,.4))).unit()*FRandom[Spreadgun](.4,2.);
 			let s = Spawn("SWWMSmoke",pos);
 			s.vel = pvel;
+			s.scale *= 1.4;
 			s.special1 = Random[Spreadgun](0,2);
 			s.SetShade(Color(1,1,1)*Random[Spreadgun](96,192));
 		}