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

Game/AI/Zones.cs

@@ -10,6 +10,8 @@
         z5 = 0x20,
         z6 = 0x40,
 
+        FieldZone = 0x20,
+
         MonsterZones = 0x7f,
         MainMonsterZones = 0x1f,
         ExtraMonsterZones = 0x60,

Game/GameBehavior.cs

@@ -1332,6 +1332,12 @@ namespace WindBot.Game
                 location = CardLocation.SpellZone;
                 filter = (field >> 8) & Zones.SpellZones;
             }
+            else if ((field & 0x2000) != 0)
+            {
+                player = 0;
+                location = CardLocation.FieldZone;
+                filter = Zones.FieldZone;
+            }
             else if ((field & 0xc000) != 0)
             {
                 player = 0;
@@ -1350,6 +1356,12 @@ namespace WindBot.Game
                 location = CardLocation.SpellZone;
                 filter = (field >> 24) & Zones.SpellZones;
             }
+            else if ((field & 0x20000000) != 0)
+            {
+                player = 1;
+                location = CardLocation.FieldZone;
+                filter = Zones.FieldZone;
+            }
             else
             {
                 player = 1;
@@ -1363,7 +1375,7 @@ namespace WindBot.Game
             byte[] resp = new byte[3];
             resp[0] = (byte)GetLocalPlayer(player);
 
-            if (location != CardLocation.PendulumZone)
+            if (location != CardLocation.PendulumZone && location != CardLocation.FieldZone)
             {
                 resp[1] = (byte)location;
                 if ((selected & filter) > 0)
@@ -1383,8 +1395,9 @@ namespace WindBot.Game
                 if ((selected & filter) > 0)
                     filter &= selected;
 
-                if ((filter & Zones.z0) != 0) resp[2] = 6;
-                if ((filter & Zones.z1) != 0) resp[2] = 7;
+                if ((filter & Zones.FieldZone) != 0) resp[2] = 5;
+                if ((filter & Zones.z0) != 0) resp[2] = 6; // left pendulum zone
+                if ((filter & Zones.z1) != 0) resp[2] = 7; // right pendulum zone
             }
 
             BinaryWriter reply = GamePacketFactory.Create(CtosMessage.Response);