Merge branch 'master' of git.mycard.moe:mycard/windbot into develop

.gitignore

@@ -13,6 +13,11 @@
 *.user
 *.sln.docstates
 .vs/
+.vscode/
+
+Windbot.exe
+cards.cdb
+pm2.json
 
 # Build results
 

Decks/AI_Maliss.ydk

+#created by MDPro3
+#main
+68337209
+24224830
+20726052
+23434538
+30118811
+30118811
+75500286
+20938824
+10045474
+24224830
+96676583
+14558127
+27204311
+32061192
+20938824
+40366667
+40366667
+10045474
+68337209
+30118811
+94722358
+40366667
+34267821
+96676583
+3723262
+14558127
+23434538
+32061192
+10045474
+93453053
+69272449
+20938824
+69272449
+65681983
+69272449
+14558127
+32061192
+73628505
+68337209
+96676583
+#extra
+39138610
+5043010
+86066372
+4280258
+21848500
+46947713
+95454996
+68059897
+29301450
+59859086
+52698008
+98978921
+30342076
+24842059
+60303245
\ No newline at end of file

Decks/AI_MalissOCG.ydk

+#created by ...
+#main
+91800273
+91800273
+42141493
+42141493
+42141493
+3723262
+96676583
+96676583
+30118811
+30118811
+69272449
+69272449
+69272449
+32061192
+32061192
+32061192
+20938824
+20938824
+20938824
+14558128
+14558128
+14558128
+23434538
+23434538
+75500286
+24224830
+24224830
+93453053
+68337209
+68337209
+68337209
+10045474
+10045474
+10045474
+20726052
+40366667
+40366667
+40366667
+57111661
+94722358
+#extra
+64211118
+39138610
+9940036
+9940036
+92422871
+92422871
+92422871
+21848500
+68059897
+95454996
+46947713
+59859086
+9763474
+52698008
+30342076
+!side

Dialogs/Xiaoye.zh-CN.json

+{
+  "welcome": [
+    "嘿，我迷路了，你也是吗？",
+    "哦，别怕，我只是路过的",
+    "没事的，我也不擅长这套卡组"
+  ],
+  "deckerror": [
+    "{0}的数量不对！我不能少了它！。",
+    "去开个无禁限好吗，我的{0}被禁了"
+  ],
+  "duelstart": [
+    "诶呀，友好切磋而已啦",
+    "啊嘞，这就开始了吗"
+  ],
+  "newturn": [
+    "抽卡！发牌姬快来助我",
+    "抽卡！哦，我这一定是被发牌姬算计了！"
+  ],
+  "endturn": [
+    "一人一个回合，很公平吧",
+    "哦差点忘了，你也要玩游戏王"
+  ],
+  "directattack": [
+    "{0}，直接攻击！",
+    "欸嘿，就打就打就打"
+  ],
+  "attack": [
+    "{0}，去攻击 {1}"
+  ],
+  "ondirectattack": [
+    "怎么还打我！太过分了！",
+    "你不许打我！"
+  ],
+  "facedownmonstername": "怪兽",
+  "activate": [
+    " 此刻，我要发动 {0} 的效果",
+    "欸，我的 {0} 亮了，点一下"
+  ],
+  "summon": [
+    "这是我引以为傲的怪兽 {0}",
+    "锵锵！{0} 登场！"
+  ],
+  "setmonster": [],
+  "chaining": [
+    "欸，这是什么，点一下"
+  ],
+  "custom": [
+    "这卡明显是其他卡组送进去的，看我干什么"
+  ]
+}

Game/AI/CardExtension.cs

 using System;
+using System.Linq;
 using WindBot.Game.AI.Enums;
 using YGOSharp.OCGWrapper.Enums;
 
@@ -38,7 +39,8 @@ namespace WindBot.Game.AI
         /// </summary>
         public static bool IsShouldNotBeTarget(this ClientCard card)
         {
-            return !card.IsDisabled() && !card.HasType(CardType.Normal) && Enum.IsDefined(typeof(ShouldNotBeTarget), card.Id);
+            return !card.IsDisabled() && !card.HasType(CardType.Normal)
+                && (Enum.IsDefined(typeof(ShouldNotBeTarget), card.Id) || card.Overlays.Any(code => code == 91025875));
         }
 
         /// <summary>
@@ -46,7 +48,8 @@ namespace WindBot.Game.AI
         /// </summary>
         public static bool IsShouldNotBeMonsterTarget(this ClientCard card)
         {
-            return !card.IsDisabled() && Enum.IsDefined(typeof(ShouldNotBeMonsterTarget), card.Id);
+            return !card.IsDisabled() && Enum.IsDefined(typeof(ShouldNotBeMonsterTarget), card.Id)
+                || card.EquipCards.Any(c => c.IsCode(89812483) && !c.IsDisabled());
         }
 
         /// <summary>
@@ -54,7 +57,8 @@ namespace WindBot.Game.AI
         /// </summary>
         public static bool IsShouldNotBeSpellTrapTarget(this ClientCard card)
         {
-            return !card.IsDisabled() && Enum.IsDefined(typeof(ShouldNotBeSpellTrapTarget), card.Id);
+            return !card.IsDisabled() && Enum.IsDefined(typeof(ShouldNotBeSpellTrapTarget), card.Id)
+                || card.EquipCards.Any(c => c.IsCode(89812483) && !c.IsDisabled());
         }
 
         /// <summary>

Game/AI/DefaultExecutor.cs

@@ -179,6 +179,7 @@ namespace WindBot.Game.AI
             public const int HeroicChampionClaivesolish = 97453744;
             public const int GhostrickAlucard = 75367227;
             public const int DinowrestlerKingTWrextle = 77967790;
+            public const int NumberF0UtopicFutureZexal = 41522092;
 
             public const int PerformapalMissDirector = 92932860;
             public const int AncientWarriorsMasterfulSunMou = 40140448;
@@ -201,6 +202,8 @@ namespace WindBot.Game.AI
             public const int SeleneQueenOfTheMasterMagicians = 45819647;
             public const int TheWingedDragonofRaSphereMode = 10000080;
             public const int SelettriceVaalmonica = 23093373;
+            public const int PerformageTrapezeWitch = 33206889;
+            public const int PoseidraTheStormingAtlantean = 99193444;
 
             public const int RockOfTheVanquisher = 28168628;
             public const int SpiralDischarge = 29477860;
@@ -229,6 +232,7 @@ namespace WindBot.Game.AI
             public const int Ghostrick = 0x8d;
             public const int OddEyes = 0x99;
             public const int Performapal = 0x9f;
+            public const int Performage = 0xc6;
             public const int BlueEyes = 0xdd;
             public const int FurHire = 0x114;
             public const int Altergeist = 0x103;
@@ -295,7 +299,8 @@ namespace WindBot.Game.AI
             {_CardId.HeroicChampionClaivesolish, defender => true},
             {_CardId.GhostrickAlucard, defender => defender.HasSetcode(_Setcode.Ghostrick) || defender.IsFacedown()},
             {_CardId.MekkKnightCrusadiaAstram, defender => true},
-            {_CardId.DinowrestlerKingTWrextle, defender => true}
+            {_CardId.DinowrestlerKingTWrextle, defender => true},
+            {_CardId.NumberF0UtopicFutureZexal, defender => true}
         };
 
         /// <summary>
@@ -324,7 +329,9 @@ namespace WindBot.Game.AI
             {_CardId.SeleneQueenOfTheMasterMagicians, (defender, list) => list.Any(monster => monster.HasSetcode(_Setcode.Endymion))},
 
             {_CardId.TheWingedDragonofRaSphereMode, (defender, list) => true},
-            {_CardId.SelettriceVaalmonica, (defender, list) => list.Any(monster => !monster.IsCode(_CardId.SelettriceVaalmonica))}
+            {_CardId.SelettriceVaalmonica, (defender, list) => list.Any(monster => !monster.IsCode(_CardId.SelettriceVaalmonica))},
+            {_CardId.PerformageTrapezeWitch, (defender, list) => list.Any(monster => !monster.IsCode(_CardId.PerformageTrapezeWitch) && monster.HasSetcode(_Setcode.Performage))},
+            {_CardId.PoseidraTheStormingAtlantean, (defender, list) => list.Any(monster => !monster.IsCode(_CardId.PoseidraTheStormingAtlantean))}
         };
 
         /// <summary>

Game/AI/Enums/DangerousMonster.cs

@@ -26,6 +26,9 @@
         DaigustoSphreeze = 29552709,
         OhimetheManifestedMikanko = 81260679,
         ArahimetheManifestedMikanko = 75771170,
-        YubelDasEwigLiebeWachter = 47172959
+        YubelDasEwigLiebeWachter = 47172959,
+        UzuhimeTheManifestedMikanko = 57566760,
+        MaidenInLove = 8445808,
+        ArchfiendMatador = 7622360
     }
 }

Game/AI/Enums/Floodgate.cs

@@ -223,6 +223,55 @@
         LightAndDarknessDragonLord = 19652159,
         FiendsmithDiesIrae = 82135803,
         MementomictlanTecuhtlicaCombinedConqueror = 14529511,
-        MadolcheQueenTiaraalaFraise = 49689480
+        MadolcheQueenTiaraalaFraise = 49689480,
+        XYZHyperDragonCannon = 75748977,
+        ClearViciousKnight = 70095046,
+        Red_EyesBlackFullmetalDragon = 80870883,
+        MetalzoaX = 27268998,
+        AzaminaIliaSilvia = 46396218,
+        HeosvarogTheMechanicalDawn = 8963089,
+        LegendaryLordSixSamurai_ShiEn = 34235530,
+        NumberC32SharkDrakeLeVeiss = 7628844,
+        RyzealDetonator = 34909328,
+        MalissQHeartsCrypter = 21848500,
+        Blue_EyesUltimateSpiritDragon = 89604813,
+        TheiaThePrimalBeing = 85687952,
+        ArcanaForceEX_TheChaosRuler = 12686296,
+        SaintAzamina = 85065943,
+        CrystalClearWingOverSynchroDragon = 84343351,
+        JurracAstero = 52553102,
+        NekrozOfMetaltron = 13408726,
+        ZoroaTheMagistusVerethragna = 37260677,
+        DiabellstarVengeance = 23151193,
+        RegenesisWarrior = 96540807,
+        RegenesisSage = 22938501,
+        RegenesisDragon = 59323650,
+        Snake_EyesVengeanceDragon = 79415624,
+        LegendaryLordSixSamurai_Kizan = 42209438,
+        JuraishinTheCursedThunderGod = 78693036,
+        EclipseDragonRulerOfCatastrophes = 30350202,
+        AlliedCodeTalkerIgnister = 39138610,
+        EternalSunshine = 28903523,
+        RegenesisBirth = 27781371,
+        Ryu_GeEnd = 90664684,
+        SoulOfGaiaTheFierceKnight = 73129314,
+        K9_XWerewolf = 90303227,
+        ArtmageFinmel = 34541940,
+        LeoWizardTheDarkFiend = 55423549,
+        LunalightLigerDancer = 54701958,
+        ArtmageDiactorus = 27184601,
+        PsychicBlasterMk_II = 88139289,
+        NumberF0UtopicFutureZexal = 41522092,
+        VallonTheSuperPsySkyblaster = 40673853,
+        MasterPeaceTheTrueDracoverlord = 12800564,
+        MegalithNotrahPlura = 44293356,
+        AxonKickerOracle = 33171768,
+        DoomZXIIEnd_Drastrius = 95626382,
+        DDDSkyKingZeusRagnarok = 30998403,
+        DarkContractWithTheDifferentDimension = 54936778,
+        KillerTuneRedSeal = 15665977,
+        RBGa10Driller = 6043161,
+        RBGa10Cutter = 33438265,
+        RBLambdaBlade = 17188206
     }
 }

Game/AI/Enums/FusionSpell.cs

@@ -88,6 +88,25 @@
         HarmonicSynchroFusion = 7473735,
         SouloftheSupremeCelestialKing = 76840111,
         MelodiousConcerto = 31458630,
-        MementotlanFusion = 66518509
+        MementotlanFusion = 66518509,
+        TheHallowedAzamina = 94845588,
+        AzaminaDebtors = 20934683,
+        AzaminaDetermination = 42201897,
+        HeavyPolymerization = 58570206,
+        DoubleFusion = 10218411,
+        DarkContact = 77124096,
+        GemKnightMasterDiamondDispersion = 25342956,
+        GemKnightDispersion = 24220368,
+        DracotailFaimena = 1498449,
+        DracotailMululu = 7375867,
+        KetuDracotail = 6153210,
+        RahuDracotail = 32548318,
+        ArtmagePowerPatron = 23829452,
+        ArtmageMasterworkSuccession = 37517035,
+        TeleportFusion = 36494597,
+        PrimiteFusion = 99161253,
+        TheGazeOfTimaeus = 22283204,
+        MutinyInTheSky = 71593652,
+        HuntingHorn = 55421040
     }
 }

Game/AI/Enums/InvincibleMonster.cs

@@ -29,7 +29,9 @@
         Number2NinjaShadowMosquito = 32453837,
         OhimetheManifestedMikanko = 81260679,
         NightmareMagician = 40221691,
-        ArahimetheManifestedMikanko = 75771170
+        ArahimetheManifestedMikanko = 75771170,
+        UzuhimeTheManifestedMikanko = 57566760,
+        ArchfiendMatador = 7622360
     }
     /// <summary>
     /// Cards that are invincible to battle.
@@ -123,6 +125,21 @@
         MillenniumFiendReflection = 63947968,
         HereticalPhoboscobos = 76078185,
         TopHatHareTheSilhouetteMagician = 1528054,
-        Silhouhatte = 24440742
+        Silhouhatte = 24440742,
+        TheDukeofDemise = 45445571,
+        EvilHERONeosLord = 13708888,
+        GladiatorBeastDareios = 72246674,
+        Number69HeraldryCrest_DarkMatterDemolition = 77571454,
+        FirstOfTheDragonlords = 53466722,
+        UzuhimeTheManifestedMikanko = 57566760,
+        HecahandsIbel = 95365081,
+        HecahandsYadel = 32759190,
+        HecahandsGoddus = 68144894,
+        HecahandsGygas = 95132593,
+        HecahandsBreus = 21637502,
+        HecahandsJawza = 67021206,
+        HecahandsXeno = 94410955,
+        MaidenInLove = 8445808,
+        ArchfiendMatador = 7622360
     }
 }

Game/AI/Enums/OneForXyz.cs

@@ -18,6 +18,11 @@
         GalaxyEyesCipherDragon = 18963306,
         Number107 = 88177324,
         CyberDragonNova = 58069384,
-        Number39 = 84013237
+        Number39 = 84013237,
+        Argostars_GloriousAdra = 91438674,
+        Argostars_LightningTydeu = 65889305,
+        Argostars_SwiftCapane = 91284003,
+        Argostars_SlayerEteo = 38379052,
+        Argostars_FierceParthe = 21050476
     }
 }

Game/AI/Enums/PreventActivationEffectInBattle.cs

@@ -11,6 +11,7 @@
         SamuraiDestroyer = 40509732,
         ArmadesKeeperOfBoundaries = 88033975,
         NumberS39UtopiaTheLightning = 56832966,
-        DualAvatarEmpoweredKonGyo = 33026283
+        DualAvatarEmpoweredKonGyo = 33026283,
+        GoukiTheTyrantOgre = 7782069
     }
 }

Game/AI/Enums/ShouldBeDisabledBeforeItUseEffectMonster.cs

@@ -67,6 +67,12 @@
         GGolemRockHammer = 98875863,
         WishDragon = 64583600,
         ChaosWitch = 30327674,
-        FissioningMotherSpider = 34034150
+        FissioningMotherSpider = 34034150,
+        AncientGearStatue = 32762201,
+        SplittingPlanarian = 44175358,
+        TestBear = 62076252,
+        RescueHedgehog = 99742859,
+        SuperQuantalFairyZetan = 66646087,
+        LightWaterDragon = 82616239
     }
 }

Game/AI/Enums/ShouldNotBeMonsterTarget.cs

@@ -17,6 +17,7 @@
         BorrelendDragon = 98630720,
         DrytronMeteonisDraconids = 69815951,
         MyutantBeast = 34695290,
-        VeidosTheDragonOfEndlessDarkness = 8540986
+        VeidosTheDragonOfEndlessDarkness = 8540986,
+        FirstOfTheDragonlords = 53466722
     }
 }

Game/AI/Enums/ShouldNotBeTarget.cs

@@ -51,6 +51,9 @@
         RedEyesBDragon = 74677422, // sometimes the name of DragunofRedEyes will be changed to RedEyesBDragon
         TheArrivalCyberseIgnister = 11738489,
         MajespecterPorcupineYamaarashi = 51073802,
-        RaidraptorRisingRebellionFalcon = 71222868
+        RaidraptorRisingRebellionFalcon = 71222868,
+        Number97Draglubion = 28400508,
+        SaintAzamina = 85065943,
+        LunalightLigerDancer = 54701958
     }
 }

WindBot.csproj

@@ -68,6 +68,7 @@
     <Compile Include="Game\AI\CardSelector.cs" />
     <Compile Include="Game\AI\DeckAttribute.cs" />
     <Compile Include="Game\AI\DecksManager.cs" />
+    <Compile Include="Game\AI\Decks\MalissExecutor.cs" />
     <Compile Include="Game\AI\Decks\RyzealExecutor.cs" />
     <Compile Include="Game\AI\Decks\AlbazExecutor.cs" />
     <Compile Include="Game\AI\Decks\AltergeistExecutor.cs" />
@@ -87,6 +88,7 @@
     <Compile Include="Game\AI\Decks\DogmatikaExecutor.cs" />
     <Compile Include="Game\AI\Decks\OrcustExecutor.cs" />
     <Compile Include="Game\AI\Decks\SkyStrikerExecutor.cs" />
+    <Compile Include="Game\AI\Decks\MalissOCGExecutor.cs" />
     <Compile Include="Game\AI\Decks\MokeyMokeyKingExecutor.cs" />
     <Compile Include="Game\AI\Decks\MokeyMokeyExecutor.cs" />
     <Compile Include="Game\AI\Decks\TearlamentsExecutor.cs" />

bots.json

@@ -249,6 +249,7 @@
       {
         "name": "宫水静香",
         "deck": "SuperheavySamurai",
+<<<<<<< HEAD
         "dialog": "wof-Miyamizu-Shizuka"
       },
       {
@@ -260,6 +261,14 @@
         "name": "夏洛特·格雷",
         "deck": "Yubel",
         "dialog": "wof-Charlotte-Gray"
+=======
+        "dialog": "superheavysamurai.zh-CN"
+      },
+      {
+        "name": "今晚有宵夜吗",
+        "deck": "MalissOCG",
+        "dialog": "Xiaoye.zh-CN"
+>>>>>>> d65223bd24c56285bc480d6e266476163b7771dc
       }
     ]
 }