add ClientCard.IsCode, fix ClientCard.Alias support (#97)

Game/AI/AIFunctions.cs

@@ -335,12 +335,12 @@ namespace WindBot.Game.AI
 
         public bool ChainContainsCard(int id)
         {
-            return Duel.CurrentChain.Any(card => card.Id == id);
+            return Duel.CurrentChain.Any(card => card.IsCode(id));
         }
 
         public bool ChainContainsCard(int[] ids)
         {
-            return Duel.CurrentChain.Any(card => ids.Contains(card.Id));
+            return Duel.CurrentChain.Any(card => card.IsCode(ids));
         }
 
         public int ChainCountPlayer(int player)
@@ -385,7 +385,7 @@ namespace WindBot.Game.AI
             IList<ClientCard> selected = new List<ClientCard>();
             foreach (ClientCard card in cards)
             {
-                if (card.Id== preferred && selected.Count < max)
+                if (card.IsCode(preferred) && selected.Count < max)
                     selected.Add(card);
             }
 
@@ -420,7 +420,7 @@ namespace WindBot.Game.AI
             {
                 foreach (ClientCard card in cards)
                 {
-                    if (card.Id == id && selected.Count < max && selected.IndexOf(card) <= 0)
+                    if (card.IsCode(id) && selected.Count < max && selected.IndexOf(card) <= 0)
                         selected.Add(card);
                 }
                 if (selected.Count >= max)

Game/AI/CardContainer.cs

@@ -47,12 +47,12 @@ namespace WindBot.Game.AI
 
         public static bool ContainsCardWithId(this IEnumerable<ClientCard> cards, int id)
         {
-            return cards.Where(card => card?.Data != null).Any(card => card.Id == id);
+            return cards.Where(card => card?.Data != null).Any(card => card.IsCode(id));
         }
 
         public static int GetCardCount(this IEnumerable<ClientCard> cards, int id)
         {
-            return cards.Where(card => card?.Data != null).Count(card => card.Id == id);
+            return cards.Where(card => card?.Data != null).Count(card => card.IsCode(id));
         }
 
         public static List<ClientCard> GetMonsters(this IEnumerable<ClientCard> cards)

Game/AI/CardSelector.cs

@@ -68,13 +68,13 @@ namespace WindBot.Game.AI
                     break;
                 case SelectType.Id:
                     foreach (ClientCard card in cards)
-                        if (card.Id == _id)
+                        if (card.IsCode(_id))
                             result.Add(card);
                     break;
                 case SelectType.Ids:
                     foreach (int id in _ids)
                         foreach (ClientCard card in cards)
-                            if (card.Id == id && !result.Contains(card))
+                            if (card.IsCode(id) && !result.Contains(card))
                                 result.Add(card);
                     break;
                 case SelectType.Location:

Game/AI/Decks/BlackwingExecutor.cs

@@ -111,7 +111,7 @@ namespace WindBot.Game.AI.Decks
         {
             List<ClientCard> monster = Bot.GetMonsters();
             foreach (ClientCard card in monster)
-                if (card != null && card.Id == CardId.KrisTheCrackOfDawn || card.Id == CardId.KalutTheMoonShadow || card.Id == CardId.GaleTheWhirlwind || card.Id == CardId.BoraTheSpear || card.Id == CardId.SiroccoTheDawn || card.Id == CardId.ShuraTheBlueFlame || card.Id == CardId.BlizzardTheFarNorth)
+                if (card != null && card.IsCode(CardId.KrisTheCrackOfDawn, CardId.KalutTheMoonShadow, CardId.GaleTheWhirlwind, CardId.BoraTheSpear, CardId.SiroccoTheDawn, CardId.ShuraTheBlueFlame, CardId.BlizzardTheFarNorth))
                     return true;
             return false;
         }
@@ -119,7 +119,7 @@ namespace WindBot.Game.AI.Decks
         private bool KalutTheMoonShadowSummon()
         {
             foreach (ClientCard card in Bot.Hand)
-                if (card != null && card.Id == CardId.KrisTheCrackOfDawn || card.Id == CardId.GaleTheWhirlwind || card.Id == CardId.BoraTheSpear || card.Id == CardId.SiroccoTheDawn || card.Id == CardId.ShuraTheBlueFlame || card.Id == CardId.BlizzardTheFarNorth)
+                if (card != null && card.IsCode(CardId.KrisTheCrackOfDawn, CardId.GaleTheWhirlwind, CardId.BoraTheSpear, CardId.SiroccoTheDawn, CardId.ShuraTheBlueFlame, CardId.BlizzardTheFarNorth))
                     return false;
             return true;
         }
@@ -127,7 +127,7 @@ namespace WindBot.Game.AI.Decks
         private bool BlizzardTheFarNorthSummon()
         {
             foreach (ClientCard card in Bot.Graveyard)
-                if (card != null && card.Id == CardId.KalutTheMoonShadow || card.Id == CardId.BoraTheSpear || card.Id == CardId.ShuraTheBlueFlame || card.Id == CardId.KrisTheCrackOfDawn)
+                if (card != null && card.IsCode(CardId.KalutTheMoonShadow, CardId.BoraTheSpear, CardId.ShuraTheBlueFlame, CardId.KrisTheCrackOfDawn))
                     return true;
             return false;
         }
@@ -138,7 +138,7 @@ namespace WindBot.Game.AI.Decks
 
             List<ClientCard> monster = Bot.GetMonsters();
             foreach (ClientCard card in monster)
-                if (card != null && card.Id == CardId.KrisTheCrackOfDawn || card.Id == CardId.KalutTheMoonShadow || card.Id == CardId.GaleTheWhirlwind || card.Id == CardId.BoraTheSpear || card.Id == CardId.SiroccoTheDawn || card.Id == CardId.ShuraTheBlueFlame || card.Id == CardId.BlizzardTheFarNorth)
+                if (card != null && card.IsCode(CardId.KrisTheCrackOfDawn, CardId.KalutTheMoonShadow, CardId.GaleTheWhirlwind, CardId.BoraTheSpear, CardId.SiroccoTheDawn, CardId.ShuraTheBlueFlame, CardId.BlizzardTheFarNorth))
                     Count++;
 
             if (Count == 3)

Game/AI/Decks/BlueEyesExecutor.cs

@@ -141,8 +141,8 @@ namespace WindBot.Game.AI.Decks
                 Logger.DebugWriteLine("OnSelectCard MelodyOfAwakeningDragon");
                 List<ClientCard> result = new List<ClientCard>();
                 if (!Bot.HasInHand(CardId.WhiteDragon))
-                    result.AddRange(cards.Where(card => card.Id == CardId.WhiteDragon).Take(1));
-                result.AddRange(cards.Where(card => card.Id == CardId.AlternativeWhiteDragon));
+                    result.AddRange(cards.Where(card => card.IsCode(CardId.WhiteDragon)).Take(1));
+                result.AddRange(cards.Where(card => card.IsCode(CardId.AlternativeWhiteDragon)));
                 return AI.Utils.CheckSelectCount(result, cards, min, max);
             }
             Logger.DebugWriteLine("Use default.");
@@ -883,23 +883,16 @@ namespace WindBot.Game.AI.Decks
                 return true;
             if (Card.IsDefense() && !enemyBetter && Card.Attack >= Card.Defense)
                 return true;
-            if (Card.IsDefense() && (
-                   Card.Id == CardId.BlueEyesSpiritDragon
-                || Card.Id == CardId.AzureEyesSilverDragon
-                ))
+            if (Card.IsDefense() && Card.IsCode(CardId.BlueEyesSpiritDragon, CardId.AzureEyesSilverDragon))
                 return true;
-            if (Card.IsAttack() && (
-                   Card.Id == CardId.SageWithEyesOfBlue
-                || Card.Id == CardId.WhiteStoneOfAncients
-                || Card.Id == CardId.WhiteStoneOfLegend
-                ))
+            if (Card.IsAttack() && Card.IsCode(CardId.SageWithEyesOfBlue, CardId.WhiteStoneOfAncients, CardId.WhiteStoneOfLegend))
                 return true;
             return false;
         }
 
         private bool SpellSet()
         {
-            return (Card.IsTrap() || (Card.Id==CardId.SilversCry)) && Bot.GetSpellCountWithoutField() < 4;
+            return (Card.IsTrap() || Card.IsCode(CardId.SilversCry)) && Bot.GetSpellCountWithoutField() < 4;
         }
 
         private bool HasTwoInHand(int id)
@@ -907,7 +900,7 @@ namespace WindBot.Game.AI.Decks
             int num = 0;
             foreach (ClientCard card in Bot.Hand)
             {
-                if (card != null && card.Id == id)
+                if (card != null && card.IsCode(id))
                     num++;
             }
             return num >= 2;

Game/AI/Decks/BurnExecutor.cs

@@ -108,7 +108,7 @@ namespace WindBot.Game.AI.Decks
         {
             foreach (ClientCard card in Bot.GetMonsters())
             {
-                if (card.Id == CardId.Marshmallon || card.Id == CardId.SpiritReaper)
+                if (card.IsCode(CardId.Marshmallon, CardId.SpiritReaper))
                 {
                     return false;
                 }
@@ -134,9 +134,9 @@ namespace WindBot.Game.AI.Decks
 
         private bool ReposEverything()
         {
-            if (Card.Id == CardId.ReflectBounder)
+            if (Card.IsCode(CardId.ReflectBounder))
                 return Card.IsDefense();
-            if (Card.Id == CardId.FencingFireFerret)
+            if (Card.IsCode(CardId.FencingFireFerret))
                 return DefaultMonsterRepos();
             if (Card.IsAttack())
                 return true;

Game/AI/Decks/ChainBurnExecutor.cs

@@ -227,7 +227,7 @@ namespace WindBot.Game.AI.Decks
         {
             return (id == CardId.SandaionTheTimelord ||
                     id == CardId.BattleFader ||
-                    id ==CardId.MichionTimelord
+                    id == CardId.MichionTimelord
                    );
         }
         bool no_sp = false;
@@ -322,49 +322,49 @@ namespace WindBot.Game.AI.Decks
             IList<ClientCard> check = Bot.GetSpells();
             foreach (ClientCard card in check)
             {
-                if (card.Id == CardId.AccuulatedFortune)
+                if (card.IsCode(CardId.AccuulatedFortune))
                     HasAccuulatedFortune++;
 
             }
             foreach (ClientCard card in check)
             {
-                if (card.Id == CardId.SecretBlast)
+                if (card.IsCode(CardId.SecretBlast))
                     blast_count++;
 
             }
             foreach (ClientCard card in check)
             {
-                if (card.Id == CardId.SectetBarrel)
+                if (card.IsCode(CardId.SectetBarrel))
                     barrel_count++;
 
             }
             foreach (ClientCard card in check)
             {
-                if (card.Id == CardId.JustDesserts)
+                if (card.IsCode(CardId.JustDesserts))
                     just_count++;
 
             }
             foreach (ClientCard card in check)
             {
-                if (card.Id == CardId.ChainStrike)
+                if (card.IsCode(CardId.ChainStrike))
                     strike_count++;
 
             }
             foreach (ClientCard card in Bot.GetSpells())
             {
-                if (card.Id == CardId.RecklessGreed)
+                if (card.IsCode(CardId.RecklessGreed))
                     greed_count++;
 
             }
             foreach (ClientCard card in check)
             {
-                if (card.Id == CardId.Waboku)
+                if (card.IsCode(CardId.Waboku))
                     Waboku_count++;
 
             }
             foreach (ClientCard card in check)
             {
-                if (card.Id == CardId.ThreateningRoar)
+                if (card.IsCode(CardId.ThreateningRoar))
                     Roar_count++;
 
             }            
@@ -418,7 +418,7 @@ namespace WindBot.Game.AI.Decks
             if (AI.Utils.IsChainTarget(Card)) return true;
             foreach (ClientCard card in Enemy.GetSpells())
             {
-                if (card.Id == CardId.HarpiesFeatherDuster&&card.IsFaceup())
+                if (card.IsCode(CardId.HarpiesFeatherDuster)&&card.IsFaceup())
                 {
                     return true;
                 }
@@ -432,7 +432,7 @@ namespace WindBot.Game.AI.Decks
         }
         private bool BrunSpellSet()
         {
-            if (Card.Id == CardId.OjamaTrio && Bot.HasInSpellZone(CardId.OjamaTrio))return false;
+            if (Card.IsCode(CardId.OjamaTrio) && Bot.HasInSpellZone(CardId.OjamaTrio))return false;
             return (Card.IsTrap() || Card.HasType(CardType.QuickPlay)) && Bot.GetSpellCountWithoutField() < 5;
         }
         private bool MichionTimelordsummon()
@@ -565,7 +565,7 @@ namespace WindBot.Game.AI.Decks
             int count=0;
             foreach (ClientCard card in Bot.GetSpells())
             {
-                if (card.Id == CardId.RecklessGreed)
+                if (card.IsCode(CardId.RecklessGreed))
                     count++;
 
             }           
@@ -668,7 +668,7 @@ namespace WindBot.Game.AI.Decks
         {
             foreach (ClientCard card in Bot.GetMonsters())
             {
-                if (card.Id == CardId.CardcarD && card.IsFaceup())
+                if (card.IsCode(CardId.CardcarD) && card.IsFaceup())
                     return false;
             }
             if (Bot.GetHandCount() == 1 && Bot.GetSpellCountWithoutField() <= 3)
@@ -694,7 +694,7 @@ namespace WindBot.Game.AI.Decks
             foreach (ClientCard card in Bot.GetMonsters())
 
             {
-                if (card.Id == CardId.DiceJar && card.IsFacedown())
+                if (card.IsCode(CardId.DiceJar) && card.IsFacedown())
                     return true;
                 break;
             }
@@ -725,24 +725,24 @@ namespace WindBot.Game.AI.Decks
             if (GetTotalATK(newlist) / 2 >= Enemy.LifePoints && Bot.HasInSpellZone(CardId.BlazingMirrorForce))
                 return false;
             if (AI.Utils.GetLastChainCard() == null) return true;
-            if (AI.Utils.GetLastChainCard().Id == CardId.Linkuriboh) return false;
+            if (AI.Utils.GetLastChainCard().IsCode(CardId.Linkuriboh)) return false;
             return true;
         }
         public bool MonsterRepos()
         {
-            if (Card.IsFacedown() && Card.Id!=CardId.DiceJar)
+            if (Card.IsFacedown() && !Card.IsCode(CardId.DiceJar))
                 return true;
             return base.DefaultMonsterRepos();
         }
         public override bool OnPreBattleBetween(ClientCard attacker, ClientCard defender)
         {
-            if (attacker.Id == CardId.Linkuriboh && defender.IsFacedown()) return false;
-            if (attacker.Id == CardId.SandaionTheTimelord && !attacker.IsDisabled())
+            if (attacker.IsCode(CardId.Linkuriboh) && defender.IsFacedown()) return false;
+            if (attacker.IsCode(CardId.SandaionTheTimelord) && !attacker.IsDisabled())
             {
                 attacker.RealPower = 9999;
                 return true;
             }
-            if(attacker.Id==CardId.MichionTimelord && !attacker.IsDisabled())
+            if(attacker.IsCode(CardId.MichionTimelord) && !attacker.IsDisabled())
             {
                 attacker.RealPower = 9999;
                 return true;
@@ -771,49 +771,49 @@ namespace WindBot.Game.AI.Decks
             IList<ClientCard> check = Bot.GetSpells();
             foreach (ClientCard card1 in check)
             {
-                if (card1.Id == CardId.AccuulatedFortune)
+                if (card1.IsCode(CardId.AccuulatedFortune))
                     HasAccuulatedFortune++;
 
             }
             foreach (ClientCard card1 in check)
             {
-                if (card1.Id == CardId.SecretBlast)
+                if (card1.IsCode(CardId.SecretBlast))
                     blast_count++;
 
             }
             foreach (ClientCard card1 in check)
             {
-                if (card1.Id == CardId.SectetBarrel)
+                if (card1.IsCode(CardId.SectetBarrel))
                     barrel_count++;
 
             }
             foreach (ClientCard card1 in check)
             {
-                if (card1.Id == CardId.JustDesserts)
+                if (card1.IsCode(CardId.JustDesserts))
                     just_count++;
 
             }
             foreach (ClientCard card1 in check)
             {
-                if (card1.Id == CardId.ChainStrike)
+                if (card1.IsCode(CardId.ChainStrike))
                     strike_count++;
 
             }
             foreach (ClientCard card1 in Bot.GetSpells())
             {
-                if (card1.Id == CardId.RecklessGreed)
+                if (card1.IsCode(CardId.RecklessGreed))
                     greed_count++;
 
             }
             foreach (ClientCard card1 in check)
             {
-                if (card1.Id == CardId.Waboku)
+                if (card1.IsCode(CardId.Waboku))
                     Waboku_count++;
 
             }
             foreach (ClientCard card1 in check)
             {
-                if (card1.Id == CardId.ThreateningRoar)
+                if (card1.IsCode(CardId.ThreateningRoar))
                     Roar_count++;
 
             }

Game/AI/Decks/DragunityExecutor.cs

@@ -136,7 +136,7 @@ namespace WindBot.Game.AI.Decks
                 int count = 0;
                 foreach (ClientCard card in Bot.Hand)
                 {
-                    if (card.Id == CardId.DragunityDux)
+                    if (card.IsCode(CardId.DragunityDux))
                         ++count;
                 }
                 if (count >= 2)
@@ -164,7 +164,7 @@ namespace WindBot.Game.AI.Decks
                 /*bool hasRealMonster = false;
                 foreach (ClientCard card in Bot.GetMonsters())
                 {
-                    if (card.Id != CardId.AssaultBeast)
+                    if (!card.IsCode(CardId.AssaultBeast))
                     {
                         hasRealMonster = true;
                         break;
@@ -184,13 +184,13 @@ namespace WindBot.Game.AI.Decks
 
             int remaining = 3;
             foreach (ClientCard card in Bot.Hand)
-                if (card.Id == needId)
+                if (card.IsCode(needId))
                     remaining--;
             foreach (ClientCard card in Bot.Graveyard)
-                if (card.Id == needId)
+                if (card.IsCode(needId))
                     remaining--;
             foreach (ClientCard card in Bot.Banished)
-                if (card.Id == needId)
+                if (card.IsCode(needId))
                     remaining--;
             if (remaining <= 0)
                 return false;
@@ -262,8 +262,7 @@ namespace WindBot.Game.AI.Decks
                 ClientCard card = cards[i];
                 if (card.Attack < 2000)
                     break;
-                if (card.Id == (int) CardId.StardustDragonAssaultMode ||
-                    card.Id == (int) CardId.FiveHeadedDragon)
+                if (card.IsCode(CardId.StardustDragonAssaultMode, CardId.FiveHeadedDragon))
                     continue;
                 if (card.IsMonster())
                 {
@@ -298,7 +297,7 @@ namespace WindBot.Game.AI.Decks
             int phalanxCount = 0;
             foreach (ClientCard card in Bot.Graveyard)
             {
-                if (card.Id == (int) CardId.DragunityPhalanx)
+                if (card.IsCode(CardId.DragunityPhalanx))
                 {
                     phalanxCount++;
                     break;
@@ -315,7 +314,7 @@ namespace WindBot.Game.AI.Decks
             {
                 foreach (ClientCard card in Bot.Graveyard)
                 {
-                    if (card.Id == (int) CardId.DragunityPhalanx)
+                    if (card.IsCode(CardId.DragunityPhalanx))
                     {
                         phalanxCount--;
                         tributes.Add(card);
@@ -462,7 +461,7 @@ namespace WindBot.Game.AI.Decks
                 List<ClientCard> monsters = Bot.GetMonsters();
                 foreach (ClientCard monster in monsters)
                 {
-                    if (monster.Id == CardId.StardustDragon && monster.Attacked)
+                    if (monster.IsCode(CardId.StardustDragon) && monster.Attacked)
                     {
                         AI.SelectCard(monster);
                         return true;

Game/AI/Decks/FrogExecutor.cs

@@ -147,7 +147,7 @@ namespace WindBot.Game.AI.Decks
             if (AI.Utils.IsOneEnemyBetterThanValue(atk, true))
                 return false;
 
-            if (Card.Id == CardId.SwapFrog)
+            if (Card.IsCode(CardId.SwapFrog))
                 m_swapFrogSummoned = Duel.Turn;
             return true;
         }
@@ -200,7 +200,7 @@ namespace WindBot.Game.AI.Decks
             List<ClientCard> spells = Bot.GetSpells();
             foreach (ClientCard spell in spells)
             {
-                if (spell.Id == CardId.GravityBind && !spell.IsFacedown())
+                if (spell.IsCode(CardId.GravityBind) && !spell.IsFacedown())
                     return false;
             }
             return true;
@@ -208,9 +208,9 @@ namespace WindBot.Game.AI.Decks
 
         private bool FrogMonsterRepos()
         {
-            if (Card.Id == CardId.Unifrog)
+            if (Card.IsCode(CardId.Unifrog))
                 return Card.IsDefense();
-            if (Card.Id == CardId.DewdarkOfTheIceBarrier)
+            if (Card.IsCode(CardId.DewdarkOfTheIceBarrier))
                 return Card.IsDefense();
 
             bool enemyBetter = AI.Utils.IsOneEnemyBetterThanValue(Card.Attack + (Card.IsFacedown() ? GetSpellBonus() : 0), true);
@@ -222,10 +222,10 @@ namespace WindBot.Game.AI.Decks
             if (Card.IsDefense() && !enemyBetter)
                 result = true;
 
-            if (!result && Card.Id == CardId.FlipFlopFrog && Enemy.GetMonsterCount() > 0 && Card.IsFacedown())
+            if (!result && Card.IsCode(CardId.FlipFlopFrog) && Enemy.GetMonsterCount() > 0 && Card.IsFacedown())
                 result = true;
 
-            if (Card.Id == CardId.FlipFlopFrog && Card.IsFacedown() && result)
+            if (Card.IsCode(CardId.FlipFlopFrog) && Card.IsFacedown() && result)
                 m_flipFlopFrogSummoned = Duel.Turn;
 
             return result;
@@ -242,7 +242,7 @@ namespace WindBot.Game.AI.Decks
             {
                 foreach (ClientCard card in Bot.GetSpells())
                 {
-                    if (card.Id == CardId.Solidarity)
+                    if (card.IsCode(CardId.Solidarity))
                         atk += 800;
                 }
             }

Game/AI/Decks/GrenMajuThunderBoarderExecutor.cs

@@ -251,21 +251,21 @@ namespace WindBot.Game.AI.Decks
 
         private bool DarkBribeeff()
         {
-            if (AI.Utils.GetLastChainCard()!=null && AI.Utils.GetLastChainCard().Id == CardId.UpstartGoblin)
+            if (AI.Utils.GetLastChainCard()!=null && AI.Utils.GetLastChainCard().IsCode(CardId.UpstartGoblin))
                 return false;
             return true;
 
         }
         private bool ImperialOrderfirst()
         {
-            if (AI.Utils.GetLastChainCard() != null && AI.Utils.GetLastChainCard().Id == CardId.UpstartGoblin)
+            if (AI.Utils.GetLastChainCard() != null && AI.Utils.GetLastChainCard().IsCode(CardId.UpstartGoblin))
                 return false;
             return DefaultOnBecomeTarget() && AI.Utils.GetLastChainCard().HasType(CardType.Spell);
         }
 
         private bool ImperialOrdereff()
         {
-            if (AI.Utils.GetLastChainCard() != null && AI.Utils.GetLastChainCard().Id == CardId.UpstartGoblin)
+            if (AI.Utils.GetLastChainCard() != null && AI.Utils.GetLastChainCard().IsCode(CardId.UpstartGoblin))
                 return false;
             if (Duel.LastChainPlayer == 1)
             {
@@ -437,7 +437,7 @@ namespace WindBot.Game.AI.Decks
             IList<ClientCard> material_list = new List<ClientCard>();
             foreach (ClientCard monster in Bot.GetMonsters())
             {
-                if (monster.Id ==CardId.MissusRadiant || monster.Id==CardId.LinkSpider || monster.Id==CardId.Linkuriboh)
+                if (monster.IsCode(CardId.MissusRadiant, CardId.LinkSpider, CardId.Linkuriboh))
                     material_list.Add(monster);
                 if (material_list.Count == 3) break;
             }
@@ -454,10 +454,7 @@ namespace WindBot.Game.AI.Decks
             IList<ClientCard> material_list = new List<ClientCard>();
             foreach (ClientCard monster in Bot.GetMonsters())
             {
-                if ((monster.Id == CardId.MissusRadiant || 
-                    monster.Id == CardId.LinkSpider || 
-                    monster.Id == CardId.Linkuriboh )&&
-                    monster.Id!=CardId.EaterOfMillions)
+                if (monster.IsCode(CardId.MissusRadiant, CardId.LinkSpider, CardId.Linkuriboh))
                     material_list.Add(monster);
                 if (material_list.Count == 3) break;
             }
@@ -559,7 +556,7 @@ namespace WindBot.Game.AI.Decks
             IList<ClientCard> material_list = new List<ClientCard>();
             foreach (ClientCard monster in Bot.GetMonsters())
             {
-                if (monster.HasAttribute(CardAttribute.Earth) && monster.Level==1 && monster.Id!=CardId.EaterOfMillions)
+                if (monster.HasAttribute(CardAttribute.Earth) && monster.Level==1 && !monster.IsCode(CardId.EaterOfMillions))
                     material_list.Add(monster);
                 if (material_list.Count == 2) break;
             }
@@ -587,7 +584,7 @@ namespace WindBot.Game.AI.Decks
         {            
             foreach (ClientCard c in Bot.GetMonsters())
             {
-                if (c.Id != CardId.EaterOfMillions  && c.Id != CardId.Linkuriboh && c.Level==1 )
+                if (!c.IsCode(CardId.EaterOfMillions, CardId.Linkuriboh) && c.Level==1)
                 {
                     AI.SelectMaterials(c);
                     return true;
@@ -598,12 +595,12 @@ namespace WindBot.Game.AI.Decks
 
         private bool Linkuriboheff()
         {
-            if (Duel.LastChainPlayer == 0 && AI.Utils.GetLastChainCard().Id == CardId.Linkuriboh) return false;           
+            if (Duel.LastChainPlayer == 0 && AI.Utils.GetLastChainCard().IsCode(CardId.Linkuriboh)) return false;           
             return true;
         }
         private bool MonsterRepos()
         {
-            if (Card.Id == CardId.EaterOfMillions && Card.IsAttack()) return false;
+            if (Card.IsCode(CardId.EaterOfMillions) && Card.IsAttack()) return false;
             return DefaultMonsterRepos();
         }
 
@@ -612,29 +609,29 @@ namespace WindBot.Game.AI.Decks
             int count = 0;
             foreach(ClientCard check in Bot.Hand)
             {
-                if (check.Id == CardId.CardOfDemise)
+                if (check.IsCode(CardId.CardOfDemise))
                     count++;
             }
             if (count == 2 && Bot.Hand.Count == 2 && Bot.GetSpellCountWithoutField() <= 2)
                 return true;            
-            if (Card.Id == CardId.MacroCosmos && Bot.HasInSpellZone(CardId.MacroCosmos)) return false;
-            if (Card.Id == CardId.AntiSpellFragrance && Bot.HasInSpellZone(CardId.AntiSpellFragrance)) return false;
+            if (Card.IsCode(CardId.MacroCosmos) && Bot.HasInSpellZone(CardId.MacroCosmos)) return false;
+            if (Card.IsCode(CardId.AntiSpellFragrance) && Bot.HasInSpellZone(CardId.AntiSpellFragrance)) return false;
             if (CardOfDemiseeff_used)return true;            
-            if (Card.Id == CardId.EvenlyMatched && (Enemy.GetFieldCount() - Bot.GetFieldCount()) < 0) return false;
-            if (Card.Id == CardId.AntiSpellFragrance && Bot.HasInSpellZone(CardId.AntiSpellFragrance)) return false;
-            if (Card.Id == CardId.MacroCosmos && Bot.HasInSpellZone(CardId.MacroCosmos)) return false;
+            if (Card.IsCode(CardId.EvenlyMatched) && (Enemy.GetFieldCount() - Bot.GetFieldCount()) < 0) return false;
+            if (Card.IsCode(CardId.AntiSpellFragrance) && Bot.HasInSpellZone(CardId.AntiSpellFragrance)) return false;
+            if (Card.IsCode(CardId.MacroCosmos) && Bot.HasInSpellZone(CardId.MacroCosmos)) return false;
             if (Duel.Turn > 1 && Duel.Phase == DuelPhase.Main1 && Bot.HasAttackingMonster())
                 return false;
-            if (Card.Id == CardId.InfiniteImpermanence)
+            if (Card.IsCode(CardId.InfiniteImpermanence))
                 return Bot.GetFieldCount() > 0 && Bot.GetSpellCountWithoutField() < 4;
-            if (Card.Id == CardId.Scapegoat)
+            if (Card.IsCode(CardId.Scapegoat))
                 return true;
             if (Card.HasType(CardType.Trap))
                 return Bot.GetSpellCountWithoutField() < 4;
             if(Bot.HasInSpellZone(CardId.AntiSpellFragrance,true))
             {
-                if (Card.Id == CardId.UpstartGoblin || Card.Id == CardId.PotOfDesires || Card.Id==CardId.PotOfDuality) return true;
-                if (Card.Id == CardId.CardOfDemise && Bot.HasInSpellZone(CardId.CardOfDemise)) return false;
+                if (Card.IsCode(CardId.UpstartGoblin, CardId.PotOfDesires, CardId.PotOfDuality)) return true;
+                if (Card.IsCode(CardId.CardOfDemise) && Bot.HasInSpellZone(CardId.CardOfDemise)) return false;
                 if (Card.HasType(CardType.Spell))
                     return Bot.GetSpellCountWithoutField() < 4;
             }
@@ -642,12 +639,12 @@ namespace WindBot.Game.AI.Decks
         }
         public override bool OnPreBattleBetween(ClientCard attacker, ClientCard defender)
         {
-            if (attacker.Id == _CardId.EaterOfMillions && (Bot.HasInMonstersZone(CardId.InspectBoarder) && eater_eff) && !attacker.IsDisabled())
+            if (attacker.IsCode(_CardId.EaterOfMillions) && (Bot.HasInMonstersZone(CardId.InspectBoarder) && eater_eff) && !attacker.IsDisabled())
             {
                 attacker.RealPower = 9999;
                 return true;
             }
-            if (attacker.Id == _CardId.EaterOfMillions && !Bot.HasInMonstersZone(CardId.InspectBoarder) && !attacker.IsDisabled())
+            if (attacker.IsCode(_CardId.EaterOfMillions) && !Bot.HasInMonstersZone(CardId.InspectBoarder) && !attacker.IsDisabled())
             {
                 attacker.RealPower = 9999;
                 return true;
@@ -659,7 +656,7 @@ namespace WindBot.Game.AI.Decks
             for (int i = 0; i < attackers.Count; ++i)
             {
                 ClientCard attacker = attackers[i];
-                if (attacker.Id == CardId.BirrelswordDragon || attacker.Id == CardId.EaterOfMillions) return attacker;
+                if (attacker.IsCode(CardId.BirrelswordDragon, CardId.EaterOfMillions)) return attacker;
             }
             return null;
         }

Game/AI/Decks/HorusExecutor.cs

@@ -79,7 +79,7 @@ namespace WindBot.Game.AI.Decks
                 return false;
             int remaining = 2;
             foreach (ClientCard card in Bot.Banished)
-                if (card.Id == CardId.WhiteNightDragon)
+                if (card.IsCode(CardId.WhiteNightDragon))
                     remaining--;
             if (remaining > 0)
             {
@@ -154,7 +154,7 @@ namespace WindBot.Game.AI.Decks
             // We should summon Horus the Black Flame Dragon LV6 if he can lvlup.
             if (Enemy.GetMonsterCount() != 0 && !AI.Utils.IsAllEnemyBetterThanValue(2300 - 1, false))
                 foreach (ClientCard card in Main.SummonableCards)
-                    if (card.Id == 11224103)
+                    if (card.IsCode(11224103))
                         return false;
 
             return DefaultTributeSummon();
@@ -197,7 +197,7 @@ namespace WindBot.Game.AI.Decks
                 ClientCard monster = cards[i];
                 if (monster.Attack < 2300)
                     return false;
-                if (monster.Race == (int)CardRace.Dragon && monster.Id != CardId.HorusTheBlackFlameDragonLv8)
+                if (monster.Race == (int)CardRace.Dragon && !monster.IsCode(CardId.HorusTheBlackFlameDragonLv8))
                 {
                     summonCard = monster;
                     break;

Game/AI/Decks/LightswornExecutor.cs

@@ -110,7 +110,7 @@ namespace WindBot.Game.AI.Decks
             IList<ClientCard> result = new List<ClientCard>();
             foreach (ClientCard card in cards)
             {
-                if (!result.Contains(card) && (!ClownUsed || card.Id != CardId.PerformageTrickClown))
+                if (!result.Contains(card) && (!ClownUsed || !card.IsCode(CardId.PerformageTrickClown)))
                     result.Add(card);
                 if (result.Count >= max)
                     break;

Game/AI/Decks/LightswornShaddoldinosourExecutor.cs

@@ -390,7 +390,7 @@ namespace WindBot.Game.AI.Decks
             Pillused = true;
             foreach (ClientCard card in Bot.GetMonsters())
             {
-                if (card.Id == CardId.UltimateConductorTytanno && card.IsFaceup())
+                if (card.IsCode(CardId.UltimateConductorTytanno) && card.IsFaceup())
                     return false;
             }
             Ultimate_ss++;
@@ -410,12 +410,12 @@ namespace WindBot.Game.AI.Decks
 
         private bool MonsterRepos()
         {
-            if (Card.Id == CardId.UltimateConductorTytanno && Card.IsFacedown()) return true;
-            if (Card.Id == CardId.ElShaddollConstruct && Card.IsFacedown()) return true;
-            if (Card.Id == CardId.ElShaddollConstruct && Card.IsAttack()) return false;
-            if (Card.Id == CardId.GlowUpBulb && Card.IsDefense()) return false;
-            if (Card.Id == CardId.ShaddollDragon && Card.IsFacedown() && Enemy.GetMonsterCount() >= 0) return true;
-            if (Card.Id == CardId.ShaddollSquamata && Card.IsFacedown() && Enemy.GetMonsterCount() >= 0) return true;
+            if (Card.IsCode(CardId.UltimateConductorTytanno) && Card.IsFacedown()) return true;
+            if (Card.IsCode(CardId.ElShaddollConstruct) && Card.IsFacedown()) return true;
+            if (Card.IsCode(CardId.ElShaddollConstruct) && Card.IsAttack()) return false;
+            if (Card.IsCode(CardId.GlowUpBulb) && Card.IsDefense()) return false;
+            if (Card.IsCode(CardId.ShaddollDragon) && Card.IsFacedown() && Enemy.GetMonsterCount() >= 0) return true;
+            if (Card.IsCode(CardId.ShaddollSquamata) && Card.IsFacedown() && Enemy.GetMonsterCount() >= 0) return true;
             return base.DefaultMonsterRepos();
         }
 
@@ -430,7 +430,7 @@ namespace WindBot.Game.AI.Decks
         {          
             foreach (ClientCard card in Bot.GetMonsters())
             {
-                if (card.Id == CardId.UltimateConductorTytanno && card.IsFaceup())
+                if (card.IsCode(CardId.UltimateConductorTytanno) && card.IsFaceup())
                     return false;
             }
             if (Pillused == true) return false;
@@ -552,7 +552,7 @@ namespace WindBot.Game.AI.Decks
                 IList<ClientCard> all = new List<ClientCard>();
                 foreach (ClientCard check in grave)
                 {
-                    if (check.Id == CardId.GiantRex)
+                    if (check.IsCode(CardId.GiantRex))
                     {
                         all.Add(check);
                     }
@@ -1030,8 +1030,8 @@ namespace WindBot.Game.AI.Decks
        
         public bool Hand_act_eff()
         {
-            //if (Card.Id == CardId.Urara && Bot.HasInHand(CardId.LockBird) && Bot.HasInSpellZone(CardId.Re)) return false;
-            if (Card.Id == CardId.GhostOgre && Card.Location == CardLocation.Hand && Bot.HasInMonstersZone(CardId.GhostOgre)) return false;
+            //if (Card.IsCode(CardId.Urara) && Bot.HasInHand(CardId.LockBird) && Bot.HasInSpellZone(CardId.Re)) return false;
+            if (Card.IsCode(CardId.GhostOgre) && Card.Location == CardLocation.Hand && Bot.HasInMonstersZone(CardId.GhostOgre)) return false;
             return (Duel.LastChainPlayer == 1);
         }
         //other extra
@@ -1128,14 +1128,8 @@ namespace WindBot.Game.AI.Decks
             };
             int count=0;
             foreach (ClientCard monster in Bot.GetMonsters())
-                if (monster.Id == CardId.GlowUpBulb ||
-                   monster.Id == CardId.FairyTailSnow ||
-                   monster.Id == CardId.KeeperOfDragonicMagic ||
-                   monster.Id == CardId.SouleatingOviraptor||
-                   monster.Id == CardId.GiantRex||
-                   monster.Id == CardId.Lumina||
-                   monster.Id == CardId.Raiden
-                    )
+                if (monster.IsCode(CardId.GlowUpBulb, CardId.FairyTailSnow, CardId.KeeperOfDragonicMagic,
+                    CardId.SouleatingOviraptor, CardId.GiantRex, CardId.Lumina, CardId.Raiden))
                     count++;
             if (!Bot.HasInMonstersZone(CardId.GlowUpBulb) || count<2)
                 return false;
@@ -1150,7 +1144,7 @@ namespace WindBot.Game.AI.Decks
             bool DarkHole = false;
             foreach (ClientCard card in Enemy.GetSpells())
             {
-                if (card.Id == 53129443 && card.IsFaceup())
+                if (card.IsCode(53129443) && card.IsFaceup())
                 {
                     DarkHole = true;
                 }
@@ -1222,12 +1216,12 @@ namespace WindBot.Game.AI.Decks
             {
                 foreach (ClientCard hand in Bot.Hand)
                 {
-                    if (hand.Id == CardId.Red || hand.Id == CardId.Pink)
+                    if (hand.IsCode(CardId.Red, CardId.Pink))
                     {
                         AI.SelectCard(hand);
                         return true;
                     }
-                    if (hand.Id == CardId.Urara || hand.Id == CardId.Ghost)
+                    if (hand.IsCode(CardId.Urara, CardId.Ghost))
                     {
                         if (Tuner_ss())
                         {
@@ -1304,9 +1298,9 @@ namespace WindBot.Game.AI.Decks
         {
             if (!defender.IsMonsterHasPreventActivationEffectInBattle())
             {
-                if (attacker.Id == CardId.ElShaddollConstruct && !attacker.IsDisabled()) // TODO: && defender.IsSpecialSummoned
+                if (attacker.IsCode(CardId.ElShaddollConstruct) && !attacker.IsDisabled()) // TODO: && defender.IsSpecialSummoned
                     attacker.RealPower = 9999;
-                if (attacker.Id == CardId.UltimateConductorTytanno && !attacker.IsDisabled() && defender.IsDefense())
+                if (attacker.IsCode(CardId.UltimateConductorTytanno) && !attacker.IsDisabled() && defender.IsDefense())
                     attacker.RealPower = 9999;
             }
             return base.OnPreBattleBetween(attacker, defender);

Game/AI/Decks/NekrozExecutor.cs

@@ -106,9 +106,9 @@ namespace WindBot.Game.AI.Decks
             if (!Bot.HasInHand(NekrozRituelCard) || Bot.HasInHand(CardId.Shurit) || !Bot.HasInHand(NekrozSpellCard))
                 return true;
             foreach (ClientCard Card in Bot.Hand)
-                if (Card != null && Card.Id == CardId.Kaleidoscope && !Bot.HasInHand(CardId.Unicore))
+                if (Card != null && Card.IsCode(CardId.Kaleidoscope) && !Bot.HasInHand(CardId.Unicore))
                     return true;
-                else if (Card.Id == CardId.Trishula || Card.Id == CardId.DecisiveArmor && !Bot.HasInHand(CardId.Mirror) || !Bot.HasInHand(CardId.Shurit))
+                else if (Card.IsCode(CardId.Trishula) || Card.IsCode(CardId.DecisiveArmor) && !Bot.HasInHand(CardId.Mirror) || !Bot.HasInHand(CardId.Shurit))
                     return true;
             return false;
         }
@@ -271,9 +271,9 @@ namespace WindBot.Game.AI.Decks
             List<int> NekrozCard = new List<int>();
             try
             {
-                foreach (ClientCard Card in Bot.Hand)
-                    if (Card != null && NekrozRituelCard.Contains((int)Card.Id))
-                        NekrozCard.Add(Card.Id);
+                foreach (ClientCard card in Bot.Hand)
+                    if (card != null && card.IsCode(NekrozRituelCard))
+                        NekrozCard.Add(card.Id);
 
                 foreach (int Id in NekrozCard)
                 {

Game/AI/Decks/PhantasmExecutor.cs

@@ -162,7 +162,7 @@ namespace WindBot.Game.AI.Decks
             }
             if (AI.Utils.GetProblematicEnemyCard(9999,true)!=null)
             {
-                if (AI.Utils.GetProblematicEnemyCard(9999, true).Id == CardId.ElShaddollWinda &&
+                if (AI.Utils.GetProblematicEnemyCard(9999, true).IsCode(CardId.ElShaddollWinda) &&
                     !AI.Utils.GetProblematicEnemyCard(9999, true).IsDisabled())
                     return false;
                 AI.SelectCard(AI.Utils.GetProblematicEnemyCard(9999, true));                
@@ -349,7 +349,7 @@ namespace WindBot.Game.AI.Decks
                 ClientCard target = null;
                 foreach(ClientCard s in Bot.GetSpells())
                 {
-                    if(s.Id==CardId.SeaStealthAttack && Card.IsFaceup())
+                    if(s.IsCode(CardId.SeaStealthAttack) && Card.IsFaceup())
                     {
                         target = s;
                         break;
@@ -388,7 +388,7 @@ namespace WindBot.Game.AI.Decks
             IList<ClientCard> material_list = new List<ClientCard>();
             foreach (ClientCard m in Bot.GetMonsters())
             {
-                if (m.Id == CardId.MissusRadiant)
+                if (m.IsCode(CardId.MissusRadiant))
                 {
                     material_list.Add(m);
                     break;
@@ -396,7 +396,7 @@ namespace WindBot.Game.AI.Decks
             }
             foreach (ClientCard m in Bot.GetMonsters())
             {
-                if (m.Id == CardId.Linkuriboh || m.Id == CardId.LinkSpider)
+                if (m.IsCode(CardId.Linkuriboh, CardId.LinkSpider))
                 {
                     material_list.Add(m);
                     if (material_list.Count == 3)
@@ -489,7 +489,7 @@ namespace WindBot.Game.AI.Decks
             IList<ClientCard> material_list = new List<ClientCard>();
             foreach (ClientCard monster in Bot.GetMonsters())
             {
-                if (monster.HasAttribute(CardAttribute.Earth) && monster.Level == 1 && monster.Id != CardId.EaterOfMillions)
+                if (monster.HasAttribute(CardAttribute.Earth) && monster.Level == 1 && !monster.IsCode(CardId.EaterOfMillions))
                     material_list.Add(monster);
                 if (material_list.Count == 2) break;
             }
@@ -518,7 +518,7 @@ namespace WindBot.Game.AI.Decks
         {
             foreach (ClientCard c in Bot.GetMonsters())
             {
-                if (c.Id != CardId.EaterOfMillions && c.Id != CardId.Linkuriboh && c.Level == 1)
+                if (!c.IsCode(CardId.EaterOfMillions, CardId.Linkuriboh) && c.Level == 1)
                 {
                     AI.SelectMaterials(c);
                     return true;
@@ -529,7 +529,7 @@ namespace WindBot.Game.AI.Decks
 
         private bool Linkuriboheff()
         {
-            if (Duel.LastChainPlayer == 0 && AI.Utils.GetLastChainCard().Id == CardId.Linkuriboh) return false;
+            if (Duel.LastChainPlayer == 0 && AI.Utils.GetLastChainCard().IsCode(CardId.Linkuriboh)) return false;
             return true;
         }
         private bool SeaStealthAttackeff()
@@ -548,7 +548,7 @@ namespace WindBot.Game.AI.Decks
                     {
                         foreach (ClientCard s in Bot.GetGraveyardSpells())
                         {
-                            if (s.Id == CardId.PacifisThePhantasmCity)
+                            if (s.IsCode(CardId.PacifisThePhantasmCity))
                             {
                                 AI.SelectYesNo(true);
                                 AI.SelectCard(s);
@@ -560,7 +560,7 @@ namespace WindBot.Game.AI.Decks
                     {
                         foreach (ClientCard s in Bot.Hand)
                         {
-                            if (s.Id == CardId.PacifisThePhantasmCity)
+                            if (s.IsCode(CardId.PacifisThePhantasmCity))
                             {
                                 AI.SelectYesNo(true);
                                 AI.SelectCard(s);
@@ -579,7 +579,7 @@ namespace WindBot.Game.AI.Decks
                 ClientCard target = null;
                 foreach(ClientCard s in Bot.GetSpells())
                 {
-                    if (s.Id == CardId.PacifisThePhantasmCity)
+                    if (s.IsCode(CardId.PacifisThePhantasmCity))
                         target = s;
                 }
                 if (target != null && AI.Utils.IsChainTarget(target))
@@ -590,13 +590,13 @@ namespace WindBot.Game.AI.Decks
                 target = AI.Utils.GetLastChainCard();
                 if(target!=null)
                 {
-                    if(target.Id==CardId.BrandishSkillAfterburner)
+                    if(target.IsCode(CardId.BrandishSkillAfterburner))
                     {
                         AI.SelectCard(CardId.MegalosmasherX);
                         SeaStealthAttackeff_used = true;
                         return true;
                     }
-                    if(Enemy.GetGraveyardSpells().Count>=3 && target.Id==CardId.BrandishSkillJammingWave)
+                    if(Enemy.GetGraveyardSpells().Count>=3 && target.IsCode(CardId.BrandishSkillJammingWave))
                     {
                         AI.SelectCard(CardId.MegalosmasherX);
                         SeaStealthAttackeff_used = true;
@@ -675,7 +675,7 @@ namespace WindBot.Game.AI.Decks
                 int zone_count = 5 - Bot.GetSpellCountWithoutField();
                 return zone_count- hand_spell_count >= 1;
             }
-            if(Card.Id==CardId.PhantasmSprialBattle || Card.Id==CardId.PhantasmSpiralPower)
+            if(Card.IsCode(CardId.PhantasmSprialBattle, CardId.PhantasmSpiralPower))
             {
                 if (Bot.HasInMonstersZone(CardId.MegalosmasherX) &&
                     !Bot.HasInHandOrInSpellZone(CardId.PacifisThePhantasmCity) &&
@@ -691,20 +691,20 @@ namespace WindBot.Game.AI.Decks
             {
                 foreach (ClientCard s in Bot.GetSpells())
                 {
-                    if (s.IsFaceup() && s.Id == CardId.SeaStealthAttack &&
+                    if (s.IsFaceup() && s.IsCode(CardId.SeaStealthAttack) &&
                         Bot.HasInSpellZone(CardId.PacifisThePhantasmCity) &&
                         Card.IsAttack())
                         return false;
                 }
             }
-            if (Card.Id == CardId.EaterOfMillions && !Card.IsDisabled() && Card.IsAttack())
+            if (Card.IsCode(CardId.EaterOfMillions) && !Card.IsDisabled() && Card.IsAttack())
                 return false;
             return DefaultMonsterRepos();
         }
 
         public override bool OnPreBattleBetween(ClientCard attacker, ClientCard defender)
         {
-            if(attacker.Id==CardId.PacifisThePhantasmCity+1 && defender.Id==CardId.EaterOfMillions)
+            if(attacker.IsCode(CardId.PacifisThePhantasmCity+1) && defender.IsCode(CardId.EaterOfMillions))
             {
                 if (attacker.RealPower >= defender.RealPower) return true;
             }
@@ -712,10 +712,10 @@ namespace WindBot.Game.AI.Decks
             {
                 foreach(ClientCard s in Bot.GetSpells())
                 {
-                    if (s.IsFaceup() && s.Id == CardId.SeaStealthAttack && Bot.HasInSpellZone(CardId.PacifisThePhantasmCity))
+                    if (s.IsFaceup() && s.IsCode(CardId.SeaStealthAttack) && Bot.HasInSpellZone(CardId.PacifisThePhantasmCity))
                     { 
                         attacker.RealPower = 9999;
-                        if (defender.Id == CardId.EaterOfMillions) return true;
+                        if (defender.IsCode(CardId.EaterOfMillions)) return true;
                     }
                        
                 }
@@ -728,7 +728,7 @@ namespace WindBot.Game.AI.Decks
             for (int i = 0; i < attackers.Count; ++i)
             {
                 ClientCard attacker = attackers[i];
-                if (attacker.Id == CardId.EaterOfMillions) return attacker;
+                if (attacker.IsCode(CardId.EaterOfMillions)) return attacker;
             }
             return null;
         }

Game/AI/Decks/QliphortExecutor.cs

@@ -141,7 +141,7 @@ namespace WindBot.Game.AI.Decks
             for (int i = 1; i <= max; ++i)
             {
                 ClientCard card = cards[cards.Count - i];
-                if (card.Id != CardId.Scout || (card.Location == CardLocation.Extra && !Duel.IsNewRule))
+                if (!card.IsCode(CardId.Scout) || (card.Location == CardLocation.Extra && !Duel.IsNewRule))
                     selected.Add(card);
             }
             if (selected.Count == 0)
@@ -152,7 +152,7 @@ namespace WindBot.Game.AI.Decks
 
         private bool NormalSummon()
         {
-            if (Card.Id == CardId.Scout)
+            if (Card.IsCode(CardId.Scout))
                 return false;
             if (Card.Level < 8)
                 AI.SelectOption(1);
@@ -196,7 +196,7 @@ namespace WindBot.Game.AI.Decks
         {
             foreach (ClientCard card in Bot.GetSpells())
             {
-                if (card.Id == Card.Id)
+                if (card.IsCode(Card.Id))
                     return false;
             }
             return TrapSetWhenZoneFree();

Game/AI/Decks/RainbowExecutor.cs

@@ -162,7 +162,7 @@ namespace WindBot.Game.AI.Decks
             {
                 foreach (ClientCard card2 in cards)
                 {
-                    if (card1.Id == card2.Id && !card1.Equals(card2))
+                    if (card1.IsCode(card2.Id) && !card1.Equals(card2))
                     {
                         result.Add(card1);
                         result.Add(card2);

Game/AI/Decks/Rank5Executor.cs

@@ -185,15 +185,15 @@ namespace WindBot.Game.AI.Decks
             int lv5Count = 0;
             foreach (ClientCard card in Bot.Hand)
             {
-                if (card.Id == CardId.SolarWindJammer && Bot.GetMonsterCount() == 0)
+                if (card.IsCode(CardId.SolarWindJammer) && Bot.GetMonsterCount() == 0)
                     ++lv5Count;
-                if (card.Id == CardId.InstantFusion && !InstantFusionUsed)
+                if (card.IsCode(CardId.InstantFusion) && !InstantFusionUsed)
                     ++lv5Count;
-                if (card.Id == CardId.QuickdrawSynchron && Bot.Hand.ContainsMonsterWithLevel(4))
+                if (card.IsCode(CardId.QuickdrawSynchron) && Bot.Hand.ContainsMonsterWithLevel(4))
                     ++lv5Count;
-                if (card.Id == CardId.MistArchfiend && !NormalSummoned)
+                if (card.IsCode(CardId.MistArchfiend) && !NormalSummoned)
                     ++lv5Count;
-                if (card.Id == CardId.DoubleSummon && DoubleSummonEffect())
+                if (card.IsCode(CardId.DoubleSummon) && DoubleSummonEffect())
                     ++lv5Count;
             }
             if (lv5Count >= 2)
@@ -387,8 +387,8 @@ namespace WindBot.Game.AI.Decks
                 if (monster.HasType(CardType.Monster) &&
                     !monster.HasType(CardType.Xyz) &&
                     (monster.Level == 5
-                    || monster.Id == CardId.StarDrawing
-                    || (monster.Id == CardId.WindUpSoldier) && !monster.Equals(Card)))
+                    || monster.IsCode(CardId.StarDrawing)
+                    || (monster.IsCode(CardId.WindUpSoldier)) && !monster.Equals(Card)))
                     return true;
             }
             return false;

Game/AI/Decks/ST1732Executor.cs

@@ -284,7 +284,7 @@ namespace WindBot.Game.AI.Decks
                 List<ClientCard> monsters = Bot.GetMonsters();
                 foreach (ClientCard monster in monsters)
                 {
-                    if (monster.Id == CardId.BalancerLord)
+                    if (monster.IsCode(CardId.BalancerLord))
                     {
                         AI.SelectCard(monster);
                         selected = true;
@@ -404,7 +404,7 @@ namespace WindBot.Game.AI.Decks
             };
             foreach (ClientCard monster in Bot.Hand)
             {
-                if (targets.Contains(monster.Id))
+                if (monster.IsCode(targets))
                 {
                     AI.SelectCard(targets);
                     return true;
@@ -418,7 +418,7 @@ namespace WindBot.Game.AI.Decks
             };
             foreach (ClientCard monster in Bot.GetMonsters())
             {
-                if (targets2.Contains(monster.Id))
+                if (monster.IsCode(targets2))
                 {
                     AI.SelectCard(targets2);
                     return true;

Game/AI/Decks/SkyStrikerExecutor.cs

@@ -152,7 +152,7 @@ namespace WindBot.Game.AI.Decks
         {
             if (!defender.IsMonsterHasPreventActivationEffectInBattle())
             {
-                if (attacker.Id == CardId.HiSpeedroidChanbara && !attacker.IsDisabled())
+                if (attacker.IsCode(CardId.HiSpeedroidChanbara) && !attacker.IsDisabled())
                     attacker.RealPower = attacker.RealPower + 200;
             }
             return base.OnPreBattleBetween(attacker, defender);
@@ -399,7 +399,7 @@ namespace WindBot.Game.AI.Decks
                 IList<ClientCard> targets = new List<ClientCard>();
                 foreach(ClientCard card in Bot.GetGraveyardMonsters())
                 {
-                    if (card.Id == CardId.Hayate || card.Id == CardId.Kagari || card.Id == CardId.Shizuku)
+                    if (card.IsCode(CardId.Hayate, CardId.Kagari, CardId.Shizuku))
                         targets.Add(card);
                 }
                 if (targets.Count > 0)
@@ -451,7 +451,7 @@ namespace WindBot.Game.AI.Decks
             }
             foreach (ClientCard target in Bot.GetMonsters())
             {
-                if (target.Id == CardId.Raye && Bot.GetMonstersExtraZoneCount() == 0)
+                if (target.IsCode(CardId.Raye) && Bot.GetMonstersExtraZoneCount() == 0)
                 {
                     AI.SelectCard(target);
                     return true;
@@ -459,7 +459,7 @@ namespace WindBot.Game.AI.Decks
             }
             foreach (ClientCard target in Bot.GetSpells())
             {
-                if (target.Id != CardId.AreaZero && target.Id != CardId.Multirole && target.Id != CardId.WidowAnchor && target.IsSpell())
+                if (!target.IsCode(CardId.AreaZero, CardId.Multirole, CardId.WidowAnchor) && target.IsSpell())
                 {
                     AI.SelectCard(target);
                     return true;
@@ -482,7 +482,7 @@ namespace WindBot.Game.AI.Decks
                 }
                 foreach (ClientCard target in Bot.GetMonsters())
                 {
-                    if (target.Id == CardId.Raye && Bot.GetMonstersExtraZoneCount() == 0)
+                    if (target.IsCode(CardId.Raye) && Bot.GetMonstersExtraZoneCount() == 0)
                     {
                         AI.SelectCard(target);
                         return true;
@@ -490,7 +490,7 @@ namespace WindBot.Game.AI.Decks
                 }
                 foreach (ClientCard target in Bot.GetSpells())
                 {
-                    if (target.Id == CardId.AreaZero)
+                    if (target.IsCode(CardId.AreaZero))
                     {
                         AI.SelectCard(target);
                         return true;
@@ -498,7 +498,7 @@ namespace WindBot.Game.AI.Decks
                 }
                 foreach (ClientCard target in Bot.GetSpells())
                 {
-                    if (target.Id != CardId.Multirole && target.Id != CardId.WidowAnchor && target.IsSpell())
+                    if (!target.IsCode(CardId.Multirole, CardId.WidowAnchor) && target.IsSpell())
                     {
                         AI.SelectCard(target);
                         return true;

Game/AI/Decks/ToadallyAwesomeExecutor.cs

@@ -116,7 +116,7 @@ namespace WindBot.Game.AI.Decks
         {
             if (!defender.IsMonsterHasPreventActivationEffectInBattle())
             {
-                if (attacker.Id == CardId.SkyCavalryCentaurea && !attacker.IsDisabled() && attacker.HasXyzMaterial())
+                if (attacker.IsCode(CardId.SkyCavalryCentaurea) && !attacker.IsDisabled() && attacker.HasXyzMaterial())
                     attacker.RealPower = Bot.LifePoints + attacker.Attack;
             }
             return base.OnPreBattleBetween(attacker, defender);
@@ -315,7 +315,7 @@ namespace WindBot.Game.AI.Decks
                 };
                 foreach (ClientCard monster in monsters)
                 {
-                    if (suitableCost.Contains(monster.Id))
+                    if (monster.IsCode(suitableCost))
                     {
                         AI.SelectCard(monster);
                         return true;
@@ -325,7 +325,7 @@ namespace WindBot.Game.AI.Decks
                 {
                     foreach (ClientCard monster in monsters)
                     {
-                        if (monster.Id == CardId.DupeFrog)
+                        if (monster.IsCode(CardId.DupeFrog))
                         {
                             AI.SelectCard(monster);
                             return true;
@@ -337,7 +337,7 @@ namespace WindBot.Game.AI.Decks
                 {
                     foreach (ClientCard monster in hands)
                     {
-                        if (monster.Id == CardId.GraydleSlimeJr)
+                        if (monster.IsCode(CardId.GraydleSlimeJr))
                         {
                             AI.SelectCard(monster);
                             return true;
@@ -348,7 +348,7 @@ namespace WindBot.Game.AI.Decks
                 {
                     foreach (ClientCard monster in hands)
                     {
-                        if (monster.Id == CardId.DupeFrog)
+                        if (monster.IsCode(CardId.DupeFrog))
                         {
                             AI.SelectCard(monster);
                             return true;
@@ -357,7 +357,7 @@ namespace WindBot.Game.AI.Decks
                 }
                 foreach (ClientCard monster in hands)
                 {
-                    if (monster.Id == CardId.Ronintoadin || monster.Id == CardId.DupeFrog)
+                    if (monster.IsCode(CardId.Ronintoadin, CardId.DupeFrog))
                     {
                         AI.SelectCard(monster);
                         return true;
@@ -442,7 +442,7 @@ namespace WindBot.Game.AI.Decks
             List<ClientCard> monsters = Bot.GetMonsters();
             foreach (ClientCard monster in monsters)
             {
-                if (monster.Id == CardId.ToadallyAwesome && monster.Attack <= 2200)
+                if (monster.IsCode(CardId.ToadallyAwesome) && monster.Attack <= 2200)
                 {
                     SelectXYZDetach(Card.Overlays);
                     AI.SelectNextCard(monster);
@@ -451,7 +451,7 @@ namespace WindBot.Game.AI.Decks
             }
             foreach (ClientCard monster in monsters)
             {
-                if (monster.Id == CardId.SkyCavalryCentaurea && monster.Attack <= 2000)
+                if (monster.IsCode(CardId.SkyCavalryCentaurea) && monster.Attack <= 2000)
                 {
                     SelectXYZDetach(Card.Overlays);
                     AI.SelectNextCard(monster);
@@ -460,7 +460,7 @@ namespace WindBot.Game.AI.Decks
             }
             foreach (ClientCard monster in monsters)
             {
-                if (monster.Id == CardId.DaigustoPhoenix && monster.Attack <= 1500)
+                if (monster.IsCode(CardId.DaigustoPhoenix) && monster.Attack <= 1500)
                 {
                     SelectXYZDetach(Card.Overlays);
                     AI.SelectNextCard(monster);

Game/AI/Decks/YosenjuExecutor.cs

@@ -163,7 +163,7 @@ namespace WindBot.Game.AI.Decks
             if (Card == null)
                 return true;
             // Logger.DebugWriteLine(Card.Name);
-            if (Card.Id == CardId.YosenjuKama2)
+            if (Card.IsCode(CardId.YosenjuKama2))
                 return Card.ShouldDirectAttack;
             else
                 return true;
@@ -181,7 +181,7 @@ namespace WindBot.Game.AI.Decks
 
         public override IList<ClientCard> OnSelectXyzMaterial(IList<ClientCard> cards, int min, int max)
         {
-            IList<ClientCard> result = AI.Utils.SelectPreferredCards(CardId.YosenjuTsujik, cards, min, max);
+            IList<ClientCard> result = AI.Utils.SelectPreferredCards(CardId.YosenjuTsujik, cards, min, max);
             return AI.Utils.CheckSelectCount(result, cards, min, max);
         }
 
@@ -241,7 +241,7 @@ namespace WindBot.Game.AI.Decks
         {
             foreach (ClientCard card in Bot.Hand.GetMonsters())
             {
-                if (!card.Equals(Card) && card.Id == Card.Id)
+                if (!card.Equals(Card) && card.IsCode(Card.Id))
                     return true;
             }
             return false;
@@ -251,7 +251,7 @@ namespace WindBot.Game.AI.Decks
         {
             foreach (ClientCard card in Bot.GetSpells())
             {
-                if (card.Id == Card.Id)
+                if (card.IsCode(Card.Id))
                     return false;
             }
             return TrapSetWhenZoneFree();

Game/AI/Decks/ZexalWeaponsExecutor.cs

@@ -238,7 +238,7 @@ namespace WindBot.Game.AI.Decks
         {
             var lastChainCard = AI.Utils.GetLastChainCard();
             if (lastChainCard == null) return true;
-            return lastChainCard.Id != CardId.Goblindbergh && lastChainCard.Id != CardId.TinGoldfish;
+            return !lastChainCard.IsCode(CardId.Goblindbergh, CardId.TinGoldfish);
         }
 
         private bool SummonerMonkEffect()
@@ -279,7 +279,7 @@ namespace WindBot.Game.AI.Decks
 
         private bool MonsterRepos()
         {
-            if (Card.Id == CardId.NumberS39UtopiatheLightning && Card.IsAttack())
+            if (Card.IsCode(CardId.NumberS39UtopiatheLightning) && Card.IsAttack())
                 return false;
             return base.DefaultMonsterRepos();
         }

Game/AI/Decks/ZoodiacExecutor.cs

@@ -230,14 +230,14 @@ namespace WindBot.Game.AI.Decks
         {
             foreach (ClientCard card in Enemy.Graveyard)
             {
-                if (card.Id == CardId.AleisterTheInvoker)
+                if (card.IsCode(CardId.AleisterTheInvoker))
                 {
                     return card;
                 }
             }
             foreach (ClientCard card in Bot.Graveyard)
             {
-                if (card.Id == CardId.AleisterTheInvoker)
+                if (card.IsCode(CardId.AleisterTheInvoker))
                 {
                     return card;
                 }
@@ -445,7 +445,7 @@ namespace WindBot.Game.AI.Decks
             List<ClientCard> monsters = Bot.GetMonsters();
             foreach (ClientCard monster in monsters)
             {
-                if (monster.IsFaceup() && monster.Id == CardId.Drident && !monster.HasXyzMaterial())
+                if (monster.IsFaceup() && monster.IsCode(CardId.Drident) && !monster.HasXyzMaterial())
                 {
                     target = monster;
                     break;
@@ -455,7 +455,7 @@ namespace WindBot.Game.AI.Decks
             {
                 foreach (ClientCard monster in monsters)
                 {
-                    if (monster.IsFaceup() && monster.Type == (int)CardType.Xyz && monster.Id != CardId.DaigustoEmeral && !monster.HasXyzMaterial())
+                    if (monster.IsFaceup() && monster.Type == (int)CardType.Xyz && !monster.IsCode(CardId.DaigustoEmeral) && !monster.HasXyzMaterial())
                     {
                         target = monster;
                         break;
@@ -550,7 +550,7 @@ namespace WindBot.Game.AI.Decks
         {
             foreach (ClientCard spell in Bot.GetSpells())
             {
-                if (spell.Id == CardId.ZoodiacBarrage && !Card.Equals(spell))
+                if (spell.IsCode(CardId.ZoodiacBarrage) && !Card.Equals(spell))
                     return false;
             }
             AI.SelectCard(new[]
@@ -604,7 +604,7 @@ namespace WindBot.Game.AI.Decks
 
         private bool MonsterRepos()
         {
-            if (Card.Id == CardId.NumberS39UtopiatheLightning && Card.IsAttack())
+            if (Card.IsCode(CardId.NumberS39UtopiatheLightning) && Card.IsAttack())
                 return false;
             return base.DefaultMonsterRepos();
         }

Game/AI/DefaultExecutor.cs

@@ -129,16 +129,16 @@ namespace WindBot.Game.AI
                 if (defender.IsMonsterDangerous())
                 {
                     bool canIgnoreIt = !attacker.IsDisabled() && (
-                        attacker.Id == _CardId.UltimateConductorTytanno && defender.IsDefense() || 
-                        attacker.Id == _CardId.ElShaddollConstruct && defender.IsSpecialSummoned ||
-                        attacker.Id == _CardId.AllyOfJusticeCatastor && !defender.HasAttribute(CardAttribute.Dark));
+                        attacker.IsCode(_CardId.UltimateConductorTytanno) && defender.IsDefense() || 
+                        attacker.IsCode(_CardId.ElShaddollConstruct) && defender.IsSpecialSummoned ||
+                        attacker.IsCode(_CardId.AllyOfJusticeCatastor) && !defender.HasAttribute(CardAttribute.Dark));
                     if (!canIgnoreIt)
                         return false;
                 }
 
                 foreach (ClientCard equip in defender.EquipCards)
                 {
-                    if (equip.Id == _CardId.MoonMirrorShield && !equip.IsDisabled())
+                    if (equip.IsCode(_CardId.MoonMirrorShield) && !equip.IsDisabled())
                     {
                         return false;
                     }
@@ -146,44 +146,44 @@ namespace WindBot.Game.AI
 
                 if (!defender.IsDisabled())
                 {
-                    if (defender.Id == _CardId.CrystalWingSynchroDragon && defender.IsAttack() && attacker.Level >= 5)
+                    if (defender.IsCode(_CardId.CrystalWingSynchroDragon) && defender.IsAttack() && attacker.Level >= 5)
                         return false;
 
-                    if (defender.Id == _CardId.AllyOfJusticeCatastor && !attacker.HasAttribute(CardAttribute.Dark))
+                    if (defender.IsCode(_CardId.AllyOfJusticeCatastor) && !attacker.HasAttribute(CardAttribute.Dark))
                         return false;
 
-                    if (defender.Id == _CardId.NumberS39UtopiaTheLightning && defender.IsAttack() && defender.HasXyzMaterial(2, _CardId.Number39Utopia))
+                    if (defender.IsCode(_CardId.NumberS39UtopiaTheLightning) && defender.IsAttack() && defender.HasXyzMaterial(2, _CardId.Number39Utopia))
                         defender.RealPower = 5000;
 
-                    if (defender.Id == _CardId.VampireFraeulein)
+                    if (defender.IsCode(_CardId.VampireFraeulein))
                         defender.RealPower += (Enemy.LifePoints > 3000) ? 3000 : (Enemy.LifePoints - 100);
 
-                    if (defender.Id == _CardId.InjectionFairyLily && Enemy.LifePoints > 2000)
+                    if (defender.IsCode(_CardId.InjectionFairyLily) && Enemy.LifePoints > 2000)
                         defender.RealPower += 3000;
                 }
             }
 
             if (!defender.IsMonsterHasPreventActivationEffectInBattle())
             {
-                if (attacker.Id == _CardId.NumberS39UtopiaTheLightning && !attacker.IsDisabled() && attacker.HasXyzMaterial(2, _CardId.Number39Utopia))
+                if (attacker.IsCode(_CardId.NumberS39UtopiaTheLightning) && !attacker.IsDisabled() && attacker.HasXyzMaterial(2, _CardId.Number39Utopia))
                     attacker.RealPower = 5000;
 
                 foreach (ClientCard equip in attacker.EquipCards)
                 {
-                    if (equip.Id == _CardId.MoonMirrorShield && !equip.IsDisabled())
+                    if (equip.IsCode(_CardId.MoonMirrorShield) && !equip.IsDisabled())
                     {
                         attacker.RealPower = defender.RealPower + 100;
                     }
                 }
             }
 
-            if (Enemy.HasInMonstersZone(_CardId.DupeFrog, true) && defender.Id != _CardId.DupeFrog)
+            if (Enemy.HasInMonstersZone(_CardId.DupeFrog, true) && !(defender).IsCode(_CardId.DupeFrog))
                 return false;
 
-            if (Enemy.HasInMonstersZone(_CardId.MaraudingCaptain, true) && defender.Id != _CardId.MaraudingCaptain && defender.Race == (int)CardRace.Warrior)
+            if (Enemy.HasInMonstersZone(_CardId.MaraudingCaptain, true) && !defender.IsCode(_CardId.MaraudingCaptain) && defender.Race == (int)CardRace.Warrior)
                 return false;
 
-            if (defender.Id == _CardId.UltimayaTzolkin && !defender.IsDisabled() && Enemy.GetMonsters().Any(monster => !monster.Equals(defender) && monster.HasType(CardType.Synchro)))
+            if (defender.IsCode(_CardId.UltimayaTzolkin) && !defender.IsDisabled() && Enemy.GetMonsters().Any(monster => !monster.Equals(defender) && monster.HasType(CardType.Synchro)))
                 return false;
 
             return true;
@@ -231,7 +231,7 @@ namespace WindBot.Game.AI
         /// </summary>
         protected bool DefaultMysticalSpaceTyphoon()
         {
-            if (Duel.CurrentChain.Any(card => card.Id == _CardId.MysticalSpaceTyphoon))
+            if (Duel.CurrentChain.Any(card => card.IsCode(_CardId.MysticalSpaceTyphoon)))
             {
                 return false;
             }
@@ -262,7 +262,7 @@ namespace WindBot.Game.AI
         protected bool DefaultCosmicCyclone()
         {
             foreach (ClientCard card in Duel.CurrentChain)
-                if (card.Id == _CardId.CosmicCyclone)
+                if (card.IsCode(_CardId.CosmicCyclone))
                     return false;
             return (Bot.LifePoints > 1000) && DefaultMysticalSpaceTyphoon();
         }
@@ -386,7 +386,7 @@ namespace WindBot.Game.AI
                 _CardId.UpstartGoblin,
                 _CardId.CyberEmergency
             };
-            if (ignoreList.Contains(AI.Utils.GetLastChainCard().Id))
+            if (AI.Utils.GetLastChainCard().IsCode(ignoreList))
                 return false;
             return Duel.LastChainPlayer == 1;
         }
@@ -411,7 +411,7 @@ namespace WindBot.Game.AI
         /// </summary>
         protected bool DefaultEffectVeiler()
         {
-            if (AI.Utils.GetLastChainCard() != null && AI.Utils.GetLastChainCard().Id == _CardId.GalaxySoldier && Enemy.Hand.Count >= 3) return false;
+            if (AI.Utils.GetLastChainCard() != null && AI.Utils.GetLastChainCard().IsCode(_CardId.GalaxySoldier) && Enemy.Hand.Count >= 3) return false;
             if (AI.Utils.ChainContainsCard(_CardId.EffectVeiler))
                 return false;
             return DefaultBreakthroughSkill();
@@ -433,7 +433,7 @@ namespace WindBot.Game.AI
             {
                 foreach (int id in targetList)
                 {
-                    if (AI.Utils.GetLastChainCard().Id == id)
+                    if (AI.Utils.GetLastChainCard().IsCode(id))
                     {
                         AI.SelectCard(id);
                         return UniqueFaceupSpell();
@@ -479,7 +479,7 @@ namespace WindBot.Game.AI
 
             if (Bot.BattlingMonster != null && Enemy.BattlingMonster != null)
             {
-                if (!Enemy.BattlingMonster.IsDisabled() && Enemy.BattlingMonster.Id == _CardId.EaterOfMillions)
+                if (!Enemy.BattlingMonster.IsDisabled() && Enemy.BattlingMonster.IsCode(_CardId.EaterOfMillions))
                 {
                     AI.SelectCard(Enemy.BattlingMonster);
                     return true;
@@ -659,7 +659,7 @@ namespace WindBot.Game.AI
             ClientCard card = null;
             foreach (ClientCard check in Bot.GetSpells())
             {
-                if (check.Id == _CardId.AntiSpellFragrance && !check.IsDisabled())
+                if (check.IsCode(_CardId.AntiSpellFragrance) && !check.IsDisabled())
                     card = check;
             }
             if (card != null && card.IsFaceup())
@@ -715,7 +715,7 @@ namespace WindBot.Game.AI
         /// </summary>
         protected bool UniqueFaceupSpell()
         {
-            return !Bot.GetSpells().Any(card => card.Id == Card.Id && card.IsFaceup());
+            return !Bot.GetSpells().Any(card => card.IsCode(Card.Id) && card.IsFaceup());
         }
 
         /// <summary>
@@ -723,7 +723,7 @@ namespace WindBot.Game.AI
         /// </summary>
         protected bool UniqueFaceupMonster()
         {
-            return !Bot.GetMonsters().Any(card => card.Id == Card.Id && card.IsFaceup());
+            return !Bot.GetMonsters().Any(card => card.IsCode(Card.Id) && card.IsFaceup());
         }
 
         /// <summary>
@@ -917,7 +917,7 @@ namespace WindBot.Game.AI
             };
             foreach (ClientCard monster in Enemy.GetMonsters())
             {
-                if (kaijus.Contains(monster.Id))
+                if (monster.IsCode(kaijus))
                     return Card.GetDefensePower() > monster.GetDefensePower();
             }
             ClientCard card = Enemy.MonsterZone.GetFloodgate();

Game/ClientCard.cs

 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using YGOSharp.OCGWrapper;
 using YGOSharp.OCGWrapper.Enums;
 
@@ -72,7 +73,11 @@ namespace WindBot.Game
             Id = id;
             Data = NamedCard.Get(Id);
             if (Data != null)
+            {
                 Name = Data.Name;
+                if (Data.Alias != 0)
+                    Alias = Data.Alias;
+            }
         }
 
         public void Update(BinaryReader packet, Duel duel)
@@ -274,6 +279,21 @@ namespace WindBot.Game
             return Disabled != 0;
         }
 
+        public bool IsCode(int id)
+        {
+            return Id == id || Alias != 0 && Alias == id;
+        }
+
+        public bool IsCode(IList<int> ids)
+        {
+            return ids.Contains(Id) || Alias != 0 && ids.Contains(Alias);
+        }
+
+        public bool IsCode(params int[] ids)
+        {
+            return ids.Contains(Id) || Alias != 0 && ids.Contains(Alias);
+        }
+
         public bool HasXyzMaterial()
         {
             return Overlays.Count > 0;

Game/ClientField.cs

@@ -300,10 +300,10 @@ namespace WindBot.Game
         public int GetRemainingCount(int cardId, int initialCount)
         {
             int remaining = initialCount;
-            remaining = remaining - Hand.Count(card => card != null && card.Id == cardId);
-            remaining = remaining - SpellZone.Count(card => card != null && card.Id == cardId);
-            remaining = remaining - Graveyard.Count(card => card != null && card.Id == cardId);
-            remaining = remaining - Banished.Count(card => card != null && card.Id == cardId);
+            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));
             return (remaining < 0) ? 0 : remaining;
         }
 
@@ -314,12 +314,12 @@ namespace WindBot.Game
 
         public int GetCountCardInZone(IEnumerable<ClientCard> cards, int cardId)
         {
-            return cards.Count(card => card != null && card.Id == cardId);
+            return cards.Count(card => card != null && card.IsCode(cardId));
         }
 
         public int GetCountCardInZone(IEnumerable<ClientCard> cards, List<int> cardId)
         {
-            return cards.Count(card => card != null && cardId.Contains(card.Id));
+            return cards.Count(card => card != null && card.IsCode(cardId));
         }
 
         private static List<ClientCard> GetCards(IEnumerable<ClientCard> cards, CardType type)
@@ -334,12 +334,12 @@ namespace WindBot.Game
 
         private static bool HasInCards(IEnumerable<ClientCard> cards, int cardId, bool notDisabled = false, bool hasXyzMaterial = false, bool faceUp = false)
         {
-            return cards.Any(card => card != null && card.Id == cardId && !(notDisabled && card.IsDisabled()) && !(hasXyzMaterial && !card.HasXyzMaterial()) && !(faceUp && card.IsFacedown()));
+            return cards.Any(card => card != null && card.IsCode(cardId) && !(notDisabled && card.IsDisabled()) && !(hasXyzMaterial && !card.HasXyzMaterial()) && !(faceUp && card.IsFacedown()));
         }
 
         private static bool HasInCards(IEnumerable<ClientCard> cards, IList<int> cardId, bool notDisabled = false, bool hasXyzMaterial = false, bool faceUp = false)
         {
-            return cards.Any(card => card != null && cardId.Contains(card.Id) && !(notDisabled && card.IsDisabled()) && !(hasXyzMaterial && !card.HasXyzMaterial()) && !(faceUp && card.IsFacedown()));
+            return cards.Any(card => card != null && card.IsCode(cardId) && !(notDisabled && card.IsDisabled()) && !(hasXyzMaterial && !card.HasXyzMaterial()) && !(faceUp && card.IsFacedown()));
         }
     }
 }
\ No newline at end of file

Game/GameBehavior.cs

@@ -1086,7 +1086,8 @@ namespace WindBot.Game
                 return;
             }
             
-            if (card.Id == 0) card.SetId(cardId);
+            if (card.Id == 0)
+                card.SetId(cardId);
 
             int reply = _ai.OnSelectEffectYn(card, desc) ? (1) : (0);
             Connection.Send(CtosMessage.Response, reply);