fix(Player): coin detection

HearthSim · Dec 12, 2023 · b82567c · b82567c
1 parent d3e0461
commit b82567c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Hearthstone Deck Tracker/Hearthstone/Entities/Entity.cs b/Hearthstone Deck Tracker/Hearthstone/Entities/Entity.cs
@@ -162,6 +162,8 @@ public void ClearCardId()
 
 		public bool IsCurrentPlayer => HasTag(GameTag.CURRENT_PLAYER);
 
+		public bool IsTheCoin => CardId == HearthDb.CardIds.NonCollectible.Neutral.TheCoinCore || (IsSpell && GetTag((GameTag)2088) == 1);
+
 		public bool HasCardId => !string.IsNullOrEmpty(CardId);
 
 		public int ZonePosition
@@ -267,8 +269,7 @@ public CardMark CardMark
 			{
 				if(Hidden)
 					return CardMark.None;
-				if(_entity.CardId == HearthDb.CardIds.NonCollectible.Neutral.TheCoinCore
-					   || _entity.CardId == HearthDb.CardIds.NonCollectible.Neutral.TradePrinceGallywix_GallywixsCoinToken)
+				if(_entity.IsTheCoin)
 					return CardMark.Coin;
 				if(Returned)
 					return CardMark.Returned;

diff --git a/Hearthstone Deck Tracker/Hearthstone/Player.cs b/Hearthstone Deck Tracker/Hearthstone/Player.cs
@@ -39,7 +39,7 @@ public Player(IGame game, bool isLocalPlayer)
 		public HashSet<SpellSchool> PlayedSpellSchools { get; private set; } = new HashSet<SpellSchool>();
 		public int AbyssalCurseCount { get; private set; }
 
-		public bool HasCoin => Hand.Any(e => e.CardId == HearthDb.CardIds.NonCollectible.Neutral.TheCoinCore);
+		public bool HasCoin => Hand.Any(e => e.IsTheCoin);
 		public int HandCount => Hand.Count();
 		public int DeckCount => Deck.Count();