diff --git a/.gitattributes b/.gitattributes index 4c58696a976..ff8335a2223 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4349,6 +4349,7 @@ res/cardsfolder/memnarch.txt -text svneol=native#text/plain res/cardsfolder/memnite.txt -text svneol=native#text/plain res/cardsfolder/memory_erosion.txt -text svneol=native#text/plain res/cardsfolder/memory_lapse.txt -text svneol=native#text/plain +res/cardsfolder/mending_hands.txt -text svneol=native#text/plain res/cardsfolder/meng_huo_barbarian_king.txt -text svneol=native#text/plain res/cardsfolder/meng_huos_horde.txt -text svneol=native#text/plain res/cardsfolder/mental_discipline.txt -text svneol=native#text/plain @@ -6675,6 +6676,7 @@ res/cardsfolder/spitting_image.txt svneol=native#text/plain res/cardsfolder/spitting_sliver.txt -text svneol=native#text/plain res/cardsfolder/spitting_spider.txt -text svneol=native#text/plain res/cardsfolder/splinter_twin.txt svneol=native#text/plain +res/cardsfolder/split_tail_miko.txt -text svneol=native#text/plain res/cardsfolder/splitting_headache.txt -text svneol=native#text/plain res/cardsfolder/spoils_of_victory.txt -text svneol=native#text/plain res/cardsfolder/spontaneous_combustion.txt svneol=native#text/plain diff --git a/res/cardsfolder/jackal_pup.txt b/res/cardsfolder/jackal_pup.txt index 6d6918631df..6334e048688 100644 --- a/res/cardsfolder/jackal_pup.txt +++ b/res/cardsfolder/jackal_pup.txt @@ -1,9 +1,11 @@ Name:Jackal Pup ManaCost:R Types:Creature Hound -Text:Whenever Jackal Pup is dealt damage, it deals that much damage to you. +Text:no text PT:2/1 +T:Mode$ DamageDone | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to you. +SVar:TrigDamage:AB$DealDamage | Cost$ 0 | NumDmg$ X | Defined$ You SVar:Rarity:Uncommon -SVar:Picture:http://resources.wizards.com/magic/cards/te/en-us/card4825.jpg +SVar:Picture:http://www.wizards.com/global/images/magic/general/jackal_pup.jpg SetInfo:TMP|Uncommon|http://magiccards.info/scans/en/tp/183.jpg End \ No newline at end of file diff --git a/res/cardsfolder/mending_hands.txt b/res/cardsfolder/mending_hands.txt new file mode 100644 index 00000000000..8bfd9b21408 --- /dev/null +++ b/res/cardsfolder/mending_hands.txt @@ -0,0 +1,8 @@ +Name:Mending Hands +ManaCost:W +Types:Instant +Text:no text +A:SP$ PreventDamage | Cost$ W | Tgt$ TgtCP | Amount$ 4 | SpellDescription$ Prevent the next 4 damage that would be dealt to target creature or player this turn. +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/mending_hands.jpg +End \ No newline at end of file diff --git a/res/cardsfolder/shinka_gatekeeper.txt b/res/cardsfolder/shinka_gatekeeper.txt index ad2ee3636ae..3c702a6f9af 100644 --- a/res/cardsfolder/shinka_gatekeeper.txt +++ b/res/cardsfolder/shinka_gatekeeper.txt @@ -1,9 +1,11 @@ Name:Shinka Gatekeeper ManaCost:2 R Types:Creature Ogre Warrior -Text:Whenever Shinka Gatekeeper is dealt damage, it deals that much damage to you. +Text:no text PT:3/2 +T:Mode$ DamageDone | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME is dealt damage, it deals that much damage to you. +SVar:TrigDamage:AB$DealDamage | Cost$ 0 | NumDmg$ X | Defined$ You SVar:Rarity:Common -SVar:Picture:http://resources.wizards.com/magic/cards/bok/en-us/card74099.jpg +SVar:Picture:http://www.wizards.com/global/images/magic/general/shinka_gatekeeper.jpg SetInfo:BOK|Common|http://magiccards.info/scans/en/bok/117.jpg End \ No newline at end of file diff --git a/res/cardsfolder/split_tail_miko.txt b/res/cardsfolder/split_tail_miko.txt new file mode 100644 index 00000000000..a7dda16e60a --- /dev/null +++ b/res/cardsfolder/split_tail_miko.txt @@ -0,0 +1,9 @@ +Name:Split-Tail Miko +ManaCost:1 W +Types:Creature Fox Cleric +Text:no text +PT:1/1 +A:AB$ PreventDamage | Cost$ W T | Tgt$ TgtCP | Amount$ 2 | SpellDescription$ Prevent the next 2 damage that would be dealt to target creature or player this turn. +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/split_tail_miko.jpg +End \ No newline at end of file diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index e6668110ebb..a54f82b857d 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -2095,22 +2095,6 @@ public class GameActionUtil { AllZone.Stack.addSimultaneousStackEntry(ability); - } - - if(affected.getName().equals("Jackal Pup") || affected.getName().equals("Shinka Gatekeeper")) { - final int selfDamage = damage; - Ability ability = new Ability(affected, "0") { - @Override - public void resolve() { - player.addDamage(selfDamage, affected); - } - }; - StringBuilder sb = new StringBuilder(); - sb.append(affected.getName()+" - Deals ").append(selfDamage).append(" damage to ").append(player); - ability.setStackDescription(sb.toString()); - - AllZone.Stack.addSimultaneousStackEntry(ability); - } if(source.getName().equals("Spiritmonger")) {