From bcba7b7c3b05710dbc12e0aee5ce202fc418d98c Mon Sep 17 00:00:00 2001 From: swordshine Date: Mon, 21 Apr 2014 06:41:57 +0000 Subject: [PATCH] - Fixed Biomantic Mastery --- .../src/main/java/forge/game/ability/AbilityUtils.java | 7 +++++++ forge-gui/res/cardsfolder/b/biomantic_mastery.txt | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java index e9e9473696d..e4449e60b0a 100644 --- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java +++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java @@ -486,6 +486,13 @@ public class AbilityUtils { } return CardFactoryUtil.playerXCount(players, calcX[1], card) * multiplier; } + if (calcX[0].startsWith("ThisTargetedPlayer")) { + final ArrayList players = new ArrayList(); + if (null != ability) { + Iterables.addAll(players, ability.getTargets().getTargetPlayers()); + } + return CardFactoryUtil.playerXCount(players, calcX[1], card) * multiplier; + } if (calcX[0].startsWith("TargetedObjects")) { final List objects = new ArrayList(); // Make list of all targeted objects starting with the root SpellAbility diff --git a/forge-gui/res/cardsfolder/b/biomantic_mastery.txt b/forge-gui/res/cardsfolder/b/biomantic_mastery.txt index 597533c9936..c3ea1fcb233 100644 --- a/forge-gui/res/cardsfolder/b/biomantic_mastery.txt +++ b/forge-gui/res/cardsfolder/b/biomantic_mastery.txt @@ -1,7 +1,8 @@ Name:Biomantic Mastery ManaCost:4 GU GU GU Types:Sorcery -A:SP$ Draw | Cost$ 4 GU GU GU | NumCards$ X | References$ X | SpellDescription$ Draw a card for each creature target player controls, then draw a card for each creature another target player controls. -SVar:X:Count$TypeOnBattlefield.Creature +A:SP$ Draw | Cost$ 4 GU GU GU | Defined$ You | ValidTgts$ Player | NumCards$ X | References$ X | SubAbility$ DBDraw | SpellDescription$ Draw a card for each creature target player controls, then draw a card for each creature another target player controls. +SVar:DBDraw:DB$ Draw | Defined$ You | ValidTgts$ Player | TargetUnique$ True | NumCards$ X | References$ X +SVar:X:ThisTargetedPlayer$Valid Creature.YouCtrl SVar:Picture:http://www.wizards.com/global/images/magic/general/biomantic_mastery.jpg Oracle:({G/U} can be paid with either {G} or {U}.)\nDraw a card for each creature target player controls, then draw a card for each creature another target player controls. \ No newline at end of file