Merge branch 'master' into rd

.gitlab-ci.yml

@@ -18,7 +18,7 @@ build:
     - apt update && apt -y install p7zip-full tar
     - msbuild /p:Configuration=Release /p:TargetFrameworkVersion=v4.6
     - mv -f bin/Release WindBot
-    - rm -rf WindBot/WindBot.exe.config
+    #- rm -rf WindBot/WindBot.exe.config
     - mv -f BotWrapper/bin/Release/Bot.exe .
     - mv -f BotWrapper/bin/Release/bot.conf .
     - mv -f BotWrapper/BotWrapper.sh ./bot
@@ -46,9 +46,7 @@ upload_to_minio:
     - build
   tags: 
     - linux
-  image: python
   script:
-    - pip install -U -i https://mirrors.aliyun.com/pypi/simple/ awscli
     - aws s3 --endpoint=https://minio.mycard.moe:9000 sync dist/ s3://mycard/windbot
   only:
     - master

BotWrapper/bot.conf

@@ -220,11 +220,11 @@ Name=玻璃女巫 Deck=Witchcraft Dialog=verre.zh-CN
 AI_LV3 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !源千雪-凭依装着
-Name=源千雪 Deck=FamiliarPossessed Dialog=default.zh-CN
+Name=源千雪 Deck=FamiliarPossessed Dialog=default
 凭依装着卡组。
 AI_ANTI_META SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
 !璃璃子-时劫者
-Name=璃璃子 Deck=TimeThief Dialog=default.zh-CN
+Name=璃璃子 Deck=TimeThief Dialog=default
 时间潜行者卡组。
 AI_LV2 SUPPORT_MASTER_RULE_3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020

Game/AI/DefaultExecutor.cs

@@ -725,6 +725,9 @@ namespace WindBot.Game.AI
         /// </summary>
         protected bool DefaultMonsterRepos()
         {
+            if (Card.IsMonsterInvincible())
+                return Card.IsDefense();
+
             if (Card.Attack == 0)
             {
                 if (Card.IsFaceup() && Card.IsAttack())

Game/GameBehavior.cs

@@ -188,8 +188,8 @@ namespace WindBot.Game
             int duel_rule = packet.ReadByte();
             _ai.Duel.IsNewRule = (duel_rule >= 4);
             _ai.Duel.IsNewRule2020 = (duel_rule >= 5);
-            BinaryWriter deck = buildUpdateDeck(pickDeckOnResult());
-            Connection.Send(deck);
+            //BinaryWriter deck = buildUpdateDeck(pickDeckOnResult());
+            //Connection.Send(deck);
             _ai.OnJoinGame();
         }
         
@@ -228,6 +228,8 @@ namespace WindBot.Game
             _room.Position = pos;
             _room.IsHost = ((type >> 4) & 0xF) != 0;
             _room.IsReady[pos] = true;
+            BinaryWriter deck = buildUpdateDeck(pickDeckOnResult());
+            Connection.Send(deck);
             Connection.Send(CtosMessage.HsReady);
         }
 
@@ -353,7 +355,7 @@ namespace WindBot.Game
                     if (card != null)
                         _ai.OnDeckError(card.Name);
                     else
-                        _ai.OnDeckError("Unknown Card");
+                        _ai.OnDeckError(code.ToString());
                 }
                 else
                     _ai.OnDeckError("DECK");

WindBotInfo.cs

@@ -26,7 +26,7 @@ namespace WindBot
             Host = "127.0.0.1";
             Port = 7911;
             HostInfo = "";
-            Version = 0x1352;
+            Version = 0x1353;
             Hand = 0;
             Debug = false;
             Chat = true;