chore(BattlegroundsQuestPickingViewModel): hide via SendChoices

HearthSim · Dec 4, 2023 · 4906092 · 4906092
1 parent 3093e1d
commit 4906092
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 22 deletions.
diff --git a/...Tracker/Controls/Overlay/Battlegrounds/QuestPicking/BattlegroundsQuestPickingViewModel.cs b/...Tracker/Controls/Overlay/Battlegrounds/QuestPicking/BattlegroundsQuestPickingViewModel.cs
@@ -57,7 +57,6 @@ public void Reset()
 			_entities.Clear();
 			Quests = null;
 			Visibility = Collapsed;
-			_watchChoices = false;
 			Message.Clear();
 		}
 
@@ -123,30 +122,10 @@ private async Task Update()
 			if(choices.IsVisible)
 				Visibility = Visible;
 
-			WatchChoices();
-
 			if(Config.Instance.ShowBattlegroundsQuestPicking)
 				Core.Game.Metrics.Tier7QuestOverlayDisplayed = true;
 		}
 
-		private bool _watchChoices;
-		private async void WatchChoices()
-		{
-			_watchChoices = true;
-			while(_watchChoices)
-			{
-				await Task.Delay(100);
-				var choices = Reflection.Client.GetCardChoices();
-				if(choices == null)
-				{
-					_watchChoices = false;
-					Visibility = Collapsed;
-					break;
-				}
-				Visibility = choices.IsVisible ? Visible : Collapsed;
-			}
-		}
-
 		private BattlegroundsQuestStatsParams? GetApiParams()
 		{
 			var hero = Core.Game.Entities.Values.FirstOrDefault(x => x.IsPlayer && x.IsHero);

diff --git a/Hearthstone Deck Tracker/GameEventHandler.cs b/Hearthstone Deck Tracker/GameEventHandler.cs
@@ -1034,7 +1034,18 @@ public void HandlePlayerSendChoices(Choice choice)
 		{
 			if(choice.ChoiceType == ChoiceType.MULLIGAN)
 			{
-				_game.SnapshotMulliganChoices(choice);
+				if(_game.IsBattlegroundsMatch)
+				{
+					Core.Overlay.BattlegroundsHeroPickingViewModel.Reset();
+				}
+				else if(_game.IsConstructedMatch)
+				{
+					_game.SnapshotMulliganChoices(choice);
+				}
+			}
+			else if(_game.IsBattlegroundsMatch)
+			{
+				Core.Overlay.BattlegroundsQuestPickingViewModel.Reset();
 			}
 		}