From ac12acf94b4f915f89dd0b8cc43df07ab05fe904 Mon Sep 17 00:00:00 2001
From: Jbleezy <thejbirdjustin@yahoo.com>
Date: Mon, 16 Mar 2020 13:29:53 -0700
Subject: [PATCH] Solo revive requires perk to be active

---
 README.md          |  3 +--
 _zm_reimagined.gsc | 15 +++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 8a054c03..e6b7dcf2 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@
 
 ## Players
 * Unlimited sprint
-* Automatically get 3 self revives in solo
+* Self revives in solo are active whenever the player has at least 1 perk
 * 100% backwards speed, strafe speed, and sprint strafe speed
 * Can dive again right away after just diving
 * Can move after diving quicker
@@ -84,7 +84,6 @@
 ### Quick Revive
 * No longer automatically powered on in solo
 * Increased cost in solo from 500 to 1500
-* No longer gives an additional self revive in solo
 * Decreases normal health regeneration delay from 2 seconds to 1.5 seconds
 * Decreases low health regeneration delay from 4 seconds to 3 seconds
 * Increases health regeneration rate from 100 health per second to 125 health per second
diff --git a/_zm_reimagined.gsc b/_zm_reimagined.gsc
index 4626c5ce..7f4fe1e4 100644
--- a/_zm_reimagined.gsc
+++ b/_zm_reimagined.gsc
@@ -2683,12 +2683,20 @@ solo_lives_fix()
 
 	self.lives = 3;
 	self.bought_solo_revive = 0;
-	self setPerk("specialty_quickrevive");
 
 	while (1)
 	{
 		self waittill_any("perk_acquired", "perk_lost");
 
+		if (self.perks_active.size < 1)
+		{
+			self unsetPerk("specialty_quickrevive");
+			self.bought_solo_revive = 0;
+			continue;
+		}
+
+		self setPerk("specialty_quickrevive");
+
 		has_revive = 0;
 		foreach (perk in self.perks_active)
 		{
@@ -2700,11 +2708,6 @@ solo_lives_fix()
 		}
 
 		self.bought_solo_revive = has_revive;
-
-		if (!has_revive)
-		{
-			self setPerk("specialty_quickrevive");
-		}
 	}
 }