From 821447c38c204a51587bfc73c283b31301d662bf Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Thu, 12 Sep 2019 21:37:33 +0200
Subject: [PATCH] Quadshot balancing. Allow Quadshot manual reload. Fix
 Biorifle still attempting to fire without ammo.

---
 zscript/quadshot.zsc  | 9 +++++++--
 zscript/ubiorifle.zsc | 3 +++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/zscript/quadshot.zsc b/zscript/quadshot.zsc
index 3692a37..2fc0805 100644
--- a/zscript/quadshot.zsc
+++ b/zscript/quadshot.zsc
@@ -88,7 +88,7 @@ Class QuadShot : UnrealWeapon
 	{
 		if ( t.Results.HitType == TRACE_HitActor )
 		{
-			int dmg = Random[Quadshot](8,12);
+			int dmg = Random[Quadshot](4,8);
 			FlakAccumulator.Accumulate(t.Results.HitActor,dmg,invoker,self,'shot');
 			double mm = 2400;
 			UTMainHandler.DoKnockback(t.Results.HitActor,t.Results.HitVector+(0,0,0.025),mm*FRandom[Quadshot](0.4,1.2));
@@ -275,7 +275,12 @@ Class QuadShot : UnrealWeapon
 		{
 			A_CheckReload();
 			if ( !A_QuadshotCheckForReload() )
-				A_WeaponReady();
+			{
+				let weap = Weapon(invoker);
+				if ( (invoker.clipcount > 0) && (weap.Ammo1.Amount > 4-invoker.clipcount) )
+					A_WeaponReady(WRF_ALLOWRELOAD);
+				else A_WeaponReady();
+			}
 		}
 		Wait;
 	Idle:
diff --git a/zscript/ubiorifle.zsc b/zscript/ubiorifle.zsc
index 7ff7367..1951e90 100644
--- a/zscript/ubiorifle.zsc
+++ b/zscript/ubiorifle.zsc
@@ -642,7 +642,10 @@ Class UBioRifle : UnrealWeapon
 			}
 		}
 		if ( !(player.cmd.buttons&BT_ALTATTACK) )
+		{
+			invoker.bCharging = false;
 			player.SetPSPrite(PSP_WEAPON,invoker.FindState("AltRelease"));
+		}
 	}
 	action void A_BeginCharge()
 	{