diff --git a/.gitattributes b/.gitattributes index 24dbdd34b71..d7d9c3093c7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4409,6 +4409,7 @@ res/cardsfolder/i/infested_roothold.txt svneol=native#text/plain res/cardsfolder/i/infiltrate.txt svneol=native#text/plain res/cardsfolder/i/infiltration_lens.txt svneol=native#text/plain res/cardsfolder/i/infiltrator_il_kor.txt svneol=native#text/plain +res/cardsfolder/i/infiltrators_magemark.txt -text res/cardsfolder/i/infinite_hourglass.txt -text res/cardsfolder/i/inflame.txt svneol=native#text/plain res/cardsfolder/i/information_dealer.txt svneol=native#text/plain diff --git a/res/cardsfolder/i/infiltrators_magemark.txt b/res/cardsfolder/i/infiltrators_magemark.txt new file mode 100644 index 00000000000..385ab25c36e --- /dev/null +++ b/res/cardsfolder/i/infiltrators_magemark.txt @@ -0,0 +1,12 @@ +Name:Infiltrator's Magemark +ManaCost:2 U +Types:Enchantment Aura +Text:no text +K:Enchant creature +A:SP$ Attach | Cost$ 2 U | ValidTgts$ Creature | AILogic$ Pump +S:Mode$ Continuous | Affected$ Creature.enchanted+YouCtrl | AddPower$ 1 | AddToughness$ 1 | AddHiddenKeyword$ HIDDEN CARDNAME can't be blocked except by creatures with defender. | Description$ Creatures you control that are enchanted get +1/+1 and can't be blocked except by creatures with defender. +SVar:Rarity:Common +SVar:Picture:http://www.wizards.com/global/images/magic/general/infiltrators_magemark.jpg +SetInfo:GPT|Common|http://magiccards.info/scans/en/gp/28.jpg +Oracle:Enchant creature\nCreatures you control that are enchanted get +1/+1 and can't be blocked except by creatures with defender. +End \ No newline at end of file diff --git a/src/main/java/forge/game/phase/CombatUtil.java b/src/main/java/forge/game/phase/CombatUtil.java index 1be8f32fdff..87d8b5a80fc 100644 --- a/src/main/java/forge/game/phase/CombatUtil.java +++ b/src/main/java/forge/game/phase/CombatUtil.java @@ -678,6 +678,10 @@ public class CombatUtil { } } + if (attacker.hasKeyword("CARDNAME can't be blocked except by creatures with defender.") && !blocker.hasKeyword("Defender")) { + return false; + } + if (attacker.hasKeyword("Horsemanship")) { if (!blocker.hasKeyword("Horsemanship")) { return false;