Merge branch 'master' of github.com:moecube/windbot

Decks/AI_Brave.ydk

+#created by ...
+#main
+2563463
+81866673
+72090076
+63362460
+30680659
+30680659
+30680659
+26202165
+26202165
+26202165
+91646304
+14558127
+14558127
+14558127
+72291078
+72291078
+23434538
+23434538
+9742784
+97268402
+3285551
+3285551
+3285551
+18144506
+52947044
+52947044
+52947044
+81439173
+83764718
+24224830
+24224830
+65681983
+65681983
+39568067
+38745520
+10045474
+10045474
+10045474
+40605147
+40605147
+#extra
+15291624
+60461804
+84815190
+92519087
+27548199
+42566602
+90953320
+98558751
+21915012
+44097050
+50588353
+70369116
+98978921
+98978921
+60303245
+!side
+55063751
+55063751
+55063751
+34267821
+34267821
+34267821
+43534808
+43534808
+43534808
+94145021
+94145021
+94145021
+14532163
+14532163
+14532163

Game/AI/DefaultExecutor.cs

@@ -500,8 +500,9 @@ namespace WindBot.Game.AI
         /// </summary>
         protected bool DefaultEffectVeiler()
         {
-            if (Util.GetLastChainCard() != null && Util.GetLastChainCard().IsCode(_CardId.GalaxySoldier) && Enemy.Hand.Count >= 3) return false;
-            if (Util.ChainContainsCard(_CardId.EffectVeiler))
+            ClientCard LastChainCard = Util.GetLastChainCard();
+            if (LastChainCard != null && (LastChainCard.IsCode(_CardId.GalaxySoldier) && Enemy.Hand.Count >= 3
+                                    || LastChainCard.IsCode(_CardId.EffectVeiler, _CardId.InfiniteImpermanence)))
                 return false;
             return DefaultBreakthroughSkill();
         }
@@ -539,7 +540,9 @@ namespace WindBot.Game.AI
         protected bool DefaultInfiniteImpermanence()
         {
             // TODO: disable s & t
-            if (!DefaultUniqueTrap())
+            ClientCard LastChainCard = Util.GetLastChainCard();
+            if (LastChainCard != null && (LastChainCard.IsCode(_CardId.GalaxySoldier) && Enemy.Hand.Count >= 3
+                                    || LastChainCard.IsCode(_CardId.EffectVeiler, _CardId.InfiniteImpermanence)))
                 return false;
             return DefaultDisableMonster();
         }

Game/ClientField.cs

@@ -248,6 +248,11 @@ namespace WindBot.Game
             return HasInHand(cardId) || HasInGraveyard(cardId);
         }
 
+        public bool HasInGraveyardOrInBanished(int cardId)
+        {
+            return HasInBanished(cardId) || HasInGraveyard(cardId);
+        }
+
         public bool HasInMonstersZoneOrInGraveyard(int cardId)
         {
             return HasInMonstersZone(cardId) || HasInGraveyard(cardId);

Game/GameAI.cs

@@ -464,13 +464,13 @@ namespace WindBot.Game
         /// <returns>Index of the selected option.</returns>
         public int OnSelectOption(IList<int> options)
         {
-            if (m_option != -1 && m_option < options.Count)
-                return m_option;
-
             int result = Executor.OnSelectOption(options);
             if (result != -1)
                 return result;
 
+            if (m_option != -1 && m_option < options.Count)
+                return m_option;
+
             return 0; // Always select the first option.
         }
 

WindBot.csproj

@@ -70,6 +70,7 @@
     <Compile Include="Game\AI\DeckAttribute.cs" />
     <Compile Include="Game\AI\DecksManager.cs" />
     <Compile Include="Game\AI\Decks\AltergeistExecutor.cs" />
+    <Compile Include="Game\AI\Decks\BraveExecutor.cs" />
     <Compile Include="Game\AI\Decks\FamiliarPossessedExecutor.cs" />
     <Compile Include="Game\AI\Decks\BlackwingExecutor.cs" />
     <Compile Include="Game\AI\Decks\LuckyExecutor.cs" />