From 9cfb9a0de69060216fc1de0bf7a358cd5c744b88 Mon Sep 17 00:00:00 2001
From: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com>
Date: Sun, 6 Feb 2022 14:28:37 -0800
Subject: [PATCH] Added specific smashable mission progression

---
 dScripts/FvRaceSmashEggImagineServer.cpp | 4 +++-
 dScripts/RaceSmashServer.cpp             | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dScripts/FvRaceSmashEggImagineServer.cpp b/dScripts/FvRaceSmashEggImagineServer.cpp
index 68faea04..8e0d0897 100644
--- a/dScripts/FvRaceSmashEggImagineServer.cpp
+++ b/dScripts/FvRaceSmashEggImagineServer.cpp
@@ -27,7 +27,9 @@ void FvRaceSmashEggImagineServer::OnDie(Entity *self, Entity *killer) {
                     characterComponent->UpdatePlayerStatistic(RacingSmashablesSmashed);
                 }
                 if (missionComponent == nullptr) return;
-                missionComponent->Progress(MissionTaskType::MISSION_TASK_TYPE_RACING, self->GetLOT(), (LWOOBJID)RacingTaskParam::RACING_TASK_PARAM_SMASH_DRAGON_EGGS);
+                // Dragon eggs have their own smash server so we handle mission progression for them here.
+                missionComponent->Progress(MissionTaskType::MISSION_TASK_TYPE_RACING, 0, (LWOOBJID)RacingTaskParam::RACING_TASK_PARAM_SMASHABLES);
+                missionComponent->Progress(MissionTaskType::MISSION_TASK_TYPE_RACING, self->GetLOT(), (LWOOBJID)RacingTaskParam::RACING_TASK_PARAM_SMASH_SPECIFIC_SMASHABLE);
             }
         }
 
diff --git a/dScripts/RaceSmashServer.cpp b/dScripts/RaceSmashServer.cpp
index 059ac430..582a8ed3 100644
--- a/dScripts/RaceSmashServer.cpp
+++ b/dScripts/RaceSmashServer.cpp
@@ -22,6 +22,8 @@ void RaceSmashServer::OnDie(Entity *self, Entity *killer) {
             // Progress racing smashable missions
             if(missionComponent == nullptr) return;
             missionComponent->Progress(MissionTaskType::MISSION_TASK_TYPE_RACING, 0, (LWOOBJID)RacingTaskParam::RACING_TASK_PARAM_SMASHABLES);
+            // Progress missions that ask us to smash a specific smashable.
+            missionComponent->Progress(MissionTaskType::MISSION_TASK_TYPE_RACING, self->GetLOT(), (LWOOBJID)RacingTaskParam::RACING_TASK_PARAM_SMASH_SPECIFIC_SMASHABLE);
         }
     }
 }