From b3edcf8620e563e610cd39ef6cde397fc72bcd58 Mon Sep 17 00:00:00 2001 From: drdev Date: Fri, 18 Jul 2014 07:52:17 +0000 Subject: [PATCH] Prevent printing out "an another" in card rules text --- forge-game/src/main/java/forge/game/cost/Cost.java | 4 ++++ forge-gui/res/cardsfolder/b/blood_host.txt | 4 ++-- forge-gui/res/cardsfolder/g/gobbling_ooze.txt | 4 ++-- forge-gui/res/cardsfolder/j/jarad_golgari_lich_lord.txt | 4 ++-- forge-gui/res/cardsfolder/s/scourge_of_skola_vale.txt | 2 +- forge-gui/res/cardsfolder/t/tymaret_the_murder_king.txt | 4 ++-- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/forge-game/src/main/java/forge/game/cost/Cost.java b/forge-game/src/main/java/forge/game/cost/Cost.java index c76bac2ef05..f0f878d9553 100644 --- a/forge-game/src/main/java/forge/game/cost/Cost.java +++ b/forge-game/src/main/java/forge/game/cost/Cost.java @@ -677,6 +677,10 @@ public class Cost { * @return a {@link java.lang.String} object. */ public static String convertIntAndTypeToWords(final int i, final String type) { + if (i == 1 && type.startsWith("another")) { + return type; //prevent returning "an another" + } + final StringBuilder sb = new StringBuilder(); if (i >= Cost.NUM_NAMES.length) { diff --git a/forge-gui/res/cardsfolder/b/blood_host.txt b/forge-gui/res/cardsfolder/b/blood_host.txt index 55629673336..5b06c9ae689 100644 --- a/forge-gui/res/cardsfolder/b/blood_host.txt +++ b/forge-gui/res/cardsfolder/b/blood_host.txt @@ -2,7 +2,7 @@ Name:Blood Host ManaCost:3 B B Types:Creature Vampire PT:3/3 -A:AB$ PutCounter | Cost$ 1 B Sac<1/Creature.Other/creature other than CARDNAME> | CounterType$ P1P1 | CounterNum$1 | SubAbility$ DBGainLife | SpellDescription$ Put a +1/+1 counter on CARDNAME and you gain 2 life. +A:AB$ PutCounter | Cost$ 1 B Sac<1/Creature.Other/another creature> | CounterType$ P1P1 | CounterNum$1 | SubAbility$ DBGainLife | SpellDescription$ Put a +1/+1 counter on CARDNAME and you gain 2 life. SVar:DBGainLife:DB$ GainLife | LifeAmount$ 2 SVar:Picture:http://www.wizards.com/global/images/magic/general/blood_host.jpg -Oracle:{1}{B}, Sacrifice another creature: Put a +1/+1 counter on Blood Host and you gain 2 life. +Oracle:{1}{B}, Sacrifice another creature: Put a +1/+1 counter on Blood Host and you gain 2 life. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/g/gobbling_ooze.txt b/forge-gui/res/cardsfolder/g/gobbling_ooze.txt index 28c4a0fbcf5..df84bebce41 100644 --- a/forge-gui/res/cardsfolder/g/gobbling_ooze.txt +++ b/forge-gui/res/cardsfolder/g/gobbling_ooze.txt @@ -2,6 +2,6 @@ Name:Gobbling Ooze ManaCost:4 G Types:Creature Ooze PT:3/3 -A:AB$ PutCounter | Cost$ G Sac<1/Creature.Other/creature other than CARDNAME> | CounterType$ P1P1 | CounterNum$1 | SpellDescription$ Put a +1/+1 counter on CARDNAME. +A:AB$ PutCounter | Cost$ G Sac<1/Creature.Other/another creature> | CounterType$ P1P1 | CounterNum$1 | SpellDescription$ Put a +1/+1 counter on CARDNAME. SVar:Picture:http://www.wizards.com/global/images/magic/general/gobbling_ooze.jpg -Oracle:{G}, Sacrifice another creature: Put a +1/+1 counter on Gobbling Ooze. +Oracle:{G}, Sacrifice another creature: Put a +1/+1 counter on Gobbling Ooze. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/j/jarad_golgari_lich_lord.txt b/forge-gui/res/cardsfolder/j/jarad_golgari_lich_lord.txt index 62ae53c5f5b..134c9a15da2 100644 --- a/forge-gui/res/cardsfolder/j/jarad_golgari_lich_lord.txt +++ b/forge-gui/res/cardsfolder/j/jarad_golgari_lich_lord.txt @@ -3,9 +3,9 @@ ManaCost:B B G G Types:Legendary Creature Zombie Elf PT:2/2 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ X | AddToughness$ X | Description$ CARDNAME gets +1/+1 for each creature card in your graveyard. -A:AB$ LoseLife | Cost$ 1 B G Sac<1/Creature.Other/creature other than CARDNAME> | Defined$ Player.Opponent | LifeAmount$ LichLeech | References$ LichLeech | SpellDescription$ Each opponent loses life equal to the sacrificed creature's power. +A:AB$ LoseLife | Cost$ 1 B G Sac<1/Creature.Other/another creature> | Defined$ Player.Opponent | LifeAmount$ LichLeech | References$ LichLeech | SpellDescription$ Each opponent loses life equal to the sacrificed creature's power. A:AB$ ChangeZone | Cost$ Sac<1/Swamp> Sac<1/Forest> | Origin$ Graveyard | Destination$ Hand | ActivationZone$ Graveyard | SpellDescription$ Return CARDNAME from your graveyard to your hand. SVar:X:Count$TypeInYourYard.Creature SVar:LichLeech:Sacrificed$CardPower SVar:Picture:http://www.wizards.com/global/images/magic/general/jarad_golgari_lich_lord.jpg -Oracle:Jarad, Golgari Lich Lord gets +1/+1 for each creature card in your graveyard.\n{1}{B}{G}, Sacrifice another creature: Each opponent loses life equal to the sacrificed creature's power.\nSacrifice a Swamp and a Forest: Return Jarad from your graveyard to your hand. +Oracle:Jarad, Golgari Lich Lord gets +1/+1 for each creature card in your graveyard.\n{1}{B}{G}, Sacrifice another creature: Each opponent loses life equal to the sacrificed creature's power.\nSacrifice a Swamp and a Forest: Return Jarad from your graveyard to your hand. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/s/scourge_of_skola_vale.txt b/forge-gui/res/cardsfolder/s/scourge_of_skola_vale.txt index 1232dc05b63..7c3097caa9f 100644 --- a/forge-gui/res/cardsfolder/s/scourge_of_skola_vale.txt +++ b/forge-gui/res/cardsfolder/s/scourge_of_skola_vale.txt @@ -8,4 +8,4 @@ A:AB$ PutCounter | Cost$ T Sac<1/Creature.Other/another creature> | CounterType$ SVar:X:Sacrificed$CardToughness SVar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/scourge_of_skola_vale.jpg -Oracle:Trample\nScourge of Skola Vale enters the battlefield with two +1/+1 counters on it.\n{T}, Sacrifice another creature: Put a number of +1/+1 counters on Scourge of Skola Vale equal to the sacrificed creature's toughness. +Oracle:Trample\nScourge of Skola Vale enters the battlefield with two +1/+1 counters on it.\n{T}, Sacrifice another creature: Put a number of +1/+1 counters on Scourge of Skola Vale equal to the sacrificed creature's toughness. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/t/tymaret_the_murder_king.txt b/forge-gui/res/cardsfolder/t/tymaret_the_murder_king.txt index 9096bf6bd0f..59ba13d4b6a 100644 --- a/forge-gui/res/cardsfolder/t/tymaret_the_murder_king.txt +++ b/forge-gui/res/cardsfolder/t/tymaret_the_murder_king.txt @@ -2,7 +2,7 @@ Name:Tymaret, the Murder King ManaCost:B R Types:Legendary Creature Zombie Warrior PT:2/2 -A:AB$ DealDamage | Cost$ 1 R Sac<1/Creature.Other/creature other than CARDNAME> | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target player. +A:AB$ DealDamage | Cost$ 1 R Sac<1/Creature.Other/another creature> | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target player. A:AB$ ChangeZone | Cost$ 1 B Sac<1/Creature> | Origin$ Graveyard | Destination$ Hand | Defined$ Self | ActivationZone$ Graveyard | SpellDescription$ Return CARDNAME from your graveyard to your hand. SVar:Picture:http://www.wizards.com/global/images/magic/general/tymaret_the_murder_king.jpg -Oracle:{1}{R}, Sacrifice another creature: Tymaret, the Murder King deals 2 damage to target player.\n{1}{B}, Sacrifice a creature: Return Tymaret from your graveyard to your hand. +Oracle:{1}{R}, Sacrifice another creature: Tymaret, the Murder King deals 2 damage to target player.\n{1}{B}, Sacrifice a creature: Return Tymaret from your graveyard to your hand. \ No newline at end of file