From 09edb071ff6da692d7f5f4665c4d3a3a04dab470 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Fri, 21 Jun 2013 13:38:48 +0000 Subject: [PATCH] removed keyword CARDNAME can't be blocked by red creatures --- res/cardsfolder/e/elder_spawn.txt | 2 +- res/cardsfolder/r/red_scarab.txt | 2 +- src/main/java/forge/game/phase/CombatUtil.java | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/res/cardsfolder/e/elder_spawn.txt b/res/cardsfolder/e/elder_spawn.txt index 65b297d1155..a318085ba86 100644 --- a/res/cardsfolder/e/elder_spawn.txt +++ b/res/cardsfolder/e/elder_spawn.txt @@ -2,7 +2,7 @@ Name:Elder Spawn ManaCost:4 U U U Types:Creature Spawn PT:6/6 -K:CARDNAME can't be blocked by red creatures. +K:CantBeBlockedBy Creature.Red T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigElderSpawnSacrifice | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, unless you sacrifice an Island, sacrifice CARDNAME and it deals 6 damage to you. CARDNAME can't be blocked by red creatures. SVar:TrigElderSpawnSacrifice:AB$ Sacrifice | Cost$ 0 | SacValid$ Island | Optional$ True | RememberSacrificed$ True | SubAbility$ DBElderSpawnSacrificeMe SVar:DBElderSpawnSacrificeMe:DB$ Sacrifice | Defined$ Self | ConditionDefined$ Remembered | ConditionPresent$ Island | ConditionCompare$ EQ0 | SubAbility$ DBElderSpawnDamage diff --git a/res/cardsfolder/r/red_scarab.txt b/res/cardsfolder/r/red_scarab.txt index 0f894c27a88..141dcd6b22a 100644 --- a/res/cardsfolder/r/red_scarab.txt +++ b/res/cardsfolder/r/red_scarab.txt @@ -3,7 +3,7 @@ ManaCost:W Types:Enchantment Aura K:Enchant creature A:SP$ Attach | Cost$ W | ValidTgts$ Creature | AILogic$ Pump -S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME can't be blocked by red creatures. | Description$ Enchanted creature can't be blocked by red creatures. +S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CantBeBlockedBy Creature.Red | Description$ Enchanted creature can't be blocked by red creatures. S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | CheckSVar$ X | SVarCompare$ GE1 | References$ X | Description$ Enchanted creature gets +2/+2 as long as an opponent controls a red permanent. SVar:X:Count$Valid Permanent.Red+OppCtrl SVar:RemRandomDeck:True diff --git a/src/main/java/forge/game/phase/CombatUtil.java b/src/main/java/forge/game/phase/CombatUtil.java index 972be9f9293..63dfe2282ff 100644 --- a/src/main/java/forge/game/phase/CombatUtil.java +++ b/src/main/java/forge/game/phase/CombatUtil.java @@ -689,9 +689,6 @@ public class CombatUtil { if (attacker.hasKeyword("CARDNAME can't be blocked by green creatures.") && blocker.isGreen()) { return false; } - if (attacker.hasKeyword("CARDNAME can't be blocked by red creatures.") && blocker.isRed()) { - return false; - } if (attacker.hasKeyword("CARDNAME can't be blocked by white creatures.") && blocker.isWhite()) { return false; }