Commit ec4143e5 authored by wind2009's avatar wind2009

Merge branch 'master' of https://github.com/IceYGO/windbot

parents 16f8a4e8 68276aa0
...@@ -1713,6 +1713,8 @@ namespace WindBot.Game.AI.Decks ...@@ -1713,6 +1713,8 @@ namespace WindBot.Game.AI.Decks
enemySetThisTurn.Add(card); enemySetThisTurn.Add(card);
} }
} }
if (card != null)
{
if (previousControler == 0) if (previousControler == 0)
{ {
if (previousLocation == (int)CardLocation.MonsterZone && currentLocation != (int)CardLocation.MonsterZone) if (previousLocation == (int)CardLocation.MonsterZone && currentLocation != (int)CardLocation.MonsterZone)
...@@ -1729,7 +1731,7 @@ namespace WindBot.Game.AI.Decks ...@@ -1729,7 +1731,7 @@ namespace WindBot.Game.AI.Decks
{ {
ClientCard currentSolvingChain = Duel.GetCurrentSolvingChainCard(); ClientCard currentSolvingChain = Duel.GetCurrentSolvingChainCard();
if (currentLocation == (int)CardLocation.SpellZone && (currentSolvingChain == null || !currentSolvingChain.IsCode(CardId.AriasTheLabrynthButler)) if (currentLocation == (int)CardLocation.SpellZone && (currentSolvingChain == null || !currentSolvingChain.IsCode(CardId.AriasTheLabrynthButler))
&& card != null && (card.HasType(CardType.Trap) || card.IsCode(CardId.WelcomeLabrynth, CardId.BigWelcomeLabrynth)) && (card.HasType(CardType.Trap) || card.IsCode(CardId.WelcomeLabrynth, CardId.BigWelcomeLabrynth))
) )
{ {
Logger.DebugWriteLine("[setTrapThisTurn]set " + card.Name ?? "UnknowCard"); Logger.DebugWriteLine("[setTrapThisTurn]set " + card.Name ?? "UnknowCard");
...@@ -1749,6 +1751,7 @@ namespace WindBot.Game.AI.Decks ...@@ -1749,6 +1751,7 @@ namespace WindBot.Game.AI.Decks
} }
} }
} }
}
base.OnMove(card, previousControler, previousLocation, currentControler, currentLocation); base.OnMove(card, previousControler, previousLocation, currentControler, currentLocation);
} }
...@@ -3444,10 +3447,11 @@ namespace WindBot.Game.AI.Decks ...@@ -3444,10 +3447,11 @@ namespace WindBot.Game.AI.Decks
level2MonsterList.Sort(CompareUsableAttack); level2MonsterList.Sort(CompareUsableAttack);
level4MonsterList.Sort(CompareUsableAttack); level4MonsterList.Sort(CompareUsableAttack);
bool checkFlag = GetProblematicEnemyCardList(true, selfType: CardType.Monster).Count() > 0 && !CheckWhetherNegated(true, true, CardType.Monster); bool checkFlag = GetProblematicEnemyCardList(true, selfType: CardType.Monster).Count() > 0 && !CheckWhetherNegated(true, true, CardType.Monster);
if (Util.GetBestPower(Bot, true) <= Util.GetBestPower(Enemy)) ClientCard BestEnemyMonster = Util.GetBestEnemyMonster();
if (BestEnemyMonster != null && Util.GetBestPower(Bot, true) <= Util.GetBestPower(Enemy))
{ {
checkFlag |= Util.GetBestPower(Enemy) <= 3500; checkFlag |= Util.GetBestPower(Enemy) <= 3500;
checkFlag |= !Util.GetBestEnemyMonster().IsShouldNotBeTarget() && !Util.GetBestEnemyMonster().IsShouldNotBeMonsterTarget(); checkFlag |= !BestEnemyMonster.IsShouldNotBeTarget() && !BestEnemyMonster.IsShouldNotBeMonsterTarget();
} }
// 2+4+4 // 2+4+4
if (level2MonsterList.Count() >= 1 && level4MonsterList.Count() >= 2) if (level2MonsterList.Count() >= 1 && level4MonsterList.Count() >= 2)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment