Commit 64d906c1 authored by mercury233's avatar mercury233

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

parents 6260492f 1b401e3a
...@@ -1950,7 +1950,7 @@ namespace WindBot.Game.AI.Decks ...@@ -1950,7 +1950,7 @@ namespace WindBot.Game.AI.Decks
} }
// become target // become target
if (DefaultOnBecomeTarget() || (Duel.CurrentChain.Any(c => c == Card) && Duel.LastChainPlayer != 0)) if ((DefaultOnBecomeTarget() && !Util.ChainContainsCard(_CardId.EvenlyMatched)) || (Duel.CurrentChain.Any(c => c == Card) && Duel.LastChainPlayer != 0))
{ {
targetedMagnificaList.Add(Card); targetedMagnificaList.Add(Card);
transformDestList.AddRange(new List<int>{CardId.ExosistersMagnifica, CardId.ExosisterMikailis, CardId.ExosisterGibrine, CardId.ExosisterKaspitell, CardId.ExosisterAsophiel}); transformDestList.AddRange(new List<int>{CardId.ExosistersMagnifica, CardId.ExosisterMikailis, CardId.ExosisterGibrine, CardId.ExosisterKaspitell, CardId.ExosisterAsophiel});
...@@ -2025,7 +2025,7 @@ namespace WindBot.Game.AI.Decks ...@@ -2025,7 +2025,7 @@ namespace WindBot.Game.AI.Decks
public bool ExosisterPaxActivate() public bool ExosisterPaxActivate()
{ {
if (potActivate) if (potActivate || Bot.LifePoints <= 800)
{ {
return false; return false;
} }
...@@ -2198,7 +2198,7 @@ namespace WindBot.Game.AI.Decks ...@@ -2198,7 +2198,7 @@ namespace WindBot.Game.AI.Decks
public bool ExosisterPaxActivateForEndSearch() public bool ExosisterPaxActivateForEndSearch()
{ {
if (potActivate) if (potActivate || Bot.LifePoints <= 800)
{ {
return false; return false;
} }
...@@ -2230,6 +2230,10 @@ namespace WindBot.Game.AI.Decks ...@@ -2230,6 +2230,10 @@ namespace WindBot.Game.AI.Decks
public bool ExosisterArmentActivate() public bool ExosisterArmentActivate()
{ {
if (Bot.LifePoints <= 800)
{
return false;
}
ClientCard activateTarget = null; ClientCard activateTarget = null;
if (Duel.Player == 0) if (Duel.Player == 0)
...@@ -2366,6 +2370,11 @@ namespace WindBot.Game.AI.Decks ...@@ -2366,6 +2370,11 @@ namespace WindBot.Game.AI.Decks
public bool ExosisterVadisActivate() public bool ExosisterVadisActivate()
{ {
if (Bot.LifePoints <= 800)
{
return false;
}
List<int> checkListForSpSummon = new List<int>{ List<int> checkListForSpSummon = new List<int>{
CardId.ExosisterSophia, CardId.ExosisterIrene, CardId.ExosisterStella, CardId.ExosisterMartha, CardId.ExosisterElis CardId.ExosisterSophia, CardId.ExosisterIrene, CardId.ExosisterStella, CardId.ExosisterMartha, CardId.ExosisterElis
}; };
...@@ -2435,6 +2444,11 @@ namespace WindBot.Game.AI.Decks ...@@ -2435,6 +2444,11 @@ namespace WindBot.Game.AI.Decks
public bool ExosisterReturniaActivate() public bool ExosisterReturniaActivate()
{ {
if (Bot.LifePoints <= 800)
{
return false;
}
// banish problem card // banish problem card
ClientCard target = GetProblematicEnemyCard(true); ClientCard target = GetProblematicEnemyCard(true);
if (target != null && Duel.LastChainPlayer != 0) if (target != null && Duel.LastChainPlayer != 0)
...@@ -2463,7 +2477,7 @@ namespace WindBot.Game.AI.Decks ...@@ -2463,7 +2477,7 @@ namespace WindBot.Game.AI.Decks
// dump banish // dump banish
target = GetBestEnemyCard(false, true, true); target = GetBestEnemyCard(false, true, true);
bool check1 = DefaultOnBecomeTarget() && target.Id != _CardId.EvenlyMatched; bool check1 = DefaultOnBecomeTarget() && target != null && (target.Location != CardLocation.Onfield || target.Id != _CardId.EvenlyMatched);
bool check2 = Bot.UnderAttack; bool check2 = Bot.UnderAttack;
bool check3 = (Duel.Player == 1 && Duel.Phase == DuelPhase.End && Duel.LastChainPlayer != 0 && target != null && target.Location != CardLocation.Grave); bool check3 = (Duel.Player == 1 && Duel.Phase == DuelPhase.End && Duel.LastChainPlayer != 0 && target != null && target.Location != CardLocation.Grave);
bool check4 = (Duel.Player == 1 && Enemy.GetMonsterCount() >= 2 && Duel.LastChainPlayer != 0); bool check4 = (Duel.Player == 1 && Enemy.GetMonsterCount() >= 2 && Duel.LastChainPlayer != 0);
......
...@@ -1755,7 +1755,7 @@ namespace WindBot.Game ...@@ -1755,7 +1755,7 @@ namespace WindBot.Game
int count = packet.ReadByte(); int count = packet.ReadByte();
int available = packet.ReadInt32(); int available = packet.ReadInt32();
int filter = 0x1; int filter = 0x1;
for (int i = 0; i < 23; ++i) for (int i = 0; i < 26; ++i)
{ {
if ((available & filter) != 0) if ((available & filter) != 0)
races.Add((CardRace)filter); races.Add((CardRace)filter);
......
...@@ -24,7 +24,7 @@ namespace WindBot ...@@ -24,7 +24,7 @@ namespace WindBot
Host = "127.0.0.1"; Host = "127.0.0.1";
Port = 7911; Port = 7911;
HostInfo = ""; HostInfo = "";
Version = 0x1354; Version = 0x1360;
Hand = 0; Hand = 0;
Debug = false; Debug = false;
Chat = true; Chat = true;
......
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