external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent printing out "an another" in card rules text

Browse Source
This commit is contained in:
drdev
2014-07-18 07:52:17 +00:00
parent 461e425908
commit b3edcf8620
6 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-game/src/main/java/forge/game/cost/Cost.java
View File

@@ -677,6 +677,10 @@ public class Cost {
* @return a {@link java.lang.String} object. * @return a {@link java.lang.String} object.
*/ */
public static String convertIntAndTypeToWords(final int i, final String type) { 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(); final StringBuilder sb = new StringBuilder();
if (i >= Cost.NUM_NAMES.length) { if (i >= Cost.NUM_NAMES.length) {

2
forge-gui/res/cardsfolder/b/blood_host.txt
View File

@@ -2,7 +2,7 @@ Name:Blood Host
ManaCost:3 B B ManaCost:3 B B
Types:Creature Vampire Types:Creature Vampire
PT:3/3 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:DBGainLife:DB$ GainLife | LifeAmount$ 2
SVar:Picture:http://www.wizards.com/global/images/magic/general/blood_host.jpg 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.

2
forge-gui/res/cardsfolder/g/gobbling_ooze.txt
View File

@@ -2,6 +2,6 @@ Name:Gobbling Ooze
ManaCost:4 G ManaCost:4 G
Types:Creature Ooze Types:Creature Ooze
PT:3/3 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 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.

2
forge-gui/res/cardsfolder/j/jarad_golgari_lich_lord.txt
View File

@@ -3,7 +3,7 @@ ManaCost:B B G G
Types:Legendary Creature Zombie Elf Types:Legendary Creature Zombie Elf
PT:2/2 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. 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. 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:X:Count$TypeInYourYard.Creature
SVar:LichLeech:Sacrificed$CardPower SVar:LichLeech:Sacrificed$CardPower

2
forge-gui/res/cardsfolder/t/tymaret_the_murder_king.txt
View File

@@ -2,7 +2,7 @@ Name:Tymaret, the Murder King
ManaCost:B R ManaCost:B R
Types:Legendary Creature Zombie Warrior Types:Legendary Creature Zombie Warrior
PT:2/2 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. 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 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.