diff --git a/.gitattributes b/.gitattributes index 75a32a9464d..654581ad40d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3559,6 +3559,7 @@ res/cardsfolder/phantom_beast.txt -text svneol=native#text/plain res/cardsfolder/phantom_centaur.txt -text svneol=native#text/plain res/cardsfolder/phantom_monster.txt -text svneol=native#text/plain res/cardsfolder/phantom_nishoba.txt -text svneol=native#text/plain +res/cardsfolder/phantom_tiger.txt -text svneol=native#text/plain res/cardsfolder/phantom_warrior.txt -text svneol=native#text/plain res/cardsfolder/phobian_phantasm.txt -text svneol=native#text/plain res/cardsfolder/phylactery_lich.txt -text svneol=native#text/plain diff --git a/res/cardsfolder/phantom_tiger.txt b/res/cardsfolder/phantom_tiger.txt new file mode 100644 index 00000000000..795049290d3 --- /dev/null +++ b/res/cardsfolder/phantom_tiger.txt @@ -0,0 +1,11 @@ +Name:Phantom Tiger +ManaCost:2 G +Types:Creature Cat Spirit +Text:no text +PT:1/0 +K:etbCounter:P1P1:2 +K:If damage would be dealt to CARDNAME, prevent that damage. Remove a +1/+1 counter from CARDNAME. +SVar:RemAIDeck:True +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/phantom_tiger.jpg +End \ No newline at end of file diff --git a/src/forge/Card.java b/src/forge/Card.java index a4a474dd3ae..3abaef324db 100644 --- a/src/forge/Card.java +++ b/src/forge/Card.java @@ -2875,6 +2875,13 @@ public class Card extends MyObservable { restDamage = staticDamagePrevention(restDamage, source, isCombat); + if(restDamage == 0) return 0; + + if (this.hasKeyword("If damage would be dealt to CARDNAME, prevent that damage. Remove a +1/+1 counter from CARDNAME.")) { + restDamage = 0; + this.subtractCounter(Counters.P1P1, 1); + } + if(restDamage >= preventNextDamage) { restDamage = restDamage - preventNextDamage; preventNextDamage = 0;