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

BotWrapper/bot.conf

@@ -69,10 +69,15 @@ Name=尼亚 Deck=Trickstar Dialog=near.zh-CN
 淘气仙星卡组。
 AI_LV3 SUPPORT_NEW_MASTER_RULE
 
+!尼亚-幻变骚灵
+Name=尼亚 Deck=Altergeist Dialog=near.zh-CN
+幻变骚灵卡组。
+AI_LV3 SUPPORT_NEW_MASTER_RULE
+
 !永远之魂-削血
 Name=永远之魂 Deck=Burn Dialog=soul.zh-CN
 老式削血卡组。
-AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !永远之魂-青蛙
 Name=永远之魂 Deck=Frog Dialog=soul.zh-CN
@@ -109,11 +114,26 @@ Name=奇魔果 Deck=DarkMagician Dialog=kiwi.zh-TW
 黑魔术师卡组。
 AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
+!MAX龍果
+Name=MAX龍果 Deck=BlueEyesMaxDragon Dialog=kiwi.zh-TW
+青眼混沌极龙卡组。
+AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+
+!幻煌果
+Name=幻煌果 Deck=Phantasm Dialog=kiwi.zh-TW
+幻煌龙卡组。
+AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+
 !燃血鬥士
 Name=燃血鬥士 Deck=ChainBurn Dialog=kiwi.zh-TW
 连锁烧卡组。
 AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
+!報社鬥士
+Name=報社鬥士 Deck=GrenMajuThunderBoarder Dialog=kiwi.zh-TW
+红莲雷王滑板卡组。
+AI_LV3 SUPPORT_NEW_MASTER_RULE
+
 !复制梁龙-闪刀姬
 Name=复制梁龙 Deck=SkyStriker Dialog=anothercopy.zh-CN
 纯闪刀姬卡组。

Decks/AI_Altergeist.ydk

@@ -6,7 +6,6 @@
 53143898
 42790071
 42790071
-42790071
 14558127
 14558127
 59438930

Game/AI/Decks/AltergeistExecutor.cs

@@ -194,7 +194,7 @@ namespace WindBot.Game.AI.Decks
         public bool has_altergeist_left()
         {
             return (Bot.GetRemainingCount(CardId.Marionetter, 3) > 0
-                || Bot.GetRemainingCount(CardId.Multifaker, 3) > 0
+                || Bot.GetRemainingCount(CardId.Multifaker, 2) > 0
                 || Bot.GetRemainingCount(CardId.Meluseek,3) > 0
                 || Bot.GetRemainingCount(CardId.Silquitous,2) > 0
                 || Bot.GetRemainingCount(CardId.Kunquery,1) > 0);
@@ -1265,7 +1265,7 @@ namespace WindBot.Game.AI.Decks
                 AI.SelectCard(CardId.Marionetter);
                 return true;
             }
-            if (!Bot.HasInHandOrHasInMonstersZone(CardId.Multifaker) && Bot.GetRemainingCount(CardId.Multifaker, 3) > 0 && Multifaker_can_ss())
+            if (!Bot.HasInHandOrHasInMonstersZone(CardId.Multifaker) && Bot.GetRemainingCount(CardId.Multifaker, 2) > 0 && Multifaker_can_ss())
             {
                 AI.SelectCard(CardId.Multifaker);
                 return true;
@@ -1332,7 +1332,7 @@ namespace WindBot.Game.AI.Decks
             {
                 if (Duel.Player == 1)
                 {
-                    if (!Bot.HasInHandOrHasInMonstersZone(CardId.Multifaker) && Bot.GetRemainingCount(CardId.Multifaker, 3) > 0 && Multifaker_candeckss() && Multifaker_can_ss())
+                    if (!Bot.HasInHandOrHasInMonstersZone(CardId.Multifaker) && Bot.GetRemainingCount(CardId.Multifaker, 2) > 0 && Multifaker_candeckss() && Multifaker_can_ss())
                     {
                         foreach(ClientCard set_card in Bot.GetSpells())
                         {
@@ -1356,7 +1356,7 @@ namespace WindBot.Game.AI.Decks
                         AI.SelectCard(CardId.Marionetter);
                         return true;
                     }
-                    if (!Bot.HasInHandOrHasInMonstersZone(CardId.Multifaker) && Bot.GetRemainingCount(CardId.Multifaker, 3) > 0 && Multifaker_can_ss())
+                    if (!Bot.HasInHandOrHasInMonstersZone(CardId.Multifaker) && Bot.GetRemainingCount(CardId.Multifaker, 2) > 0 && Multifaker_can_ss())
                     {
                         AI.SelectCard(CardId.Multifaker);
                         return true;
@@ -2362,7 +2362,7 @@ namespace WindBot.Game.AI.Decks
                     if (GetTotalATK(targets) >= 1500 && (summoned || (!Meluseek_selected && !Hexstia_selected))) return false;
                 }
                 bool can_have_Multifaker = (Bot.HasInHand(CardId.Multifaker) 
-                    || (Bot.GetRemainingCount(CardId.Multifaker, 3) > 0 
+                    || (Bot.GetRemainingCount(CardId.Multifaker, 2) > 0 
                         && ( (Meluseek_selected && !Meluseek_searched) 
                             || (Hexstia_selected && !Hexstia_searched) )));
                 if (can_have_Multifaker && Multifaker_can_ss()) altergeist_count++;

Game/AI/Enums/Floodgate.cs

@@ -78,6 +78,8 @@
         SuperboltThunderDragon = 15291624,
         ThunderDragonLord = 41685633,
         CyberDragonInfinity = 10443957,
-        ImperialCustom = 9995766
+        ImperialCustom = 9995766,
+        InspectorBoarder = 15397015
+
     }
 }

Game/ClientCard.cs

@@ -247,6 +247,21 @@ namespace WindBot.Game
             return (Attribute & (int)attribute) != 0;
         }
 
+        public bool HasSetcode(int setcode)
+        {
+            if (Data == null) return false;
+            long setcodes = Data.Setcode;
+            int settype = setcode & 0xfff;
+            int setsubtype = setcode & 0xf000;
+            while (setcodes > 0)
+            {
+                long check_setcode = setcodes & 0xffff;
+                setcodes >>= 16;
+                if ((check_setcode & 0xfff) == settype && (check_setcode & 0xf000 & setsubtype) == setsubtype) return true;
+            }
+            return false;
+        }
+
         public bool IsMonster()
         {
             return HasType(CardType.Monster);

WindBotInfo.cs

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