From 046833ccc10739d9c0374764ed402e48be351324 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Wed, 13 Jun 2018 13:38:23 +0200
Subject: [PATCH] Make biorifle damage proportional to square of sludge scale.
 Tweaked the timing of the Enforcer and Dual Enforcers.

---
 zscript/biorifle.zsc |  4 ++--
 zscript/enforcer.zsc | 21 ++++++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/zscript/biorifle.zsc b/zscript/biorifle.zsc
index 6a91cd8..e7b1a6a 100644
--- a/zscript/biorifle.zsc
+++ b/zscript/biorifle.zsc
@@ -402,7 +402,7 @@ Class BioGel : Actor
 		s.args[3] = int(s.args[3]*Scale.x);
 		invoker.deadtimer = -2;
 		if ( invoker.atline ) invoker.atline.RemoteActivate(target,invoker.atside,SPAC_Impact,pos);
-		A_Explode(int(Random[GES](20,40)*Scale.x),Min(150,int(Scale.x*25)));
+		A_Explode(int(Random[GES](10,20)*Scale.x*Scale.x),Min(150,int(Scale.x*25)));
 		A_PlaySound("ges/explode",CHAN_VOICE);
 		int numpt = Min(300,int(Scale.x*30))+Random[GES](-10,10);
 		for ( int i=0; i<numpt; i++ )
@@ -428,7 +428,7 @@ Class BioGel : Actor
 	{
 		Obituary "%o drank a glass of %k's dripping green load.";
 		DamageType 'Slime';
-		DamageFunction Random[GES](20,40)*Scale.x;
+		DamageFunction int(Random[GES](10,20)*Scale.x*Scale.x);
 		RenderStyle "Add";
 		Radius 3;
 		Height 3;
diff --git a/zscript/enforcer.zsc b/zscript/enforcer.zsc
index 37012ec..240314a 100644
--- a/zscript/enforcer.zsc
+++ b/zscript/enforcer.zsc
@@ -456,16 +456,22 @@ Class Enforcer : UTWeapon replaces Pistol
 		ENFF A 0 A_Overlay(-9999,"Null");
 	Hold:
 		ENFF A 0 A_EnforcerFire();
-		ENFF ABCDEFGHI 1;
-		ENFF J 3 A_EnforcerRefire();
+		ENFF ABCDEFGHIJ 1;
+		ENFF J 0 A_EnforcerRefire();
+		ENFF J 2;
+		ENFI A 0;
 		Goto Idle;
 	LeftFire:
 		2NFI A 0 A_Overlay(-9998,"Null");
-		2NFI A 1 A_SetTics(Random[Enforcer](0,5));
+		2NFI A 1 A_SetTics(Random[Enforcer](5,6));
+		2NFI A 0 A_EnforcerRefire(1,true);
+		Goto LeftIdle;
 	LeftHold:
 		2NFF A 0 A_EnforcerFire(false,true);
-		2NFF ABCDEFGHI 1;
-		2NFF J 3 A_EnforcerRefire("LeftHold",true);
+		2NFF ABCDEFGHIJ 1;
+		2NFF J 0 A_EnforcerRefire("LeftHold",true);
+		2NFF J 2;
+		2NFI A 0;
 		Goto LeftIdle;
 	AltFire:
 		ENFA A 0 A_Overlay(-9999,"Null");
@@ -478,8 +484,9 @@ Class Enforcer : UTWeapon replaces Pistol
 		Goto Idle;
 	LeftAltFire:
 		2NFI A 0 A_Overlay(-9998,"Null");
-		2NFI A 1 A_SetTics(Random[Enforcer](0,5));
-		2NFI A 0;
+		2NFI A 1 A_SetTics(Random[Enforcer](5,6));
+		2NFI A 0 A_EnforcerRefire(1,true);
+		Goto LeftIdle;
 		2NFA ABCDEF 1;
 	LeftAltHold:
 		2NFA G 0 A_EnforcerFire(true,true);