From 84e73f6f52c50df3adb943f5712ae29461ba3edc Mon Sep 17 00:00:00 2001 From: Agetian Date: Tue, 29 Aug 2017 16:18:09 +0000 Subject: [PATCH] - Fixed the AI cheating with Plague Belcher by ignoring its triggered ETB ability. --- forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java | 7 +++++++ forge-gui/res/cardsfolder/p/plague_belcher.txt | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java b/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java index e5f59ab2412..7f23316da9e 100644 --- a/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java @@ -707,6 +707,13 @@ public class CountersPutAi extends SpellAbilityAi { list = CardLists.getTargetableCards(ai.getOpponents().getCardsIn(ZoneType.Battlefield), sa); preferred = false; } + + if (list.isEmpty()) { + // Still an empty list, but we have to choose something (mandatory); expand targeting to + // include AI's own cards to see if there's anything targetable (e.g. Plague Belcher). + list = CardLists.getTargetableCards(ai.getCardsIn(ZoneType.Battlefield), sa); + preferred = false; + } } if (list.isEmpty()) { diff --git a/forge-gui/res/cardsfolder/p/plague_belcher.txt b/forge-gui/res/cardsfolder/p/plague_belcher.txt index fabcdcc0dbb..09eca3c7ea9 100644 --- a/forge-gui/res/cardsfolder/p/plague_belcher.txt +++ b/forge-gui/res/cardsfolder/p/plague_belcher.txt @@ -4,9 +4,9 @@ Types:Creature Zombie Beast PT:5/4 K:Menace T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPutCounter | TriggerDescription$ When CARDNAME enters the battlefield, put two -1/-1 counters on target creature you control. -SVar:TrigPutCounter:DB$ PutCounter | Cost$ 0 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ M1M1 | IsCurse$ True | CounterNum$ 2 +SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ M1M1 | IsCurse$ True | CounterNum$ 2 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Zombie.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever another Zombie you control dies, each opponent loses 1 life. SVar:TrigLoseLife:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 1 SVar:Picture:http://www.wizards.com/global/images/magic/general/plague_belcher.jpg -DeckHints:Type$Zombie +DeckHints:Type$Zombie Oracle:Menace\nWhen Plague Belcher enters the battlefield, put two -1/-1 counters on target creature you control.\nWhenever another Zombie you control dies, each opponent loses 1 life.