Token Scripts: add Token to Name

2025-11-19 04:08:01 +00:00 · 2021-11-19 10:26:46 +01:00
parent 0035616964
commit 53b000515b
458 changed files with 474 additions and 475 deletions
--- a/forge-core/src/main/java/forge/card/CardType.java
+++ b/forge-core/src/main/java/forge/card/CardType.java
@@ -722,7 +722,12 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
                return CardType.isALandType(input);
            }
        };
-
+        public static Predicate<String> IS_BASIC_LAND_TYPE = new Predicate<String>() {
+            @Override
+            public boolean apply(String input) {
+                return CardType.isABasicLandType(input);
+            }
+        };
        public static Predicate<String> IS_ARTIFACT_TYPE = new Predicate<String>() {
            @Override
            public boolean apply(String input) {
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -5139,12 +5139,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
    }

    public final boolean hasABasicLandType() {
-        for (final String type : getType().getSubtypes()) {
-            if (forge.card.CardType.isABasicLandType(type)) {
-                return true;
-            }
-        }
-        return false;
+        return Iterables.any(getType().getSubtypes(), CardType.Predicates.IS_BASIC_LAND_TYPE);
    }

    public final boolean isUsedToPay() {
--- a/forge-game/src/main/java/forge/game/card/token/TokenInfo.java
+++ b/forge-game/src/main/java/forge/game/card/token/TokenInfo.java
@@ -185,11 +185,9 @@ public class TokenInfo {
            }
        }
        if (!typeMap.isEmpty()) {
-            String oldName = result.getName();

            CardType type = new CardType(result.getType());
-            String joinedName = StringUtils.join(type.getSubtypes(), " ");
-            final boolean nameGenerated = oldName.equals(joinedName);
+            final boolean nameGenerated = result.getName().endsWith(" Token");
            boolean typeChanged = false;

            if (!Iterables.isEmpty(type.getSubtypes())) {
@@ -207,7 +205,7 @@ public class TokenInfo {

                // update generated Name
                if (nameGenerated) {
-                    result.setName(StringUtils.join(type.getSubtypes(), " "));
+                    result.setName(StringUtils.join(type.getSubtypes(), " ") + " Token");
                }
            }
        }
--- a/forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulatorTest.java
+++ b/forge-gui-desktop/src/test/java/forge/ai/simulation/GameSimulatorTest.java
@@ -48,7 +48,7 @@ public class GameSimulatorTest extends SimulationTestCase {
        assertEquals(1, heraldCopy.getToughnessBonusFromCounters());
        assertEquals(1, heraldCopy.getPowerBonusFromCounters());

-        Card warriorToken = findCardWithName(simGame, "Warrior");
+        Card warriorToken = findCardWithName(simGame, "Warrior Token");
        assertNotNull(warriorToken);
        assertTrue(warriorToken.isSick());
        assertEquals(1, warriorToken.getCurrentPower());
@@ -233,7 +233,7 @@ public class GameSimulatorTest extends SimulationTestCase {
        GameSimulator sim = createSimulator(game, p);
        sim.simulateSpellAbility(minusTwo);
        Game simGame = sim.getSimulatedGameState();
-        Card vampireToken = findCardWithName(simGame, "Vampire");
+        Card vampireToken = findCardWithName(simGame, "Vampire Token");
        assertNotNull(vampireToken);

        Player simP = simGame.getPlayers().get(1);
@@ -599,7 +599,7 @@ public class GameSimulatorTest extends SimulationTestCase {
        assertTrue(score > 0);
        Game simGame = sim.getSimulatedGameState();

-        Card scion = findCardWithName(simGame, "Eldrazi Scion");
+        Card scion = findCardWithName(simGame, "Eldrazi Scion Token");
        assertNotNull(scion);
        assertEquals(1, scion.getNetPower());
        assertEquals(1, scion.getNetToughness());
@@ -608,7 +608,7 @@ public class GameSimulatorTest extends SimulationTestCase {

        GameCopier copier = new GameCopier(simGame);
        Game copy = copier.makeCopy();
-        Card scionCopy = findCardWithName(copy, "Eldrazi Scion");
+        Card scionCopy = findCardWithName(copy, "Eldrazi Scion Token");
        assertNotNull(scionCopy);
        assertEquals(1, scionCopy.getNetPower());
        assertEquals(1, scionCopy.getNetToughness());
@@ -1288,7 +1288,7 @@ public class GameSimulatorTest extends SimulationTestCase {
        assertTrue(score > 0);
        Game simGame = sim.getSimulatedGameState();

-        int numZombies = countCardsWithName(simGame, "Zombie");
+        int numZombies = countCardsWithName(simGame, "Zombie Token");
        assertEquals(2, numZombies);
    }

@@ -1323,11 +1323,11 @@ public class GameSimulatorTest extends SimulationTestCase {
        GameSimulator sim = createSimulator(game, p);
        int score = sim.simulateSpellAbility(fatalPushSA).value;
        assertTrue(score > 0);
-        assertEquals(2, countCardsWithName(sim.getSimulatedGameState(), "Zombie"));
+        assertEquals(2, countCardsWithName(sim.getSimulatedGameState(), "Zombie Token"));

        score = sim.simulateSpellAbility(electrifySA).value;
        assertTrue(score > 0);
-        assertEquals(countCardsWithName(sim.getSimulatedGameState(), "Zombie"), 4);
+        assertEquals(4, countCardsWithName(sim.getSimulatedGameState(), "Zombie Token"));
    }

    public void testPlayerXCount() {
@@ -1564,7 +1564,7 @@ public class GameSimulatorTest extends SimulationTestCase {
        assertTrue(score > 0);
        Game simGame = sim.getSimulatedGameState();

-        int numZombies = countCardsWithName(simGame, "Zombie");
+        int numZombies = countCardsWithName(simGame, "Zombie Token");
        assertEquals(4, numZombies);
    }

@@ -1592,7 +1592,7 @@ public class GameSimulatorTest extends SimulationTestCase {
        assertTrue(score > 0);
        Game simGame = sim.getSimulatedGameState();

-        int numZombies = countCardsWithName(simGame, "Zombie");
+        int numZombies = countCardsWithName(simGame, "Zombie Token");
        assertEquals(3, numZombies);
    }

--- a/forge-gui/res/cardsfolder/c/curse_of_opulence.txt
+++ b/forge-gui/res/cardsfolder/c/curse_of_opulence.txt
@@ -5,5 +5,5 @@ K:Enchant player
 A:SP$ Attach | Cost$ R | ValidTgts$ Player | AILogic$ Curse
 T:Mode$ AttackersDeclared | ValidCard$ Creature | AttackedTarget$ Player.EnchantedBy | Execute$ TrigRepeat | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted player is attacked, create a Gold token. Each opponent attacking that player does the same. (A Gold token is an artifact with "Sacrifice this artifact: Add one mana of any color.")
 SVar:TrigRepeat:DB$ RepeatEach | RepeatPlayers$ TriggeredAttackingPlayerAndYou | RepeatSubAbility$ TrigToken | ChangeZoneTable$ True
-SVar:TrigToken:DB$ Token | TokenScript$ gold | TokenOwner$ Player.IsRemembered | TokenAmount$ 1 | LegacyImage$ gold c17
+SVar:TrigToken:DB$ Token | TokenScript$ c_a_gold_draw | TokenOwner$ Player.IsRemembered | TokenAmount$ 1
 Oracle:Enchant player\nWhenever enchanted player is attacked, create a Gold token. Each opponent attacking that player does the same. (A Gold token is an artifact with "Sacrifice this artifact: Add one mana of any color.")
--- a/forge-gui/res/cardsfolder/g/gild.txt
+++ b/forge-gui/res/cardsfolder/g/gild.txt
@@ -2,5 +2,5 @@ Name:Gild
 ManaCost:3 B
 Types:Sorcery
 A:SP$ ChangeZone | Cost$ 3 B | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBToken | SpellDescription$ Exile target creature. Create a Gold token. (It's an artifact with "Sacrifice this artifact: Add one mana of any color.")
-SVar:DBToken:DB$ Token | TokenScript$ gold | TokenOwner$ You | LegacyImage$ gold bng
+SVar:DBToken:DB$ Token | TokenScript$ c_a_gold_draw | TokenOwner$ You
 Oracle:Exile target creature. Create a Gold token. (It's an artifact with "Sacrifice this artifact: Add one mana of any color.")
--- a/forge-gui/res/cardsfolder/k/king_macar_the_gold_cursed.txt
+++ b/forge-gui/res/cardsfolder/k/king_macar_the_gold_cursed.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Human Noble
 PT:2/3
 T:Mode$ Untaps | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigExile | OptionalDecider$ You | TriggerDescription$ Inspired — Whenever CARDNAME becomes untapped, you may exile target creature. If you do, create a Gold token. (It's an artifact with "Sacrifice this artifact: Add one mana of any color.")
 SVar:TrigExile:DB$ ChangeZone | ValidTgts$ Creature | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBToken
-SVar:DBToken:DB$ Token | TokenScript$ gold | TokenOwner$ You | TokenAmount$ 1 | LegacyImage$ gold jou | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SubAbility$ DBCleanup
+SVar:DBToken:DB$ Token | TokenScript$ c_a_gold_draw | TokenOwner$ You | TokenAmount$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
 Oracle:Inspired — Whenever King Macar, the Gold-Cursed becomes untapped, you may exile target creature. If you do, create a Gold token. (It's an artifact with "Sacrifice this artifact: Add one mana of any color.")
--- a/forge-gui/res/cardsfolder/n/niko_aris.txt
+++ b/forge-gui/res/cardsfolder/n/niko_aris.txt
@@ -3,7 +3,7 @@ ManaCost:X W U U
 Types:Legendary Planeswalker Niko
 Loyalty:3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create X Shard tokens. (They're enchantments with "{2}, Sacrifice this enchantment: Scry 1, then draw a card.")
-SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ shard | TokenOwner$ You
+SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ c_e_shard_draw | TokenOwner$ You
 SVar:X:Count$xPaid
 A:AB$ Effect | Cost$ AddCounter<1/LOYALTY> | Name$ Niko Aris Effect | Planeswalker$ True | Triggers$ Trig | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | RememberObjects$ Targeted | SubAbility$ DBPump | SpellDescription$ Up to one target creature you control can't be blocked this turn. Whenever that creature deals damage this turn, return it to its owner's hand.
 SVar:DBPump:DB$ Pump | KW$ HIDDEN Unblockable | Defined$ Targeted
@@ -11,6 +11,6 @@ SVar:Trig:Mode$ DamageDealtOnce | ValidSource$ Creature.IsRemembered | Execute$
 SVar:Eff:DB$ ChangeZone | ValidTgts$ Creature.IsRemembered | Origin$ Battlefield | Destination$ Hand
 A:AB$ DealDamage | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature.tapped | NumDmg$ Y | TgtPrompt$ Select target tapped creature | SpellDescription$ CARDNAME deals 2 damage to target tapped creature for each card you've drawn this turn.
 SVar:Y:Count$YouDrewThisTurn/Twice
-A:AB$ Token | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenScript$ shard | TokenOwner$ You | SpellDescription$ Create a Shard token.
+A:AB$ Token | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenScript$ c_e_shard_draw | TokenOwner$ You | SpellDescription$ Create a Shard token.
 DeckHas:Ability$Token & Ability$Sacrifice
 Oracle:When Niko Aris enters the battlefield, create X Shard tokens. (They're enchantments with "{2}, Sacrifice this enchantment: Scry 1, then draw a card.")\n[+1]: Up to one target creature you control can't be blocked this turn. Whenever that creature deals damage this turn, return it to its owner's hand.\n[−1]: Niko Aris deals 2 damage to target tapped creature for each card you've drawn this turn.\n[−1]: Create a Shard token.
--- a/forge-gui/res/cardsfolder/t/the_first_iroan_games.txt
+++ b/forge-gui/res/cardsfolder/t/the_first_iroan_games.txt
@@ -5,6 +5,6 @@ K:Saga:4:TrigToken,TrigPutCounter,TrigDraw,TrigGold
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_human_soldier | TokenOwner$ You | LegacyImage$ w 1 1 human soldier thb | SpellDescription$ Create a 1/1 white Human Soldier token.
 SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 3 | SpellDescription$ Put three +1/+1 counters on target creature you control.
 SVar:TrigDraw:DB$ Draw | NumCards$ 2 | ConditionPresent$ Creature.YouCtrl+powerGE4 | SpellDescription$ If you control a creature with power 4 or greater, draw two cards.
-SVar:TrigGold:DB$ Token | TokenAmount$ 1 | TokenScript$ gold | TokenOwner$ You | LegacyImage$ gold thb | SpellDescription$ Create a Gold token.
+SVar:TrigGold:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_gold_draw | TokenOwner$ You | SpellDescription$ Create a Gold token.
 DeckHas:Ability$Counters & Ability$Token
 Oracle:(As this Saga enters and after your draw step, add a lore counter. Sacrifice after IV.)\nI — Create a 1/1 white Human Soldier creature token.\nII — Put three +1/+1 counters on target creature you control.\nIII — If you control a creature with power 4 or greater, draw two cards.\nIV — Create a Gold token. (It's an artifact with "Sacrifice this artifact: Add one mana of any color.")
--- a/forge-gui/res/lists/TypeLists.txt
+++ b/forge-gui/res/lists/TypeLists.txt
@@ -300,6 +300,7 @@ Curse
 Rune
 Saga
 Shrine
+Shard
 [ArtifactTypes]
 Blood
 Clue:Clues
--- a/forge-gui/res/tokenscripts/b_0_0_phyrexian_germ.txt
+++ b/forge-gui/res/tokenscripts/b_0_0_phyrexian_germ.txt
@@ -1,4 +1,4 @@
-Name:Phyrexian Germ
+Name:Phyrexian Germ Token
 ManaCost:no cost
 Types:Creature Phyrexian Germ
 Colors:black
--- a/forge-gui/res/tokenscripts/b_0_0_zombie_army.txt
+++ b/forge-gui/res/tokenscripts/b_0_0_zombie_army.txt
@@ -1,4 +1,4 @@
-Name:Zombie Army
+Name:Zombie Army Token
 ManaCost:no cost
 Types:Creature Zombie Army
 Colors:black
--- a/forge-gui/res/tokenscripts/b_0_1_cleric.txt
+++ b/forge-gui/res/tokenscripts/b_0_1_cleric.txt
@@ -1,4 +1,4 @@
-Name:Cleric
+Name:Cleric Token
 ManaCost:no cost
 Types:Creature Cleric
 Colors:black
--- a/forge-gui/res/tokenscripts/b_0_1_insect.txt
+++ b/forge-gui/res/tokenscripts/b_0_1_insect.txt
@@ -1,4 +1,4 @@
-Name:Insect
+Name:Insect Token
 ManaCost:no cost
 Types:Creature Insect
 Colors:black
--- a/forge-gui/res/tokenscripts/b_0_1_serf.txt
+++ b/forge-gui/res/tokenscripts/b_0_1_serf.txt
@@ -1,4 +1,4 @@
-Name:Serf
+Name:Serf Token
 ManaCost:no cost
 Types:Creature Serf
 Colors:black
--- a/forge-gui/res/tokenscripts/b_0_1_thrull.txt
+++ b/forge-gui/res/tokenscripts/b_0_1_thrull.txt
@@ -1,4 +1,4 @@
-Name:Thrull
+Name:Thrull Token
 ManaCost:no cost
 Types:Creature Thrull
 Colors:black
--- a/forge-gui/res/tokenscripts/b_1_1_assassin_deathtouch_haste.txt
+++ b/forge-gui/res/tokenscripts/b_1_1_assassin_deathtouch_haste.txt
@@ -1,4 +1,4 @@
-Name:Assassin
+Name:Assassin Token
 ManaCost:no cost
 Types:Creature Assassin
 Colors:black
--- a/forge-gui/res/tokenscripts/b_1_1_assassin_deathtouch_pwdestroy.txt
+++ b/forge-gui/res/tokenscripts/b_1_1_assassin_deathtouch_pwdestroy.txt
@@ -1,4 +1,4 @@
-Name:Assassin
+Name:Assassin Token
 ManaCost:no cost
 Types:Creature Assassin
 Colors:black
--- a/forge-gui/res/tokenscripts/b_1_1_assassin_lose_con.txt
+++ b/forge-gui/res/tokenscripts/b_1_1_assassin_lose_con.txt
@@ -1,4 +1,4 @@
-Name:Assassin
+Name:Assassin Token
 ManaCost:no cost
 Types:Creature Assassin
 Colors:black
--- a/forge-gui/res/tokenscripts/b_1_1_bat_flying.txt
+++ b/forge-gui/res/tokenscripts/b_1_1_bat_flying.txt
@@ -1,4 +1,4 @@
-Name:Bat
+Name:Bat Token
 ManaCost:no cost
 Types:Creature Bat
 Colors:black
--- a/forge-gui/res/tokenscripts/b_1_1_faerie_rogue_flying.txt
+++ b/forge-gui/res/tokenscripts/b_1_1_faerie_rogue_flying.txt
@@ -1,4 +1,4 @@
-Name:Faerie Rogue
+Name:Faerie Rogue Token
 ManaCost:no cost
 Types:Creature Faerie Rogue
 Colors:black
--- a/forge-gui/res/tokenscripts/b_1_1_goblin_rogue.txt
+++ b/forge-gui/res/tokenscripts/b_1_1_goblin_rogue.txt
@@ -1,4 +1,4 @@
-Name:Goblin Rogue
+Name:Goblin Rogue Token
 ManaCost:no cost
 Types:Creature Goblin Rogue
 Colors:black
--- a/forge-gui/res/tokenscripts/b_1_1_harpy_flying.txt
+++ b/forge-gui/res/tokenscripts/b_1_1_harpy_flying.txt
@@ -1,4 +1,4 @@
-Name:Harpy
+Name:Harpy Token
 ManaCost:no cost
 Types:Creature Harpy
 Colors:black
--- a/forge-gui/res/tokenscripts/b_1_1_insect.txt
+++ b/forge-gui/res/tokenscripts/b_1_1_insect.txt
@@ -1,4 +1,4 @@
-Name:Insect
+Name:Insect Token
 ManaCost:no cost
 Types:Creature Insect
 Colors:black
--- a/forge-gui/res/tokenscripts/b_1_1_minion.txt
+++ b/forge-gui/res/tokenscripts/b_1_1_minion.txt
@@ -1,4 +1,4 @@
-Name:Minion
+Name:Minion Token
 ManaCost:no cost
 Types:Creature Minion
 Colors:black
--- a/forge-gui/res/tokenscripts/b_1_1_rat.txt
+++ b/forge-gui/res/tokenscripts/b_1_1_rat.txt
@@ -1,4 +1,4 @@
-Name:Rat
+Name:Rat Token
 ManaCost:no cost
 Types:Creature Rat
 Colors:black
--- a/forge-gui/res/tokenscripts/b_1_1_rat_deathtouch.txt
+++ b/forge-gui/res/tokenscripts/b_1_1_rat_deathtouch.txt
@@ -1,4 +1,4 @@
-Name:Rat
+Name:Rat Token
 ManaCost:no cost
 Types:Creature Rat
 Colors:black
--- a/forge-gui/res/tokenscripts/b_1_1_skeleton.txt
+++ b/forge-gui/res/tokenscripts/b_1_1_skeleton.txt
@@ -1,4 +1,4 @@
-Name:Skeleton
+Name:Skeleton Token
 ManaCost:no cost
 Types:Creature Skeleton
 Colors:black
--- a/forge-gui/res/tokenscripts/b_1_1_skeleton_opp_life.txt
+++ b/forge-gui/res/tokenscripts/b_1_1_skeleton_opp_life.txt
@@ -1,4 +1,4 @@
-Name:Skeleton
+Name:Skeleton Token
 ManaCost:no cost
 Types:Creature Minion
 Colors:black
--- a/forge-gui/res/tokenscripts/b_1_1_skeleton_regenerate.txt
+++ b/forge-gui/res/tokenscripts/b_1_1_skeleton_regenerate.txt
@@ -1,4 +1,4 @@
-Name:Skeleton
+Name:Skeleton Token
 ManaCost:no cost
 Colors:black
 Types:Creature Skeleton
--- a/forge-gui/res/tokenscripts/b_1_1_slug.txt
+++ b/forge-gui/res/tokenscripts/b_1_1_slug.txt
@@ -1,4 +1,4 @@
-Name:Slug
+Name:Slug Token
 ManaCost:no cost
 Types:Creature Slug
 Colors:black
--- a/forge-gui/res/tokenscripts/b_1_1_snake_deathtouch.txt
+++ b/forge-gui/res/tokenscripts/b_1_1_snake_deathtouch.txt
@@ -1,4 +1,4 @@
-Name:Snake
+Name:Snake Token
 ManaCost:no cost
 Types:Creature Snake
 Colors:black
--- a/forge-gui/res/tokenscripts/b_1_1_thrull.txt
+++ b/forge-gui/res/tokenscripts/b_1_1_thrull.txt
@@ -1,4 +1,4 @@
-Name:Thrull
+Name:Thrull Token
 ManaCost:no cost
 Types:Creature Thrull
 Colors:black
--- a/forge-gui/res/tokenscripts/b_1_1_vampire.txt
+++ b/forge-gui/res/tokenscripts/b_1_1_vampire.txt
@@ -1,4 +1,4 @@
-Name:Vampire
+Name:Vampire Token
 ManaCost:no cost
 Types:Creature Vampire
 Colors:black
--- a/forge-gui/res/tokenscripts/b_1_1_vampire_knight_lifelink.txt
+++ b/forge-gui/res/tokenscripts/b_1_1_vampire_knight_lifelink.txt
@@ -1,4 +1,4 @@
-Name:Vampire Knight
+Name:Vampire Knight Token
 ManaCost:no cost
 Types:Creature Vampire Knight
 Colors:black
--- a/forge-gui/res/tokenscripts/b_1_1_vampire_lifelink.txt
+++ b/forge-gui/res/tokenscripts/b_1_1_vampire_lifelink.txt
@@ -1,4 +1,4 @@
-Name:Vampire
+Name:Vampire Token
 ManaCost:no cost
 Types:Creature Vampire
 Colors:black
--- a/forge-gui/res/tokenscripts/b_1_1_wolf_deathtouch.txt
+++ b/forge-gui/res/tokenscripts/b_1_1_wolf_deathtouch.txt
@@ -1,4 +1,4 @@
-Name:Wolf
+Name:Wolf Token
 ManaCost:no cost
 Types:Creature Wolf
 Colors:black
--- a/forge-gui/res/tokenscripts/b_1_2_bat_flying_nosferatu.txt
+++ b/forge-gui/res/tokenscripts/b_1_2_bat_flying_nosferatu.txt
@@ -1,4 +1,4 @@
-Name:Bat
+Name:Bat Token
 ManaCost:no cost
 Types:Creature Bat
 Colors:black
--- a/forge-gui/res/tokenscripts/b_2_1_cat.txt
+++ b/forge-gui/res/tokenscripts/b_2_1_cat.txt
@@ -1,4 +1,4 @@
-Name:Cat
+Name:Cat Token
 ManaCost:no cost
 Types:Creature Cat
 Colors:black
--- a/forge-gui/res/tokenscripts/b_2_1_spider_menace_reach.txt
+++ b/forge-gui/res/tokenscripts/b_2_1_spider_menace_reach.txt
@@ -1,4 +1,4 @@
-Name:Spider
+Name:Spider Token
 ManaCost:no cost
 Types:Creature Spider
 Colors:black
--- a/forge-gui/res/tokenscripts/b_2_1_warrior.txt
+++ b/forge-gui/res/tokenscripts/b_2_1_warrior.txt
@@ -1,4 +1,4 @@
-Name:Warrior
+Name:Warrior Token
 ManaCost:no cost
 Types:Creature Warrior
 Colors:black
--- a/forge-gui/res/tokenscripts/b_2_2_e_zombie.txt
+++ b/forge-gui/res/tokenscripts/b_2_2_e_zombie.txt
@@ -1,4 +1,4 @@
-Name:Zombie
+Name:Zombie Token
 ManaCost:no cost
 Types:Enchantment Creature Zombie
 Colors:black
--- a/forge-gui/res/tokenscripts/b_2_2_knight_flanking_pro_white_haste.txt
+++ b/forge-gui/res/tokenscripts/b_2_2_knight_flanking_pro_white_haste.txt
@@ -1,4 +1,4 @@
-Name:Knight
+Name:Knight Token
 ManaCost:no cost
 Types:Creature Knight
 Colors:black
--- a/forge-gui/res/tokenscripts/b_2_2_phyrexian_zombie.txt
+++ b/forge-gui/res/tokenscripts/b_2_2_phyrexian_zombie.txt
@@ -1,4 +1,4 @@
-Name:Phyrexian Zombie
+Name:Phyrexian Zombie Token
 ManaCost:no cost
 Types:Creature Phyrexian Zombie
 Colors:black
--- a/forge-gui/res/tokenscripts/b_2_2_pirate_menace.txt
+++ b/forge-gui/res/tokenscripts/b_2_2_pirate_menace.txt
@@ -1,4 +1,4 @@
-Name:Pirate
+Name:Pirate Token
 ManaCost:no cost
 Types:Creature Pirate
 Colors:black
--- a/forge-gui/res/tokenscripts/b_2_2_rogue_hexproof.txt
+++ b/forge-gui/res/tokenscripts/b_2_2_rogue_hexproof.txt
@@ -1,4 +1,4 @@
-Name:Rogue
+Name:Rogue Token
 ManaCost:no cost
 Types:Creature Rogue
 Colors:black
--- a/forge-gui/res/tokenscripts/b_2_2_rogue_menace.txt
+++ b/forge-gui/res/tokenscripts/b_2_2_rogue_menace.txt
@@ -1,4 +1,4 @@
-Name:Rogue
+Name:Rogue Token
 ManaCost:no cost
 Types:Creature Rogue
 Colors:black
--- a/forge-gui/res/tokenscripts/b_2_2_vampire_flying.txt
+++ b/forge-gui/res/tokenscripts/b_2_2_vampire_flying.txt
@@ -1,4 +1,4 @@
-Name:Vampire
+Name:Vampire Token
 ManaCost:no cost
 Types:Creature Vampire
 Colors:black
--- a/forge-gui/res/tokenscripts/b_2_2_zombie.txt
+++ b/forge-gui/res/tokenscripts/b_2_2_zombie.txt
@@ -1,4 +1,4 @@
-Name:Zombie
+Name:Zombie Token
 ManaCost:no cost
 Types:Creature Zombie
 Colors:black
--- a/forge-gui/res/tokenscripts/b_2_2_zombie_berserker.txt
+++ b/forge-gui/res/tokenscripts/b_2_2_zombie_berserker.txt
@@ -1,4 +1,4 @@
-Name:Zombie Berserker
+Name:Zombie Berserker Token
 ManaCost:no cost
 Types:Creature Zombie Berserker
 Colors:black
--- a/forge-gui/res/tokenscripts/b_2_2_zombie_decayed.txt
+++ b/forge-gui/res/tokenscripts/b_2_2_zombie_decayed.txt
@@ -1,4 +1,4 @@
-Name:Zombie
+Name:Zombie Token
 ManaCost:no cost
 Types:Creature Zombie
 Colors:black
--- a/forge-gui/res/tokenscripts/b_2_2_zombie_designated.txt
+++ b/forge-gui/res/tokenscripts/b_2_2_zombie_designated.txt
@@ -1,4 +1,4 @@
-Name:Zombie
+Name:Zombie Token
 ManaCost:no cost
 Types:Creature Zombie
 Colors:black
--- a/forge-gui/res/tokenscripts/b_2_2_zombie_knight_menace.txt
+++ b/forge-gui/res/tokenscripts/b_2_2_zombie_knight_menace.txt
@@ -1,4 +1,4 @@
-Name:Zombie Knight
+Name:Zombie Knight Token
 ManaCost:no cost
 Types:Creature Zombie Knight
 Colors:black
--- a/forge-gui/res/tokenscripts/b_2_3_vampire_flying_lifelink.txt
+++ b/forge-gui/res/tokenscripts/b_2_3_vampire_flying_lifelink.txt
@@ -1,4 +1,4 @@
-Name:Vampire
+Name:Vampire Token
 ManaCost:no cost
 Types:Creature Vampire
 Colors:black
--- a/forge-gui/res/tokenscripts/b_2_4_spider_reach.txt
+++ b/forge-gui/res/tokenscripts/b_2_4_spider_reach.txt
@@ -1,4 +1,4 @@
-Name:Spider
+Name:Spider Token
 ManaCost:no cost
 Types:Creature Spider
 Colors:black
--- a/forge-gui/res/tokenscripts/b_3_3_angel_flying.txt
+++ b/forge-gui/res/tokenscripts/b_3_3_angel_flying.txt
@@ -1,4 +1,4 @@
-Name:Angel
+Name:Angel Token
 ManaCost:no cost
 Types:Creature Angel
 Colors:black
--- a/forge-gui/res/tokenscripts/b_3_3_beast_deathtouch.txt
+++ b/forge-gui/res/tokenscripts/b_3_3_beast_deathtouch.txt
@@ -1,4 +1,4 @@
-Name:Beast
+Name:Beast Token
 ManaCost:no cost
 Types:Creature Beast
 Colors:black
--- a/forge-gui/res/tokenscripts/b_3_3_horror.txt
+++ b/forge-gui/res/tokenscripts/b_3_3_horror.txt
@@ -1,4 +1,4 @@
-Name:Horror
+Name:Horror Token
 ManaCost:no cost
 Types:Creature Horror
 Colors:black
--- a/forge-gui/res/tokenscripts/b_3_3_horror_designated.txt
+++ b/forge-gui/res/tokenscripts/b_3_3_horror_designated.txt
@@ -1,4 +1,4 @@
-Name:Horror
+Name:Horror Token
 ManaCost:no cost
 Types:Creature Horror
 Colors:black
--- a/forge-gui/res/tokenscripts/b_3_3_kavu.txt
+++ b/forge-gui/res/tokenscripts/b_3_3_kavu.txt
@@ -1,4 +1,4 @@
-Name:Kavu
+Name:Kavu Token
 ManaCost:no cost
 Types:Creature Kavu
 Colors:black
--- a/forge-gui/res/tokenscripts/b_4_4_horror.txt
+++ b/forge-gui/res/tokenscripts/b_4_4_horror.txt
@@ -1,4 +1,4 @@
-Name:Horror
+Name:Horror Token
 ManaCost:no cost
 Types:Creature Horror
 Colors:black
--- a/forge-gui/res/tokenscripts/b_4_4_zombie_warrior_vigilance.txt
+++ b/forge-gui/res/tokenscripts/b_4_4_zombie_warrior_vigilance.txt
@@ -1,4 +1,4 @@
-Name:Zombie Warrior
+Name:Zombie Warrior Token
 ManaCost:no cost
 Types:Creature Zombie Warrior
 Colors:black
--- a/forge-gui/res/tokenscripts/b_5_5_demon_flying.txt
+++ b/forge-gui/res/tokenscripts/b_5_5_demon_flying.txt
@@ -1,4 +1,4 @@
-Name:Demon
+Name:Demon Token
 ManaCost:no cost
 Types:Creature Demon
 Colors:black
--- a/forge-gui/res/tokenscripts/b_5_5_zombie_giant.txt
+++ b/forge-gui/res/tokenscripts/b_5_5_zombie_giant.txt
@@ -1,4 +1,4 @@
-Name:Zombie Giant
+Name:Zombie Giant Token
 ManaCost:no cost
 Types:Creature Zombie Giant
 Colors:black
--- a/forge-gui/res/tokenscripts/b_6_6_demon_flying_trample_aristocrat.txt
+++ b/forge-gui/res/tokenscripts/b_6_6_demon_flying_trample_aristocrat.txt
@@ -1,4 +1,4 @@
-Name:Demon
+Name:Demon Token
 ManaCost:no cost
 Types:Creature Demon
 Colors:black
--- a/forge-gui/res/tokenscripts/b_6_6_wurm_trample.txt
+++ b/forge-gui/res/tokenscripts/b_6_6_wurm_trample.txt
@@ -1,4 +1,4 @@
-Name:Wurm
+Name:Wurm Token
 ManaCost:no cost
 Types:Creature Wurm
 Colors:black
--- a/forge-gui/res/tokenscripts/b_aura_curse_life.txt
+++ b/forge-gui/res/tokenscripts/b_aura_curse_life.txt
@@ -1,4 +1,4 @@
-Name:Aura Curse
+Name:Aura Curse Token
 ManaCost:no cost
 Types:Enchantment Aura Curse
 Colors:black
--- a/forge-gui/res/tokenscripts/b_x_x_demon_flying.txt
+++ b/forge-gui/res/tokenscripts/b_x_x_demon_flying.txt
@@ -1,4 +1,4 @@
-Name:Demon
+Name:Demon Token
 ManaCost:no cost
 Colors:black
 Types:Creature Demon
--- a/forge-gui/res/tokenscripts/b_x_x_horror.txt
+++ b/forge-gui/res/tokenscripts/b_x_x_horror.txt
@@ -1,4 +1,4 @@
-Name:Horror
+Name:Horror Token
 ManaCost:no cost
 Colors:black
 Types:Creature Horror
--- a/forge-gui/res/tokenscripts/b_x_x_nightmare_horror.txt
+++ b/forge-gui/res/tokenscripts/b_x_x_nightmare_horror.txt
@@ -1,4 +1,4 @@
-Name:Nightmare Horror
+Name:Nightmare Horror Token
 ManaCost:no cost
 Colors:black
 Types:Creature Nightmare Horror
--- a/forge-gui/res/tokenscripts/b_x_x_phyrexian_minion.txt
+++ b/forge-gui/res/tokenscripts/b_x_x_phyrexian_minion.txt
@@ -1,4 +1,4 @@
-Name:Phyrexian Minion
+Name:Phyrexian Minion Token
 ManaCost:no cost
 Types:Creature Phyrexian Minion
 PT:*/*
--- a/forge-gui/res/tokenscripts/b_x_x_spirit.txt
+++ b/forge-gui/res/tokenscripts/b_x_x_spirit.txt
@@ -1,4 +1,4 @@
-Name:Spirit
+Name:Spirit Token
 ManaCost:no cost
 Colors:black
 Types:Creature Spirit
--- a/forge-gui/res/tokenscripts/b_x_x_vampire.txt
+++ b/forge-gui/res/tokenscripts/b_x_x_vampire.txt
@@ -1,4 +1,4 @@
-Name:Vampire
+Name:Vampire Token
 ManaCost:no cost
 Colors:black
 Types:Creature Vampire
--- a/forge-gui/res/tokenscripts/b_x_x_zombie.txt
+++ b/forge-gui/res/tokenscripts/b_x_x_zombie.txt
@@ -1,4 +1,4 @@
-Name:Zombie
+Name:Zombie Token
 ManaCost:no cost
 Colors:black
 Types:Creature Zombie
--- a/forge-gui/res/tokenscripts/b_x_x_zombie_horror.txt
+++ b/forge-gui/res/tokenscripts/b_x_x_zombie_horror.txt
@@ -1,4 +1,4 @@
-Name:Zombie Horror
+Name:Zombie Horror Token
 ManaCost:no cost
 Colors:black
 Types:Creature Zombie Horror
--- a/forge-gui/res/tokenscripts/bg_1_1_e_snake_deathtouch.txt
+++ b/forge-gui/res/tokenscripts/bg_1_1_e_snake_deathtouch.txt
@@ -1,4 +1,4 @@
-Name:Snake
+Name:Snake Token
 ManaCost:no cost
 Types:Enchantment Creature Snake
 Colors:black,green
--- a/forge-gui/res/tokenscripts/bg_1_1_insect.txt
+++ b/forge-gui/res/tokenscripts/bg_1_1_insect.txt
@@ -1,4 +1,4 @@
-Name:Insect
+Name:Insect Token
 ManaCost:no cost
 Types:Creature Insect
 Colors:black,green
--- a/forge-gui/res/tokenscripts/bg_1_1_pest_lifegain.txt
+++ b/forge-gui/res/tokenscripts/bg_1_1_pest_lifegain.txt
@@ -1,4 +1,4 @@
-Name:Pest
+Name:Pest Token
 ManaCost:no cost
 Types:Creature Pest
 Colors:black,green
--- a/forge-gui/res/tokenscripts/bg_1_1_worm.txt
+++ b/forge-gui/res/tokenscripts/bg_1_1_worm.txt
@@ -1,4 +1,4 @@
-Name:Worm
+Name:Worm Token
 ManaCost:no cost
 Types:Creature Worm
 Colors:black,green
--- a/forge-gui/res/tokenscripts/bg_2_2_wolf_garruk.txt
+++ b/forge-gui/res/tokenscripts/bg_2_2_wolf_garruk.txt
@@ -1,4 +1,4 @@
-Name:Wolf
+Name:Wolf Token
 ManaCost:no cost
 Types:Creature Wolf
 Colors:black,green
--- a/forge-gui/res/tokenscripts/bg_x_x_hydra.txt
+++ b/forge-gui/res/tokenscripts/bg_x_x_hydra.txt
@@ -1,4 +1,4 @@
-Name:Hydra
+Name:Hydra Token
 ManaCost:no cost
 Colors:black,green
 Types:Creature Hydra
--- a/forge-gui/res/tokenscripts/bg_x_x_spirit_warrior.txt
+++ b/forge-gui/res/tokenscripts/bg_x_x_spirit_warrior.txt
@@ -1,4 +1,4 @@
-Name:Spirit Warrior
+Name:Spirit Warrior Token
 ManaCost:no cost
 Colors:black,green
 Types:Creature Spirit Warrior
--- a/forge-gui/res/tokenscripts/br_3_1_graveborn_haste.txt
+++ b/forge-gui/res/tokenscripts/br_3_1_graveborn_haste.txt
@@ -1,4 +1,4 @@
-Name:Graveborn
+Name:Graveborn Token
 ManaCost:no cost
 Types:Creature Graveborn
 Colors:black,red
--- a/forge-gui/res/tokenscripts/br_3_1_vampire_trample_lifelink_haste.txt
+++ b/forge-gui/res/tokenscripts/br_3_1_vampire_trample_lifelink_haste.txt
@@ -1,4 +1,4 @@
-Name:Vampire
+Name:Vampire Token
 ManaCost:no cost
 Types:Creature Vampire
 Colors:black,red
--- a/forge-gui/res/tokenscripts/br_3_6_avatar_haste_bolt.txt
+++ b/forge-gui/res/tokenscripts/br_3_6_avatar_haste_bolt.txt
@@ -1,4 +1,4 @@
-Name:Avatar
+Name:Avatar Token
 ManaCost:no cost
 Types:Creature Avatar
 Colors:black,red
--- a/forge-gui/res/tokenscripts/br_5_5_elemental.txt
+++ b/forge-gui/res/tokenscripts/br_5_5_elemental.txt
@@ -1,4 +1,4 @@
-Name:Elemental
+Name:Elemental Token
 ManaCost:no cost
 Types:Creature Elemental
 Colors:black,red
--- a/forge-gui/res/tokenscripts/brg_3_3_cat_dragon_flying.txt
+++ b/forge-gui/res/tokenscripts/brg_3_3_cat_dragon_flying.txt
@@ -1,4 +1,4 @@
-Name:Cat Dragon
+Name:Cat Dragon Token
 ManaCost:no cost
 Types:Creature Cat Dragon
 Colors:black,red,green
--- a/forge-gui/res/tokenscripts/c_0_0_a_construct_total_artifacts.txt
+++ b/forge-gui/res/tokenscripts/c_0_0_a_construct_total_artifacts.txt
@@ -1,4 +1,4 @@
-Name:Construct
+Name:Construct Token
 ManaCost:no cost
 PT:0/0
 Types:Artifact Creature Construct
--- a/forge-gui/res/tokenscripts/c_0_1_a_egg.txt
+++ b/forge-gui/res/tokenscripts/c_0_1_a_egg.txt
@@ -1,4 +1,4 @@
-Name:Egg
+Name:Egg Token
 ManaCost:no cost
 PT:0/1
 Types:Artifact Creature Egg
--- a/forge-gui/res/tokenscripts/c_0_1_a_goblin_construct_noblock_ping.txt
+++ b/forge-gui/res/tokenscripts/c_0_1_a_goblin_construct_noblock_ping.txt
@@ -1,4 +1,4 @@
-Name:Goblin Construct
+Name:Goblin Construct Token
 ManaCost:no cost
 PT:0/1
 Types:Artifact Creature Goblin Construct
--- a/forge-gui/res/tokenscripts/c_0_1_a_pest.txt
+++ b/forge-gui/res/tokenscripts/c_0_1_a_pest.txt
@@ -1,4 +1,4 @@
-Name:Pest
+Name:Pest Token
 ManaCost:no cost
 PT:0/1
 Types:Artifact Creature Pest
--- a/forge-gui/res/tokenscripts/c_0_1_a_prism.txt
+++ b/forge-gui/res/tokenscripts/c_0_1_a_prism.txt
@@ -1,4 +1,4 @@
-Name:Prism
+Name:Prism Token
 ManaCost:no cost
 PT:0/1
 Types:Artifact Creature Prism
--- a/forge-gui/res/tokenscripts/c_0_1_eldrazi_spawn_sac.txt
+++ b/forge-gui/res/tokenscripts/c_0_1_eldrazi_spawn_sac.txt
@@ -1,4 +1,4 @@
-Name:Eldrazi Spawn
+Name:Eldrazi Spawn Token
 ManaCost:no cost
 PT:0/1
 Types:Creature Eldrazi Spawn
--- a/forge-gui/res/tokenscripts/c_0_2_a_wall_defender.txt
+++ b/forge-gui/res/tokenscripts/c_0_2_a_wall_defender.txt
@@ -1,4 +1,4 @@
-Name:Wall
+Name:Wall Token
 ManaCost:no cost
 PT:0/2
 Types:Artifact Creature Wall
--- a/forge-gui/res/tokenscripts/c_0_4_a_wall_defender.txt
+++ b/forge-gui/res/tokenscripts/c_0_4_a_wall_defender.txt
@@ -1,4 +1,4 @@
-Name:Wall
+Name:Wall Token
 ManaCost:no cost
 Types:Artifact Creature Wall
 PT:0/4
--- a/forge-gui/res/tokenscripts/c_10_10_eldrazi.txt
+++ b/forge-gui/res/tokenscripts/c_10_10_eldrazi.txt
@@ -1,4 +1,4 @@
-Name:Eldrazi
+Name:Eldrazi Token
 ManaCost:no cost
 PT:10/10
 Types:Creature Eldrazi
--- a/forge-gui/res/tokenscripts/c_1_1_a_construct.txt
+++ b/forge-gui/res/tokenscripts/c_1_1_a_construct.txt
@@ -1,4 +1,4 @@
-Name:Construct
+Name:Construct Token
 ManaCost:no cost
 PT:1/1
 Types:Artifact Creature Construct
--- a/forge-gui/res/tokenscripts/c_1_1_a_construct_defender.txt
+++ b/forge-gui/res/tokenscripts/c_1_1_a_construct_defender.txt
@@ -1,4 +1,4 @@
-Name:Construct
+Name:Construct Token
 ManaCost:no cost
 PT:1/1
 Types:Artifact Creature Construct
--- a/forge-gui/res/tokenscripts/c_1_1_a_gnome.txt
+++ b/forge-gui/res/tokenscripts/c_1_1_a_gnome.txt
@@ -1,4 +1,4 @@
-Name:Gnome
+Name:Gnome Token
 ManaCost:no cost
 PT:1/1
 Types:Artifact Creature Gnome
--- a/forge-gui/res/tokenscripts/c_1_1_a_myr.txt
+++ b/forge-gui/res/tokenscripts/c_1_1_a_myr.txt
@@ -1,4 +1,4 @@
-Name:Myr
+Name:Myr Token
 ManaCost:no cost
 PT:1/1
 Types:Artifact Creature Myr
--- a/Show More
+++ b/Show More