fix: timewarped tavern affecting game state

Author: IgorMCesar

HearthWatcher/SpecialShopChoicesStateWatcher.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using HearthWatcher.EventArgs;
 using HearthWatcher.Providers;
@@ -14,6 +14,7 @@ public class SpecialShopChoicesStateWatcher
 	private bool _running;
 	private bool _watch;
 	private SpecialShopChoicesArgs _prev = null;
+	public SpecialShopChoicesArgs? CurrentState => _prev;
 
 	public SpecialShopChoicesStateWatcher(ISpecialShopChoicesProvider opponentBoardProvider, int delay = 16)
 	{

Hearthstone Deck Tracker/Live/BoardStateWatcher.cs

@@ -105,6 +105,13 @@ private int ZonePosition(BattlegroundsTeammateBoardStateEntity e) =>
 		private int[] SortedDbfIds(IEnumerable<BattlegroundsTeammateBoardStateEntity> entities) =>
 			entities.OrderBy(ZonePosition).Select(DbfId).ToArray();
 
+		private int[] SortedDbfIds(IEnumerable<BoardCard> boardCards) =>
+			boardCards
+				.Where(c => c?.CardId != null)
+				.Select(c => Database.GetCardFromId(c.CardId)?.DbfId ?? 0)
+				.Where(dbfId => dbfId != 0)
+				.ToArray();
+
 		private int HeroId(Entity playerEntity) => playerEntity.GetTag(GameTag.HERO_ENTITY);
 
 		private int WeaponId(Entity playerEntity) => playerEntity.GetTag(GameTag.WEAPON);
@@ -263,6 +270,13 @@ private int HeroDbfId(Entity? entity)
 			var anomalyId = new[] { GameTag.ANOMALY1, GameTag.ANOMALY2 }.Select(x => Core.Game.GameEntity?.GetTag(x)).FirstOrDefault(x => x is > 0);
 			var anomaly = anomalyId.HasValue && Core.Game.Entities.TryGetValue(anomalyId.Value, out var anomalyEntity) ? anomalyEntity?.Card.DbfId : null;
 
+			// Check if the special shop (timewarped tavern) is currently active
+			var specialShopState = Watchers.SpecialShopChoicesStateWatcher.CurrentState;
+			var specialShopActive = specialShopState?.IsActive == true && specialShopState.BoardCards.Count > 0;
+			var opponentBoard = specialShopActive
+				? SortedDbfIds(specialShopState!.BoardCards)
+				: SortedDbfIds(opponent.Board.Where(x => x.TakesBoardSlot));
+
 			return new BoardState
 			{
 				Player = new BoardStatePlayer
@@ -292,7 +306,7 @@ private int HeroDbfId(Entity? entity)
 				},
 				Opponent = new BoardStatePlayer
 				{
-					Board = SortedDbfIds(opponent.Board.Where(x => x.TakesBoardSlot)),
+					Board = opponentBoard,
 					Deck = new BoardStateDeck
 					{
 						Size = opponent.DeckCount
@@ -325,6 +339,13 @@ private Tuple<BoardStatePlayer, BoardStatePlayer> GetBattlegroundsSoloPlayerBoar
 			int? opponentWeaponEntityId = opponentEntity != null ? WeaponId(opponentEntity) : null;
 			int opponentWeapon = opponentWeaponEntityId.HasValue ? DbfId(Find(opponent, opponentWeaponEntityId.Value)) : 0;
 
+			// Check if the special shop (timewarped tavern) is currently active
+			var specialShopState = Watchers.SpecialShopChoicesStateWatcher.CurrentState;
+			var specialShopActive = specialShopState?.IsActive == true && specialShopState.BoardCards.Count > 0;
+			var opponentBoard = specialShopActive
+				? SortedDbfIds(specialShopState!.BoardCards)
+				: SortedDbfIds(opponent.Board.Where(x => x.TakesBoardSlot));
+
 			return new Tuple<BoardStatePlayer, BoardStatePlayer>(
 				new BoardStatePlayer
 				{
@@ -346,7 +367,7 @@ private Tuple<BoardStatePlayer, BoardStatePlayer> GetBattlegroundsSoloPlayerBoar
 					Fatigue = playerEntity?.GetTag(GameTag.FATIGUE) ?? 0
 				}, new BoardStatePlayer
 				{
-					Board = SortedDbfIds(opponent.Board.Where(x => x.TakesBoardSlot)),
+					Board = opponentBoard,
 					Hero = HeroDbfId(opponentEntity != null ? Find(opponent, HeroId(opponentEntity)) : null),
 					HeroPower = BgsQuestReward(opponent, true) ?? BgsTrinket(opponent, TrinketHeroPowerSlot) ?? DbfId(FindHeroPower(opponent)),
 					Weapon = opponentWeapon != 0 ? opponentWeapon :

Hearthstone Deck Tracker/Windows/OverlayWindow.xaml.cs

@@ -73,7 +73,6 @@ public partial class OverlayWindow : Window, INotifyPropertyChanged
 		private readonly Dictionary<UIElement, ResizeGrip> _movableElements = new Dictionary<UIElement, ResizeGrip>();
 		private readonly List<FrameworkElement> _clickableElements = new List<FrameworkElement>();
 		private readonly HashSet<FrameworkElement> _hoverableElements = new HashSet<FrameworkElement>();
-		private readonly HashSet<int> _specialShopEntityIds = new HashSet<int>();
 		private readonly List<Rectangle> _playerHand = new List<Rectangle>();
 		private readonly List<Rectangle> _leaderboardIcons = new List<Rectangle>();
 		private readonly List<HearthstoneTextBlock> _leaderboardDeadForText = new List<HearthstoneTextBlock>();
@@ -1391,44 +1390,12 @@ internal void HandleSpecialShop(SpecialShopChoicesArgs args)
 			if(!_game.IsBattlegroundsMatch)
 				return;
 
-			var isActive = args.IsActive;
-			var boardCards = args.BoardCards;
-
-			// Clear previously added entities by resetting their tags
-			foreach(var entityId in _specialShopEntityIds)
-			{
-				if(_game.Entities.TryGetValue(entityId, out var previousEntity))
-				{
-					previousEntity.Info.Created = false;
-					previousEntity.SetTag(GameTag.ZONE, 0);
-					previousEntity.SetTag(GameTag.ZONE_POSITION, 0);
-					previousEntity.SetTag(GameTag.CONTROLLER, 0);
-				}
-			}
-			_specialShopEntityIds.Clear();
-
-			if(!isActive)
-				return;
-			if(boardCards == null)
+			if(!args.IsActive)
 				return;
 
-			Core.Overlay.BattlegroundsMinionPinningViewModel.OnShopChange(boardCards, args.MousedOverSlot);
+			var boardCards = args.BoardCards;
 
-			for(var i = 0; i < boardCards.Count; i++)
-			{
-				var card = boardCards[i];
-				if(card == null)
-					continue;
-				var entity = _game.Entities.FirstOrDefault(x => x.Value.Id == card.EntityId).Value;
-				if(entity != null)
-				{
-					entity.SetTag(GameTag.CONTROLLER, _game.Opponent.Id);
-					entity.SetTag(GameTag.ZONE_POSITION, i);
-					entity.SetTag(GameTag.ZONE, (int)Zone.PLAY);
-					_game.Opponent.CreateInPlay(entity, _game.GetTurnNumber());
-					_specialShopEntityIds.Add(entity.Id);
-				}
-			}
+			Core.Overlay.BattlegroundsMinionPinningViewModel.OnShopChange(boardCards, args.MousedOverSlot);
 		}
 
 		private void BgsInspirationCover_OnMouseDown(object sender, MouseButtonEventArgs e) => HideBgsInspiration();