Update for YGOPro v1338 + Major code cleanup

Use OCGWrapper and YGOSharp.Network to remove a lot of duplicate code.

Game/AI/CardContainer.cs

@@ -1,5 +1,5 @@
-using System.Collections.Generic;
-using WindBot.Game.Enums;
+using OCGWrapper.Enums;
+using System.Collections.Generic;
 
 namespace WindBot.Game.AI
 {

Game/AI/CardSelector.cs

@@ -1,5 +1,5 @@
-using System.Collections.Generic;
-using WindBot.Game.Enums;
+using OCGWrapper.Enums;
+using System.Collections.Generic;
 
 namespace WindBot.Game.AI
 {

Game/AI/Decks/HorusExecutor.cs

@@ -1,5 +1,5 @@
-using System.Collections.Generic;
-using WindBot.Game.Enums;
+using OCGWrapper.Enums;
+using System.Collections.Generic;
 
 namespace WindBot.Game.AI.Decks
 {
@@ -86,9 +86,9 @@ private bool FoolishBurial()
 
         private bool BellowOfTheSilverDragon()
         {
-            if (Duel.Player == 0 && (Duel.Phase == Phase.Draw || Duel.Phase == Phase.Standby))
+            if (Duel.Player == 0 && (Duel.Phase == DuelPhase.Draw || Duel.Phase == DuelPhase.Standby))
                 return false;
-            if (Duel.Player == 1 && Duel.Phase == Phase.End)
+            if (Duel.Player == 1 && Duel.Phase == DuelPhase.End)
                 return false;
 
             List<ClientCard> cards = new List<ClientCard>(Duel.Fields[0].Graveyard);

Game/AI/DefaultExecutor.cs

@@ -1,6 +1,6 @@
-using System;
+using OCGWrapper.Enums;
+using System;
 using System.Collections.Generic;
-using WindBot.Game.Enums;
 
 namespace WindBot.Game.AI
 {

Game/AI/Executor.cs

@@ -1,6 +1,6 @@
-using System;
+using OCGWrapper.Enums;
+using System;
 using System.Collections.Generic;
-using WindBot.Game.Enums;
 
 namespace WindBot.Game.AI
 {

Game/ClientCard.cs

@@ -1,14 +1,14 @@
-using System.Collections.Generic;
-using WindBot.Game.Data;
-using WindBot.Game.Enums;
-using WindBot.Game.Network;
+using OCGWrapper;
+using OCGWrapper.Enums;
+using System.Collections.Generic;
+using YGOSharp.Network;
 
 namespace WindBot.Game
 {
     public class ClientCard
     {
         public int Id { get; private set; }
-        public CardData Data { get; private set; }
+        public NamedCard Data { get; private set; }
         public string Name { get; private set; }
 
         public int Position { get; set; }
@@ -49,12 +49,12 @@ public void SetId(int id)
         {
             if (Id == id) return;
             Id = id;
-            Data = CardsManager.GetCard(Id);
+            Data = NamedCard.Get(Id);
             if (Data != null)
                 Name = Data.Name;
         }
 
-        public void Update(GameServerPacket packet, Duel duel)
+        public void Update(GamePacketReader packet, Duel duel)
         {
             int flag = packet.ReadInt32();
             if ((flag & (int)Query.Code) != 0)
@@ -170,7 +170,7 @@ public bool IsAttack()
 
         public bool IsDefense()
         {
-            return HasPosition(CardPosition.Defense);
+            return HasPosition(CardPosition.Defence);
         }
 
         public int GetDefensePower()

Game/ClientField.cs

@@ -1,5 +1,5 @@
-using System.Collections.Generic;
-using WindBot.Game.Enums;
+using OCGWrapper.Enums;
+using System.Collections.Generic;
 
 namespace WindBot.Game
 {

Game/Data/Deck.cs → Game/Deck.cs

@@ -1,25 +1,26 @@
-using System;
+using OCGWrapper;
+using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace WindBot.Game.Data
+namespace WindBot.Game
 {
     public class Deck
     {
-        public IList<CardData> Cards { get; private set; }
-        public IList<CardData> ExtraCards { get; private set; }
-        public IList<CardData> SideCards { get; private set; }
+        public IList<NamedCard> Cards { get; private set; }
+        public IList<NamedCard> ExtraCards { get; private set; }
+        public IList<NamedCard> SideCards { get; private set; }
 
         public Deck()
         {
-            Cards = new List<CardData>();
-            ExtraCards = new List<CardData>();
-            SideCards = new List<CardData>();
+            Cards = new List<NamedCard>();
+            ExtraCards = new List<NamedCard>();
+            SideCards = new List<NamedCard>();
         }
 
         private void AddNewCard(int cardId, bool sideDeck)
         {
-            CardData newCard = CardsManager.GetCard(cardId);
+            NamedCard newCard = NamedCard.Get(cardId);
             if (newCard == null)
                 return;
 
@@ -29,7 +30,7 @@ private void AddNewCard(int cardId, bool sideDeck)
                 SideCards.Add(newCard);
         }
 
-        private void AddCard(CardData card)
+        private void AddCard(NamedCard card)
         {
             if (card.IsExtraCard())
                 ExtraCards.Add(card);

Game/Duel.cs

@@ -1,5 +1,5 @@
-using System.Collections.Generic;
-using WindBot.Game.Enums;
+using OCGWrapper.Enums;
+using System.Collections.Generic;
 
 namespace WindBot.Game
 {
@@ -12,7 +12,7 @@ public class Duel
 
         public int Turn { get; set; }
         public int Player { get; set; }
-        public Phase Phase { get; set; }
+        public DuelPhase Phase { get; set; }
         public MainPhase MainPhase { get; set; }
         public BattlePhase BattlePhase { get; set; }