From 325d9d26f69e1e16fd1818fc204212e9f57df1f2 Mon Sep 17 00:00:00 2001
From: pfirpfel <michaelkuenzli@gmail.com>
Date: Mon, 30 Nov 2020 17:07:56 +0100
Subject: [PATCH] XLN, RIX cleanup

---
 forge-gui/res/blockdata/printsheets.txt     | 35 ---------------------
 forge-gui/res/editions/Ixalan.txt           |  4 ++-
 forge-gui/res/editions/Rivals of Ixalan.txt | 16 +++++++++-
 3 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/forge-gui/res/blockdata/printsheets.txt b/forge-gui/res/blockdata/printsheets.txt
index 84a800b59a3..a97a08c15eb 100644
--- a/forge-gui/res/blockdata/printsheets.txt
+++ b/forge-gui/res/blockdata/printsheets.txt
@@ -1152,41 +1152,6 @@ Zealot of the God-Pharaoh
 Visage of Bolas
 Cinder Barrens
 
-[XLN Planeswalker Decks and Toolkit]
-Jace, Ingenious Mind-Mage
-Castaway's Despair
-Grasping Current
-Jace's Sentinel
-Woodland Stream
-Huatli, Dinosaur Knight
-Huatli's Snubhorn 
-Huatli's Spurring
-Sun-Blessed Mount
-Stone Quarry
-
-[RIX Planeswalker Decks and Toolkit]
-Vraska, Scheming Gorgon
-Vampire Champion
-Vraska's Conquistador
-Vraska's Scorn
-Angrath, Minotaur Pirate
-Angrath's Ambusher
-Swab Goblin
-Angrath's Fury
-Cinder Barrens
-
-[RIX Basic Lands]
-4 Plains|XLN
-4 Island|XLN
-4 Swamp|XLN
-4 Mountain|XLN
-4 Forest|XLN
-1 Plains|RIX
-1 Island|RIX
-1 Swamp|RIX
-1 Mountain|RIX
-1 Forest|RIX
-
 [DOM Planeswalker Decks and Additional Promo]
 Teferi, Timebender
 Temporal Machinations
diff --git a/forge-gui/res/editions/Ixalan.txt b/forge-gui/res/editions/Ixalan.txt
index dff41f60fd4..83260821c73 100644
--- a/forge-gui/res/editions/Ixalan.txt
+++ b/forge-gui/res/editions/Ixalan.txt
@@ -6,7 +6,7 @@ Code2=XLN
 Type=Expansion
 MciCode=xln
 BoosterCovers=5
-Booster=10 Common:!fromSheet("XLN Planeswalker Decks and Toolkit"), 3 Uncommon:!fromSheet("XLN Planeswalker Decks and Toolkit"), 1 RareMythic:!fromSheet("XLN Planeswalker Decks and Toolkit"), 1 BasicLand
+Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand
 
 [cards]
 1 U Adanto Vanguard
@@ -288,6 +288,8 @@ Booster=10 Common:!fromSheet("XLN Planeswalker Decks and Toolkit"), 3 Uncommon:!
 277 L Forest
 278 L Forest
 279 L Forest
+
+[precon product]
 280 M Jace, Ingenious Mind-Mage
 281 C Castaway's Despair
 282 R Grasping Current
diff --git a/forge-gui/res/editions/Rivals of Ixalan.txt b/forge-gui/res/editions/Rivals of Ixalan.txt
index bfea6df9af7..4e8864bd87d 100644
--- a/forge-gui/res/editions/Rivals of Ixalan.txt	
+++ b/forge-gui/res/editions/Rivals of Ixalan.txt	
@@ -6,7 +6,7 @@ Code2=RIX
 Type=Expansion
 MciCode=rix
 BoosterCovers=5
-Booster=10 Common:!fromSheet("RIX Planeswalker Decks and Toolkit"), 3 Uncommon:!fromSheet("RIX Planeswalker Decks and Toolkit"), 1 RareMythic:!fromSheet("RIX Planeswalker Decks and Toolkit"), 1 BasicLand:fromSheet("RIX Basic Lands")
+Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand:fromSheet("RIX Basic Lands")
 TreatAsSmallSet=true
 
 [cards]
@@ -206,6 +206,8 @@ TreatAsSmallSet=true
 194 L Swamp
 195 L Mountain
 196 L Forest
+
+[precon product]
 197 M Vraska, Scheming Gorgon
 198 C Vampire Champion
 199 U Vraska's Conquistador
@@ -216,6 +218,18 @@ TreatAsSmallSet=true
 204 R Angrath's Fury
 205 C Cinder Barrens
 
+[Basic Lands]
+4 Plains|XLN
+4 Island|XLN
+4 Swamp|XLN
+4 Mountain|XLN
+4 Forest|XLN
+1 Plains|RIX
+1 Island|RIX
+1 Swamp|RIX
+1 Mountain|RIX
+1 Forest|RIX
+
 [tokens]
 w_1_1_vampire_lifelink
 u_1_1_merfolk_hexproof