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

Game/AI/Decks/Rank5Executor.cs

@@ -220,8 +220,9 @@ namespace WindBot.Game.AI.Decks
                 {
                     CardId.WindUpSoldier,
                     CardId.StarDrawing,
-                    CardId.ChronomalyGoldenJet
-                }) || (Bot.HasInHand(CardId.MistArchfiend) && NeedLV5()))
+                    CardId.ChronomalyGoldenJet,
+                    CardId.MistArchfiend
+                }))
             {
                 NormalSummoned = false;
                 DoubleSummonUsed = true;

Game/AI/Decks/ZexalWeaponsExecutor.cs

@@ -79,9 +79,9 @@ namespace WindBot.Game.AI.Decks
             AddExecutor(ExecutorType.Activate, CardId.Number61Volcasaurus);
 
             // Weapons
-            AddExecutor(ExecutorType.Activate, CardId.ZwTornadoBringer);
-            AddExecutor(ExecutorType.Activate, CardId.ZwLightningBlade);
-            AddExecutor(ExecutorType.Activate, CardId.ZwAsuraStrike);
+            AddExecutor(ExecutorType.Activate, CardId.ZwTornadoBringer, ZwWeapon);
+            AddExecutor(ExecutorType.Activate, CardId.ZwLightningBlade, ZwWeapon);
+            AddExecutor(ExecutorType.Activate, CardId.ZwAsuraStrike, ZwWeapon);
 
 
             // Special summons
@@ -122,6 +122,13 @@ namespace WindBot.Game.AI.Decks
             AddExecutor(ExecutorType.Activate, CardId.SolemnStrike, DefaultSolemnStrike);
         }
 
+        private int ZwCount = 0;
+
+        public override void OnNewTurn()
+        {
+            ZwCount = 0;
+        }
+
         public override bool OnSelectHand()
         {
             return false;
@@ -164,10 +171,16 @@ namespace WindBot.Game.AI.Decks
             if (ActivateDescription == Util.GetStringId(CardId.ZwLionArms, 0))
                 return true;
             if (ActivateDescription == Util.GetStringId(CardId.ZwLionArms, 1))
-                return !Card.IsDisabled();
+                return !Card.IsDisabled() && ZwWeapon();
             return false;
         }
 
+        private bool ZwWeapon()
+        {
+            ZwCount++;
+            return ZwCount < 10;
+        }
+
         private bool ReinforcementOfTheArmy()
         {
             AI.SelectCard(

Game/GameBehavior.cs

@@ -506,6 +506,11 @@ namespace WindBot.Game
             _duel.Fields[1].BattlingMonster = null;
             _duel.Fields[0].UnderAttack = false;
             _duel.Fields[1].UnderAttack = false;
+            List<ClientCard> monsters = _duel.Fields[0].GetMonsters();
+            foreach (ClientCard monster in monsters)
+            {
+                monster.Attacked = false;
+            }
             _select_hint = 0;
             _ai.OnNewPhase();
         }