From d51de2a1a1ae74deeac6011deb526fd4f6a8e0b5 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Wed, 20 Oct 2021 10:01:50 -0400 Subject: [PATCH] tidy up non-mana Evoke costs --- .../src/main/java/forge/game/card/CardFactoryUtil.java | 6 +++--- forge-gui/res/cardsfolder/e/endurance.txt | 2 +- forge-gui/res/cardsfolder/f/fury.txt | 2 +- forge-gui/res/cardsfolder/g/grief.txt | 2 +- forge-gui/res/cardsfolder/s/solitude.txt | 2 +- forge-gui/res/cardsfolder/s/subtlety.txt | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index 5daa5c2139c..a8146312959 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -2844,9 +2844,9 @@ public class CardFactoryUtil { final SpellAbility newSA = sa.copyWithDefinedCost(evokedCost); final StringBuilder desc = new StringBuilder(); - desc.append("Evoke ").append(evokedCost.toSimpleString()).append(" ("); - desc.append(inst.getReminderText()); - desc.append(")"); + boolean onlyMana = evokedCost.isOnlyManaCost(); + desc.append("Evoke").append(onlyMana ? " " : "—").append(evokedCost.toSimpleString()); + desc.append(onlyMana ? "" : ".").append(" (").append(inst.getReminderText()).append(")"); newSA.setDescription(desc.toString()); diff --git a/forge-gui/res/cardsfolder/e/endurance.txt b/forge-gui/res/cardsfolder/e/endurance.txt index 3218615b437..272d902943d 100644 --- a/forge-gui/res/cardsfolder/e/endurance.txt +++ b/forge-gui/res/cardsfolder/e/endurance.txt @@ -4,7 +4,7 @@ Types:Creature Elemental Incarnation PT:3/4 K:Flash K:Reach -K:Evoke:ExileFromHand<1/Card.Green+Other> +K:Evoke:ExileFromHand<1/Card.Green+Other/green card> T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBottom | TriggerDescription$ When CARDNAME enters the battlefield, up to one target player puts all the cards from their graveyard on the bottom of their library in a random order. SVar:TrigBottom:DB$ ChangeZoneAll | ValidTgts$ Player | TargetMin$ 0 | TargetMax$ 1 | TgtPrompt$ Select up to one target player | ChangeType$ Card | Origin$ Graveyard | Destination$ Library | LibraryPosition$ -1 | Reveal$ False | RandomOrder$ True Oracle:Flash\nReach\nWhen Endurance enters the battlefield, up to one target player puts all the cards from their graveyard on the bottom of their library in a random order.\nEvoke—Exile a green card from your hand. diff --git a/forge-gui/res/cardsfolder/f/fury.txt b/forge-gui/res/cardsfolder/f/fury.txt index 4b2da40f1f0..db186bdd38c 100644 --- a/forge-gui/res/cardsfolder/f/fury.txt +++ b/forge-gui/res/cardsfolder/f/fury.txt @@ -3,7 +3,7 @@ ManaCost:3 R R Types:Creature Elemental Incarnation PT:3/3 K:Double Strike -K:Evoke:ExileFromHand<1/Card.Red+Other> +K:Evoke:ExileFromHand<1/Card.Red+Other/red card> T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ When CARDNAME enters the battlefield, it deals 4 damage divided as you choose among any number of target creatures and/or planeswalkers. SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker to distribute damage to | NumDmg$ 4 | TargetMin$ 1 | TargetMax$ 4 | DividedAsYouChoose$ 4 Oracle:Double strike\nWhen Fury enters the battlefield, it deals 4 damage divided as you choose among any number of target creatures and/or planeswalkers.\nEvoke—Exile a red card from your hand. diff --git a/forge-gui/res/cardsfolder/g/grief.txt b/forge-gui/res/cardsfolder/g/grief.txt index c9364c3387b..a1339b44bc5 100644 --- a/forge-gui/res/cardsfolder/g/grief.txt +++ b/forge-gui/res/cardsfolder/g/grief.txt @@ -3,7 +3,7 @@ ManaCost:2 B B Types:Creature Elemental Incarnation PT:3/2 K:Menace -K:Evoke:ExileFromHand<1/Card.Black+Other> +K:Evoke:ExileFromHand<1/Card.Black+Other/black card> T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigRemove | TriggerDescription$ When CARDNAME enters the battlefield, target opponent reveals their hand. You choose a nonland card from it. That player discards that card. SVar:TrigRemove:DB$ Discard | ValidTgts$ Opponent | NumCards$ 1 | Mode$ RevealYouChoose | DiscardValid$ Card.nonLand | SpellDescription$ Target opponent reveals their hand. You choose a nonland card from it. That player discards that card. Oracle:Menace\nWhen Grief enters the battlefield, target opponent reveals their hand. You choose a nonland card from it. That player discards that card.\nEvoke—Exile a black card from your hand. diff --git a/forge-gui/res/cardsfolder/s/solitude.txt b/forge-gui/res/cardsfolder/s/solitude.txt index a62098e0442..26d9282a6b7 100644 --- a/forge-gui/res/cardsfolder/s/solitude.txt +++ b/forge-gui/res/cardsfolder/s/solitude.txt @@ -4,7 +4,7 @@ Types:Creature Elemental Incarnation PT:3/2 K:Flash K:Lifelink -K:Evoke:ExileFromHand<1/Card.White+Other> +K:Evoke:ExileFromHand<1/Card.White+Other/white card> T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile up to one other target creature. That creature's controller gains life equal to its power. SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature.Other | RememberLKI$ True | TgtPrompt$ Select up to one other target creature | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBGainLife SVar:DBGainLife:DB$ GainLife | Defined$ RememberedController | LifeAmount$ X | SubAbility$ DBCleanup diff --git a/forge-gui/res/cardsfolder/s/subtlety.txt b/forge-gui/res/cardsfolder/s/subtlety.txt index 132b89b196c..175afc4a63f 100644 --- a/forge-gui/res/cardsfolder/s/subtlety.txt +++ b/forge-gui/res/cardsfolder/s/subtlety.txt @@ -6,5 +6,5 @@ K:Flash K:Flying T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTuck | TriggerDescription$ When CARDNAME enters the battlefield, choose up to one target creature spell or planeswalker spell. Its owner puts it on the top or bottom of their library. SVar:TrigTuck:DB$ ChangeZone | ValidTgts$ Card.inZoneStack+Creature,Card.inZoneStack+Planeswalker | TgtZone$ Stack | TgtPrompt$ Select up to one target creature spell or planeswalker spell | AlternativeDecider$ TargetedController | Origin$ Stack | Fizzle$ True | Destination$ Library | LibraryPosition$ 0 | DestinationAlternative$ Library | LibraryPositionAlternative$ -1 | AlternativeDestinationMessage$ Would you like to put the card on the top of your library (and not on the bottom)? | SpellDescription$ Choose up to one target creature spell or planeswalker spell. Its owner puts it on the top or bottom of their library. -K:Evoke:ExileFromHand<1/Card.Blue+Other> +K:Evoke:ExileFromHand<1/Card.Blue+Other/blue card> Oracle:Flash\nFlying\nWhen Subtlety enters the battlefield, choose up to one target creature spell or planeswalker spell. Its owner puts it on the top or bottom of their library.\nEvoke—Exile a blue card from your hand.