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

Game/AI/Decks/GrenMajuThunderBoarderExecutor.cs

@@ -230,6 +230,9 @@ namespace WindBot.Game.AI.Decks
         }
         private bool UnendingNightmareeff()
         {
+            if (Card.IsDisabled()){
+                return false;
+            }
             ClientCard card = null;
             foreach(ClientCard check in Enemy.GetSpells())
             {
@@ -724,4 +727,4 @@ namespace WindBot.Game.AI.Decks
             return true;
         }        
     }
-}
+}
\ No newline at end of file

Game/AI/Decks/WitchcraftExecutor.cs

@@ -197,6 +197,7 @@ namespace WindBot.Game.AI.Decks
         bool MagicianRightHand_used = false;
         ClientCard MagiciansLeftHand_negate = null;
         ClientCard MagicianRightHand_negate = null;
+        int PSYOmega_count = 0;
 
         // go first
         public override bool OnSelectHand()
@@ -282,7 +283,8 @@ namespace WindBot.Game.AI.Decks
             FirstCheckSS.Clear();
             UseSSEffect.Clear();
             ActivatedCards.Clear();
-            // CalledbytheGrave刷新
+            int PSYOmega_count = 0;
+            // CalledbytheGrave refrest
             List<int> key_list = CalledbytheGraveCount.Keys.ToList();
             foreach (int dic in key_list)
             {
@@ -2501,15 +2503,20 @@ namespace WindBot.Game.AI.Decks
             // recycle from grave
             if (Card.Location == CardLocation.Grave)
             {
+                if (PSYOmega_count >= 5){
+                    return false;
+                }
                 List<ClientCard> enemy_danger = CheckDangerousCardinEnemyGrave();
                 if (enemy_danger.Count > 0)
                 {
                     AI.SelectCard(enemy_danger);
+                    PSYOmega_count ++;
                     return true;
                 }
                 if (!Bot.HasInHandOrInSpellZoneOrInGraveyard(CardId.Holiday) && Bot.HasInGraveyard(important_witchcraft))
                 {
                     AI.SelectCard(important_witchcraft);
+                    PSYOmega_count ++;
                     return true;
                 }
                 if (CheckProblematicCards() == null)
@@ -2518,6 +2525,7 @@ namespace WindBot.Game.AI.Decks
                         CardId.MaxxC, CardId.AshBlossom_JoyousSpring,
                         CardId.MagicianRightHand, CardId.MagiciansLeftHand, CardId.MagiciansRestage, CardId.Patronus, 
                         CardId.LightningStorm, CardId.Reasoning);
+                    PSYOmega_count ++;
                     return true;
                 }
             }

README.md

@@ -127,6 +127,11 @@ WindBot can run as a "server", provide a http interface to create bot.
 
 * Nekroz
 
+### AI Template Generator
+
+A Java program which generate executor code from deck, made by Levyaton.
+https://github.com/Levyaton/WindbotTemplateGenerator
+ 
 ### Server mode
 
 WindBot can run as a "server", provide a http interface to create bot.

WindBotInfo.cs

@@ -22,7 +22,7 @@ namespace WindBot
             Host = "127.0.0.1";
             Port = 7911;
             HostInfo = "";
-            Version = 0x1351;
+            Version = 0x1352;
             Hand = 0;
             Debug = false;
             Chat = true;