Merge remote-tracking branch 'upstream/master' into mc_master

BotWrapper/bot.conf

@@ -233,3 +233,8 @@ AI_LV3 SUPPORT_MASTER_RULE_2020
 Name=神数不神 Deck=Zefra Dialog=Zefra.zh-CN
 神数卡组。
 AI_LV3 SUPPORT_MASTER_RULE_2020
+
+!今晚有宵夜吗-超重武者
+Name=今晚有宵夜吗 Deck=SuperheavySamurai Dialog=superheavysamurai.zh-CN
+超重武者卡组。
+AI_LV3 SUPPORT_MASTER_RULE_2020

Decks/AI_SuperheavySamurai.ydk

+#created by ...
+#main
+83334932
+83334932
+83334932
+82112494
+82112494
+82112494
+19510093
+19510093
+34496660
+34496660
+34496660
+90361010
+90361010
+90361010
+78391364
+78391364
+56727340
+56727340
+14624296
+95500396
+10604644
+23434538
+23434538
+23434538
+14558127
+14558127
+14558127
+49036338
+38814750
+38814750
+97268402
+97268402
+73642296
+73642296
+59438930
+59438930
+59438930
+94145021
+94145021
+94145021
+#extra
+64193046
+84815190
+30983281
+44508094
+27548199
+76471944
+74586817
+28912357
+38342335
+27381364
+22423493
+65741786
+33918636
+33918636
+33918636
+!side

Dialogs/superheavysamurai.zh-CN.json

+{
+  "welcome": [
+    "是宵夜哒哟！",
+    "什么灵摆卡组都会玩的哟！",
+    "什么？你说超重不是灵摆卡组？"
+  ],
+  "deckerror": [
+    "{0}的数量不对！快去改成无禁限模式！。"
+  ],
+  "duelstart": [
+    "给你展现一下超重的魅力！"
+  ],
+  "newturn": [
+    "抽卡！弁庆你别上手救我了！",
+    "抽卡！P身子你别上手救我了！"
+  ],
+  "endturn": [
+    "哼哼，到你的回合了！",
+    "喜不喜欢我的展开呢？"
+  ],
+  "directattack": [
+    "我用{0}直接攻击！"
+  ],
+  "attack": [
+    "我用{0}攻击{1}！"
+  ],
+  "ondirectattack": [
+    "不许打！不许打呀！",
+    "呜哇！要被打倒惹~"
+  ],
+  "facedownmonstername": "怪兽",
+  "activate": [
+    "呼呼呼，{0}的效果太厉害了！",
+    "呼呼呼，我使用{0}的效果。"
+  ],
+  "summon": [
+    "呼呼呼，我召唤{0}！"
+  ],
+  "setmonster": [
+    "呼呼呼，我盖放了一只怪兽。"
+  ],
+  "chaining": [
+    "此刻！{0}的效果发动！"
+  ]
+}

Game/AI/AIUtil.cs

@@ -434,6 +434,15 @@ namespace WindBot.Game.AI
                     if (selected.Count >= max)
                         break;
                 }
+                if (selected.Count < min)
+                {
+#if DEBUG
+                    throw new Exception("Not enough cards to CheckSelectCount");
+#else
+                    Logger.WriteErrorLine("Not enough cards to CheckSelectCount, using default");
+                    return null;
+#endif
+                }
             }
             while (selected.Count > max)
             {

WindBot.csproj

-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -108,6 +108,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\SuperheavySamuraiExecutor.cs" />
     <Compile Include="Game\AI\Decks\SwordsoulExecutor.cs" />
     <Compile Include="Game\AI\Decks\TrickstarExecutor.cs" />
     <Compile Include="Game\AI\Decks\WitchcraftExecutor.cs" />