add ClientCard.IsOriginalCode

Game/ClientCard.cs

@@ -336,6 +336,11 @@ namespace WindBot.Game
             return ids.Contains(Id) || Alias != 0 && ids.Contains(Alias);
         }
 
+        public bool IsOriginalCode(int id)
+        {
+            return Id == id || Alias - Id < 10 && Alias == id;
+        }
+
         public bool HasXyzMaterial()
         {
             return Overlays.Count > 0;

Game/ClientField.cs

@@ -306,10 +306,11 @@ namespace WindBot.Game
         public int GetRemainingCount(int cardId, int initialCount)
         {
             int remaining = initialCount;
-            remaining = remaining - Hand.Count(card => card != null && card.IsCode(cardId));
-            remaining = remaining - SpellZone.Count(card => card != null && card.IsCode(cardId));
-            remaining = remaining - Graveyard.Count(card => card != null && card.IsCode(cardId));
-            remaining = remaining - Banished.Count(card => card != null && card.IsCode(cardId));
+            remaining = remaining - Hand.Count(card => card != null && card.IsOriginalCode(cardId));
+            remaining = remaining - SpellZone.Count(card => card != null && card.IsOriginalCode(cardId));
+            remaining = remaining - MonsterZone.Count(card => card != null && card.IsOriginalCode(cardId));
+            remaining = remaining - Graveyard.Count(card => card != null && card.IsOriginalCode(cardId));
+            remaining = remaining - Banished.Count(card => card != null && card.IsOriginalCode(cardId));
             return (remaining < 0) ? 0 : remaining;
         }