From cd78a3dec72ac2e4c427ef21c9fbcb452fc02fe5 Mon Sep 17 00:00:00 2001
From: David Markowitz <39972741+EmosewaMC@users.noreply.github.com>
Date: Fri, 16 Dec 2022 13:23:09 -0800
Subject: [PATCH] Fix cannon super charge speed (#883)

* Fix cannon

* Update SGCannon.cpp
---
 dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp b/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp
index 049837a4..912b9f58 100644
--- a/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp
+++ b/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp
@@ -722,7 +722,7 @@ void SGCannon::ToggleSuperCharge(Entity* self, bool enable) {
 	Game::logger->Log("SGCannon", "Player has %d equipped items", equippedItems.size());
 
 	auto skillID = constants.cannonSkill;
-	auto coolDown = constants.cannonRefireRate;
+	auto cooldown = constants.cannonRefireRate;
 
 	auto* selfInventoryComponent = self->GetComponent<InventoryComponent>();
 
@@ -738,7 +738,7 @@ void SGCannon::ToggleSuperCharge(Entity* self, bool enable) {
 
 		// TODO: Equip items
 		skillID = constants.cannonSuperChargeSkill;
-		coolDown = 400;
+		cooldown = 400;
 	} else {
 		selfInventoryComponent->UpdateSlot("greeble_r", { ObjectIDManager::GenerateRandomObjectID(), 0, 0, 0 });
 		selfInventoryComponent->UpdateSlot("greeble_l", { ObjectIDManager::GenerateRandomObjectID(), 0, 0, 0 });
@@ -761,7 +761,7 @@ void SGCannon::ToggleSuperCharge(Entity* self, bool enable) {
 				}
 			}
 		}
-
+		cooldown = 800;
 		self->SetVar<uint32_t>(NumberOfChargesVariable, 0);
 	}
 
@@ -777,7 +777,7 @@ void SGCannon::ToggleSuperCharge(Entity* self, bool enable) {
 
 	properties.cannonFOV = 58.6f;
 	properties.cannonVelocity = 129.0;
-	properties.cannonRefireRate = 800;
+	properties.cannonRefireRate = cooldown;
 	properties.cannonMinDistance = 30;
 	properties.cannonTimeout = -1;