From ada8ccbd1ae017675731add28b4c65ef17d84849 Mon Sep 17 00:00:00 2001 From: Sloth Date: Thu, 10 May 2012 20:24:30 +0000 Subject: [PATCH] - Improved AI of Glint Hawk Idol. --- res/cardsfolder/g/glint_hawk_idol.txt | 1 + .../card/abilityfactory/AbilityFactoryAnimate.java | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/res/cardsfolder/g/glint_hawk_idol.txt b/res/cardsfolder/g/glint_hawk_idol.txt index fa10538e7bd..81dee23a131 100644 --- a/res/cardsfolder/g/glint_hawk_idol.txt +++ b/res/cardsfolder/g/glint_hawk_idol.txt @@ -5,6 +5,7 @@ Text:no text T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Artifact.Other+YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigAnimate | TriggerDescription$ Whenever another artifact enters the battlefield under your control, you may have CARDNAME become a 2/2 Bird artifact creature with flying until end of turn. SVar:TrigAnimate:AB$Animate | Cost$ 0 | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Artifact,Creature,Bird | Keywords$ Flying A:AB$ Animate | Cost$ W | Defined$ Self | Power$ 2 | Toughness$ 2 | Types$ Artifact,Creature,Bird | Keywords$ Flying | SpellDescription$ CARDNAME becomes a 2/2 Bird artifact creature with flying until end of turn. +SVar:BuffedBy:Artifact SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/glint_hawk_idol.jpg SetInfo:SOM|Common|http://magiccards.info/scans/en/som/156.jpg diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryAnimate.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryAnimate.java index 48d79207052..d4a475eb892 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryAnimate.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryAnimate.java @@ -395,9 +395,11 @@ public final class AbilityFactoryAnimate { */ private static boolean animatePlayDrawbackAI(final AbilityFactory af, final SpellAbility sa) { // AI should only activate this during Human's turn - boolean chance = AbilityFactoryAnimate.animateTgtAI(af, sa); + boolean chance = true; - // TODO - restrict the subAbility a bit + if (sa.getTarget() != null) { + chance = AbilityFactoryAnimate.animateTgtAI(af, sa); + } final AbilitySub subAb = sa.getSubAbility(); if (subAb != null) { @@ -425,7 +427,11 @@ public final class AbilityFactoryAnimate { return false; } - boolean chance = AbilityFactoryAnimate.animateTgtAI(af, sa); + boolean chance = true; + + if (sa.getTarget() != null) { + chance = AbilityFactoryAnimate.animateTgtAI(af, sa); + } // Improve AI for triggers. If source is a creature with: // When ETB, sacrifice a creature. Check to see if the AI has something