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

BotWrapper/bot.conf

@@ -2,7 +2,11 @@
 # !name
 # command
 # description
+<<<<<<< HEAD
 # flags (avail flags: SUPPORT_MASTER_RULE_3, SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020)
+=======
+# flags (avail flags: SUPPORT_MASTER_RULE_3, SUPPORT_NEW_MASTER_RULE, SUPPORT_MASTER_RULE_2020)
+>>>>>>> 795ac990ff54118181873e013ffab43cc4ec9998
 
 !随机-非常简单
 Random=AI_LV1
@@ -71,7 +75,7 @@ AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !尼亚-淘气仙星
 Name=尼亚 Deck=Trickstar Dialog=near.zh-CN
-淘气仙星卡组。
+旧式淘气仙星卡组。
 AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !尼亚-幻变骚灵
@@ -79,6 +83,24 @@ Name=尼亚 Deck=Altergeist Dialog=near.zh-CN
 幻变骚灵卡组。
 AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
+<<<<<<< HEAD
+=======
+!复制梁龙-闪刀姬
+Name=复制梁龙 Deck=SkyStriker Dialog=anothercopy.zh-CN
+旧式闪刀姬卡组。
+AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
+
+!复制梁龙-自奏圣乐
+Name=复制梁龙 Deck=Orcust Dialog=anothercopy.zh-CN
+旧式自奏圣乐卡组。
+AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
+
+!复制梁龙-转生炎兽
+Name=复制梁龙 Deck=Salamangreat Dialog=anothercopy.zh-CN
+转生炎兽卡组。
+AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
+
+>>>>>>> 795ac990ff54118181873e013ffab43cc4ec9998
 !永远之魂-削血
 Name=永远之魂 Deck=Burn Dialog=soul.zh-CN
 老式削血卡组。
@@ -104,6 +126,11 @@ Name=悠悠王 Deck=MokeyMokeyKing Dialog=mokey.zh-CN
 大沙包。
 AI_LV1 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
+!兔明-微风
+Name=兔明 Deck=PureWinds Dialog=zh-CN
+风属性卡组。
+AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
+
 !试作型机器人1732
 Name=试作型机器人1732 Deck=ST1732 Dialog=zh-CN
 由三盒ST17和三盒SD32组成的卡组。
@@ -177,6 +204,7 @@ AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 !報社鬥士
 Name=報社鬥士 Deck=GrenMajuThunderBoarder Dialog=kiwi.zh-TW
 红莲雷王滑板卡组。
+<<<<<<< HEAD
 AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !彩音-黑魔术师
@@ -193,8 +221,16 @@ AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 Name=朱露咲浅羽 Deck=Salamangreat Dialog=nlch.zh-CN
 浅羽的香喷喷曲奇。
 AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
+=======
+AI_ANTI_META SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
+>>>>>>> 795ac990ff54118181873e013ffab43cc4ec9998
 
 !朱露咲浅羽-真红眼
 Name=朱露咲浅羽 Deck=Dragun Dialog=nlch.zh-CN
 超魔导真红眼龙骑士卡组。
-AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
+AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
+
+!玻璃女巫
+Name=玻璃女巫 Deck=Witchcraft Dialog=verre.zh-CN
+魔女术卡组。
+AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020

Decks/AI_Witchcraft.ydk

+#created by ...
+#main
+49036338
+71074418
+21522601
+84523092
+84523092
+21744288
+21744288
+21744288
+95245544
+95245544
+95245544
+14558127
+38814750
+38814750
+38814750
+23434538
+59851535
+64756282
+64756282
+10805153
+11110587
+11110587
+14532163
+14532163
+49238328
+49238328
+49238328
+54693926
+54693926
+57916305
+57916305
+57916305
+58577036
+58577036
+58577036
+73594093
+83301414
+83301414
+83301414
+24224830
+24224830
+24224830
+56894757
+65681983
+65681983
+70226289
+13758665
+19673561
+40252269
+40252269
+83289866
+83289866
+83289866
+87769556
+10045474
+10045474
+10045474
+55072170
+94553671
+94553671
+#extra
+27548199
+5041348
+5041348
+74586817
+98558751
+85289965
+38342335
+2857636
+2857636
+8802510
+50588353
+60303245
+94259633
+94259633
+94259633
+!side
+65681983
+40252269

Dialogs/verre.zh-CN.json

+{
+  "welcome": [
+    "啊~~让我再睡一会嘛~",
+    "AI功能正在测试中，遇到问题请及时反馈。"
+  ],
+  "deckerror": [
+    "我的卡组里{0}不能用，我回去睡觉了。"
+  ],
+  "duelstart": [
+    "好困……",
+    "啊呀，对面看上去好厉害的样子。"
+  ],
+  "newturn": [
+    "我的回合，抽卡！",
+    "我抽了一张卡。"
+  ],
+  "endturn": [
+    "不想干活怎么办……",
+    "就这样吧，该你了。"
+  ],
+  "directattack": [
+    "{0}，直接攻击！",
+    "不过如此嘛，直接攻击！",
+    "快走开，我要回去睡觉了。",
+  ],
+  "attack": [
+    "{0}，攻击{1}，我来为你加油！",
+    "{0}，替我打倒{1}！"
+  ],
+  "ondirectattack": [
+    "啊啊……",
+    "啊啊啊……",
+    "{0}好可怕啊……",
+    "我累了……"
+  ],
+  "facedownmonstername": "怪兽",
+  "activate": [
+    "我发动{0}的效果。",
+    "{0}效果发动。"
+  ],
+  "summon": [
+    "我召唤{0}。",
+    "出来吧，{0}！",
+    "{0}，来帮我一下。"
+  ],
+  "setmonster": [
+    "……"
+  ],
+  "chaining": [
+    "我使用{0}的力量。",
+    "等一下，我发动{0}。"
+  ]
+}

WindBot.csproj

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

bots.json

@@ -15,11 +15,6 @@
         "deck": "Toadally Awesome",
         "dialog": "cirno.zh-CN"
       },
-      {
-        "name": "琪露诺",
-        "deck": "Toadally Awesome",
-        "dialog": "cirno.zh-CN"
-      },
       {
         "name": "谜之剑士LV4",
         "deck": "Dragunity",
@@ -155,25 +150,28 @@
         "deck": "PureWinds",
         "dialog": "zh-CN"
       },
+      {
+        "name": "兔明",
+        "deck": "Witchcraft",
+        "dialog": "zh-CN"
+      },
       {
         "name": "永远之魂",
         "deck": "Burn",
-        "dialog": "soul.zh-CN"
+        "dialog": "soul.zh-CN",
+        "hidden": true
       },
       {
         "name": "永远之魂",
         "deck": "Frog",
-        "dialog": "soul.zh-CN"
+        "dialog": "soul.zh-CN",
+        "hidden": true
       },
       {
         "name": "永远之魂",
         "deck": "Horus",
-        "dialog": "soul.zh-CN"
-      },
-      {
-        "name": "奇異果",
-        "deck": "LightswornShaddoldinosour",
-        "dialog": "kiwi.zh-TW"
+        "dialog": "soul.zh-CN",
+        "hidden": true
       },
       {
         "name": "MAX龍果",
@@ -198,12 +196,14 @@
       {
         "name": "報社鬥士",
         "deck": "GrenMajuThunderBoarder",
-        "dialog": "kiwi.zh-TW"
+        "dialog": "kiwi.zh-TW",
+        "hidden": true
       },
       {
         "name": "燃血鬥士",
         "deck": "ChainBurn",
-        "dialog": "kiwi.zh-TW"
+        "dialog": "kiwi.zh-TW",
+        "hidden": true
       }
     ]
 }