Tokens cleanup (R-S sets) (#8138)

* Update SOK

* Update SCG

* Update ALA

* Update SOM

* Update SHM

* Update SOI

* Update SCD

* Update SNC

* Update STX

* Update STH

* Update PSVC

* Update RNA

* Update RAV

* Update RTR

* Update REV

* Update ROE

* Update PRIX

* Update RIX

* Fix RNA

forge-gui/res/editions/Ravnica Allegiance.txt

@@ -2,7 +2,6 @@
 Code=RNA
 Date=2019-01-25
 Name=Ravnica Allegiance
-Code2=RNA
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common:fromSheet("RNA cards"):!fromSheet("RNA Lands"), 3 Uncommon:fromSheet("RNA cards"), 1 RareMythic:fromSheet("RNA cards"), 1 fromSheet("RNA Lands")
@@ -310,3 +309,6 @@ Simic Guildgate|RNA
 10 wb_1_1_spirit_flying @Josh Hass
 11 c_1_1_a_thopter_flying @Darren Tan
 12 c_a_treasure_sac @Mark Behm
+
+[other]
+13 emblem_domri_chaos_bringer @Zack Stella

forge-gui/res/editions/Ravnica City of Guilds.txt

@@ -2,7 +2,6 @@
 Code=RAV
 Date=2005-10-07
 Name=Ravnica: City of Guilds
-Code2=RAV
 Type=Expansion
 BoosterCovers=5
 Booster=11 Common, 3 Uncommon, 1 Rare
@@ -319,13 +318,3 @@ ScryfallCode=RAV
 304 L Forest @Christopher Moeller
 305 L Forest @Anthony S. Waters
 306 L Forest @Richard Wright
-
-[tokens]
-voja
-w_2_2_knight
-w_1_1_spirit_flying
-u_1_1_faerie_flying
-b_4_4_horror
-r_1_1_goblin
-g_3_3_centaur_pro_black
-g_1_1_saproling

forge-gui/res/editions/Return to Ravnica.txt

@@ -2,7 +2,6 @@
 Code=RTR
 Date=2012-10-05
 Name=Return to Ravnica
-Code2=RTR
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand
@@ -290,13 +289,11 @@ ScryfallCode=RTR
 [tokens]
 1 w_1_1_bird_flying @James Ryman
 2 w_2_2_knight_vigilance @Matt Stewart
-3 w_2_2_knight_vigilance @Matt Stewart
 3 w_1_1_soldier @Steve Prescott
 4 b_1_1_assassin_lose_con @Svetlin Velinov
 5 r_6_6_dragon_flying @Mark Zug
 6 r_1_1_goblin @Christopher Moeller
 7 g_3_3_centaur @Slawomir Maniak
-7 g_3_3_centaur @Slawomir Maniak
 8 g_x_x_ooze @Marco Nelor
 9 g_4_4_rhino_trample @Tomasz Jedruszek
 10 g_1_1_saproling @Raoul Vitale

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

@@ -318,7 +318,3 @@ ScryfallCode=3ED
 304 L Forest @Christopher Rush
 305 L Forest @Christopher Rush
 306 L Forest @Christopher Rush
-
-[tokens]
-wasp
-c_5_5_a_djinn_flying

forge-gui/res/editions/Rise of the Eldrazi.txt

@@ -2,7 +2,6 @@
 Code=ROE
 Date=2010-04-23
 Name=Rise of the Eldrazi
-Code2=ROE
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand
@@ -263,8 +262,8 @@ TokenFallbackCode=WWK
 
 [tokens]
 1a c_0_1_eldrazi_spawn_sac @Aleksi Briclot
-1a c_0_1_eldrazi_spawn_sac @Aleksi Briclot
+1a c_0_1_eldrazi_spawn_sac @Mark Tedin
-1a c_0_1_eldrazi_spawn_sac @Aleksi Briclot
+1a c_0_1_eldrazi_spawn_sac @Véronique Meignaud
 2 r_x_x_elemental @Jung Park
 3 r_4_4_hellion @Anthony Francisco
 4 g_x_x_ooze @Daniel Ljunggren

forge-gui/res/editions/Rivals of Ixalan Promos.txt

@@ -12,6 +12,3 @@ ScryfallCode=PRIX
 130 R Ghalta, Primal Hunger @Johann Bodin
 177 R Captain's Hook @Kev Walker
 186 C Evolving Wilds @Daniel Ljunggren
-
-[tokens]
-c_a_treasure_sac

forge-gui/res/editions/Rivals of Ixalan.txt

@@ -2,7 +2,6 @@
 Code=RIX
 Date=2018-01-19
 Name=Rivals of Ixalan
-Code2=RIX
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common:fromSheet("RIX cards"), 3 Uncommon:fromSheet("RIX cards"), 1 RareMythic:fromSheet("RIX cards"), 1 BasicLand:fromSheet("RIX Basic Lands")

forge-gui/res/editions/Saviors of Kamigawa.txt

@@ -2,7 +2,6 @@
 Code=SOK
 Date=2005-06-03
 Name=Saviors of Kamigawa
-Code2=SOK
 Type=Expansion
 BoosterCovers=3
 Booster=11 Common, 3 Uncommon, 1 Rare
@@ -176,10 +175,3 @@ ScryfallCode=SOK
 163 R Miren, the Moaning Well @Rob Alexander
 164 R Oboro, Palace in the Clouds @Rob Alexander
 165 R Tomb of Urami @Alex Horley-Orlandelli
-
-[tokens]
-urami
-c_1_1_spirit
-r_3_1_elemental_haste
-r_1_1_warrior
-g_1_1_snake

forge-gui/res/editions/Scars of Mirrodin.txt

@@ -2,7 +2,6 @@
 Code=SOM
 Date=2010-10-01
 Name=Scars of Mirrodin
-Code2=SOM
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand
@@ -266,7 +265,7 @@ ScryfallCode=SOM
 1 w_2_2_cat @Scott Chou
 2 w_1_1_soldier @Goran Josic
 3 r_1_1_goblin @Goran Josic
-4 g_1_1_phyrexian_insect_infect @Adrian Smith
+4 g_1_1_insect_infect @Adrian Smith
 5 g_2_2_wolf @Chris Rahn
 6 c_3_3_a_golem @Nic Klein
 7 c_1_1_a_myr @Ryan Pancoast

forge-gui/res/editions/Scourge.txt

@@ -156,10 +156,3 @@ ScryfallCode=SCG
 141 U Proteus Machine @Greg Staples
 142 R Stabilizer @David Martin
 143 U Temple of the False God @Brian Snõddy
-
-[tokens]
-w_4_4_angel_flying
-w_1_1_soldier
-r_5_5_dragon_flying
-r_1_1_goblin
-g_4_4_beast

forge-gui/res/editions/Shadowmoor.txt

@@ -2,7 +2,6 @@
 Code=SHM
 Date=2008-05-02
 Name=Shadowmoor
-Code2=SHM
 Type=Expansion
 BoosterCovers=5
 Booster=11 Common, 3 Uncommon, 1 Rare

forge-gui/res/editions/Shadows over Innistrad.txt

@@ -2,7 +2,6 @@
 Code=SOI
 Date=2016-04-08
 Name=Shadows over Innistrad
-Code2=SOI
 Type=Expansion
 BoosterCovers=5
 Booster=9 Common:!dfc, 3 Uncommon:!dfc, 1 RareMythic:!dfc, 1 dfc:!Rare:!Mythic, 1 BasicLand
@@ -323,8 +322,12 @@ ScryfallCode=SOI
 9 g_2_2_wolf @Aaron Miller
 10 wb_1_1_human_cleric @Min Yum
 11 c_a_clue_draw @John Avon
-12 c_a_clue_draw @John Avon
+12 c_a_clue_draw @Noah Bradley
-13 c_a_clue_draw @John Avon
+13 c_a_clue_draw @Zezhou Chen
-14 c_a_clue_draw @John Avon
+14 c_a_clue_draw @Cliff Childs
-15 c_a_clue_draw @John Avon
+15 c_a_clue_draw @James Paick
-16 c_a_clue_draw @John Avon
+16 c_a_clue_draw @Franz Vohwinkel
+
+[other]
+17 emblem_jace_unraveler_of_secrets @Tyler Jacobson
+18 emblem_arlinn_embraced_by_the_moon @Winona Nelson

forge-gui/res/editions/Shards of Alara.txt

@@ -2,7 +2,6 @@
 Code=ALA
 Date=2008-10-03
 Name=Shards of Alara
-Code2=ALA
 Type=Expansion
 BoosterCovers=5
 Booster=10 Common:fromsheet("ALA cards"), 3 Uncommon:fromSheet("ALA cards"), 1 RareMythic:fromSheet("ALA cards"), 1 BasicLand:fromSheet("ALA cards")
@@ -272,7 +271,6 @@ ScryfallCode=ALA
 5 b_2_2_zombie @Dave Kendall
 6 r_4_4_dragon_flying @Vance Kovacs
 7 r_1_1_goblin @Brandon Kitkouski
-8 r_1_1_goblin_haste @Brandon Kitkouski
 8 g_x_x_ooze @Anthony S. Waters
 9 g_1_1_saproling @Trevor Claxton
 10 rgw_8_8_beast @Paolo Parente

forge-gui/res/editions/Starter Commander Decks.txt

@@ -385,3 +385,7 @@ ScryfallCode=SCD
 23 g_1_1_saproling @Joseph Meehan
 24 c_1_1_a_thopter_flying @Richard Wright
 25 c_a_treasure_sac @Alayna Danner
+
+[other]
+26 emblem_ob_nixilis_reignited @Chris Rahn
+27 emblem_sarkhan_the_dragonspeaker @Daarken

forge-gui/res/editions/Streets of New Capenna.txt

@@ -2,7 +2,6 @@
 Code=SNC
 Date=2022-04-29
 Name=Streets of New Capenna
-Code2=SNC
 Type=Expansion
 BoosterCovers=3
 Booster=10 Common:fromsheet("SNC cards"), 3 Uncommon:fromSheet("SNC cards"), 1 RareMythic:fromSheet("SNC cards"), 1 fromSheet("SNC lands")
@@ -576,10 +575,10 @@ A-242 C A-Paragon of Modernity @Volkan Baǵa
 11 g_4_4_rhino_warrior @Zoltan Boros
 12 gw_1_1_citizen @Maria Poliakova
 13 c_a_treasure_sac @Nadia Hurianova
-14 c_a_treasure_sac @Nadia Hurianova
+14 c_a_treasure_sac @Alex Stone
-15 c_a_treasure_sac @Nadia Hurianova
+15 c_a_treasure_sac @Minttu Hynninen
-16 c_a_treasure_sac @Nadia Hurianova
+16 c_a_treasure_sac @Brigitte Roka
-17 c_a_treasure_sac @Nadia Hurianova
+17 c_a_treasure_sac @Forrest Imel
 
 [other]
 1 copy @David Palumbo

forge-gui/res/editions/Strixhaven School of Mages.txt

@@ -2,7 +2,6 @@
 Code=STX
 Date=2021-04-23
 Name=Strixhaven: School of Mages
-Code2=STX
 Type=Expansion
 BoosterCovers=5
 DraftBooster=1 fromSheet("STX lesson"), 9 Common:fromSheet("STX cards"), 3 Uncommon:fromSheet("STX cards"), 1 RareMythic:fromSheet("STX cards"), 1 Any STA

forge-gui/res/editions/Stronghold.txt

@@ -153,10 +153,3 @@ ScryfallCode=STH
 141 R Sword of the Chosen @Adam Rex
 142 R Volrath's Laboratory @Brom
 143 R Volrath's Stronghold @Kev Walker
-
-[tokens]
-hornet
-c_1_1_sliver
-b_1_1_rat
-r_1_1_goblin
-g_1_1_spike

forge-gui/res/editions/Summer Vacation Promos 2022.txt

@@ -4,6 +4,7 @@ Date=2022-08-01
 Name=Summer Vacation Promos 2022
 Type=Promo
 ScryfallCode=PSVC
+CardLang=ja
 
 [cards]
 1 R Ephemerate @Bastien L. Deharme

forge-gui/res/tokenscripts/g_1_1_insect_infect.txt

@@ -0,0 +1,7 @@
+Name:Insect Token
+ManaCost:no cost
+Colors:green
+Types:Creature Insect
+PT:1/1
+K:Infect
+Oracle:Infect (This creature deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.)