diff --git a/res/cardsfolder/armadillo_cloak.txt b/res/cardsfolder/armadillo_cloak.txt index b7bc820d433..5c44f67e0ac 100644 --- a/res/cardsfolder/armadillo_cloak.txt +++ b/res/cardsfolder/armadillo_cloak.txt @@ -1,9 +1,10 @@ Name:Armadillo Cloak ManaCost:1 G W Types:Enchantment Aura -Text:Enchanted creature gets +2/+2 and has trample and lifelink. +Text:Enchanted creature gets +2/+2 and has trample. K:Enchant creature -K:enPump:+2/+2/Trample & Lifelink +K:enPump:+2/+2/Trample +K:Whenever enchanted creature deals damage, you gain that much life. SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/armadillo_cloak.jpg SetInfo:INV|Common|http://magiccards.info/scans/en/in/229.jpg diff --git a/res/cardsfolder/crystal_ball.txt b/res/cardsfolder/crystal_ball.txt index 9574193ade1..c3ba5b28412 100644 --- a/res/cardsfolder/crystal_ball.txt +++ b/res/cardsfolder/crystal_ball.txt @@ -3,6 +3,7 @@ ManaCost:3 Types:Artifact Text:no text A:AB$Scry | Cost$ 1 T | ScryNum$ 2 |SpellDescription$ Scry 2. (To scry 2, look at the top two cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.) +SVar:RemAIDeck:True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/crystal_ball.jpg End \ No newline at end of file diff --git a/res/cardsfolder/mystic_speculation.txt b/res/cardsfolder/mystic_speculation.txt index 274fcf457e6..885150199dc 100644 --- a/res/cardsfolder/mystic_speculation.txt +++ b/res/cardsfolder/mystic_speculation.txt @@ -4,6 +4,7 @@ Types:Sorcery Text:no text A:SP$Scry | Cost$ U | ScryNum$ 3 | SpellDescription$ Scry 3. (To scry 3, look at the top three cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.) SVar:Buyback:2 +SVar:RemAIDeck:True SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/mystic_speculation.jpg SetInfo:FUT|Uncommon|http://magiccards.info/scans/en/fut/41.jpg diff --git a/res/cardsfolder/spirit_link.txt b/res/cardsfolder/spirit_link.txt index 0bd0f9aeec3..abd5ce64b5d 100644 --- a/res/cardsfolder/spirit_link.txt +++ b/res/cardsfolder/spirit_link.txt @@ -1,9 +1,10 @@ Name:Spirit Link ManaCost:W Types:Enchantment Aura -Text:Whenever enchanted creature deals damage, you gain that much life. +Text:no text K:Enchant creature -K:enPump:Whenever CARDNAME deals damage, you gain that much life. +K:enPump:+0/+0 +K:Whenever enchanted creature deals damage, you gain that much life. SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/spirit_link.jpg End \ No newline at end of file diff --git a/res/cardsfolder/thrull_surgeon.txt b/res/cardsfolder/thrull_surgeon.txt index 9e34a00531d..8f00c11d24b 100644 --- a/res/cardsfolder/thrull_surgeon.txt +++ b/res/cardsfolder/thrull_surgeon.txt @@ -3,7 +3,7 @@ ManaCost:1 B Types:Creature Thrull Text:no text PT:1/1 -A:AB$Discard | Cost$ 1 B Sac<1/CARDNAME> | ValidTgts$ Player|TgtPrompt$Select target player. | Mode$ RevealYouChoose | NumCards$ 1 |SorcerySpeed$True| SpellDescription$ Look at target player's hand and choose a card from it. That player discards that card. Activate this ability only any time you could cast a sorcery. +A:AB$Discard | Cost$ 1 B Sac<1/CARDNAME> | ValidTgts$ Player | TgtPrompt$ Select target player. | Mode$ RevealYouChoose | NumCards$ 1 | SorcerySpeed$ True | SpellDescription$ Look at target player's hand and choose a card from it. That player discards that card. Activate this ability only any time you could cast a sorcery. SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/thrull_surgeon.jpg End \ No newline at end of file diff --git a/res/cardsfolder/weathered_wayfarer.txt b/res/cardsfolder/weathered_wayfarer.txt index 9439bf9f505..8de95e2e222 100644 --- a/res/cardsfolder/weathered_wayfarer.txt +++ b/res/cardsfolder/weathered_wayfarer.txt @@ -3,7 +3,7 @@ ManaCost:W Types:Creature Human Nomad Cleric Text:no text PT:1/1 -A:AB$ChangeZone | Cost$ W T| Origin$ Library | Destination$ Hand | ChangeType$ Land | ChangeNum$ 1|IsPresent$Land.YouDontCtrl|PresentCompare$ GTX | SpellDescription$ Search your library for a land card, reveal it, and put it into your hand. Then shuffle your library. Activate this ability only if an opponent controls more lands than you. +A:AB$ChangeZone | Cost$ W T | Origin$ Library | Destination$ Hand | ChangeType$ Land | ChangeNum$ 1| IsPresent$ Land.YouDontCtrl | PresentCompare$ GTX | SpellDescription$ Search your library for a land card, reveal it, and put it into your hand. Then shuffle your library. Activate this ability only if an opponent controls more lands than you. SVar:X:Count$Valid Land.YouCtrl SVar:Rarity:Rare SVar:Picture:http://resources.wizards.com/magic/cards/9ed/en-us/card83311.jpg diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index e44dd0d620b..102a0309be9 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -5397,9 +5397,27 @@ public class GameActionUtil { AllZone.Stack.add(ability); } - CardList cl = CardFactoryUtil.getAurasEnchanting(source, "Guilty Conscience"); - for(Card c:cl) { - GameActionUtil.executeGuiltyConscienceEffects(source, c, damage); + CardList enchantments = new CardList(source.getEnchantedBy().toArray()); + + for(Card enchantment: enchantments) { + if(enchantment.getName().equals("Guilty Conscience")) + GameActionUtil.executeGuiltyConscienceEffects(source, enchantment, damage); + if(enchantment.getKeyword().contains("Whenever enchanted creature deals damage, you gain that much life.")) { + final int life = damage; + final Card e = enchantment; + final Player player = e.getController(); + + Ability ability = new Ability(e, "0") { + @Override + public void resolve() { + player.gainLife(life, e); + } + }; + StringBuilder sb = new StringBuilder(); + sb.append(e.getName()+" - ").append(player).append(" gains ").append(life).append(" life"); + ability.setStackDescription(sb.toString()); + AllZone.Stack.add(ability); + } } }