Skip to content

Commit

Permalink
Merge branch 'master' of github.com:IceYGO/windbot
Browse files Browse the repository at this point in the history
  • Loading branch information
purerosefallen committed Jun 3, 2024
2 parents a7f1ca0 + eb5d8f4 commit e55be8b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
7 changes: 4 additions & 3 deletions Game/AI/DefaultExecutor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@ protected class _CardId
public const int PatricianOfDarkness = 19153634;
public const int DictatorOfD = 66961194;

public const int NovoxTheSilenforcerDisciple = 25801745;
public const int SilenforcingBarrier = 98477480;
public const int LoThePrayersOfTheVoicelessVoice = 25801745;
public const int BarrierOfTheVoicelessVoice = 98477480;

public const int DiabellzeOfTheOriginalSin = 53765052;
public const int PotOfExtravagance = 49238328;
Expand Down Expand Up @@ -450,7 +450,8 @@ public override bool OnPreBattleBetween(ClientCard attacker, ClientCard defender
if (defender.IsCode(_CardId.RescueACEHydrant) && !defender.IsDisabled() && Enemy.GetMonsters().Any(monster => monster.HasSetcode(_Setcode.RescueACE) && !monster.IsCode(_CardId.RescueACEHydrant)))
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 true;
Expand Down
7 changes: 7 additions & 0 deletions Game/GameBehavior.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1078,6 +1078,13 @@ private void InternalOnSelectCard(BinaryReader packet, Func<IList<ClientCard>, i
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);
_select_hint = 0;

Expand Down

0 comments on commit e55be8b

Please sign in to comment.