merge

BotWrapper/bot.conf

@@ -2,119 +2,120 @@
 # !name
 # command
 # description
-# flag ( 0x1=SUPPORT_MASTER_RULE_3 , 0x2=SUPPORT_NEW_MASTER_RULE )
+# flags (avail flags: SUPPORT_MASTER_RULE_3, SUPPORT_NEW_MASTER_RULE)
 
 !谜之剑士LV4-龙骑星爆
 Name=谜之剑士LV4 Deck=Dragunity Dialog=swordsman.zh-CN
 龙骑轴星尘龙爆裂体卡组。
-3
+SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !谜之剑士LV4-R5
 Name=谜之剑士LV4 Deck='Rank V' Dialog=swordsman.zh-CN
 5阶超量卡组。
-3
+SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !谜之剑士LV4-异热同心武器
 Name=谜之剑士LV4 Deck='Zexal Weapons' Dialog=swordsman.zh-CN
 神装电光皇卡组。
-3
+SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !琪露诺-彩虹
 Name=琪露诺 Deck=Rainbow Dialog=cirno.zh-CN
 全属性凡骨卡组。
-3
+SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !琪露诺-饼蛙
 Name=琪露诺 Deck='Toadally Awesome' Dialog=cirno.zh-CN
 大师规则三的全盛饼蛙卡组。
-1
+SUPPORT_MASTER_RULE_3
 
 !复制植物-青眼
 Name=复制植物 Deck=Blue-Eyes Dialog=copy.zh-CN
 青眼卡组。
-3
+SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !复制植物-十二兽
 Name=复制植物 Deck=Zoodiac Dialog=copy.zh-CN
 大师规则三的十四兽卡组。
-1
+SUPPORT_MASTER_RULE_3
 
 !尼亚-妖仙兽
 Name=尼亚 Deck=Yosenju Dialog=near.zh-CN
 妖仙兽卡组。
-3
+SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !尼亚-机壳
 Name=尼亚 Deck=Qliphort Dialog=near.zh-CN
 机壳卡组。
-3
+SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !永远之魂-削血
 Name=永远之魂 Deck=Burn Dialog=soul.zh-CN
 老式削血卡组。
-3
+SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !永远之魂-青蛙
 Name=永远之魂 Deck=Frog Dialog=soul.zh-CN
 老式青蛙卡组。
-3
+SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !永远之魂-荷鲁斯
 Name=永远之魂 Deck=Horus Dialog=soul.zh-CN
 老式龙族卡组。
-3
+SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !悠悠
 Name=悠悠 Deck=MokeyMokey Dialog=mokey.zh-CN
 沙包。
-3
+SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !悠悠王
 Name=悠悠王 Deck=MokeyMokeyKing Dialog=mokey.zh-CN
 大沙包。
-3
+SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !试作型机器人1732
 Name=试作型机器人1732 Deck=ST1732 Dialog=zh-CN
 由三盒ST17和三盒SD32组成的卡组。
-2
+SUPPORT_NEW_MASTER_RULE
 
 !千奈-影灵衣
 Name=千奈 Deck=Nekroz Dialog=sennai.zh-CN
 To be added.
-3
+SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !千奈-光道
 Name=千奈 Deck=Lightsworn Dialog=sennai.zh-CN
 To be added.
-3
+SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !弥音-黑羽
 Name=弥音 Deck=Blackwing Dialog=sennai.zh-CN
 To be added.
-3
+SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !弥音-电子龙
 Name=弥音 Deck=CyberDragon Dialog=sennai.zh-CN
 To be added.
-3
+SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !弥音-入魔
 Name=弥音 Deck=Evilswarm Dialog=sennai.zh-CN
 To be added.
-3
+SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !早苗-守墓
 Name=早苗 Deck=Gravekeeper Dialog=sennai.zh-CN
 早苗的奇迹。
-3
+SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !早苗-灰篮
 Name=早苗 Deck=Graydle Dialog=sennai.zh-CN
 早苗的秘术。
-3
+SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
 
 !早苗-???
 Name=早苗 Deck='Old School' Dialog=sennai.zh-CN
 早苗的信仰。
-3
+SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE
\ No newline at end of file
+

Game/GameBehavior.cs

@@ -284,17 +284,22 @@ namespace WindBot.Game
             packet.ReadByte();
             packet.ReadByte();
             packet.ReadByte();
-            int code = packet.ReadInt32();
+            int pcode = packet.ReadInt32();
             if (msg == 2) //ERRMSG_DECKERROR
+            {
+                int code = pcode & 0xFFFFFFF;
+                int flag = pcode >> 28;
+                if (flag <= 5) //DECKERROR_CARDCOUNT
                 {
                     NamedCard card = NamedCard.Get(code);
                     if (card != null)
                         _ai.OnDeckError(card.Name);
-                else if (code == 1)
-                    _ai.OnDeckError("DECK");
                     else
                         _ai.OnDeckError("Unknown Card");
                 }
+                else
+                    _ai.OnDeckError("DECK");
+            }
             //Connection.Close();
         }