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

BotWrapper/bot.conf

@@ -199,6 +199,11 @@ Name=玻璃女巫 Deck=Exosister Dialog=verre.zh-CN
 救祓少女卡组。
 AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_MASTER_RULE_2020
 
+!艾克莉西娅-相剑
+Name=艾克莉西娅 Deck=Swordsoul Dialog=ecclesia.zh-CN
+相剑卡组。
+AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_MASTER_RULE_2020
+
 !神数不神-刹帝利
 Name=神数不神 Deck=Kashtira Dialog=Zefra.zh-CN
 俱舍怒威族卡组。

Decks/AI_Swordsoul.ydk

+#created by ...
+#main
+27204311
+87052196
+87052196
+23431858
+93490856
+93490856
+93490856
+56495147
+56495147
+56495147
+20001443
+20001443
+20001443
+55273560
+55273560
+55273560
+14558127
+14558127
+14558127
+23434538
+23434538
+23434538
+97268402
+97268402
+97268402
+98159737
+35261759
+35261759
+56465981
+56465981
+56465981
+93850690
+24224830
+24224830
+65681983
+10045474
+10045474
+10045474
+14821890
+14821890
+#extra
+42632209
+60465049
+96633955
+84815190
+47710198
+9464441
+5041348
+69248256
+69248256
+83755611
+43202238
+78917791
+32519092
+32519092
+32519092
+!side

Dialogs/ecclesia.zh-CN.json

+{
+  "welcome": [
+    "这里就是大灵峰吗？"
+  ],
+  "deckerror": [
+    "{0}被冰水咒缚了！"
+  ],
+  "duelstart": [
+    "走了好久，肚子饿了……",
+    "前方会遇到怎样的同伴呢？",
+    "有阿不思在一起的话……"
+  ],
+  "newturn": [
+    "我的回合！"
+  ],
+  "endturn": [
+    "姐姐到底在哪里……",
+    "阿不思的干粮也吃完了啊。",
+    "什么时候开饭呢？"
+  ],
+  "directattack": [
+    "{0}，直接攻击！",
+    "开饭！"
+  ],
+  "attack": [
+    "用{0}攻击{1}！"
+  ],
+  "ondirectattack": [
+    "好饿……",
+    "呜呜……",
+    "姐姐……"
+  ],
+  "facedownmonstername": "怪兽",
+  "activate": [
+    "发动{0}的效果！"
+  ],
+  "summon": [
+    "{0}召唤！",
+    "出来吧，{0}！"
+  ],
+  "setmonster": [
+    "……"
+  ],
+  "chaining": [
+    "发动{0}的效果！",
+    "{0}！"
+  ]
+}

Game/AI/DefaultExecutor.cs

@@ -319,6 +319,40 @@ namespace WindBot.Game.AI
             return card.Level <= 4 && Bot.GetMonsters().Count(m => m.IsFaceup()) == 0 && Util.IsAllEnemyBetterThanValue(card.Attack, true);
         }
 
+        /// <summary>
+        /// Called when the AI has to select one or more cards.
+        /// </summary>
+        /// <param name="cards">List of available cards.</param>
+        /// <param name="min">Minimal quantity.</param>
+        /// <param name="max">Maximal quantity.</param>
+        /// <param name="hint">The hint message of the select.</param>
+        /// <param name="cancelable">True if you can return an empty list.</param>
+        /// <returns>A new list containing the selected cards.</returns>
+        public override IList<ClientCard> OnSelectCard(IList<ClientCard> cards, int min, int max, int hint, bool cancelable)
+        {
+            // wordaround for Dogmatika Alba Zoa
+            int albaZoaCount = Bot.ExtraDeck.Count / 2;
+            if (!cancelable && min == albaZoaCount && max == albaZoaCount
+                && Duel.Player == 1 && (Duel.Phase == DuelPhase.Main1 || Duel.Phase == DuelPhase.Main2) && cards.All(card =>
+                card.Controller == 0 && (card.Location == CardLocation.Hand || card.Location == CardLocation.Extra)))
+            {
+                Logger.DebugWriteLine("Dogmatika Alba Zoa solved");
+                List<ClientCard> extraDeck = new List<ClientCard>(Bot.ExtraDeck);
+                int shuffleCount = extraDeck.Count;
+                while (shuffleCount-- > 1)
+                {
+                    int index = Program.Rand.Next(extraDeck.Count);
+                    ClientCard tempCard = extraDeck[shuffleCount];
+                    extraDeck[shuffleCount] = extraDeck[index];
+                    extraDeck[index] = tempCard;
+                }
+                
+                return Util.CheckSelectCount(extraDeck, cards, min, max);
+            }
+
+            return null;
+        }
+
         /// <summary>
         /// Destroy face-down cards first, in our turn.
         /// </summary>

Game/AI/Executor.cs

@@ -22,6 +22,7 @@ namespace WindBot.Game.AI
         protected ExecutorType Type { get; private set; }
         protected ClientCard Card { get; private set; }
         protected int ActivateDescription { get; private set; }
+        protected int CurrentTiming { get; private set; }
 
         protected ClientField Bot { get; private set; }
         protected ClientField Enemy { get; private set; }
@@ -233,11 +234,12 @@ namespace WindBot.Game.AI
         /// <summary>
         /// Set global variables Type, Card, ActivateDescription for Executor
         /// </summary>
-        public void SetCard(ExecutorType type, ClientCard card, int description)
+        public void SetCard(ExecutorType type, ClientCard card, int description, int timing = -1)
         {
             Type = type;
             Card = card;
             ActivateDescription = description;
+            CurrentTiming = timing;
         }
 
         /// <summary>

Game/GameAI.cs

@@ -309,8 +309,9 @@ namespace WindBot.Game
         /// <param name="cards">List of activable cards.</param>
         /// <param name="descs">List of effect descriptions.</param>
         /// <param name="forced">You can't return -1 if this param is true.</param>
+        /// <param name="timing">Current hint timing</param>
         /// <returns>Index of the activated card or -1.</returns>
-        public int OnSelectChain(IList<ClientCard> cards, IList<int> descs, bool forced)
+        public int OnSelectChain(IList<ClientCard> cards, IList<int> descs, bool forced, int timing = -1)
         {
             Executor.OnSelectChain(cards);
             foreach (CardExecutor exec in Executor.Executors)
@@ -318,7 +319,7 @@ namespace WindBot.Game
                 for (int i = 0; i < cards.Count; ++i)
                 {
                     ClientCard card = cards[i];
-                    if (ShouldExecute(exec, card, ExecutorType.Activate, descs[i]))
+                    if (ShouldExecute(exec, card, ExecutorType.Activate, descs[i], timing))
                     {
                         _dialogs.SendChaining(card.Name);
                         return i;
@@ -1121,7 +1122,7 @@ namespace WindBot.Game
             return new BattlePhaseAction(BattlePhaseAction.BattleAction.ToMainPhaseTwo);
         }
 
-        private bool ShouldExecute(CardExecutor exec, ClientCard card, ExecutorType type, int desc = -1)
+        private bool ShouldExecute(CardExecutor exec, ClientCard card, ExecutorType type, int desc = -1, int timing = -1)
         {
             if (card.Id != 0 && type == ExecutorType.Activate)
             {
@@ -1130,7 +1131,7 @@ namespace WindBot.Game
                 if (!Executor.OnPreActivate(card))
                     return false;
             }
-            Executor.SetCard(type, card, desc);
+            Executor.SetCard(type, card, desc, timing);
             bool result = card != null && exec.Type == type &&
                 (exec.CardId == -1 || exec.CardId == card.Id) &&
                 (exec.Func == null || exec.Func());

Game/GameBehavior.cs

@@ -1078,7 +1078,7 @@ namespace WindBot.Game
             packet.ReadByte(); // specount
             bool forced = packet.ReadByte() != 0;
             packet.ReadInt32(); // hint1
-            packet.ReadInt32(); // hint2
+            int hint2 = packet.ReadInt32(); // hint2
 
             IList<ClientCard> cards = new List<ClientCard>();
             IList<int> descs = new List<int>();
@@ -1118,7 +1118,7 @@ namespace WindBot.Game
                 return;
             }
 
-            Connection.Send(CtosMessage.Response, _ai.OnSelectChain(cards, descs, forced));
+            Connection.Send(CtosMessage.Response, _ai.OnSelectChain(cards, descs, forced, hint2));
         }
 
         private void OnSelectCounter(BinaryReader packet)

WindBot.csproj

@@ -106,6 +106,7 @@
     <Compile Include="Game\AI\Decks\PhantasmExecutor.cs" />
     <Compile Include="Game\AI\Decks\QliphortExecutor.cs" />
     <Compile Include="Game\AI\Decks\ST1732Executor.cs" />
+    <Compile Include="Game\AI\Decks\SwordsoulExecutor.cs" />
     <Compile Include="Game\AI\Decks\TrickstarExecutor.cs" />
     <Compile Include="Game\AI\Decks\WitchcraftExecutor.cs" />
     <Compile Include="Game\AI\Decks\YosenjuExecutor.cs" />