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

Decks/AI_Trickstar.ydk

@@ -22,8 +22,6 @@
 63845230
 63845230
 63845230
-5133471
-5133471
 18144506
 35261759
 35261759
@@ -34,6 +32,8 @@
 35371948
 35371948
 35371948
+10813327
+10813327
 21076084
 83555666
 40605147
@@ -42,18 +42,18 @@
 84749824
 #extra
 41999284
-99111753
-98558751
-50588353
-2857636
-38342335
-41999284
-74997493
+3987233
 41999284
-74997493
 50588353
+98558751
+74997493
 2857636
-99111753
 38342335
-98978921
+99111753
+31833038
+3987233
+50588353
+41999284
+9753964
+34408491
 !side

Game/GameAI.cs

-using System.Linq;
+using System.Linq;
 using System.Collections.Generic;
 using WindBot.Game.AI;
 using YGOSharp.OCGWrapper.Enums;
@@ -90,6 +90,8 @@ namespace WindBot.Game
             m_option = -1;
             m_yesno = -1;
             m_position = CardPosition.FaceUpAttack;
+            m_attacker = null;
+            m_defender = null;
             Duel.LastSummonPlayer = -1;
             if (Duel.Player == 0 && Duel.Phase == DuelPhase.Draw)
             {
@@ -628,9 +630,27 @@ namespace WindBot.Game
         private int m_number;
         private int m_announce;
         private int m_yesno;
+        private ClientCard m_attacker;
+        private ClientCard m_defender;
         private IList<CardAttribute> m_attributes = new List<CardAttribute>();
         private IList<CardRace> m_races = new List<CardRace>();
 
+        public void SendBattleMsg(ClientCard attackcard, ClientCard defendcard)
+        {
+            m_attacker = attackcard;
+            m_defender = defendcard;
+        }
+
+        public ClientCard GetAttacker()
+        {
+            return m_attacker;
+        }
+
+        public ClientCard GetDefender()
+        {
+            return m_defender;
+        }
+
         public void SelectCard(ClientCard card)
         {
             m_selector = new CardSelector(card);

Game/GameBehavior.cs

-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
@@ -497,12 +497,13 @@ namespace WindBot.Game
             int la = packet.ReadByte();
             int sa = packet.ReadByte();
             packet.ReadByte(); //
-            packet.ReadByte(); // cd
+            int cd = GetLocalPlayer(packet.ReadByte()); // cd
             int ld = packet.ReadByte();
-            packet.ReadByte(); // sd
+            int sd = packet.ReadByte(); // sd
             packet.ReadByte(); //
-
             ClientCard attackcard = _duel.GetCard(ca, (CardLocation)la, sa);
+            ClientCard defendcard = _duel.GetCard(cd, (CardLocation)ld, sd);
+            _ai.SendBattleMsg(attackcard, defendcard);
             if (ld == 0 && (attackcard != null) && (ca != 0))
             {
                 _ai.OnDirectAttack(attackcard);