From 28a92e34df926de247f942bb6801ffcff9de7cac Mon Sep 17 00:00:00 2001 From: elcnesh Date: Tue, 27 Jan 2015 14:29:31 +0000 Subject: [PATCH] Fix Grim Haruspex plus some cleanup. --- .../src/main/java/forge/game/ability/effects/PumpEffect.java | 2 +- forge-gui/res/cardsfolder/a/ali_baba.txt | 2 +- forge-gui/res/cardsfolder/g/grim_haruspex.txt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/PumpEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PumpEffect.java index 6fcaa90b258..ed7aa34b29a 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/PumpEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/PumpEffect.java @@ -186,7 +186,7 @@ public class PumpEffect extends SpellAbilityEffect { @Override public void resolve(final SpellAbility sa) { - final ArrayList untargetedCards = new ArrayList(); + final List untargetedCards = new ArrayList(); final TargetRestrictions tgt = sa.getTargetRestrictions(); final Game game = sa.getActivatingPlayer().getGame(); final Card host = sa.getHostCard(); diff --git a/forge-gui/res/cardsfolder/a/ali_baba.txt b/forge-gui/res/cardsfolder/a/ali_baba.txt index 30ee6d30e2c..8a026aa7ae1 100644 --- a/forge-gui/res/cardsfolder/a/ali_baba.txt +++ b/forge-gui/res/cardsfolder/a/ali_baba.txt @@ -2,6 +2,6 @@ Name:Ali Baba ManaCost:R Types:Creature Human Rogue PT:1/1 -A:AB$ Tap | Cost$ R | ValidTgts$ Wall | TgtPrompt$ Select target wall | SpellDescription$ Tap target wall. +A:AB$ Tap | Cost$ R | ValidTgts$ Wall | TgtPrompt$ Select target Wall | SpellDescription$ Tap target Wall. SVar:Picture:http://www.wizards.com/global/images/magic/general/ali_baba.jpg Oracle:{R}: Tap target Wall. diff --git a/forge-gui/res/cardsfolder/g/grim_haruspex.txt b/forge-gui/res/cardsfolder/g/grim_haruspex.txt index c8651aeaa28..60fb10c8ab9 100644 --- a/forge-gui/res/cardsfolder/g/grim_haruspex.txt +++ b/forge-gui/res/cardsfolder/g/grim_haruspex.txt @@ -3,7 +3,7 @@ ManaCost:2 B Types:Creature Human Wizard PT:3/2 K:Morph:B -T:Mode$ ChangesZone | ValidCard$ Creature.nonToken+Other+YouCtrl | Origin$ Battlefield | Destination$ Graveyard | OptionalDecider$ You | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever another nontoken creature you control dies, draw a card. -SVar:TrigDraw:AB$ Draw | Cost$ 0 | Defined$ You | NumCards$ 1 +T:Mode$ ChangesZone | ValidCard$ Creature.nonToken+Other+YouCtrl | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever another nontoken creature you control dies, draw a card. +SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 SVar:Picture:http://www.wizards.com/global/images/magic/general/grim_haruspex.jpg Oracle:Morph {B} (You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)\nWhenever another nontoken creature you control dies, draw a card.