Add AI.GetAttacker() and AI.GetDefender() (#3)

mycard · Mar 1, 2018 · 258990b · 258990b
1 parent 81235d3
commit 258990b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 9 deletions.
diff --git a/Game/GameAI.cs b/Game/GameAI.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Collections.Generic;
 using WindBot.Game.AI;
 using YGOSharp.OCGWrapper.Enums;
@@ -90,6 +90,8 @@ public void OnNewPhase()
             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)
             {
@@ -167,9 +169,9 @@ public IList<ClientCard> OnSelectCard(IList<ClientCard> cards, int min, int max,
         {
             const int HINTMSG_FMATERIAL = 511;
             const int HINTMSG_SMATERIAL = 512;
-            const int HINTMSG_XMATERIAL = 513;
-            const int HINTMSG_LMATERIAL = 533;
-            const int HINTMSG_SPSUMMON = 509;
+            const int HINTMSG_XMATERIAL = 513;
+            const int HINTMSG_LMATERIAL = 533;
+            const int HINTMSG_SPSUMMON = 509;
 
             // Check for the executor.
             IList<ClientCard> result = Executor.OnSelectCard(cards, min, max, hint, cancelable);
@@ -626,9 +628,27 @@ public int OnAnnounceCard()
         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);
@@ -894,4 +914,4 @@ private bool ShouldExecute(CardExecutor exec, ClientCard card, ExecutorType type
             return false;
         }
     }
-}
+}
diff --git a/Game/GameBehavior.cs b/Game/GameBehavior.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
@@ -494,12 +494,13 @@ private void OnAttack(BinaryReader packet)
             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);