Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enum update #171

Merged
merged 2 commits into from
Sep 23, 2023
Merged

Enum update #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0a5469
update enum
Wind2009-Louse Aug 16, 2023
9f832c9
Fix swordsoul
Wind2009-Louse Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions Game/AI/Decks/SwordsoulExecutor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,6 +936,10 @@ public bool Level7TenyiSpSummonCheck()
{
return true;
}
if (Bot.HasInExtra(CardId.PsychicEndPunisher) && Bot.HasInMonstersZone(CardId.SwordsoulToken) && !onlyWyrmSpSummon)
{
return true;
}

return false;
}
Expand Down Expand Up @@ -1387,7 +1391,7 @@ public bool TunerForSynchroSummon()
List<ClientCard> checkNonTuner = Bot.GetMonsters().Where(card => card.IsFaceup() && !card.IsTuner()).ToList();
checkNonTuner.Sort(CardContainer.CompareCardAttack);
// level7 check
if (Bot.HasInExtra(CardId.YaziEvilOfTheYangZing))
if (Bot.HasInExtra(CardId.YaziEvilOfTheYangZing) && GetProblematicEnemyCardList(true, true).Count() > 0)
{
foreach (ClientCard checkCard in checkNonTuner)
{
Expand Down Expand Up @@ -2673,7 +2677,6 @@ public bool SwordsoulGrandmaster_ChixiaoActivate()
if (CheckRemainInDeck(CardId.SwordsoulBlackout) > 0)
{
AI.SelectCard(CardId.SwordsoulBlackout);
AI.SelectYesNo(true);
activatedCardIdList.Add(Card.Id);
return true;
}
Expand All @@ -2687,7 +2690,6 @@ public bool SwordsoulGrandmaster_ChixiaoActivate()
if (CheckRemainInDeck(checkId) > 0 && !Bot.HasInHand(checkId))
{
AI.SelectCard(checkId);
AI.SelectYesNo(true);
activatedCardIdList.Add(Card.Id);
return true;
}
Expand All @@ -2700,7 +2702,6 @@ public bool SwordsoulGrandmaster_ChixiaoActivate()
&& SwordsoulOfMoYeEffectCheck() && CheckRemainInDeck(CardId.SwordsoulStrategistLongyuan) > 0)
{
AI.SelectCard(CardId.SwordsoulStrategistLongyuan);
AI.SelectYesNo(true);
activatedCardIdList.Add(Card.Id);
return true;
}
Expand All @@ -2714,7 +2715,6 @@ public bool SwordsoulGrandmaster_ChixiaoActivate()
if (CheckRemainInDeck(CardId.SwordsoulSacredSummit) > 0)
{
AI.SelectCard(CardId.SwordsoulSacredSummit);
AI.SelectYesNo(true);
activatedCardIdList.Add(Card.Id);
return true;
}
Expand All @@ -2724,7 +2724,6 @@ public bool SwordsoulGrandmaster_ChixiaoActivate()
if (CheckRemainInDeck(CardId.SwordsoulOfTaia) > 0)
{
AI.SelectCard(CardId.SwordsoulOfTaia);
AI.SelectYesNo(true);
activatedCardIdList.Add(Card.Id);
return true;
}
Expand All @@ -2738,7 +2737,7 @@ public bool SwordsoulGrandmaster_ChixiaoActivate()
{
Logger.DebugWriteLine("Chixiao banish blackout");
AI.SelectCard(CardId.SwordsoulBlackout);
AI.SelectYesNo(false);
AI.SelectOption(1);
activatedCardIdList.Add(Card.Id);
return true;
}
Expand All @@ -2754,7 +2753,6 @@ public bool SwordsoulGrandmaster_ChixiaoActivate()
if (CheckRemainInDeck(checkId) > 0 && !Bot.HasInHand(checkId))
{
AI.SelectCard(checkId);
AI.SelectYesNo(true);
activatedCardIdList.Add(Card.Id);
return true;
}
Expand All @@ -2770,7 +2768,6 @@ public bool SwordsoulGrandmaster_ChixiaoActivate()
if (CheckRemainInDeck(checkId) > 0 && !Bot.HasInHand(checkId))
{
AI.SelectCard(checkId);
AI.SelectYesNo(true);
activatedCardIdList.Add(Card.Id);
return true;
}
Expand Down
2 changes: 2 additions & 0 deletions Game/AI/Enums/DangerousMonster.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,7 @@ public enum DangerousMonster
ZushintheSleepingGiant = 67547370,
Heart_eartHDragon = 97403510,
DaigustoSphreeze = 29552709,
OhimetheManifestedMikanko = 81260679,
ArahimetheManifestedMikanko = 75771170
}
}
13 changes: 12 additions & 1 deletion Game/AI/Enums/Floodgate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,17 @@ public enum Floodgate
BystialDisPater = 27572350,
DespianLuluwalilith = 53971455,
FirewallDragonSingularity = 21637210,
BrandedEtude = 45675980
BrandedEtude = 45675980,
EvolzarLars = 35103106,
AltergeistAdminia = 61470213,
EmperorCharlesTheGreat = 97864322,
YouReFinished = 88346805,
VolcanicEmperor = 46412900,
VolcanicInferno = 84138874,
RedZone = 50056656,
TGGlaiveBlaster = 95973569,
StellarNemesisTPHON_DoomsdayStar = 93039339,
SPLittleKnight = 29301450,
AngelRing = 40678060
}
}
5 changes: 4 additions & 1 deletion Game/AI/Enums/FusionSpell.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ public enum FusionSpell
AmazonessSecretArts = 86758746,
DarkWorldAccession = 65956182,
BeetrooperLanding = 13234975,
FusionReproduction = 43331750
FusionReproduction = 43331750,
ChimeraFusion = 63136489,
HarmonicSynchroFusion = 7473735,
SouloftheSupremeCelestialKing = 76840111
}
}
12 changes: 10 additions & 2 deletions Game/AI/Enums/InvincibleMonster.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ public enum InvincibleBotMonster
NumberC96DarkStorm = 77205367,
Number54LionHeart = 54366836,
Number2NinjaShadowMosquito = 32453837,
OhimetheManifestedMikanko = 81260679
OhimetheManifestedMikanko = 81260679,
NightmareMagician = 40221691,
ArahimetheManifestedMikanko = 75771170
}
/// <summary>
/// Cards that are invincible to battle.
Expand Down Expand Up @@ -101,6 +103,12 @@ public enum InvincibleEnemyMonster
BrigrandtheGloryDragon = 34848821,
AmazonessQueen = 15951532,
Number2NinjaShadowMosquito = 32453837,
OhimetheManifestedMikanko = 81260679
OhimetheManifestedMikanko = 81260679,
CornfieldCoatl = 92565383,
MirrorSwordknight = 28954097,
NightmareMagician = 40221691,
ArahimetheManifestedMikanko = 75771170,
UFOLight = 9275482,
TaotheGreatChanter = 34541543
}
}
3 changes: 2 additions & 1 deletion Game/AI/Enums/NotBeSynchroMaterialMonster.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ public enum NotBeSynchroMaterialMonster
GreenDuston = 52182715,
RedDuston = 61019812,
EaterofMillions = 63845230,
PutridPuddingBodyBuddies = 85101097
PutridPuddingBodyBuddies = 85101097,
Click_Echo = 2992467

}
}
3 changes: 2 additions & 1 deletion Game/AI/Enums/NotBeXyzMaterialMonster.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ public enum NotBeXyzMaterialMonster
GreenDuston = 52182715,
RedDuston = 61019812,
EaterofMillions = 63845230,
PutridPuddingBodyBuddies = 85101097
PutridPuddingBodyBuddies = 85101097,
Click_Echo = 2992467
}
}
6 changes: 5 additions & 1 deletion Game/AI/Enums/ShouldBeDisabledBeforeItUseEffectMonster.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ public enum ShouldBeDisabledBeforeItUseEffectMonster
BrotherhoodoftheFireFist_Leopard = 39699564,
SpringansPedor = 56818977,
GizmekNaganakitheSunriseSignaler = 96399967,
MyutantMutant = 26561172
MyutantMutant = 26561172,
ThreeEyedGhost = 31464658,
UrsarcticPolarStar = 62714453,
BattlinBoxerPromoter = 83315222,
TGRocketSalamander = 77392987
}
}