Merge branch 'master' of https://github.com/IceYGO/windbot

Game/AI/Decks/SwordsoulExecutor.cs

@@ -936,6 +936,10 @@ namespace WindBot.Game.AI.Decks
             {
                 return true;
             }
+            if (Bot.HasInExtra(CardId.PsychicEndPunisher) && Bot.HasInMonstersZone(CardId.SwordsoulToken) && !onlyWyrmSpSummon)
+            {
+                return true;
+            }
 
             return false;
         }
@@ -1387,7 +1391,7 @@ namespace WindBot.Game.AI.Decks
             List<ClientCard> checkNonTuner = Bot.GetMonsters().Where(card => card.IsFaceup() && !card.IsTuner()).ToList();
             checkNonTuner.Sort(CardContainer.CompareCardAttack);
             // level7 check
-            if (Bot.HasInExtra(CardId.YaziEvilOfTheYangZing))
+            if (Bot.HasInExtra(CardId.YaziEvilOfTheYangZing) && GetProblematicEnemyCardList(true, true).Count() > 0)
             {
                 foreach (ClientCard checkCard in checkNonTuner)
                 {
@@ -2673,7 +2677,6 @@ namespace WindBot.Game.AI.Decks
                     if (CheckRemainInDeck(CardId.SwordsoulBlackout) > 0)
                     {
                         AI.SelectCard(CardId.SwordsoulBlackout);
-                        AI.SelectYesNo(true);
                         activatedCardIdList.Add(Card.Id);
                         return true;
                     }
@@ -2687,7 +2690,6 @@ namespace WindBot.Game.AI.Decks
                         if (CheckRemainInDeck(checkId) > 0 && !Bot.HasInHand(checkId))
                         {
                             AI.SelectCard(checkId);
-                            AI.SelectYesNo(true);
                             activatedCardIdList.Add(Card.Id);
                             return true;
                         }
@@ -2700,7 +2702,6 @@ namespace WindBot.Game.AI.Decks
                     && SwordsoulOfMoYeEffectCheck() && CheckRemainInDeck(CardId.SwordsoulStrategistLongyuan) > 0)
                     {
                         AI.SelectCard(CardId.SwordsoulStrategistLongyuan);
-                        AI.SelectYesNo(true);
                         activatedCardIdList.Add(Card.Id);
                         return true;
                     }
@@ -2714,7 +2715,6 @@ namespace WindBot.Game.AI.Decks
                             if (CheckRemainInDeck(CardId.SwordsoulSacredSummit) > 0)
                             {
                                 AI.SelectCard(CardId.SwordsoulSacredSummit);
-                                AI.SelectYesNo(true);
                                 activatedCardIdList.Add(Card.Id);
                                 return true;
                             }
@@ -2724,7 +2724,6 @@ namespace WindBot.Game.AI.Decks
                             if (CheckRemainInDeck(CardId.SwordsoulOfTaia) > 0)
                             {
                                 AI.SelectCard(CardId.SwordsoulOfTaia);
-                                AI.SelectYesNo(true);
                                 activatedCardIdList.Add(Card.Id);
                                 return true;
                             }
@@ -2738,7 +2737,7 @@ namespace WindBot.Game.AI.Decks
                 {
                     Logger.DebugWriteLine("Chixiao banish blackout");
                     AI.SelectCard(CardId.SwordsoulBlackout);
-                    AI.SelectYesNo(false);
+                    AI.SelectOption(1);
                     activatedCardIdList.Add(Card.Id);
                     return true;
                 }
@@ -2754,7 +2753,6 @@ namespace WindBot.Game.AI.Decks
                         if (CheckRemainInDeck(checkId) > 0 && !Bot.HasInHand(checkId))
                         {
                             AI.SelectCard(checkId);
-                            AI.SelectYesNo(true);
                             activatedCardIdList.Add(Card.Id);
                             return true;
                         }
@@ -2770,7 +2768,6 @@ namespace WindBot.Game.AI.Decks
                     if (CheckRemainInDeck(checkId) > 0 && !Bot.HasInHand(checkId))
                     {
                         AI.SelectCard(checkId);
-                        AI.SelectYesNo(true);
                         activatedCardIdList.Add(Card.Id);
                         return true;
                     }

Game/AI/Enums/DangerousMonster.cs

@@ -24,5 +24,7 @@
         ZushintheSleepingGiant = 67547370,
         Heart_eartHDragon = 97403510,
         DaigustoSphreeze = 29552709,
+        OhimetheManifestedMikanko = 81260679,
+        ArahimetheManifestedMikanko = 75771170
     }
 }

Game/AI/Enums/Floodgate.cs

@@ -199,6 +199,17 @@
         BystialDisPater = 27572350,
         DespianLuluwalilith = 53971455,
         FirewallDragonSingularity = 21637210,
-        BrandedEtude = 45675980
+        BrandedEtude = 45675980,
+        EvolzarLars = 35103106,
+        AltergeistAdminia = 61470213,
+        EmperorCharlesTheGreat = 97864322,
+        YouReFinished = 88346805,
+        VolcanicEmperor = 46412900,
+        VolcanicInferno = 84138874,
+        RedZone = 50056656,
+        TGGlaiveBlaster = 95973569,
+        StellarNemesisTPHON_DoomsdayStar = 93039339,
+        SPLittleKnight = 29301450,
+        AngelRing = 40678060
     }
 }

Game/AI/Enums/FusionSpell.cs

@@ -82,6 +82,9 @@
         AmazonessSecretArts = 86758746,
         DarkWorldAccession = 65956182,
         BeetrooperLanding = 13234975,
-        FusionReproduction = 43331750
+        FusionReproduction = 43331750,
+        ChimeraFusion = 63136489,
+        HarmonicSynchroFusion = 7473735,
+        SouloftheSupremeCelestialKing = 76840111
     }
 }

Game/AI/Enums/InvincibleMonster.cs

@@ -27,7 +27,9 @@
         NumberC96DarkStorm = 77205367,
         Number54LionHeart = 54366836,
         Number2NinjaShadowMosquito = 32453837,
-        OhimetheManifestedMikanko = 81260679
+        OhimetheManifestedMikanko = 81260679,
+        NightmareMagician = 40221691,
+        ArahimetheManifestedMikanko = 75771170
     }
     /// <summary>
     /// Cards that are invincible to battle.
@@ -101,6 +103,12 @@
         BrigrandtheGloryDragon = 34848821,
         AmazonessQueen = 15951532,
         Number2NinjaShadowMosquito = 32453837,
-        OhimetheManifestedMikanko = 81260679
+        OhimetheManifestedMikanko = 81260679,
+        CornfieldCoatl = 92565383,
+        MirrorSwordknight = 28954097,
+        NightmareMagician = 40221691,
+        ArahimetheManifestedMikanko = 75771170,
+        UFOLight = 9275482,
+        TaotheGreatChanter = 34541543
     }
 }

Game/AI/Enums/NotBeSynchroMaterialMonster.cs

@@ -26,7 +26,8 @@ namespace WindBot.Game.AI.Enums
         GreenDuston = 52182715,
         RedDuston = 61019812,
         EaterofMillions = 63845230,
-        PutridPuddingBodyBuddies = 85101097
+        PutridPuddingBodyBuddies = 85101097,
+        Click_Echo = 2992467
 
     }
 }
\ No newline at end of file

Game/AI/Enums/NotBeXyzMaterialMonster.cs

@@ -8,6 +8,7 @@ namespace WindBot.Game.AI.Enums
         GreenDuston = 52182715,
         RedDuston = 61019812,
         EaterofMillions = 63845230,
-        PutridPuddingBodyBuddies = 85101097
+        PutridPuddingBodyBuddies = 85101097,
+        Click_Echo = 2992467
     }
 }
\ No newline at end of file

Game/AI/Enums/ShouldBeDisabledBeforeItUseEffectMonster.cs

@@ -59,6 +59,10 @@
         BrotherhoodoftheFireFist_Leopard = 39699564,
         SpringansPedor = 56818977,
         GizmekNaganakitheSunriseSignaler = 96399967,
-        MyutantMutant = 26561172
+        MyutantMutant = 26561172,
+        ThreeEyedGhost = 31464658,
+        UrsarcticPolarStar = 62714453,
+        BattlinBoxerPromoter = 83315222,
+        TGRocketSalamander = 77392987
     }
 }