merge

mercury233 · Mar 21, 2021 · 13afeb7 · 13afeb7
1 parent b1630c8
commit 13afeb7
Show file tree

Hide file tree

Showing 32 changed files with 2,910 additions and 1,760 deletions.
diff --git a/libWindbot/Game/AI/CardExtension.cs b/libWindbot/Game/AI/CardExtension.cs
@@ -11,7 +11,9 @@ public static class CardExtension
         /// </summary>
         public static bool IsMonsterInvincible(this ClientCard card)
         {
-            return !card.IsDisabled() && Enum.IsDefined(typeof(InvincibleMonster), card.Id);
+            return !card.IsDisabled() &&
+                (card.Controller == 0 && Enum.IsDefined(typeof(InvincibleBotMonster), card.Id) ||
+                 card.Controller == 1 && Enum.IsDefined(typeof(InvincibleEnemyMonster), card.Id));
         }
 
         /// <summary>

diff --git a/libWindbot/Game/AI/Decks/AltergeistExecutor.cs b/libWindbot/Game/AI/Decks/AltergeistExecutor.cs
@@ -2742,8 +2742,6 @@ public override BattlePhaseAction OnSelectAttackTarget(ClientCard attacker, ILis
 
         public override IList<ClientCard> OnSelectCard(IList<ClientCard> cards, int min, int max, int hint, bool cancelable)
         {
-
-            int HIINT_TOGRAVE = 504;
             if (max == 1 && cards[0].Location == CardLocation.Deck 
                 && Util.GetLastChainCard() != null && Util.GetLastChainCard().IsCode(23002292) && Bot.GetRemainingCount(CardId.WakingtheDragon,1) > 0)
             {
@@ -2764,7 +2762,7 @@ public override IList<ClientCard> OnSelectCard(IList<ClientCard> cards, int min,
                 Logger.DebugWriteLine("EvenlyMatched: min=" + min.ToString() + ", max=" + max.ToString());
             }
             else if (cards[0].Location == CardLocation.Hand && cards[cards.Count - 1].Location == CardLocation.Hand
-                && (hint == 501 || hint == HIINT_TOGRAVE) && min == max)
+                && (hint == HintMsg.Discard || hint == HintMsg.ToGrave) && min == max)
             {
                 if (Duel.LastChainPlayer == 0 && Util.GetLastChainCard().IsCode(CardId.OneForOne)) return null;
                 Logger.DebugWriteLine("Hand drop except OneForOne");

diff --git a/libWindbot/Game/AI/Decks/DoEveryThingExecutor.cs b/libWindbot/Game/AI/Decks/DoEveryThingExecutor.cs
@@ -20,7 +20,7 @@ public DoEverythingExecutor(GameAI ai, Duel duel)
         {
             AddExecutor(ExecutorType.SpSummon);
             AddExecutor(ExecutorType.Activate, DefaultDontChainMyself);
-            AddExecutor(ExecutorType.SummonOrSet);
+            AddExecutor(ExecutorType.SummonOrSet, DefaultMonsterSummon);
             AddExecutor(ExecutorType.Repos, DefaultMonsterRepos);
             AddExecutor(ExecutorType.SpellSet);
         }

diff --git a/libWindbot/Game/AI/Decks/FamiliarPossessedExecutor.cs b/libWindbot/Game/AI/Decks/FamiliarPossessedExecutor.cs
diff --git a/libWindbot/Game/AI/Decks/FrogExecutor.cs b/libWindbot/Game/AI/Decks/FrogExecutor.cs
@@ -83,18 +83,10 @@ public FrogExecutor(GameAI ai, Duel duel)
 
         private int m_swapFrogSummoned;
         private int m_flipFlopFrogSummoned;
-        private int m_treebornFrogCount = 0;
-
-        public override void OnNewTurn()
-        {
-            m_treebornFrogCount = 0;
-            base.OnNewTurn();
-        }
 
         private bool TreebornFrog()
         {
-            m_treebornFrogCount++;
-            return m_treebornFrogCount <= 5;
+            return true;
         }
 
         private bool SwapFrogSummon()

diff --git a/libWindbot/Game/AI/Decks/HorusExecutor.cs b/libWindbot/Game/AI/Decks/HorusExecutor.cs
@@ -56,7 +56,7 @@ public HorusExecutor(GameAI ai, Duel duel) : base(ai, duel)
             AddExecutor(ExecutorType.Activate, CardId.MonsterReborn, MonsterReborn);
 
             AddExecutor(ExecutorType.Summon, CardId.WhiteNightDragon, WhiteNightDragon);
-            AddExecutor(ExecutorType.Summon, CardId.HorusTheBlackFlameDragonLv6, DefaultTributeSummon);
+            AddExecutor(ExecutorType.Summon, CardId.HorusTheBlackFlameDragonLv6, DefaultMonsterSummon);
             AddExecutor(ExecutorType.Summon, CardId.AlexandriteDragon);
             AddExecutor(ExecutorType.SummonOrSet, CardId.AxeDragonute);
             AddExecutor(ExecutorType.SummonOrSet, CardId.DodgerDragon);
@@ -157,7 +157,7 @@ private bool WhiteNightDragon()
                     if (card.IsCode(11224103))
                         return false;
 
-            return DefaultTributeSummon();
+            return DefaultMonsterSummon();
         }
 
         private bool HorusTheBlackFlameDragonLv8()

diff --git a/libWindbot/Game/AI/Decks/Level8Executor.cs b/libWindbot/Game/AI/Decks/Level8Executor.cs
@@ -184,7 +184,6 @@ public Level8Executor(GameAI ai, Duel duel)
         private bool JetSynchronUsed = false;
         private bool ScrapWyvernUsed = false;
         private bool MaskedChameleonUsed = false;
-        private int ShootingRiserDragonCount = 0;
 
         private int[] HandCosts = new[]
         {
@@ -218,7 +217,6 @@ public override void OnNewTurn()
             JetSynchronUsed = false;
             ScrapWyvernUsed = false;
             MaskedChameleonUsed = false;
-            ShootingRiserDragonCount = 0;
         }
 
         public override void OnChainEnd()
@@ -845,9 +843,8 @@ private bool ShootingRiserDragonEffect()
             }
             else
             {
-                if (Duel.LastChainPlayer == 0 || ShootingRiserDragonCount >= 10)
+                if (Duel.LastChainPlayer == 0)
                     return false;
-                ShootingRiserDragonCount++;
                 AI.SelectCard(new[] {
                     CardId.BlackRoseMoonlightDragon,
                     CardId.ScrapDragon,