Merge remote-tracking branch 'origin/master' into master

BotWrapper/bot.conf

@@ -129,6 +129,11 @@ Name=复制梁龙 Deck=Salamangreat Dialog=anothercopy.zh-CN
 转生炎兽卡组。
 AI_LV3 SUPPORT_NEW_MASTER_RULE SUPPORT_MASTER_RULE_2020
 
+!复制梁龙-雷火沸动
+Name=复制梁龙 Deck=Ryzeal Dialog=anothercopy.zh-CN
+初代雷火沸动卡组。
+AI_LV4 SUPPORT_MASTER_RULE_3 SUPPORT_MASTER_RULE_2020
+
 !VI-1911-凭依装着
 Name=VI-1911 Deck=FamiliarPossessed Dialog=VI-1911.zh-CN
 凭依装着卡组。

Decks/AI_Ryzeal.ydk

+#created by ...
+#main
+8633261
+8633261
+8633261
+35844557
+35844557
+35844557
+72238166
+34022970
+34022970
+34022970
+42141493
+42141493
+84192580
+87126721
+14558127
+14558127
+14558127
+59438930
+59438930
+23434538
+23434538
+94145021
+97268402
+97268402
+97268402
+7477101
+7477101
+7477101
+25311006
+35261759
+35261759
+85106525
+24224830
+24224830
+60394026
+65681983
+6798031
+10045474
+10045474
+10045474
+#extra
+9940036
+34909328
+34909328
+2061963
+7511613
+7511613
+45852939
+45852939
+6983839
+90590303
+46772449
+16643334
+21044178
+66011101
+8728498
+!side
+20292186
+34267821
+34267821
+34267821
+67173574
+18144507
+19613556
+35269904
+15693423
+83326048
+83326048
+83326048
+41420027
+41420027
+41420027

Game/AI/DefaultExecutor.cs

@@ -99,7 +99,13 @@ namespace WindBot.Game.AI
             public const int GhostOgreAndSnowRabbit = 59438930;
             public const int GhostBelle = 73642296;
             public const int EffectVeiler = 97268402;
+            public const int GhostMournerMoonlitChill = 52038441;
             public const int ArtifactLancea = 34267821;
+            public const int DimensionShifter = 91800273;
+            public const int NibiruThePrimalBeing = 27204311;
+            public const int MulcharmyPurulia = 84192580;
+            public const int MulcharmyFuwalos = 42141493;
+            public const int MulcharmyNyalus = 87126721;
 
             public const int CalledByTheGrave = 24224830;
             public const int CrossoutDesignator = 65681983;
@@ -120,9 +126,19 @@ namespace WindBot.Game.AI
 
             public const int ImperialOrder = 61740673;
             public const int RoyalDecreel = 51452091;
+            public const int NaturalExterio = 99916754;
             public const int NaturiaBeast = 33198837;
+            public const int SwordsmanLV7 = 37267041;
             public const int AntiSpellFragrance = 58921041;
-            
+            public const int Number41BagooskatheTerriblyTiredTapir = 90590303;
+            public const int SkillDrain = 82732705;
+
+            public const int DimensionalFissure = 81674782;
+            public const int BanisheroftheRadiance = 94853057;
+            public const int BanisheroftheLight = 61528025;
+            public const int KashtiraAriseHeart = 48626373;
+            public const int MaskedHERODarkLaw = 58481572;
+
             public const int VaylantzWorld_ShinraBansho = 49568943;
             public const int VaylantzWorld_KonigWissen = 75952542;
             public const int DivineArsenalAAZEUS_SkyThunder = 90448279;
@@ -214,6 +230,7 @@ namespace WindBot.Game.AI
             public const int FurHire = 0x114;
             public const int Altergeist = 0x103;
             public const int Crusadia = 0x116;
+            public const int Danger = 0x11e;
             public const int Endymion = 0x12a;
             public const int AncientWarriors = 0x137;
             public const int RescueACE = 0x18b;
@@ -780,7 +797,7 @@ namespace WindBot.Game.AI
             };
             if (Util.GetLastChainCard().IsCode(ignoreList))
                 return false;
-            if (Util.GetLastChainCard().HasSetcode(0x11e) && Util.GetLastChainCard().Location == CardLocation.Hand) // Danger! archtype hand effect
+            if (Util.GetLastChainCard().HasSetcode(_Setcode.Danger) && Util.GetLastChainCard().Location == CardLocation.Hand) // Danger! archtype hand effect
                 return false;
             return Duel.LastChainPlayer == 1;
         }
@@ -1599,6 +1616,12 @@ namespace WindBot.Game.AI
                 || (calledbytheGraveIdCountMap.ContainsKey(cardId) && calledbytheGraveIdCountMap[cardId] > 0);
         }
 
+        protected int GetCalledbytheGraveIdCount(int cardId)
+        {
+            if (!calledbytheGraveIdCountMap.ContainsKey(cardId)) return 0;
+            return calledbytheGraveIdCountMap[cardId];
+        }
+
 
         protected virtual bool DefaultSetForDiabellze()
         {

Game/ClientCard.cs

@@ -350,6 +350,11 @@ namespace WindBot.Game
             return Id == id || Alias - Id < 20 && Alias == id;
         }
 
+        public bool IsOnField()
+        {
+            return Location == CardLocation.MonsterZone || Location == CardLocation.SpellZone || Location == CardLocation.PendulumZone || Location == CardLocation.FieldZone;
+        }
+
         public bool HasXyzMaterial()
         {
             return Overlays.Count > 0;

Game/GameBehavior.cs

@@ -1017,7 +1017,13 @@ namespace WindBot.Game
                 packet.ReadByte(); // pos
                 ClientCard card;
                 if (((int)loc & (int)CardLocation.Overlay) != 0)
+                {
                     card = new ClientCard(id, CardLocation.Overlay, -1);
+                    CardLocation ownerLoc = loc ^ CardLocation.Overlay;
+                    ClientCard ownerCard = _duel.GetCard(player, ownerLoc, seq);
+                    if (ownerCard != null)
+                        card.OwnTargets.Add(ownerCard);
+                }
                 else
                 {
                     card = _duel.GetCard(player, loc, seq);

WindBot.csproj

@@ -60,6 +60,7 @@
     <Compile Include="Game\AI\CardSelector.cs" />
     <Compile Include="Game\AI\DeckAttribute.cs" />
     <Compile Include="Game\AI\DecksManager.cs" />
+    <Compile Include="Game\AI\Decks\RyzealExecutor.cs" />
     <Compile Include="Game\AI\Decks\AlbazExecutor.cs" />
     <Compile Include="Game\AI\Decks\AltergeistExecutor.cs" />
     <Compile Include="Game\AI\Decks\BraveExecutor.cs" />

bots.json

@@ -88,6 +88,21 @@
         "deck": "Salamangreat",
         "dialog": "anothercopy.zh-CN"
       },
+      {
+        "name": "复制梁龙",
+        "deck": "Ryzeal",
+        "dialog": "anothercopy.zh-CN"
+      },
+      {
+        "name": "复制梁龙",
+        "deck": "Ryzeal",
+        "dialog": "anothercopy.zh-CN"
+      },
+      {
+        "name": "复制梁龙",
+        "deck": "Ryzeal",
+        "dialog": "anothercopy.zh-CN"
+      },
       {
         "name": "尼亚",
         "deck": "Yosenju",
@@ -219,16 +234,6 @@
         "deck": "Albaz",
         "dialog": "ecclesia.zh-CN"
       },
-      {
-        "name": "艾克莉西娅",
-        "deck": "Albaz",
-        "dialog": "ecclesia.zh-CN"
-      },
-      {
-        "name": "艾克莉西娅",
-        "deck": "Albaz",
-        "dialog": "ecclesia.zh-CN"
-      },
       {
         "name": "今晚有宵夜吗",
         "deck": "SuperheavySamurai",