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

BotWrapper/bot.conf

@@ -2,42 +2,42 @@
 # !name
 # command
 # description
-# flags (avail flags: SUPPORT_MASTER_RULE_3, SUPPORT_NEW_MASTER_RULE)
+# flags (avail flags: SUPPORT_MASTER_RULE_3, SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020)
 
 !随机-非常简单
 Random=AI_LV1
 主要是一些沙包。
-SUPPORT_NEW_MASTER_RULE
+SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !随机-简单
 Random=AI_LV2
 一些比较弱的卡组。
-SUPPORT_NEW_MASTER_RULE
+SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !随机-普通
 Random=AI_LV3
 一些环境里可以看到的卡组。
-SUPPORT_NEW_MASTER_RULE
+SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !谜之剑士LV4-龙骑星爆
 Name=谜之剑士LV4 Deck=Dragunity Dialog=swordsman.zh-CN
 龙骑轴星尘龙爆裂体卡组。
-AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !谜之剑士LV4-R5
 Name=谜之剑士LV4 Deck='Rank V' Dialog=swordsman.zh-CN
 5阶超量卡组。
-AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !谜之剑士LV4-异热同心武器
 Name=谜之剑士LV4 Deck='Zexal Weapons' Dialog=swordsman.zh-CN
 神装电光皇卡组。
-AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !琪露诺-彩虹
 Name=琪露诺 Deck=Rainbow Dialog=cirno.zh-CN
 全属性凡骨卡组。
-AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !琪露诺-饼蛙
 Name=琪露诺 Deck='Toadally Awesome' Dialog=cirno.zh-CN
@@ -47,7 +47,7 @@ AI_LV2 SUPPORT_MASTER_RULE_3
 !复制植物-青眼
 Name=复制植物 Deck=Blue-Eyes Dialog=copy.zh-CN
 青眼卡组。
-AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !复制植物-十二兽
 Name=复制植物 Deck=Zoodiac Dialog=copy.zh-CN
@@ -57,134 +57,134 @@ AI_LV3 SUPPORT_MASTER_RULE_3
 !尼亚-妖仙兽
 Name=尼亚 Deck=Yosenju Dialog=near.zh-CN
 妖仙兽卡组。
-AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !尼亚-机壳
 Name=尼亚 Deck=Qliphort Dialog=near.zh-CN
 机壳卡组。
-AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !尼亚-淘气仙星
 Name=尼亚 Deck=Trickstar Dialog=near.zh-CN
 淘气仙星卡组。
-AI_LV3 SUPPORT_NEW_MASTER_RULE
+AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !尼亚-幻变骚灵
 Name=尼亚 Deck=Altergeist Dialog=near.zh-CN
 幻变骚灵卡组。
-AI_LV3 SUPPORT_NEW_MASTER_RULE
+AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !永远之魂-削血
 Name=永远之魂 Deck=Burn Dialog=soul.zh-CN
 老式削血卡组。
-SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !永远之魂-青蛙
 Name=永远之魂 Deck=Frog Dialog=soul.zh-CN
 老式青蛙卡组。
-AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !永远之魂-荷鲁斯
 Name=永远之魂 Deck=Horus Dialog=soul.zh-CN
 老式龙族卡组。
-AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !悠悠
 Name=悠悠 Deck=MokeyMokey Dialog=mokey.zh-CN
 沙包。
-AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !悠悠王
 Name=悠悠王 Deck=MokeyMokeyKing Dialog=mokey.zh-CN
 大沙包。
-AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !试作型机器人1732
 Name=试作型机器人1732 Deck=ST1732 Dialog=zh-CN
 由三盒ST17和三盒SD32组成的卡组。
-AI_LV2 SUPPORT_NEW_MASTER_RULE
+AI_LV2 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !千奈-影灵衣
 Name=千奈 Deck=Nekroz Dialog=sennai.zh-CN
 To be added.
-AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !千奈-光道
 Name=千奈 Deck=Lightsworn Dialog=sennai.zh-CN
 To be added.
-AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !弥音-黑羽
 Name=弥音 Deck=Blackwing Dialog=meon.zh-CN
 To be added.
-AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !弥音-电子龙
 Name=弥音 Deck=CyberDragon Dialog=meon.zh-CN
 To be added.
-AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !弥音-入魔
 Name=弥音 Deck=Evilswarm Dialog=meon.zh-CN
 To be added.
-AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !早苗-守墓
 Name=早苗 Deck=Gravekeeper Dialog=sanae.zh-CN
 早苗的奇迹。
-AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !早苗-灰篮
 Name=早苗 Deck=Graydle Dialog=sanae.zh-CN
 早苗的秘术。
-AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !早苗-???
 Name=早苗 Deck='Old School' Dialog=sanae.zh-CN
 早苗的信仰。
-AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !奇異果
 Name=奇異果 Deck=LightswornShaddoldinosour Dialog=kiwi.zh-TW
 光道影依恐龙卡组。
-AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !MAX龍果
 Name=MAX龍果 Deck=BlueEyesMaxDragon Dialog=kiwi.zh-TW
 青眼混沌极龙卡组。
-AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !幻煌果
 Name=幻煌果 Deck=Phantasm Dialog=kiwi.zh-TW
 幻煌龙卡组。
-AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !燃血鬥士
 Name=燃血鬥士 Deck=ChainBurn Dialog=kiwi.zh-TW
 连锁烧卡组。
-AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
+AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !彩音-闪刀姬
 Name=彩音 Deck=SkyStriker Dialog=ayane.zh-CN
 纯闪刀姬卡组。
-AI_LV3 SUPPORT_NEW_MASTER_RULE
+AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !報社鬥士
 Name=報社鬥士 Deck=GrenMajuThunderBoarder Dialog=kiwi.zh-TW
 红莲雷王滑板卡组。
-AI_LV3 SUPPORT_NEW_MASTER_RULE
+AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !彩音-黑魔术师
 Name=彩音 Deck=DarkMagician Dialog=ayane.zh-CN
 黑魔术师卡组。
-AI_LV3 SUPPORT_NEW_MASTER_RULE
+AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !朱露咲浅羽-自奏圣乐
 Name=朱露咲浅羽 Deck=Orcust Dialog=nlch.zh-CN
 浅羽的草莓蛋糕。
-AI_LV3 SUPPORT_NEW_MASTER_RULE
+AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !朱露咲浅羽-转生炎兽
 Name=朱露咲浅羽 Deck=Salamangreat Dialog=nlch.zh-CN
 浅羽的香喷喷曲奇。
-AI_LV3 SUPPORT_NEW_MASTER_RULE
+AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020

Game/AI/AIUtil.cs

@@ -251,7 +251,7 @@ namespace WindBot.Game.AI
                 if (remove.Contains(EnemyMZone[i])) EnemyMZone[i] = null;
             }
 
-            if (!Duel.IsNewRule)
+            if (!Duel.IsNewRule || Duel.IsNewRule2020)
                 return Zones.MainMonsterZones;
 
             int result = 0;

Game/Duel.cs

@@ -7,6 +7,7 @@ namespace WindBot.Game
     {
         public bool IsFirst { get; set; }
         public bool IsNewRule { get; set; }
+        public bool IsNewRule2020 { get; set; }
 
         public ClientField[] Fields { get; private set; }
 

Game/GameBehavior.cs

@@ -150,7 +150,8 @@ namespace WindBot.Game
             /*int rule = */ packet.ReadByte();
             /*int mode = */ packet.ReadByte();
             int duel_rule = packet.ReadByte();
-            _ai.Duel.IsNewRule = (duel_rule == 4);
+            _ai.Duel.IsNewRule = (duel_rule >= 4);
+            _ai.Duel.IsNewRule2020 = (duel_rule >= 5);
             BinaryWriter deck = GamePacketFactory.Create(CtosMessage.UpdateDeck);
             deck.Write(Deck.Cards.Count + Deck.ExtraCards.Count);
             deck.Write(Deck.SideCards.Count);
@@ -355,7 +356,8 @@ namespace WindBot.Game
             _duel.IsFirst = (type & 0xF) == 0;
             _duel.Turn = 0;
             int duel_rule = packet.ReadByte();
-            _ai.Duel.IsNewRule = (duel_rule == 4);
+            _ai.Duel.IsNewRule = (duel_rule >= 4);
+            _ai.Duel.IsNewRule2020 = (duel_rule >= 5);
             _duel.Fields[GetLocalPlayer(0)].LifePoints = packet.ReadInt32();
             _duel.Fields[GetLocalPlayer(1)].LifePoints = packet.ReadInt32();
             int deck = packet.ReadInt16();
@@ -1283,13 +1285,13 @@ namespace WindBot.Game
                 if ((selected & filter) > 0)
                     filter &= selected;
 
-                if ((filter & Zones.z6) != 0) resp[2] = 6;
-                else if ((filter & Zones.z5) != 0) resp[2] = 5;
-                else if ((filter & Zones.z2) != 0) resp[2] = 2;
+                if ((filter & Zones.z2) != 0) resp[2] = 2;
                 else if ((filter & Zones.z1) != 0) resp[2] = 1;
                 else if ((filter & Zones.z3) != 0) resp[2] = 3;
                 else if ((filter & Zones.z0) != 0) resp[2] = 0;
                 else if ((filter & Zones.z4) != 0) resp[2] = 4;
+                else if ((filter & Zones.z6) != 0) resp[2] = 6;
+                else if ((filter & Zones.z5) != 0) resp[2] = 5;
             }
             else
             {