diff --git a/.gitattributes b/.gitattributes index 5f1ff02f971..05332a7c47a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6210,6 +6210,7 @@ res/cardsfolder/p/pardic_lancer.txt svneol=native#text/plain res/cardsfolder/p/pardic_miner.txt -text res/cardsfolder/p/pardic_swordsmith.txt svneol=native#text/plain res/cardsfolder/p/pariah.txt -text +res/cardsfolder/p/pariahs_shield.txt -text res/cardsfolder/p/part_the_veil.txt svneol=native#text/plain res/cardsfolder/p/part_water.txt svneol=native#text/plain res/cardsfolder/p/past_in_flames.txt -text diff --git a/res/cardsfolder/p/pariahs_shield.txt b/res/cardsfolder/p/pariahs_shield.txt new file mode 100644 index 00000000000..f922b2e9fa8 --- /dev/null +++ b/res/cardsfolder/p/pariahs_shield.txt @@ -0,0 +1,14 @@ +Name:Pariah's Shield +ManaCost:5 +Types:Artifact Equipment +Text:no text +K:eqPump 3:+0/+0 +R:Event$ DamageDone | ValidTarget$ You | ReplaceWith$ DmgEquipped | IsCombat$ False | IsEquipping$ True | Description$ All damage that would be dealt to you is dealt to equipped creature instead. +R:Event$ DamageDone | ValidTarget$ You | ReplaceWith$ DmgEquippedCombat | IsCombat$ True | IsEquipping$ True +SVar:DmgEquipped:AB$DealDamage | Cost$ 0 | Defined$ Equipped | DamageSource$ ReplacedSource | NumDmg$ X +SVar:DmgEquippedCombat:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ Equipped | DamageSource$ ReplacedSource | NumDmg$ X +SVar:X:ReplaceCount$DamageAmount +SVar:Picture:http://www.wizards.com/global/images/magic/general/pariahs_shield.jpg +SetInfo:RAV|Rare|http://magiccards.info/scans/en/rav/267.jpg +Oracle:All damage that would be dealt to you is dealt to equipped creature instead.\nEquip {3} +End \ No newline at end of file diff --git a/src/main/java/forge/card/replacement/ReplaceDamage.java b/src/main/java/forge/card/replacement/ReplaceDamage.java index 7ab84fda493..0314f3d7420 100644 --- a/src/main/java/forge/card/replacement/ReplaceDamage.java +++ b/src/main/java/forge/card/replacement/ReplaceDamage.java @@ -85,6 +85,9 @@ public class ReplaceDamage extends ReplacementEffect { } } } + if (getMapParams().containsKey("IsEquipping") && !getHostCard().isEquipping()) { + return false; + } return true; }