Commit 83a4f21f authored by mercury233's avatar mercury233

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

parents 17365f29 eb5d8f48
...@@ -190,8 +190,8 @@ namespace WindBot.Game.AI ...@@ -190,8 +190,8 @@ namespace WindBot.Game.AI
public const int PatricianOfDarkness = 19153634; public const int PatricianOfDarkness = 19153634;
public const int DictatorOfD = 66961194; public const int DictatorOfD = 66961194;
public const int NovoxTheSilenforcerDisciple = 25801745; public const int LoThePrayersOfTheVoicelessVoice = 25801745;
public const int SilenforcingBarrier = 98477480; public const int BarrierOfTheVoicelessVoice = 98477480;
public const int DiabellzeOfTheOriginalSin = 53765052; public const int DiabellzeOfTheOriginalSin = 53765052;
public const int PotOfExtravagance = 49238328; public const int PotOfExtravagance = 49238328;
...@@ -448,7 +448,8 @@ namespace WindBot.Game.AI ...@@ -448,7 +448,8 @@ namespace WindBot.Game.AI
if (defender.IsCode(_CardId.RescueACEHydrant) && !defender.IsDisabled() && Enemy.GetMonsters().Any(monster => monster.HasSetcode(_Setcode.RescueACE) && !monster.IsCode(_CardId.RescueACEHydrant))) if (defender.IsCode(_CardId.RescueACEHydrant) && !defender.IsDisabled() && Enemy.GetMonsters().Any(monster => monster.HasSetcode(_Setcode.RescueACE) && !monster.IsCode(_CardId.RescueACEHydrant)))
return false; return false;
if (Enemy.HasInSpellZone(_CardId.SilenforcingBarrier, true) && Enemy.HasInMonstersZone(_CardId.NovoxTheSilenforcerDisciple, faceUp: true) && !defender.HasType(CardType.Ritual)) if (Enemy.HasInSpellZone(_CardId.BarrierOfTheVoicelessVoice, true) && Enemy.HasInMonstersZone(_CardId.LoThePrayersOfTheVoicelessVoice, faceUp: true)
&& Enemy.GetMonsters().Any(card => card.HasType(CardType.Ritual) && card.IsFaceup()) && !defender.HasType(CardType.Ritual))
return false; return false;
return true; return true;
......
...@@ -1029,6 +1029,13 @@ namespace WindBot.Game ...@@ -1029,6 +1029,13 @@ namespace WindBot.Game
cards.Add(card); cards.Add(card);
} }
if (_select_hint == 575 && cancelable) // HINTMSG_FIELD_FIRST
{
_select_hint = 0;
Connection.Send(CtosMessage.Response, -1);
return;
}
IList<ClientCard> selected = func(cards, min, max, _select_hint, cancelable); IList<ClientCard> selected = func(cards, min, max, _select_hint, cancelable);
_select_hint = 0; _select_hint = 0;
......
...@@ -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 = 0x1360; Version = 0x1361;
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