Tokens cleanup (Sets T-Z) (#8159)

* Update TPR

* Update TMP

* Update 10E

* Update BRC

* Update BRO

* Update LTR

* Update ELD

* Update TSB

* Update TSP

* Update TOR

* Update PZ2

* Add r_1_1_soldier

* Update UNF

* Update UGL

* Update UNH

* Update 2ED

* Update UND

* Update UDS

* Update ULG

* Update USG

* Update VIS

* Update VMA

* Update 40K

* Update WAR

* Update WTH

* Update WWK

* Update PZEN

* Update ZEN

* Update ZNR

* Update ZNC

* Update WOE WOC

* Add mention needing to flip tokens

* Rename w_2_2_cat flying.txt to w_2_2_cat_flying.txt

fix name

* Fix squad token names

---------

Co-authored-by: Hans Mackowiak <hanmac@gmx.de>

forge-gui/res/editions/Tempest Remastered.txt

@@ -278,15 +278,3 @@ ScryfallCode=TPR
 267 L Forest @Douglas Shuler
 268 L Forest @Douglas Shuler
 269 L Forest @Douglas Shuler
-
-[tokens]
-c_1_1_sliver
-w_1_1_pegasus_flying
-w_2_2_reflection
-w_1_1_spirit_flying
-b_1_1_rat
-b_2_2_zombie
-r_1_1_goblin
-g_1_1_saproling
-g_1_1_spike
-c_1_1_a_thopter_flying

forge-gui/res/editions/Tempest.txt

@@ -360,12 +360,3 @@ ScryfallCode=TMP
 348 L Forest @Douglas Shuler
 349 L Forest @Douglas Shuler
 350 L Forest @Douglas Shuler
-
-[tokens]
-carnivore
-w_1_1_pegasus_flying
-w_2_2_reflection
-w_1_1_spirit_flying
-b_2_2_zombie
-g_1_1_dog
-g_1_1_saproling

forge-gui/res/editions/Tenth Edition.txt

@@ -2,7 +2,6 @@
 Code=10E
 Date=2007-07-13
 Name=Tenth Edition
-Code2=10E
 Type=Core
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 Rare, 1 BasicLand

forge-gui/res/editions/The Brothers War Commander.txt

@@ -229,3 +229,6 @@ ScryfallCode=BRC
 12 scrap @Drew Tucker
 13 c_1_1_a_servo @Igor Kieryluk
 14 g_5_3_elemental @Nils Hamm
+
+[other]
+1 copy @David Palumbo

forge-gui/res/editions/The Brothers War.txt

@@ -450,6 +450,9 @@ A-289 R A-Geology Enthusiast @Fajareka Setiawan
 6 c_x_x_a_golem @Olivier Bernard
 7 c_a_powerstone @Karl Kopinski
 8 c_1_1_a_soldier @Gabor Szikszai
-8 c_1_1_a_soldier @Gabor Szikszai
+9 c_1_1_a_soldier @Kev Walker
 10 c_1_1_a_thopter_flying @Samuel Perin
 11 c_3_3_a_zombie @Kieran Yanner
+
+[other]
+12 emblem_saheeli_filigree_master @Aurore Folny

forge-gui/res/editions/The Lord of the Rings Tales of Middle-earth.txt

@@ -867,14 +867,14 @@ A-246 M A-The One Ring @Veli Nyström
 
 [tokens]
 1 w_1_1_human_soldier @Anastasia Balakchina
-1 w_1_1_human_soldier @Anastasia Balakchina
+2 w_1_1_human_soldier @Axel Sauerwald
 3 w_1_1_spirit_flying @Nino Is
 4 u_1_1_tentacle @Chris Cold
 5 b_0_0_orc_army @Veli Nyström
-5 b_0_0_orc_army @Veli Nyström
+6 b_0_0_orc_army @Veli Nyström
 7 smaug @Jarel Threat
 8 ballistic_boulder @Alexander Forssberg
 9 c_a_food_sac @Randy Gallegos
-10 c_a_food_sac @Randy Gallegos
+10 c_a_food_sac @Claudiu-Antoniu Magherusan
-11 c_a_food_sac @Randy Gallegos
+11 c_a_food_sac @L J Koh
 12 c_a_treasure_sac @Valera Lutfullina

forge-gui/res/editions/Theros.txt

@@ -267,6 +267,8 @@ ScryfallCode=THS
 4 u_2_2_bird_flying @Peter Mohrbacher
 5 u_1_0_elemental @Karl Kopinski
 6 b_1_1_harpy_flying @Nils Hamm
+7 r_1_1_soldier @Johann Bodin
+# Duplicated as there is no r_1_1_soldier_haste token yet
 7 r_1_1_soldier_haste @Johann Bodin
 8 g_2_2_boar @James Ryman
 9 rg_2_2_satyr_haste @Johann Bodin

forge-gui/res/editions/Throne of Eldraine.txt

@@ -2,7 +2,6 @@
 Code=ELD
 Date=2019-10-04
 Name=Throne of Eldraine
-Code2=ELD
 Type=Expansion
 BoosterCovers=3
 Booster=10 Common:fromSheet("ELD cards"), 3 Uncommon:fromSheet("ELD cards"), 1 RareMythic:fromSheet("ELD cards"), 1 BasicLand
@@ -443,9 +442,9 @@ A-125 R A-Fires of Invention @Stanton Feng
 13 rw_3_1_human_warrior_trample_haste @Suzanne Helmigh
 14 bg_2_2_wolf_garruk @David Gaillet
 15 c_a_food_sac @Steven Belledin
-16 c_a_food_sac @Steven Belledin
+16 c_a_food_sac @Randy Gallegos
-17 c_a_food_sac @Steven Belledin
+17 c_a_food_sac @Donato Giancola
-18 c_a_food_sac @Steven Belledin
+18 c_a_food_sac @Lucas Graciano
 
 [other]
 19 emblem_garruk_cursed_huntsman @Eric Deschamps

forge-gui/res/editions/Time Spiral Timeshifted.txt

@@ -2,7 +2,6 @@
 Code=TSB
 Date=2006-10-06
 Name=Time Spiral "Timeshifted"
-Code2=TSB
 Type=Expansion
 ScryfallCode=TSB
 BoosterBox=0
@@ -130,10 +129,3 @@ FatPack=0
 119 S Gemstone Mine @Brom
 120 S Pendelhaven @Bryon Wackwitz
 121 S Safe Haven @Christopher Rush
-
-[tokens]
-w_1_1_pegasus_flying
-b_0_1_serf
-g_3_3_elephant
-g_1_1_saproling
-g_0_1_sheep

forge-gui/res/editions/Time Spiral.txt

@@ -2,7 +2,6 @@
 Code=TSP
 Date=2006-10-06
 Name=Time Spiral
-Code2=TSP
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 Rare, 1 TimeShifted TSB
@@ -313,17 +312,3 @@ ScryfallCode=TSP
 299 L Forest @Vance Kovacs
 300 L Forest @Craig Mullins
 301 L Forest @Stephen Tappin
-
-[tokens]
-kobolds_of_kher_keep
-w_1_1_citizen
-w_2_2_griffin_flying
-u_1_1_camarid
-b_1_2_bat_flying_nosferatu
-b_2_4_spider_reach
-b_1_1_thrull
-r_1_1_goblin
-g_1_1_saproling
-g_x_x_wurm
-c_2_2_a_assembly_worker
-c_1_1_a_triskelavite_flying_ammo

forge-gui/res/editions/Torment.txt

@@ -156,6 +156,3 @@ ScryfallCode=TOR
 141 U Tainted Isle @Alan Pollack
 142 U Tainted Peak @Tony Szczudlo
 143 U Tainted Wood @Rob Alexander
-
-[tokens]
-g_1_1_squirrel

forge-gui/res/editions/Treasure Chests.txt

@@ -288,16 +288,3 @@ ScryfallCode=PZ2
 70861 R Journey for the Elixir @Qiu De En
 70863 R Screeching Phoenix @Tingting Yeh
 70865 C Cleansing Screech @Tingting Yeh
-
-[tokens]
-w_1_1_bird_flying
-w_1_1_soldier
-w_1_1_spirit_flying
-u_1_1_a_thopter_flying
-b_1_1_assassin_deathtouch_haste
-b_0_0_phyrexian_germ
-r_5_5_dragon_flying
-r_1_1_goblin_all_attack
-r_8_8_lizard
-g_1_1_saproling
-c_1_1_a_construct_defender

forge-gui/res/editions/Ultimate Masters.txt

@@ -2,7 +2,6 @@
 Code=UMA
 Date=2018-12-07
 Name=Ultimate Masters
-Code2=UMA
 Type=Reprint
 BoosterCovers=3
 Booster=11 Common, 3 Uncommon, 1 RareMythic
@@ -277,7 +276,9 @@ ScryfallCode=UMA
 7 b_6_6_wurm_trample @Daarken
 8 b_2_2_zombie @Anna Steinbauer
 9 r_1_1_elemental @Jaime Jones
-9 r_1_1_elemental @Jaime Jones
+10 r_1_1_elemental @Winona Nelson
+11 r_1_1_soldier @Johann Bodin
+# Duplicated as there is no r_1_1_soldier_haste token yet
 11 r_1_1_soldier_haste @Johann Bodin
 12 spark_elemental @John Avon
 13 g_4_4_elemental @Brandon Kitkouski

forge-gui/res/editions/Unfinity.txt

@@ -649,13 +649,17 @@ F538 R Water Gun Balloon Game @Ralph Horsley
 537 R Breeding Pool @Bruce Brenneise
 
 [tokens]
+1 w_2_2_cat_flying @Gaboleps
 2 w_1_1_a_clown_robot @Ralph Horsley
-2 w_1_1_a_clown_robot @Ralph Horsley
+3 w_1_1_a_clown_robot @Matt Dixon
+# Not implemented
+# 4 contortionist @Tomek Larek
 5 storm_crow @Greg Staples
 6 b_2_2_zombie_employee @Sebastian Giacobino
 7 r_1_1_balloon_flying @Greg Bobrowski
 8 g_1_1_squirrel @Dave Greco
+9 c_2_2_teddy_bear @Ernanda Souza
 10 c_a_food_sac @Matt Gaser
-11 c_a_food_sac @Matt Gaser
+11 c_a_food_sac @Chuck Lukacs
 12 c_a_treasure_sac @Ben Maier
-13 c_a_treasure_sac @Ben Maier
+13 c_a_treasure_sac @Michael Phillippi

forge-gui/res/editions/Unglued.txt

@@ -104,4 +104,5 @@ ScryfallCode=UGL
 2 w_1_1_soldier @Daren Bader
 3 b_2_2_zombie @Christopher Rush
 4 r_1_1_goblin @Pete Venters
+5 g_2_2_sheep @Kev Walker
 6 g_1_1_squirrel @Ron Spencer

forge-gui/res/editions/Unhinged.txt

@@ -151,9 +151,3 @@ ScryfallCode=UNH
 139 L Mountain @John Avon
 140 L Forest @John Avon
 141 R Super Secret Tech @Dan Frazier
-
-[tokens]
-r_1_1_goblin
-g_1_1_ape
-g_3_3_ape
-g_1_1_squirrel

forge-gui/res/editions/Unlimited Edition.txt

@@ -314,6 +314,3 @@ ScryfallCode=2ED
 300 L Forest @Christopher Rush
 301 L Forest @Christopher Rush
 302 L Forest @Christopher Rush
-
-[tokens]
-wasp

forge-gui/res/editions/Unsanctioned.txt

@@ -1,6 +1,5 @@
 [metadata]
 Code=UND
-Code2=UND
 Date=2020-02-29
 Name=Unsanctioned
 Type=Funny
@@ -109,3 +108,5 @@ ScryfallCode=UND
 1 u_1_1_beeble @Jeff Miracola
 2 r_1_1_goblin @Dave Allsop
 3 g_1_1_squirrel @Daniel Ljunggren
+4 c_4_4_dragon_flying @Autumn Rain Turkel
+5 c_5_5_giant_teddy_bear @Andrea Radeck

forge-gui/res/editions/Urza's Destiny.txt

@@ -154,6 +154,3 @@ ScryfallCode=UDS
 141 R Thran Golem @Ron Spears
 142 R Urza's Incubator @Pete Venters
 143 R Yavimaya Hollow @Douglas Shuler
-
-[tokens]
-r_1_1_goblin

forge-gui/res/editions/Urza's Legacy.txt

@@ -154,6 +154,3 @@ ScryfallCode=ULG
 141 U Ghitu Encampment @Don Hazeltine
 142 U Spawning Pool @Rob Alexander
 143 U Treetop Village @Anthony S. Waters
-
-[tokens]
-g_1_1_squirrel

forge-gui/res/editions/Urza's Saga.txt

@@ -360,11 +360,3 @@ ScryfallCode=USG
 348 L Forest @Anthony S. Waters
 349 L Forest @Anthony S. Waters
 350 L Forest @Anthony S. Waters
-
-[tokens]
-c_1_1_a_gnome
-w_2_2_knight
-b_x_x_phyrexian_minion
-r_1_1_goblin
-g_1_1_saproling
-g_3_3_beast

forge-gui/res/editions/Vintage Masters.txt

@@ -335,24 +335,3 @@ ScryfallCode=VMA
 323 R Underground Sea @Cliff Childs
 324 R Volcanic Island @Noah Bradley
 325 R Yavimaya Hollow @Douglas Shuler
-
-[tokens]
-w_4_4_angel_flying
-w_1_1_bird_flying
-w_2_2_reflection
-w_1_1_soldier
-w_1_1_spirit_flying
-b_x_x_demon_flying
-b_6_6_wurm_trample
-b_2_2_zombie
-r_1_1_goblin
-g_2_2_bear
-g_3_3_boar
-g_3_3_elephant
-g_1_1_insect
-g_1_1_saproling
-g_x_x_saproling_burst
-g_1_1_squirrel
-g_6_6_wurm
-rw_1_1_goblin_soldier
-c_1_1_a_thopter_flying

forge-gui/res/editions/Visions.txt

@@ -177,9 +177,3 @@ ScryfallCode=VIS
 165 U Karoo @Zina Saunders
 166 U Quicksand @Roger Raupp
 167 R Undiscovered Paradise @David O'Connor
-
-[tokens]
-butterfly
-c_0_1_a_prism
-g_0_1_sheep
-g_1_1_snake

forge-gui/res/editions/War of the Spark.txt

@@ -2,7 +2,6 @@
 Code=WAR
 Date=2019-05-03
 Name=War of the Spark
-Code2=WAR
 Type=Expansion
 BoosterCovers=3
 Booster=10 Common:fromSheet("WAR cards"), 3 Uncommon:fromSheet("WAR cards"), 1 RareMythic:fromSheet("WAR cards"), 1 BasicLand

forge-gui/res/editions/Warhammer 40,000 Commander.txt

@@ -331,24 +331,26 @@ ScryfallCode=40K
 [tokens]
 1 w_2_2_astartes_warrior_vigilance @Dmitriy Mironov
 2 w_1_1_soldier @Lixin Yin
-2★ w_1_1_soldier @Lixin Yin
 3 w_1_1_soldier @Lixin Yin
-3★ w_1_1_soldier @Lixin Yin
 4 w_1_1_soldier @Lixin Yin
-4★ w_1_1_soldier @Lixin Yin
 9 u_1_1_tyranid_gargoyle_flying @David Astruga
 12 b_2_2_astartes_warrior_menace @Helge C. Balzer
 13 cherubael @Irina Nordsol
 14 b_2_2_a_necron_warrior @Games Workshop
 15 plaguebearer_of_nurgle @Games Workshop
-15★ plaguebearer_of_nurgle @Games Workshop
 16 r_3_3_spawn @Oleg Bulakh
-16★ r_3_3_spawn @Oleg Bulakh
 17 g_1_1_tyranid @Slawomir Maniak
-17★ g_1_1_tyranid @Slawomir Maniak
 18 g_5_5_tyranid @Antonio José Manzanedo
 19 g_3_3_tyranid_warrior_trample @Sergio Cosmai
 20 blue_horror @Andrey Nyarl
 21 c_a_clue_draw @Mirko Failoni
 22 c_1_1_a_insect_flying @Bartek Fedyczak
 23 c_4_4_a_robot_noblock @Philip Helliwell
+
+[other]
+5 squad_space_marine_devastator @Dmitriy Mironov
+6 squad_ultramarines_honour_guard @Jake Murray
+7 squad_zephyrim @Jon Neimeister
+8 squad_sicarian_infiltrator @Xavier Ribeiro
+10 squad_vanguard_suppressor @Fajareka Setiawan
+11 squad_arco-flagellant @Xavier Ribeiro

forge-gui/res/editions/Weatherlight.txt

@@ -178,6 +178,3 @@ ScryfallCode=WTH
 165 R Lotus Vale @John Avon
 166 R Scorched Ruins @John Avon
 167 R Winding Canyons @John Avon
-
-[tokens]
-g_1_1_squirrel

forge-gui/res/editions/Wilds of Eldraine Commander.txt

@@ -4,6 +4,7 @@ Date=2023-09-08
 Name=Wilds of Eldraine Commander
 Type=Commander
 ScryfallCode=WOC
+TokensFallbackCode=WOE
 
 [cards]
 1 M Tegwyll, Duke of Splendor @Ekaterina Burmak
@@ -181,12 +182,12 @@ ScryfallCode=WOC
 173 U Vitu-Ghazi, the City-Tree @Martina Pilcerova
 
 [tokens]
-0 role_monster @Unknown
+1 role_monster @Rovina Cai
-0 role_royal @Unknown
+# Need to flip it
-0 role_sorcerer @Unknown
+1 role_virtuous @Rovina Cai
-0 role_virtuous @Unknown
+2 role_royal @Rovina Cai
-0 role_virtuous @Unknown
+# Need to flip it
-0 role_virtuous @Unknown
+2 role_virtuous @Rovina Cai
 7 w_1_1_human_soldier @Kimonas Theodossiou
 9 w_2_2_pegasus_flying @Lars Grant-West
 10 u_1_1_faerie_flying @Irina Nordsol
@@ -194,3 +195,6 @@ ScryfallCode=WOC
 12 r_4_2_pirate_noblock @Igor Krstic
 15 g_1_1_saproling @Joseph Meehan
 16 ub_1_1_faerie_rogue_flying @E. M. Gist
+
+[other]
+4 copy @David Palumbo

forge-gui/res/editions/Wilds of Eldraine.txt

@@ -405,12 +405,6 @@ ScryfallCode=WOE
 381 R Expel the Interlopers @Awanqi (Angela Wang)
 
 [tokens]
-0 role_cursed @Unknown
-0 role_monster @Unknown
-0 role_royal @Unknown
-0 role_sorcerer @Unknown
-0 role_wicked @Unknown
-0 role_young_hero @Unknown
 1 w_1_1_bird_flying @Kisung Koh
 2 w_1_1_human @Julia Griffin
 3 w_2_2_knight_vigilance @Dominik Mayer
@@ -421,7 +415,19 @@ ScryfallCode=WOE
 8 g_3_3_beast @Vincent Christiaens
 9 wu_4_4_elemental @Camille Alquier
 10 c_a_food_sac @Ovidio Cartagena
-11 c_a_food_sac @Ovidio Cartagena
+11 c_a_food_sac @Gaboleps
-12 c_a_food_sac @Ovidio Cartagena
+12 c_a_food_sac @Irvin Rodriguez
-13 c_a_food_sac @Ovidio Cartagena
+13 c_a_food_sac @Jokubas Uogintas
 14 c_a_treasure_sac @Zezhou Chen
+15 role_monster @Rovina Cai
+# Need to flip it
+15 role_sorcerer @Rovina Cai
+16 role_royal @Rovina Cai
+# Need to flip it
+16 role_young_hero @Rovina Cai
+17 role_wicked @Rovina Cai
+# Need to flip it
+17 role_cursed @Rovina Cai
+
+[other]
+18 adventure @Dmitry Burmak

forge-gui/res/editions/Worldwake.txt

@@ -2,7 +2,6 @@
 Code=WWK
 Date=2010-02-05
 Name=Worldwake
-Code2=WWK
 Type=Expansion
 BoosterCovers=3
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand ZEN

forge-gui/res/editions/Zendikar Promos.txt

@@ -11,6 +11,3 @@ A5 R Terra Stomper @Goran Josic
 178★ M Rampaging Baloths @Eric Deschamps
 221★ R Oran-Rief, the Vastwood @Mike Bierek
 228★ R Valakut, the Molten Pinnacle @James Paick
-
-[tokens]
-g_4_4_beast

forge-gui/res/editions/Zendikar Rising Commander.txt

@@ -153,7 +153,7 @@ ScryfallCode=ZNC
 1 w_1_1_bird_flying @Howard Lyon
 2 w_1_1_kor_ally @Jeremy Wilson
 3 b_1_1_faerie_rogue_flying @Dave Allsop
-4 b_0_0_phyrexian_germ @Igor Kieryluk
+4 b_0_0_germ @Igor Kieryluk
 5 b_1_1_goblin_rogue @Dave Kendall
 6 b_1_1_rat @Mike Bierek
 7 g_4_4_beast @Steve Prescott

forge-gui/res/editions/Zendikar Rising.txt

@@ -2,7 +2,6 @@
 Code=ZNR
 Date=2020-09-25
 Name=Zendikar Rising
-Code2=ZNR
 Type=Expansion
 BoosterCovers=3
 Booster=10 Common:!dfc:fromSheet("ZNR cards"), 3 Uncommon:!dfc:fromSheet("ZNR cards"), 1 RareMythic:!dfc:fromSheet("ZNR cards"), 1 BasicLand
@@ -486,3 +485,6 @@ A-257 U A-Base Camp @Jokubas Uogintas
 9 bg_x_x_hydra @Filip Burburan
 10 c_1_1_a_construct @Jokubas Uogintas
 11 c_0_1_a_goblin_construct_noblock_ping @Johan Grenier
+
+[other]
+12 copy @Jason Rainville

forge-gui/res/editions/Zendikar.txt

@@ -2,7 +2,6 @@
 Code=ZEN
 Date=2009-10-02
 Name=Zendikar
-Code2=ZEN
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand

forge-gui/res/tokenscripts/c_2_2_teddy_bear.txt

@@ -0,0 +1,5 @@
+Name:Teddy Bear Token
+ManaCost:no cost
+Types:Creature Teddy bear
+PT:2/2
+Oracle:

forge-gui/res/tokenscripts/c_5_5_giant_teddy_bear.txt

@@ -0,0 +1,5 @@
+Name:Giant Teddy Bear Token
+ManaCost:no cost
+Types:Creature Giant Teddy Bear
+PT:5/5
+Oracle:

forge-gui/res/tokenscripts/g_2_2_sheep.txt

@@ -0,0 +1,6 @@
+Name:Sheep Token
+ManaCost:no cost
+Colors:green
+Types:Creature Sheep
+PT:2/2
+Oracle:

forge-gui/res/tokenscripts/r_1_1_soldier.txt

@@ -0,0 +1,6 @@
+Name:Soldier Token
+ManaCost:no cost
+Colors:red
+Types:Creature Soldier
+PT:1/1
+Oracle:

forge-gui/res/tokenscripts/w_2_2_cat_flying.txt

@@ -0,0 +1,7 @@
+Name:Cat Token
+ManaCost:no cost
+Colors:white
+Types:Creature Cat
+PT:2/2
+K:Flying
+Oracle:Flying