feat: detect Pagle's Fishing Rod the moment it is offered

HearthSim · Sep 3, 2024 · 557d7c3 · 557d7c3
1 parent 71b7488
commit 557d7c3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/...tone Deck Tracker/Controls/Overlay/Battlegrounds/Minions/BattlegroundsMinionsViewModel.cs b/...tone Deck Tracker/Controls/Overlay/Battlegrounds/Minions/BattlegroundsMinionsViewModel.cs
@@ -86,10 +86,7 @@ public bool IsThorimRelevant
 		set
 		{
 			SetProp(value);
-			OnPropertyChanged(nameof(AvailableTiers));
-			OnPropertyChanged(nameof(TierButtons));
-			OnPropertyChanged(nameof(Groups));
-			OnPropertyChanged(nameof(ShowTavernTier7));
+			UpdateTavernTier7Visibility();
 		}
 	}
 
@@ -99,10 +96,7 @@ public bool IsPaglesFishingRodRelevant
 		set
 		{
 			SetProp(value);
-			OnPropertyChanged(nameof(AvailableTiers));
-			OnPropertyChanged(nameof(TierButtons));
-			OnPropertyChanged(nameof(Groups));
-			OnPropertyChanged(nameof(ShowTavernTier7));
+			UpdateTavernTier7Visibility();
 		}
 	}
 
@@ -113,6 +107,9 @@ public void UpdateTavernTier7Visibility()
 		OnPropertyChanged(nameof(AvailableTiers));
 		OnPropertyChanged(nameof(TierButtons));
 		OnPropertyChanged(nameof(Groups));
+		OnPropertyChanged(nameof(ShowTavernTier7));
+		if(!ShowTavernTier7 && ActiveTier == 7)
+			ActiveTier = null;
 	}
 
 	public IEnumerable<string>? BannedMinions

diff --git a/Hearthstone Deck Tracker/GameEventHandler.cs b/Hearthstone Deck Tracker/GameEventHandler.cs
@@ -1156,6 +1156,22 @@ public async void HandlePlayerMulliganDone()
 
 		public void HandlePlayerEntityChoices(IHsChoice choice)
 		{
+			if(choice.ChoiceType == ChoiceType.GENERAL && _game.IsBattlegroundsMatch)
+			{
+				if(
+					_game.Entities.TryGetValue(choice.SourceEntityId, out var source) &&
+					source.GetTag(GameTag.BACON_IS_MAGIC_ITEM_DISCOVER) > 0
+				)
+				{
+					var offered = choice.OfferedEntityIds
+						?.Select(id => _game.Entities.TryGetValue(id, out var e) ? e : null)
+						.WhereNotNull()
+						.Where(x => x.IsBattlegroundsTrinket)
+						.ToList() ?? new List<Entity>();
+					var existingTrinkets = Core.Game.Player.Trinkets.Select(x => x.Card.Id);
+					Core.Overlay.BattlegroundsMinionsVM.OnTrinkets(existingTrinkets.Concat(offered.Select(x => x.Card.Id)));
+				}
+			}
 		}
 
 		public void HandlePlayerEntitiesChosen(IHsCompletedChoice choice)