- Added Shieldmage Advocate

.gitattributes

@@ -10930,6 +10930,7 @@ forge-gui/res/cardsfolder/s/shield_sphere.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/s/shield_wall.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/s/shielded_passage.txt -text
 forge-gui/res/cardsfolder/s/shielding_plax.txt svneol=native#text/plain
+forge-gui/res/cardsfolder/s/shieldmage_advocate.txt -text
 forge-gui/res/cardsfolder/s/shieldmage_elder.txt -text
 forge-gui/res/cardsfolder/s/shieldmates_blessing.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/s/shields_of_velis_vel.txt -text

forge-game/src/main/java/forge/game/ability/AbilityUtils.java

@@ -115,14 +115,15 @@ public class AbilityUtils {
                 // we don't want this to fall through and return the "Self"
                 return cards;
             }
-        }
+        } else if (defined.equals("Targeted")) {
-
-        else if (defined.equals("Targeted")) {
             final SpellAbility saTargeting = sa.getSATargetingCard();
             if (saTargeting != null) {
                 Iterables.addAll(cards, saTargeting.getTargets().getTargetCards());
             }
-
+        } else if (defined.equals("ThisTargetedCard")) { // do not add parent targeted
+            if (sa != null && sa.getTargets() != null) {
+                Iterables.addAll(cards, sa.getTargets().getTargetCards());
+            }
         } else if (defined.equals("ParentTarget")) {
             final SpellAbility parent = sa.getParentTargetingCard();
             if (parent != null) {
@@ -746,7 +747,7 @@ public class AbilityUtils {
         final String defined = (def == null) ? "You" : def;
         final Game game = card == null ? null : card.getGame();
 
-        if (defined.equals("Targeted")) {
+        if (defined.equals("Targeted") || defined.equals("TargetedPlayer")) {
             final SpellAbility saTargeting = sa.getSATargetingPlayer();
             if (saTargeting != null) {
                 Iterables.addAll(players, saTargeting.getTargets().getTargetPlayers());

forge-gui/res/cardsfolder/s/shieldmage_advocate.txt

@@ -0,0 +1,12 @@
+Name:Shieldmage Advocate
+ManaCost:2 W
+Types:Creature Human Cleric
+PT:1/3
+A:AB$ ChangeZone | Cost$ T | ValidTgts$ Card.OppOwn | TgtPrompt$ Select target card in an opponent's graveyard | Origin$ Graveyard | Destination$ Hand | SubAbility$ DBChooseSource | SpellDescription$ Return target card from an opponent's graveyard to his or her hand. Prevent all damage that would be dealt to target creature or player this turn by a source of your choice.
+SVar:DBChooseSource:DB$ ChooseSource | Choices$ Card | ChoiceTitle$ Choose a source that shares a color with the exiled card | RememberChosen$ True | AILogic$ NeedsPrevention | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player to prevent damage | StaticAbilities$ PreventFromSource | References$ PreventFromSource | RememberObjects$ TargetedPlayer,ThisTargetedCard | ImprintCards$ Remembered | SubAbility$ DBCleanup | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBCleanup
+SVar:PreventFromSource:Mode$ PreventDamage | EffectZone$ Command | Source$ Card.IsImprinted | Target$ Player.IsRemembered,Card.IsRemembered | Description$ Prevent all damage that would be dealt to target creature or player this turn by a source of your choice.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/shieldmage_advocate.jpg
+Oracle:{T}: Return target card from an opponent's graveyard to his or her hand. Prevent all damage that would be dealt to target creature or player this turn by a source of your choice.

forge-gui/res/cardsfolder/s/syphon_mind.txt

@@ -2,7 +2,7 @@ Name:Syphon Mind
 ManaCost:3 B
 Types:Sorcery
 A:SP$ Discard | Cost$ 3 B | Defined$ Opponent | NumCards$ 1 | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ DBDraw | SpellDescription$ Each other player discards a card. You draw a card for each card discarded this way.
-SVar:DBDraw:DB$ Draw | Cost$ 0 | NumCards$ X | SubAbility$ DBCleanup
+SVar:DBDraw:DB$ Draw | Cost$ 0 | NumCards$ X | References$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
 SVar:Picture:http://www.wizards.com/global/images/magic/general/syphon_mind.jpg

forge-gui/res/cardsfolder/t/tribute_to_hunger.txt

@@ -2,7 +2,7 @@ Name:Tribute to Hunger
 ManaCost:2 B
 Types:Instant
 A:SP$ Sacrifice | Cost$ 2 B | SacValid$ Creature | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | Amount$ 1 | RememberSacrificed$ True | SubAbility$ DBGainLife | SpellDescription$ Target opponent sacrifices a creature. You gain life equal to that creature's toughness.
-SVar:DBGainLife:DB$ GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X
+SVar:DBGainLife:DB$ GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | References$ X
 SVar:X:RememberedLKI$CardToughness
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tribute_to_hunger.jpg
 Oracle:Target opponent sacrifices a creature. You gain life equal to that creature's toughness.