From 25995db86280a833e034d9e6706240f1901e78ba Mon Sep 17 00:00:00 2001 From: Agetian Date: Wed, 12 Jun 2019 07:59:09 +0300 Subject: [PATCH 1/2] - Fix the AI logic for Hunt the Weak --- forge-ai/src/main/java/forge/ai/ability/FightAi.java | 4 ++++ forge-gui/res/cardsfolder/h/hunt_the_weak.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/forge-ai/src/main/java/forge/ai/ability/FightAi.java b/forge-ai/src/main/java/forge/ai/ability/FightAi.java index c5f623866a9..89f97e8a8e0 100644 --- a/forge-ai/src/main/java/forge/ai/ability/FightAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/FightAi.java @@ -108,6 +108,10 @@ public class FightAi extends SpellAbilityAi { @Override public boolean chkAIDrawback(final SpellAbility sa, final Player aiPlayer) { + if ("NoRecheck".equals(sa.getParam("AILogic"))) { + return true; // e.g. Hunt the Weak, the AI logic was already checked through canFightAi + } + return checkApiLogic(aiPlayer, sa); } diff --git a/forge-gui/res/cardsfolder/h/hunt_the_weak.txt b/forge-gui/res/cardsfolder/h/hunt_the_weak.txt index e945cc5f4c9..78cfceada33 100644 --- a/forge-gui/res/cardsfolder/h/hunt_the_weak.txt +++ b/forge-gui/res/cardsfolder/h/hunt_the_weak.txt @@ -2,7 +2,7 @@ Name:Hunt the Weak ManaCost:3 G Types:Sorcery A:SP$ PutCounter | Cost$ 3 G | AILogic$ Fight | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to put a +1/+1 counter | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBFight | SpellDescription$ Put a +1/+1 counter on target creature you control. Then that creature fights target creature you don't control. -SVar:DBFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control +SVar:DBFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.YouDontCtrl | AILogic$ NoRecheck | TgtPrompt$ Select target creature you don't control DeckHas:Ability$Counters SVar:Picture:http://www.wizards.com/global/images/magic/general/hunt_the_weak.jpg Oracle:Put a +1/+1 counter on target creature you control. Then that creature fights target creature you don't control. (Each deals damage equal to its power to the other.) From b23fc791a2cf20e43ce7e10742c216127049308b Mon Sep 17 00:00:00 2001 From: Agetian Date: Wed, 12 Jun 2019 07:59:50 +0300 Subject: [PATCH 2/2] - Same tweak for Savage Stomp --- forge-gui/res/cardsfolder/s/savage_stomp.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/s/savage_stomp.txt b/forge-gui/res/cardsfolder/s/savage_stomp.txt index 1ebd7823dc5..5634f714780 100644 --- a/forge-gui/res/cardsfolder/s/savage_stomp.txt +++ b/forge-gui/res/cardsfolder/s/savage_stomp.txt @@ -5,7 +5,7 @@ S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ CostReduction SVar:CostReduction:Count$Compare CheckTgt GE1.2.0 SVar:CheckTgt:Targeted$Valid Creature.Dinosaur+YouCtrl A:SP$ PutCounter | Cost$ 2 G | AILogic$ Fight | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control to put a +1/+1 counter | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBFight | References$ CostReduction,CheckTgt | SpellDescription$ Put a +1/+1 counter on target creature you control. Then that creature fights target creature you don't control. -SVar:DBFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.YouDontCtrl | TgtPrompt$ Select target creature you don't control +SVar:DBFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature.YouDontCtrl | AILogic$ NoRecheck | TgtPrompt$ Select target creature you don't control DeckHas:Ability$Counters SVar:Picture:http://www.wizards.com/global/images/magic/general/savage_stomp.jpg DeckHas:Ability$Token & Ability$Counters