From 0144e6cde41056e8cb3f4bf94e25167bb2d79ca6 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 08:06:10 +0000 Subject: [PATCH] Removing the ":" from the following keywords so they can be used in combination with colon-delimited keywords, like stPump, etc. At the beginning of your upkeep, CARDNAME deals {num} damage to you unless you pay:{cost} ==> ...you pay {cost} At the beginning of your upkeep, destroy CARDNAME unless you pay:{cost} ==> ...you pay {cost} At the beginning of your upkeep, sacrifice CARDNAME unless you pay:{cost} ==> ...you pay {cost} Also, updated the cards using these keywords. --- res/cardsfolder/binding_grasp.txt | 2 +- res/cardsfolder/breeding_pit.txt | 2 +- res/cardsfolder/child_of_gaea.txt | 2 +- res/cardsfolder/chromium.txt | 2 +- res/cardsfolder/cosmic_horror.txt | 2 +- res/cardsfolder/darba.txt | 2 +- res/cardsfolder/dragon_tyrant.txt | 2 +- res/cardsfolder/drifter_il_dal.txt | 2 +- res/cardsfolder/drifting_djinn.txt | 2 +- res/cardsfolder/force_of_nature.txt | 2 +- res/cardsfolder/hungry_mist.txt | 2 +- res/cardsfolder/junun_efreet.txt | 2 +- res/cardsfolder/kami_of_the_tended_garden.txt | 2 +- res/cardsfolder/krosan_cloudscraper.txt | 2 +- res/cardsfolder/melancholy.txt | 2 +- res/cardsfolder/molting_harpy.txt | 2 +- res/cardsfolder/nicol_bolas.txt | 2 +- res/cardsfolder/palladia_mors.txt | 2 +- res/cardsfolder/peacekeeper.txt | 2 +- res/cardsfolder/phantasmal_forces.txt | 2 +- res/cardsfolder/pit_raptor.txt | 2 +- res/cardsfolder/school_of_piranha.txt | 2 +- res/cardsfolder/spindrift_drake.txt | 2 +- res/cardsfolder/stasis.txt | 2 +- res/cardsfolder/sunken_city.txt | 2 +- res/cardsfolder/thirst.txt | 2 +- res/cardsfolder/vaevictis_asmadi.txt | 2 +- res/cardsfolder/whipstitched_zombie.txt | 2 +- res/cardsfolder/wild_leotau.txt | 2 +- src/forge/GameActionUtil.java | 6 +++--- 30 files changed, 32 insertions(+), 32 deletions(-) diff --git a/res/cardsfolder/binding_grasp.txt b/res/cardsfolder/binding_grasp.txt index b9726063c4f..161affc088b 100644 --- a/res/cardsfolder/binding_grasp.txt +++ b/res/cardsfolder/binding_grasp.txt @@ -3,7 +3,7 @@ ManaCost:3 U Types:Enchantment Aura Text:You control enchanted creature. Enchanted creature gets +0/+1. K:Enchant creature -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:1 U +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay 1 U K:enControlCreature K:enPump:+0/+1 SVar:Rarity:Uncommon diff --git a/res/cardsfolder/breeding_pit.txt b/res/cardsfolder/breeding_pit.txt index 4ca0d5324a5..430158d20a7 100644 --- a/res/cardsfolder/breeding_pit.txt +++ b/res/cardsfolder/breeding_pit.txt @@ -2,7 +2,7 @@ Name:Breeding Pit ManaCost:2 B B Types:Enchantment Text:no text -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:B B +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay B B K:WheneverKeyword:BeginningOfEndStep:No_Initiator:Play:MakeToken-Thrull-B-0-1-None-/1:ControllingPlayer_Self:ASAP:No_Condition:ControllerEndStep:At the beginning of your end step, put a 0/1 black Thrull creature token onto the battlefield. SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/breeding_pit.jpg diff --git a/res/cardsfolder/child_of_gaea.txt b/res/cardsfolder/child_of_gaea.txt index c65985abd85..7938823d657 100644 --- a/res/cardsfolder/child_of_gaea.txt +++ b/res/cardsfolder/child_of_gaea.txt @@ -4,7 +4,7 @@ Types:Creature Elemental Text:no text PT:7/7 K:Trample -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:G G +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay G G K:RegenerateMe:1 G SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/child_of_gaea.jpg diff --git a/res/cardsfolder/chromium.txt b/res/cardsfolder/chromium.txt index f4f5b392374..3ec2c6a4d8b 100644 --- a/res/cardsfolder/chromium.txt +++ b/res/cardsfolder/chromium.txt @@ -5,7 +5,7 @@ Text:no text PT:7/7 K:Flying K:Rampage 2 -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:W U B +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay W U B SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/chromium.jpg End diff --git a/res/cardsfolder/cosmic_horror.txt b/res/cardsfolder/cosmic_horror.txt index a438fca6535..0c01ead82d5 100644 --- a/res/cardsfolder/cosmic_horror.txt +++ b/res/cardsfolder/cosmic_horror.txt @@ -4,7 +4,7 @@ Types:Creature Horror Text:If Cosmic is destroyed this way, it deals 7 damage to you. PT:7/7 K:First Strike -K:At the beginning of your upkeep, destroy CARDNAME unless you pay:3 B B B +K:At the beginning of your upkeep, destroy CARDNAME unless you pay 3 B B B SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/cosmic_horror.jpg End diff --git a/res/cardsfolder/darba.txt b/res/cardsfolder/darba.txt index 4367cdc2b1a..663195a9e4c 100644 --- a/res/cardsfolder/darba.txt +++ b/res/cardsfolder/darba.txt @@ -3,7 +3,7 @@ ManaCost:3 G Types:Creature Bird Beast Text:no text PT:5/4 -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:G G +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay G G SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/darba.jpg End diff --git a/res/cardsfolder/dragon_tyrant.txt b/res/cardsfolder/dragon_tyrant.txt index 70aee8744c7..b0884fe7091 100644 --- a/res/cardsfolder/dragon_tyrant.txt +++ b/res/cardsfolder/dragon_tyrant.txt @@ -6,7 +6,7 @@ PT:6/6 K:Flying K:Trample K:Double Strike -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:R R R R +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay R R R R K:abPump R:+1/+0 SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/dragon_tyrant.jpg diff --git a/res/cardsfolder/drifter_il_dal.txt b/res/cardsfolder/drifter_il_dal.txt index 355f95eba45..aef96f97736 100644 --- a/res/cardsfolder/drifter_il_dal.txt +++ b/res/cardsfolder/drifter_il_dal.txt @@ -3,7 +3,7 @@ ManaCost:U Types:Creature Human Wizard Text:no text PT:2/1 -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:U +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay U K:Shadow SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/drifter_il_dal.jpg diff --git a/res/cardsfolder/drifting_djinn.txt b/res/cardsfolder/drifting_djinn.txt index b2cf91f00a0..2b9dddc481c 100644 --- a/res/cardsfolder/drifting_djinn.txt +++ b/res/cardsfolder/drifting_djinn.txt @@ -5,7 +5,7 @@ Text:no text PT:5/5 K:Flying K:Cycling:2 -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:1 U +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay 1 U SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/drifting_djinn.jpg End diff --git a/res/cardsfolder/force_of_nature.txt b/res/cardsfolder/force_of_nature.txt index 9807769e0a7..bfd9a5bdd1f 100644 --- a/res/cardsfolder/force_of_nature.txt +++ b/res/cardsfolder/force_of_nature.txt @@ -4,7 +4,7 @@ Types:Creature Elemental Text:no text PT:8/8 K:Trample -K:At the beginning of your upkeep, CARDNAME deals 8 damage to you unless you pay:G G G G +K:At the beginning of your upkeep, CARDNAME deals 8 damage to you unless you pay G G G G SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/force_of_nature.jpg End diff --git a/res/cardsfolder/hungry_mist.txt b/res/cardsfolder/hungry_mist.txt index 483071beaa7..fb00cc56089 100644 --- a/res/cardsfolder/hungry_mist.txt +++ b/res/cardsfolder/hungry_mist.txt @@ -3,7 +3,7 @@ ManaCost:2 G G Types:Creature Elemental Text:no text PT:6/2 -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:G G +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay G G SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/hungry_mist.jpg End diff --git a/res/cardsfolder/junun_efreet.txt b/res/cardsfolder/junun_efreet.txt index ad4febb4db7..899b887b83e 100644 --- a/res/cardsfolder/junun_efreet.txt +++ b/res/cardsfolder/junun_efreet.txt @@ -4,7 +4,7 @@ Types:Creature Efreet Text:no text PT:3/3 K:Flying -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:B B +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay B B SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/junun_efreet.jpg End diff --git a/res/cardsfolder/kami_of_the_tended_garden.txt b/res/cardsfolder/kami_of_the_tended_garden.txt index 8e1c92aa3ac..a9bde8f825a 100644 --- a/res/cardsfolder/kami_of_the_tended_garden.txt +++ b/res/cardsfolder/kami_of_the_tended_garden.txt @@ -3,7 +3,7 @@ ManaCost:3 G Types:Creature Spirit Text:no text PT:4/4 -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:G +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay G K:Soulshift:3 SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/kami_of_the_tended_garden.jpg diff --git a/res/cardsfolder/krosan_cloudscraper.txt b/res/cardsfolder/krosan_cloudscraper.txt index a2c30e9b2ec..cef2fa4f9a6 100644 --- a/res/cardsfolder/krosan_cloudscraper.txt +++ b/res/cardsfolder/krosan_cloudscraper.txt @@ -3,7 +3,7 @@ ManaCost:7 G G G Types:Creature Beast Mutant Text:no text PT:13/13 -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:G G +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay G G K:Morph:7 G G SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/krosan_cloudscraper.jpg diff --git a/res/cardsfolder/melancholy.txt b/res/cardsfolder/melancholy.txt index 2f8a3525dba..84e933beeb4 100644 --- a/res/cardsfolder/melancholy.txt +++ b/res/cardsfolder/melancholy.txt @@ -3,7 +3,7 @@ ManaCost:2 B Types:Enchantment Aura Text:Enchanted creature doesn't untap during its controller's untap step. K:Enchant creature -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:B +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay B K:When CARDNAME enters the battlefield, tap enchanted creature. SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/melancholy.jpg diff --git a/res/cardsfolder/molting_harpy.txt b/res/cardsfolder/molting_harpy.txt index 914ab8b436c..fb2347c7bea 100644 --- a/res/cardsfolder/molting_harpy.txt +++ b/res/cardsfolder/molting_harpy.txt @@ -3,7 +3,7 @@ ManaCost:B Types:Creature Harpy Mercenary Text:no text PT:2/1 -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:2 +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay 2 K:Flying SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/molting_harpy.jpg diff --git a/res/cardsfolder/nicol_bolas.txt b/res/cardsfolder/nicol_bolas.txt index 867c2d7ac7b..60f364fca46 100644 --- a/res/cardsfolder/nicol_bolas.txt +++ b/res/cardsfolder/nicol_bolas.txt @@ -4,7 +4,7 @@ Types:Legendary Creature Elder Dragon Text:Whenever Nicol Bolas deals damage to an opponent, that player discards his or her hand. PT:7/7 K:Flying -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:U B R +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay U B R SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/nicol_bolas.jpg End diff --git a/res/cardsfolder/palladia_mors.txt b/res/cardsfolder/palladia_mors.txt index 32dfc720f43..3683c0441f4 100644 --- a/res/cardsfolder/palladia_mors.txt +++ b/res/cardsfolder/palladia_mors.txt @@ -5,7 +5,7 @@ Text:no text PT:7/7 K:Flying K:Trample -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:R G W +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay R G W SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/palladia_mors.jpg End diff --git a/res/cardsfolder/peacekeeper.txt b/res/cardsfolder/peacekeeper.txt index 793dfb58c1b..c9616df4025 100644 --- a/res/cardsfolder/peacekeeper.txt +++ b/res/cardsfolder/peacekeeper.txt @@ -3,7 +3,7 @@ ManaCost:2 W Types:Creature Human Text:Creatures can't attack PT:1/1 -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:1 W +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay 1 W SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/peacekeeper.jpg End diff --git a/res/cardsfolder/phantasmal_forces.txt b/res/cardsfolder/phantasmal_forces.txt index 22cfb920911..201939857f9 100644 --- a/res/cardsfolder/phantasmal_forces.txt +++ b/res/cardsfolder/phantasmal_forces.txt @@ -3,7 +3,7 @@ ManaCost:3 U Types:Creature Illusion Text:no text PT:4/1 -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:U +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay U K:Flying SVar:Rarity:Uncommon SVar:Picture:http://www.wizards.com/global/images/magic/general/phantasmal_forces.jpg diff --git a/res/cardsfolder/pit_raptor.txt b/res/cardsfolder/pit_raptor.txt index c75b16da953..7ccee4bd306 100644 --- a/res/cardsfolder/pit_raptor.txt +++ b/res/cardsfolder/pit_raptor.txt @@ -3,7 +3,7 @@ ManaCost:2 B B Types:Creature Bird Mercenary Text:no text PT:4/3 -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:2 B B +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay 2 B B K:Flying K:First Strike SVar:Rarity:Uncommon diff --git a/res/cardsfolder/school_of_piranha.txt b/res/cardsfolder/school_of_piranha.txt index 63beadec99a..d5948eb8dcd 100644 --- a/res/cardsfolder/school_of_piranha.txt +++ b/res/cardsfolder/school_of_piranha.txt @@ -3,7 +3,7 @@ ManaCost:1 U Types:Creature Fish Text:no text PT:3/3 -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:1 U +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay 1 U SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/school_of_piranha.jpg End diff --git a/res/cardsfolder/spindrift_drake.txt b/res/cardsfolder/spindrift_drake.txt index dfc04c3d5b2..7ea0a572421 100644 --- a/res/cardsfolder/spindrift_drake.txt +++ b/res/cardsfolder/spindrift_drake.txt @@ -3,7 +3,7 @@ ManaCost:U Types:Creature Drake Text:no text PT:2/1 -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:U +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay U K:Flying SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/spindrift_drake.jpg diff --git a/res/cardsfolder/stasis.txt b/res/cardsfolder/stasis.txt index 5ed8098f24e..cda98379ba7 100644 --- a/res/cardsfolder/stasis.txt +++ b/res/cardsfolder/stasis.txt @@ -2,7 +2,7 @@ Name:Stasis ManaCost:1 U Types:Enchantment Text:Players skip their untap steps. -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:U +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay U SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/stasis.jpg End diff --git a/res/cardsfolder/sunken_city.txt b/res/cardsfolder/sunken_city.txt index 2c61c827739..56331d89753 100644 --- a/res/cardsfolder/sunken_city.txt +++ b/res/cardsfolder/sunken_city.txt @@ -2,7 +2,7 @@ Name:Sunken City ManaCost:U U Types:Enchantment Text:no text -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:U U +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay U U K:StaticEffect:Play:All Permanents:PTBonus/1/1:Color.blue:Blue creatures get +1/+1. SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/sunken_city.jpg diff --git a/res/cardsfolder/thirst.txt b/res/cardsfolder/thirst.txt index d46a38661a4..d862cff4974 100644 --- a/res/cardsfolder/thirst.txt +++ b/res/cardsfolder/thirst.txt @@ -3,7 +3,7 @@ ManaCost:2 U Types:Enchantment Aura Text:Enchanted creature doesn't untap during its controller's untap step. K:Enchant creature -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:U +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay U K:When CARDNAME enters the battlefield, tap enchanted creature. SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/thirst.jpg diff --git a/res/cardsfolder/vaevictis_asmadi.txt b/res/cardsfolder/vaevictis_asmadi.txt index 5be19ed7178..bc920d99a84 100644 --- a/res/cardsfolder/vaevictis_asmadi.txt +++ b/res/cardsfolder/vaevictis_asmadi.txt @@ -4,7 +4,7 @@ Types:Legendary Creature Elder Dragon Text:no text PT:7/7 K:Flying -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:B R G +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay B R G K:abPump B:+1/+0 K:abPump R:+1/+0 K:abPump G:+1/+0 diff --git a/res/cardsfolder/whipstitched_zombie.txt b/res/cardsfolder/whipstitched_zombie.txt index bb40816bfd9..c187c666c17 100644 --- a/res/cardsfolder/whipstitched_zombie.txt +++ b/res/cardsfolder/whipstitched_zombie.txt @@ -3,7 +3,7 @@ ManaCost:1 B Types:Creature Zombie Text:no text PT:2/2 -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:B +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay B SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/whipstitched_zombie.jpg End diff --git a/res/cardsfolder/wild_leotau.txt b/res/cardsfolder/wild_leotau.txt index c5c5c5c866d..ddc1fb71b75 100644 --- a/res/cardsfolder/wild_leotau.txt +++ b/res/cardsfolder/wild_leotau.txt @@ -3,7 +3,7 @@ ManaCost:2 G G Types:Creature Cat Text:no text PT:5/4 -K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay:G +K:At the beginning of your upkeep, sacrifice CARDNAME unless you pay G SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/wild_leotau.jpg End diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 68edb639fcb..e9da6d24c28 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -3412,7 +3412,7 @@ public class GameActionUtil { for(int i = 0; i < a.size(); i++) { if(a.get(i).toString().startsWith("At the beginning of your upkeep, sacrifice " + c.getName()) || a.get(i).toString().startsWith("At the beginning of your upkeep, sacrifice CARDNAME")) { - String k[] = a.get(i).toString().split(":"); + String k[] = a.get(i).toString().split(" pay "); c.setUpkeepCost(k[1]); return true; } @@ -3472,7 +3472,7 @@ public class GameActionUtil { ArrayList a = c.getKeyword(); for(int i = 0; i < a.size(); i++) { if(a.get(i).toString().startsWith("At the beginning of your upkeep, destroy CARDNAME")) { - String k[] = a.get(i).toString().split(":"); + String k[] = a.get(i).toString().split(" pay "); c.setUpkeepCost(k[1]); return true; } @@ -3543,7 +3543,7 @@ public class GameActionUtil { s1 = s1.trim(); c.setUpkeepDamage(Integer.parseInt(s1)); System.out.println(k[1]); - String l[] = k[1].split("pay:"); + String l[] = k[1].split(" pay "); System.out.println(l[1]); c.setUpkeepCost(l[1]);