From a60738f78ff02741b4797e2e5507a852bf4aa646 Mon Sep 17 00:00:00 2001
From: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com>
Date: Wed, 9 Feb 2022 16:42:31 -0800
Subject: [PATCH] cleaned up SGCannon

---
 dScripts/SGCannon.cpp | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/dScripts/SGCannon.cpp b/dScripts/SGCannon.cpp
index 58e1d144..4b991253 100644
--- a/dScripts/SGCannon.cpp
+++ b/dScripts/SGCannon.cpp
@@ -61,8 +61,6 @@ void SGCannon::OnStartup(Entity *self) {
 void SGCannon::OnPlayerLoaded(Entity *self, Entity *player) {
     Game::logger->Log("SGCannon", "Player loaded\n");
     self->SetVar<LWOOBJID>(PlayerIDVariable, player->GetObjectID());
-    /*GameMessages::SendSetStunned(player->GetObjectID(), PUSH, player->GetSystemAddress(), LWOOBJID_EMPTY,
-                                 true, true, true, true, true, true, true);*/
 }
 
 void SGCannon::OnFireEventServerSide(Entity *self, Entity *sender, std::string args, int32_t param1, int32_t param2,
@@ -561,32 +559,15 @@ void SGCannon::StopGame(Entity *self, bool cancel) {
 
         auto* missionComponent = player->GetComponent<MissionComponent>();
         
-        if (self->GetVar<uint32_t>(TotalScoreVariable) >= 25000)
-        {
-            // For some reason the client thinks this mission is not complete?
-            auto* mission = missionComponent->GetMission(229);
-
-            if (mission != nullptr && !mission->IsComplete())
-            {
-                mission->Complete();
-            }
-        }
-
         if (missionComponent != nullptr) {
-            missionComponent->Progress(
-                MissionTaskType::MISSION_TASK_TYPE_MINIGAME,
-                self->GetVar<uint32_t>(TotalScoreVariable),
-                self->GetObjectID(),
-                "performact_score"
-            );
+            missionComponent->Progress(MissionTaskType::MISSION_TASK_TYPE_MINIGAME, self->GetVar<uint32_t>(TotalScoreVariable), self->GetObjectID(), "performact_score");
             missionComponent->Progress(MissionTaskType::MISSION_TASK_TYPE_MINIGAME, self->GetVar<uint32_t>(MaxStreakVariable), self->GetObjectID(), "performact_streak");
             missionComponent->Progress(MissionTaskType::MISSION_TASK_TYPE_ACTIVITY, m_CannonLot, 0, "", self->GetVar<uint32_t>(TotalScoreVariable));
         }
 
         LootGenerator::Instance().GiveActivityLoot(player, self, GetGameID(self), self->GetVar<uint32_t>(TotalScoreVariable));
 
-        StopActivity(self, player->GetObjectID(), self->GetVar<uint32_t>(TotalScoreVariable),
-                self->GetVar<uint32_t>(MaxStreakVariable), percentage);
+        StopActivity(self, player->GetObjectID(), self->GetVar<uint32_t>(TotalScoreVariable), self->GetVar<uint32_t>(MaxStreakVariable), percentage);
         self->SetNetworkVar<bool>(AudioFinalWaveDoneVariable, true);
 
         // Give the player the model rewards they earned
@@ -600,7 +581,6 @@ void SGCannon::StopGame(Entity *self, bool cancel) {
         self->SetNetworkVar<std::u16string>(u"UI_Rewards",
             GeneralUtils::to_u16string(self->GetVar<uint32_t>(TotalScoreVariable)) + u"_0_0_0_0_0_0"
         );
-        self->SetVar<uint32_t>(TotalScoreVariable, 0);
 
         GameMessages::SendRequestActivitySummaryLeaderboardData(
             player->GetObjectID(),
@@ -612,9 +592,6 @@ void SGCannon::StopGame(Entity *self, bool cancel) {
             0,
             false
         );
-
-        // The end menu is not in, just send them back to the main world
-        //static_cast<Player*>(player)->SendToZone(1300);
     }
 
     GameMessages::SendActivityStop(self->GetObjectID(), false, cancel, player->GetSystemAddress());