From 893bb0ea35b437d229b5654cc0cbc67b498f792d Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 04:44:13 +0000 Subject: [PATCH] 1) Changed the keyword: "This card can't be the target of spells or abilities your opponents control." to this new updated form: "CARDNAME can't be the target of spells or abilities your opponents control." 2) I updated these cards.txt card entries and moved them to the top of file: Drove of Elves Plated Slagwurm Shielding Plax Silhana Ledgewalker Slippery Bogle Taoist Hermit Troll Ascetic Uril, the Miststalker Zuo Ci, the Mocking Sage --- res/cards.txt | 132 ++++++++++++++++----------------- src/forge/CardFactoryUtil.java | 2 +- src/forge/GameActionUtil.java | 8 +- 3 files changed, 71 insertions(+), 71 deletions(-) diff --git a/res/cards.txt b/res/cards.txt index a4ddc79ee6b..5b8a679e37b 100644 --- a/res/cards.txt +++ b/res/cards.txt @@ -1,3 +1,69 @@ +Drove of Elves +3 G +Creature Elf +Drove of Elves's power and toughness are each equal to the number of green permanents you control. +1/1 +CARDNAME can't be the target of spells or abilities your opponents control. + +Plated Slagwurm +4 G G G +Creature Wurm +no text +8/8 +CARDNAME can't be the target of spells or abilities your opponents control. + +Shielding Plax +2 GU +Enchantment Aura +Enchanted creature can't be the target of spells or abilities your opponents control. +Enchant creature +enPump:CARDNAME can't be the target of spells or abilities your opponents control. +When CARDNAME enters the battlefield, draw a card. + +Silhana Ledgewalker +1 G +Creature Elf Rogue +no text +1/1 +CARDNAME can't be blocked except by creatures with flying. +CARDNAME can't be the target of spells or abilities your opponents control. + +Slippery Bogle +UG +Creature Beast +no text +1/1 +CARDNAME can't be the target of spells or abilities your opponents control. + +Taoist Hermit +2 G +Creature Human Mystic +no text +2/2 +CARDNAME can't be the target of spells or abilities your opponents control. + +Troll Ascetic +1 G G +Creature Troll Shaman +no text +3/2 +RegenerateMe:1 G +CARDNAME can't be the target of spells or abilities your opponents control. + +Uril, the Miststalker +2 R G W +Legendary Creature Beast +Uril gets +2/+2 for each Aura attached to it. +5/5 +CARDNAME can't be the target of spells or abilities your opponents control. + +Zuo Ci, the Mocking Sage +1 G G +Legendary Creature Human Advisor +Zuo Ci, the Mocking Sage can't be blocked by creatures with horsemanship. +1/2 +CARDNAME can't be the target of spells or abilities your opponents control. + Avatar of Might 6 G G Creature Avatar @@ -817,14 +883,6 @@ Instant no text Cycling:2 -Silhana Ledgewalker -1 G -Creature Elf Rogue -no text -1/1 -CARDNAME can't be blocked except by creatures with flying. -This card can't be the target of spells or abilities your opponents control. - Treetop Bracers 1 G Enchantment Aura @@ -2671,14 +2729,6 @@ Enchant creature enPump:+1/+1 When CARDNAME enters the battlefield, draw a card. -Shielding Plax -2 GU -Enchantment Aura -Enchanted creature can't be the target of spells or abilities your opponents control. -Enchant creature -enPump:This card can't be the target of spells or abilities your opponents control. -When CARDNAME enters the battlefield, draw a card. - Striped Bears 3 G Creature Bear @@ -6608,13 +6658,6 @@ Instant Arcane no text spDamageTgtC:1:Drawback$DamageTgt/1:First Volley deals 1 damage to target creature and 1 damage to that creature's controller.:First Volley - deals 1 damage to creature and 1 damage to its controller. -Drove of Elves -3 G -Creature Elf -Drove of Elves's power and toughness are each equal to the number of green permanents you control. -1/1 -This card can't be the target of spells or abilities your opponents control. - Faerie Swarm 3 U Creature Faerie @@ -8795,13 +8838,6 @@ Creature Elephant Soldier Loxodon Punisher gets +2/+2 for each Equipment attached to it. 2/2 -Uril, the Miststalker -2 R G W -Legendary Creature Beast -Uril gets +2/+2 for each Aura attached to it. -5/5 -This card can't be the target of spells or abilities your opponents control. - Rabid Wombat 2 G G Creature Wombat @@ -9538,13 +9574,6 @@ no text spDamageTgtP:3 Cycling:2 -Slippery Bogle -UG -Creature Beast -no text -1/1 -This card can't be the target of spells or abilities your opponents control. - Barbarian General 4 R Creature Human Barbarian Soldier @@ -9966,35 +9995,6 @@ Privileged Position Enchantment Other permanents you control can't be the targets of spells or abilities your opponents control. -Plated Slagwurm -4 G G G -Creature Wurm -no text -8/8 -This card can't be the target of spells or abilities your opponents control. - -Troll Ascetic -1 G G -Creature Troll Shaman -no text -3/2 -RegenerateMe:1 G -This card can't be the target of spells or abilities your opponents control. - -Zuo Ci, the Mocking Sage -1 G G -Legendary Creature Human Advisor -Zuo Ci, the Mocking Sage can't be blocked by creatures with horsemanship. -1/2 -This card can't be the target of spells or abilities your opponents control. - -Taoist Hermit -2 G -Creature Human Mystic -no text -2/2 -This card can't be the target of spells or abilities your opponents control. - Taoist Mystic 2 G Creature Human Mystic diff --git a/src/forge/CardFactoryUtil.java b/src/forge/CardFactoryUtil.java index 8d6dd57fef5..9149cdaf9c6 100644 --- a/src/forge/CardFactoryUtil.java +++ b/src/forge/CardFactoryUtil.java @@ -2864,7 +2864,7 @@ public class CardFactoryUtil { kw = list.get(i); if(kw.equals("Shroud")) return false; - if(kw.equals("This card can't be the target of spells or abilities your opponents control.")) { + if(kw.equals("CARDNAME can't be the target of spells or abilities your opponents control.")) { if(!spell.getController().equals(target.getController())) return false; } diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 1ebf65d4d89..d317bca695d 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -13416,7 +13416,7 @@ public class GameActionUtil { for(int i = 0; i < cList.size(); i++) { c = cList.get(i); - c.removeExtrinsicKeyword("This card can't be the target of spells or abilities your opponents control."); + c.removeExtrinsicKeyword("CARDNAME can't be the target of spells or abilities your opponents control."); } cList.clear(); PlayerZone[] zone = getZone("Privileged Position"); @@ -13432,8 +13432,8 @@ public class GameActionUtil { && !c.getName().equals( "Privileged Position") && !c.getExtrinsicKeyword().contains( - "This card can't be the target of spells or abilities your opponents control.")) { - c.addExtrinsicKeyword("This card can't be the target of spells or abilities your opponents control."); + "CARDNAME can't be the target of spells or abilities your opponents control.")) { + c.addExtrinsicKeyword("CARDNAME can't be the target of spells or abilities your opponents control."); gloriousAnthemList.add(c); } @@ -13469,7 +13469,7 @@ public class GameActionUtil { for(int i = 0; i < pp.size(); i++) { Card c = pp.get(i); otherPPs = countOtherPPs(c); - if(otherPPs > 0) c.addExtrinsicKeyword("This card can't be the target of spells or abilities your opponents control."); + if(otherPPs > 0) c.addExtrinsicKeyword("CARDNAME can't be the target of spells or abilities your opponents control."); //else if }// for inner }// execute()