From f53289cf62001d8a2c04631028da09e6fbe4dda0 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 04:18:14 +0000 Subject: [PATCH] 1) Deleted the entries form cards.txt that use this old version of the keyword "This card attacks each turn if able.": Ashen Monstrosity Battle-Mad Ronin Berserkers of Blood Ridge Bloodrock Cyclops Bloodshed Fever Crazed Goblin Dauthi Slayer Goblin Brigand Juggernaut Monstrous Carabid Phyrexian Snowcrusher Tattermunge Maniac Tectonic Fiend Thran War Machine Ulamog's Crusher Uncontrollable Anger Urborg Drake Utvara Scalper 2) Converted these 18 cards to use the new form "CARDNAME attacks each turn if able." and pasted these at the top of file at cards.txt. 3) Searched for and found the old version of the keyword and converted it to the new version in these files: CardFactory_Auras.java ComputerUtil_Attack2.java GameActionUtil.java Input_Attack_Planeswalker.java Input_Attack.java --- res/cards.txt | 276 +++++++++++------------ src/forge/CardFactory_Auras.java | 4 +- src/forge/ComputerUtil_Attack2.java | 2 +- src/forge/GameActionUtil.java | 2 +- src/forge/Input_Attack.java | 2 +- src/forge/Input_Attack_Planeswalker.java | 2 +- 6 files changed, 144 insertions(+), 144 deletions(-) diff --git a/res/cards.txt b/res/cards.txt index 108f245133b..70a558a8cda 100644 --- a/res/cards.txt +++ b/res/cards.txt @@ -1,3 +1,141 @@ +Ashen Monstrosity +5 R R +Creature Spirit +no text +7/4 +Haste +CARDNAME attacks each turn if able. + +Battle-Mad Ronin +1 R +Creature Human Samurai +no text +1/1 +CARDNAME attacks each turn if able. +Bushido 2 + +Berserkers of Blood Ridge +4 R +Creature Human Berserker +no text +4/4 +CARDNAME attacks each turn if able. + +Bloodrock Cyclops +2 R +Creature Cyclops +no text +3/3 +CARDNAME attacks each turn if able. + +Bloodshed Fever +R +Enchantment Aura +Enchanted creature attacks each turn if able. +Enchant creature +enPumpCurse:CARDNAME attacks each turn if able. + +Crazed Goblin +R +Creature Goblin Warrior +no text +1/1 +CARDNAME attacks each turn if able. + +Dauthi Slayer +B B +Creature Dauthi Soldier +no text +2/2 +Shadow +CARDNAME attacks each turn if able. + +Goblin Brigand +1 R +Creature Goblin Warrior +no text +2/2 +CARDNAME attacks each turn if able. + +Juggernaut +4 +Artifact Creature Juggernaut +no text +5/3 +CARDNAME attacks each turn if able. +CARDNAME can't be blocked by Walls. + +Monstrous Carabid +3 B R +Creature Insect +no text +4/4 +CARDNAME attacks each turn if able. +Cycling:BR + +Phyrexian Snowcrusher +6 +Snow Artifact Creature Juggernaut +no text +6/5 +CARDNAME attacks each turn if able. +abPump 1 S:+1/+0 + +Tattermunge Maniac +RG +Creature Goblin Warrior +no text +2/1 +CARDNAME attacks each turn if able. + +Tectonic Fiend +4 R R +Creature Elemental +no text +7/7 +CARDNAME attacks each turn if able. +Echo:4 R R + +Thran War Machine +4 +Artifact Creature Construct +no text +4/5 +CARDNAME attacks each turn if able. +Echo:4 + +Ulamog's Crusher +8 +Creature Eldrazi +no text +8/8 +Annihilator 2 +CARDNAME attacks each turn if able. + +Uncontrollable Anger +2 R R +Enchantment Aura +Enchanted creature gets +2/+2 and attacks each turn if able. +Enchant creature +enPump:+2/+2/CARDNAME attacks each turn if able. +Flash + +Urborg Drake +1 U B +Creature Drake +no text +2/3 +Flying +CARDNAME attacks each turn if able. + +Utvara Scalper +1 R +Creature Goblin Scout +no text +1/2 +Flying +CARDNAME attacks each turn if able. + Oust W Sorcery @@ -976,28 +1114,12 @@ no text 1/1 CARDNAME can't be blocked by Walls. -Juggernaut -4 -Artifact Creature Juggernaut -no text -5/3 -This card attacks each turn if able. -CARDNAME can't be blocked by Walls. - Phyrexian War Beast 3 Artifact Creature Beast When Phyrexian War Beast leaves the battlefield, sacrifice a land and Phyrexian War Beast deals 1 damage to you. 3/4 -Ulamog's Crusher -8 -Creature Eldrazi -no text -8/8 -Annihilator 2 -This card attacks each turn if able. - Kozilek, Butcher of Truth 10 Legendary Creature Eldrazi @@ -1968,13 +2090,6 @@ Copper Tablet Artifact At the beginning of each player's upkeep, Copper Tablet deals 1 damage to that player. -Bloodshed Fever -R -Enchantment Aura -Enchanted creature attacks each turn if able. -Enchant creature -enPumpCurse:This card attacks each turn if able. - Wings of Aesthir W U Enchantment Aura @@ -3471,14 +3586,6 @@ no text abPump B:+1/+1 Bushido 1 -Battle-Mad Ronin -1 R -Creature Human Samurai -no text -1/1 -This card attacks each turn if able. -Bushido 2 - Araba Mothrider 1 W Creature Human Samurai @@ -4403,22 +4510,6 @@ Flying Haste Echo:1 G G -Thran War Machine -4 -Artifact Creature Construct -no text -4/5 -This card attacks each turn if able. -Echo:4 - -Tectonic Fiend -4 R R -Creature Elemental -no text -7/7 -This card attacks each turn if able. -Echo:4 R R - Simian Grunts 2 G Creature Ape @@ -6343,14 +6434,6 @@ no text abPumpTgt T:This creature cannot block abPump S:Haste -Phyrexian Snowcrusher -6 -Snow Artifact Creature Juggernaut -no text -6/5 -This card attacks each turn if able. -abPump 1 S:+1/+0 - Rimebound Dead B Snow Creature Skeleton @@ -7946,14 +8029,6 @@ Enchanted creature has double strike. Enchant creature enPump:Double Strike -Uncontrollable Anger -2 R R -Enchantment Aura -Enchanted creature gets +2/+2 and attacks each turn if able. -Enchant creature -enPump:+2/+2/This card attacks each turn if able. -Flash - Soulscour 7 W W W Sorcery @@ -9764,13 +9839,6 @@ Creature Centaur Warrior no text 3/3 -Berserkers of Blood Ridge -4 R -Creature Human Berserker -no text -4/4 -This card attacks each turn if able. - Weakness B Enchantment Aura @@ -10560,74 +10628,6 @@ Creature Elemental As Nyxathid comes into play, choose an opponent. Nyxathid gets -1/-1 for each card in the chosen player's hand. 7/7 -Utvara Scalper -1 R -Creature Goblin Scout -no text -1/2 -Flying -This card attacks each turn if able. - -Urborg Drake -1 U B -Creature Drake -no text -2/3 -Flying -This card attacks each turn if able. - -Monstrous Carabid -3 B R -Creature Insect -no text -4/4 -This card attacks each turn if able. -Cycling:BR - -Ashen Monstrosity -5 R R -Creature Spirit -no text -7/4 -Haste -This card attacks each turn if able. - -Bloodrock Cyclops -2 R -Creature Cyclops -no text -3/3 -This card attacks each turn if able. - -Goblin Brigand -1 R -Creature Goblin Warrior -no text -2/2 -This card attacks each turn if able. - -Tattermunge Maniac -RG -Creature Goblin Warrior -no text -2/1 -This card attacks each turn if able. - -Dauthi Slayer -B B -Creature Dauthi Soldier -no text -2/2 -Shadow -This card attacks each turn if able. - -Crazed Goblin -R -Creature Goblin Warrior -no text -1/1 -This card attacks each turn if able. - Unsummon U Instant diff --git a/src/forge/CardFactory_Auras.java b/src/forge/CardFactory_Auras.java index e54231210e9..f5a32a21154 100644 --- a/src/forge/CardFactory_Auras.java +++ b/src/forge/CardFactory_Auras.java @@ -2476,7 +2476,7 @@ class CardFactory_Auras { Card crd = card.getEnchanting().get(0); crd.addSemiPermanentAttackBoost(2); crd.addSemiPermanentDefenseBoost(2); - crd.addExtrinsicKeyword("This card attacks each turn if able."); + crd.addExtrinsicKeyword("CARDNAME attacks each turn if able."); } }//execute() };//Command @@ -2491,7 +2491,7 @@ class CardFactory_Auras { Card crd = card.getEnchanting().get(0); crd.addSemiPermanentAttackBoost(-2); crd.addSemiPermanentDefenseBoost(-2); - crd.removeExtrinsicKeyword("This card attacks each turn if able."); + crd.removeExtrinsicKeyword("CARDNAME attacks each turn if able."); } }//execute() diff --git a/src/forge/ComputerUtil_Attack2.java b/src/forge/ComputerUtil_Attack2.java index e3a806c64f2..a14ecbfba7b 100644 --- a/src/forge/ComputerUtil_Attack2.java +++ b/src/forge/ComputerUtil_Attack2.java @@ -168,7 +168,7 @@ import java.util.*; for (int i=0; i