Added WaveInProgress var.

AnchyDev · Oct 17, 2023 · c7bc932 · c7bc932
1 parent 50db07a
commit c7bc932
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/src/scripts/ToSArenaMasterScript.h b/src/scripts/ToSArenaMasterScript.h
@@ -73,7 +73,7 @@ class ToSArenaMasterScript : public CreatureScript
             return true;
         }
 
-        if (!iScript->IsEncounterInProgress() && waveCleared && hasMoreWaves)
+        if (iScript->IsEncounterInProgress() && waveCleared && hasMoreWaves)
         {
             AddGossipItemFor(player, GOSSIP_ICON_CHAT, Acore::StringFormatFmt("Yes, I would like to proceed to the next wave. ({})", currentWave + 1), GOSSIP_SENDER_MAIN, TOS_GOSSIP_ENCOUNTER_NEXT_WAVE);
             AddGossipItemFor(player, GOSSIP_ICON_CHAT, "I would like to stop here.", GOSSIP_SENDER_MAIN, TOS_GOSSIP_ENCOUNTER_RESET);

diff --git a/src/scripts/ToSInstanceScript.h b/src/scripts/ToSInstanceScript.h
@@ -11,6 +11,7 @@ class instance_trial_of_strength : public InstanceMapScript
         EventMap events;
 
         bool encounterInProgress;
+        bool waveInProgress;
 
         uint32 currentWave;
         uint32 totalWaves;
@@ -44,7 +45,7 @@ class instance_trial_of_strength : public InstanceMapScript
 
         bool IsSubWaveCleared() const
         {
-            return encounterInProgress && GetRemainingAlive() == 0;
+            return waveInProgress && GetRemainingAlive() == 0;
         }
 
         bool IsWaveCleared() const
@@ -57,6 +58,11 @@ class instance_trial_of_strength : public InstanceMapScript
             return currentWave < totalWaves ? true : false;
         }
 
+        bool IsWaveInProgress() const
+        {
+            return waveInProgress;
+        }
+
         void SpawnNextWave(ToSWaveTemplate* waveTemplate = nullptr)
         {
             if (!waveTemplate)
@@ -165,14 +171,19 @@ class instance_trial_of_strength : public InstanceMapScript
                 return;
             }
 
-            if (IsEncounterInProgress() && !arenaMasterLeft)
+            if (!IsEncounterInProgress())
+            {
+                return;
+            }
+
+            if (IsWaveInProgress() && !arenaMasterLeft)
             {
                 RelocateArenaMaster(false);
                 arenaMasterLeft = true;
                 return;
             }
 
-            if (IsWaveCleared() && arenaMasterLeft)
+            if (!IsWaveInProgress() && arenaMasterLeft)
             {
                 RelocateArenaMaster(true);
                 arenaMasterLeft = false;
@@ -260,6 +271,7 @@ class instance_trial_of_strength : public InstanceMapScript
         void SetupEncounter()
         {
             encounterInProgress = true;
+            waveInProgress = true;
             waveCleared = false;
 
             auto waveTemplate = GetWaveTemplateForWave(currentWave);
@@ -307,7 +319,7 @@ class instance_trial_of_strength : public InstanceMapScript
                 TryRewardPlayers();
                 CleanupCreatures();
 
-                encounterInProgress = false;
+                waveInProgress = false;
                 waveCleared = true;
 
                 if (currentWave == totalWaves)
@@ -485,6 +497,7 @@ class instance_trial_of_strength : public InstanceMapScript
         void ResetEncounter()
         {
             encounterInProgress = false;
+            waveInProgress = false;
 
             currentWave = 1;
             totalWaves = 0;