From 94e4b00226926c4e4fabe3a87cf7fa278b81474c Mon Sep 17 00:00:00 2001
From: Rob Schnautz <schnautzr@yahoo.com>
Date: Thu, 12 Jul 2018 20:54:54 +0000
Subject: [PATCH 1/7] normalize filename

---
 .../cardsfolder/b/{brawl-bash_ogre.txt => brawl_bash_ogre.txt}    | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename forge-gui/res/cardsfolder/b/{brawl-bash_ogre.txt => brawl_bash_ogre.txt} (100%)

diff --git a/forge-gui/res/cardsfolder/b/brawl-bash_ogre.txt b/forge-gui/res/cardsfolder/b/brawl_bash_ogre.txt
similarity index 100%
rename from forge-gui/res/cardsfolder/b/brawl-bash_ogre.txt
rename to forge-gui/res/cardsfolder/b/brawl_bash_ogre.txt

From 9a14dba0f857125cd1b833fcaecdf4cd3ae97645 Mon Sep 17 00:00:00 2001
From: schnautzr <schnautzr@yahoo.com>
Date: Thu, 12 Jul 2018 21:54:46 -0500
Subject: [PATCH 2/7] add m19 decks

(cherry picked from commit 33f533900d2a49236ee551e2524700487869c342)
---
 .../quest/precons/Ajani, Wise Counselor.dck   | 27 ++++++++++++
 .../precons/Core Set 2019 Welcome Deck BG.dck | 41 ++++++++++++++++++
 .../precons/Core Set 2019 Welcome Deck BR.dck | 40 ++++++++++++++++++
 .../precons/Core Set 2019 Welcome Deck GU.dck | 39 +++++++++++++++++
 .../precons/Core Set 2019 Welcome Deck GW.dck | 42 +++++++++++++++++++
 .../precons/Core Set 2019 Welcome Deck RG.dck | 40 ++++++++++++++++++
 .../precons/Core Set 2019 Welcome Deck RW.dck | 41 ++++++++++++++++++
 .../precons/Core Set 2019 Welcome Deck UB.dck | 39 +++++++++++++++++
 .../precons/Core Set 2019 Welcome Deck UR.dck | 38 +++++++++++++++++
 .../precons/Core Set 2019 Welcome Deck WB.dck | 42 +++++++++++++++++++
 .../precons/Core Set 2019 Welcome Deck WU.dck | 40 ++++++++++++++++++
 .../precons/Liliana, the Necromancer.dck      | 27 ++++++++++++
 .../res/quest/precons/Sarkhan, Dragonsoul.dck | 27 ++++++++++++
 .../precons/Tezzeret, Cruel Machinist.dck     | 26 ++++++++++++
 .../quest/precons/Vivien of the Arkbow.dck    | 27 ++++++++++++
 15 files changed, 536 insertions(+)
 create mode 100644 forge-gui/res/quest/precons/Ajani, Wise Counselor.dck
 create mode 100644 forge-gui/res/quest/precons/Core Set 2019 Welcome Deck BG.dck
 create mode 100644 forge-gui/res/quest/precons/Core Set 2019 Welcome Deck BR.dck
 create mode 100644 forge-gui/res/quest/precons/Core Set 2019 Welcome Deck GU.dck
 create mode 100644 forge-gui/res/quest/precons/Core Set 2019 Welcome Deck GW.dck
 create mode 100644 forge-gui/res/quest/precons/Core Set 2019 Welcome Deck RG.dck
 create mode 100644 forge-gui/res/quest/precons/Core Set 2019 Welcome Deck RW.dck
 create mode 100644 forge-gui/res/quest/precons/Core Set 2019 Welcome Deck UB.dck
 create mode 100644 forge-gui/res/quest/precons/Core Set 2019 Welcome Deck UR.dck
 create mode 100644 forge-gui/res/quest/precons/Core Set 2019 Welcome Deck WB.dck
 create mode 100644 forge-gui/res/quest/precons/Core Set 2019 Welcome Deck WU.dck
 create mode 100644 forge-gui/res/quest/precons/Liliana, the Necromancer.dck
 create mode 100644 forge-gui/res/quest/precons/Sarkhan, Dragonsoul.dck
 create mode 100644 forge-gui/res/quest/precons/Tezzeret, Cruel Machinist.dck
 create mode 100644 forge-gui/res/quest/precons/Vivien of the Arkbow.dck

diff --git a/forge-gui/res/quest/precons/Ajani, Wise Counselor.dck b/forge-gui/res/quest/precons/Ajani, Wise Counselor.dck
new file mode 100644
index 00000000000..91960be39e6
--- /dev/null
+++ b/forge-gui/res/quest/precons/Ajani, Wise Counselor.dck	
@@ -0,0 +1,27 @@
+[metadata]
+Name=Ajani, Wise Counselor
+[Main]
+2 Ajani's Influence|M19
+2 Ajani's Pridemate|M19
+1 Ajani, Wise Counselor+|M19
+2 Cavalry Drillmaster|M19
+3 Court Cleric|M19
+2 Dwarven Priest|M19
+2 Herald of Faith|M19
+1 Inspired Charge|M19
+1 Knight's Pledge|M19
+2 Luminous Bonds|M19
+1 Mentor of the Meek|M19
+1 Meteor Golem|M19
+1 Mighty Leap|M19
+2 Militia Bugler|M19
+2 Oreskos Swiftclaw|M19
+1 Pegasus Courser|M19
+7 Plains|M19|1
+6 Plains|M19|2
+6 Plains|M19|3
+6 Plains|M19|4
+1 Revitalize|M19
+3 Rustwing Falcon|M19
+1 Serra's Guardian|M19
+4 Silverbeak Griffin|M19
diff --git a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck BG.dck b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck BG.dck
new file mode 100644
index 00000000000..6e1c596397f
--- /dev/null
+++ b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck BG.dck	
@@ -0,0 +1,41 @@
+[metadata]
+Name=Core Set 2019 Welcome Deck BG
+[Main]
+1 Aggressive Mammoth|M19
+1 Bogstomper|M19
+1 Bristling Boar|M19
+1 Centaur Courser|M19
+1 Colossal Dreadmaw|M19
+1 Diregraf Ghoul|M19
+3 Forest|M19|1
+3 Forest|M19|2
+3 Forest|M19|3
+4 Forest|M19|4
+1 Ghastbark Twins|M19
+1 Giant Spider|M19
+1 Grasping Scoundrel|M19
+1 Gravedigger|M19
+1 Gravewaker|M19
+1 Highland Game|M19
+1 Infernal Scarring|M19
+1 Lich's Caress|M19
+2 Llanowar Elves|M19
+1 Murder|M19
+1 Oakenform|M19
+1 Plummet|M19
+1 Rabid Bite|M19
+1 Skeleton Archer|M19
+1 Skymarch Bloodletter|M19
+1 Sovereign's Bite|M19
+2 Strangling Spores|M19
+3 Swamp|M19|1
+3 Swamp|M19|2
+3 Swamp|M19|3
+4 Swamp|M19|4
+1 Tattered Mummy|M19
+1 Thornhide Wolves|M19
+2 Titanic Growth|M19
+1 Ursine Champion|M19
+1 Vampire Sovereign|M19
+2 Walking Corpse|M19
+1 Wall of Vines|M19
diff --git a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck BR.dck b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck BR.dck
new file mode 100644
index 00000000000..c6a9a32b357
--- /dev/null
+++ b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck BR.dck	
@@ -0,0 +1,40 @@
+[metadata]
+Name=Core Set 2019 Welcome Deck BR
+[Main]
+1 Bogstomper|M19
+1 Diregraf Ghoul|M19
+1 Electrify|M19
+1 Fiery Finish|M19
+1 Fire Elemental|M19
+1 Goblin Motivator|M19
+1 Grasping Scoundrel|M19
+1 Gravedigger|M19
+1 Gravewaker|M19
+2 Hostile Minotaur|M19
+1 Infernal Scarring|M19
+2 Kargan Dragonrider|M19
+1 Lich's Caress|M19
+1 Lightning Strike|M19
+3 Mountain|M19|1
+3 Mountain|M19|2
+3 Mountain|M19|3
+4 Mountain|M19|4
+1 Murder|M19
+2 Onakke Ogre|M19
+1 Radiating Lightning|M19
+1 Shivan Dragon|M19
+1 Shock|M19
+1 Skeleton Archer|M19
+1 Skymarch Bloodletter|M19
+1 Sovereign's Bite|M19
+1 Sparktongue Dragon|M19
+2 Strangling Spores|M19
+3 Swamp|M19|1
+3 Swamp|M19|2
+3 Swamp|M19|3
+4 Swamp|M19|4
+1 Tattered Mummy|M19
+1 Trumpet Blast|M19
+1 Vampire Sovereign|M19
+1 Volcanic Dragon|M19
+2 Walking Corpse|M19
diff --git a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck GU.dck b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck GU.dck
new file mode 100644
index 00000000000..83bed766f18
--- /dev/null
+++ b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck GU.dck	
@@ -0,0 +1,39 @@
+[metadata]
+Name=Core Set 2019 Welcome Deck GU
+[Main]
+1 Aggressive Mammoth|M19
+1 Air Elemental|M19
+1 Aven Wind Mage|M19
+1 Befuddle|M19
+1 Bristling Boar|M19
+1 Centaur Courser|M19
+1 Colossal Dreadmaw|M19
+2 Divination|M19
+3 Forest|M19|1
+3 Forest|M19|2
+3 Forest|M19|3
+4 Forest|M19|4
+1 Frilled Sea Serpent|M19
+1 Ghastbark Twins|M19
+1 Giant Spider|M19
+1 Highland Game|M19
+3 Island|M19|1
+3 Island|M19|2
+3 Island|M19|3
+4 Island|M19|4
+2 Llanowar Elves|M19
+1 Mist-Cloaked Herald|M19
+1 Oakenform|M19
+1 Plummet|M19
+1 Rabid Bite|M19
+1 Riddlemaster Sphinx|M19
+1 Sleep|M19
+2 Snapping Drake|M19
+1 Thornhide Wolves|M19
+2 Titanic Growth|M19
+2 Tolarian Scholar|M19
+1 Uncomfortable Chill|M19
+1 Ursine Champion|M19
+1 Wall of Mist|M19
+1 Wall of Vines|M19
+2 Waterknot|M19
diff --git a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck GW.dck b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck GW.dck
new file mode 100644
index 00000000000..fef192ddf90
--- /dev/null
+++ b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck GW.dck	
@@ -0,0 +1,42 @@
+[metadata]
+Name=Core Set 2019 Welcome Deck GW
+[Main]
+1 Aggressive Mammoth|M19
+1 Bristling Boar|M19
+1 Centaur Courser|M19
+1 Colossal Dreadmaw|M19
+1 Dwarven Priest|M19
+3 Forest|M19|1
+3 Forest|M19|2
+3 Forest|M19|3
+4 Forest|M19|4
+1 Ghastbark Twins|M19
+1 Giant Spider|M19
+1 Herald of Faith|M19
+1 Highland Game|M19
+1 Inspired Charge|M19
+1 Knight's Pledge|M19
+2 Llanowar Elves|M19
+2 Loxodon Line Breaker|M19
+1 Luminous Bonds|M19
+1 Mighty Leap|M19
+1 Oakenform|M19
+1 Oreskos Swiftclaw|M19
+1 Pegasus Courser|M19
+3 Plains|M19|1
+3 Plains|M19|2
+3 Plains|M19|3
+4 Plains|M19|4
+1 Plummet|M19
+1 Rabid Bite|M19
+1 Revitalize|M19
+1 Rustwing Falcon|M19
+1 Serra's Guardian|M19
+1 Silverbeak Griffin|M19
+1 Star-Crowned Stag|M19
+1 Sun Sentinel|M19
+1 Take Vengeance|M19
+1 Thornhide Wolves|M19
+2 Titanic Growth|M19
+1 Ursine Champion|M19
+1 Wall of Vines|M19
diff --git a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck RG.dck b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck RG.dck
new file mode 100644
index 00000000000..bad3530a4a3
--- /dev/null
+++ b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck RG.dck	
@@ -0,0 +1,40 @@
+[metadata]
+Name=Core Set 2019 Welcome Deck RG
+[Main]
+1 Aggressive Mammoth|M19
+1 Bristling Boar|M19
+1 Centaur Courser|M19
+1 Colossal Dreadmaw|M19
+1 Electrify|M19
+1 Fiery Finish|M19
+1 Fire Elemental|M19
+3 Forest|M19|1
+3 Forest|M19|2
+3 Forest|M19|3
+4 Forest|M19|4
+1 Ghastbark Twins|M19
+1 Giant Spider|M19
+1 Goblin Motivator|M19
+1 Highland Game|M19
+2 Hostile Minotaur|M19
+2 Kargan Dragonrider|M19
+1 Lightning Strike|M19
+2 Llanowar Elves|M19
+3 Mountain|M19|1
+3 Mountain|M19|2
+3 Mountain|M19|3
+4 Mountain|M19|4
+1 Oakenform|M19
+2 Onakke Ogre|M19
+1 Plummet|M19
+1 Rabid Bite|M19
+1 Radiating Lightning|M19
+1 Shivan Dragon|M19
+1 Shock|M19
+1 Sparktongue Dragon|M19
+1 Thornhide Wolves|M19
+2 Titanic Growth|M19
+1 Trumpet Blast|M19
+1 Ursine Champion|M19
+1 Volcanic Dragon|M19
+1 Wall of Vines|M19
diff --git a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck RW.dck b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck RW.dck
new file mode 100644
index 00000000000..8675096a9de
--- /dev/null
+++ b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck RW.dck	
@@ -0,0 +1,41 @@
+[metadata]
+Name=Core Set 2019 Welcome Deck RW
+[Main]
+1 Dwarven Priest|M19
+1 Electrify|M19
+1 Fiery Finish|M19
+1 Fire Elemental|M19
+1 Goblin Motivator|M19
+1 Herald of Faith|M19
+2 Hostile Minotaur|M19
+1 Inspired Charge|M19
+2 Kargan Dragonrider|M19
+1 Knight's Pledge|M19
+1 Lightning Strike|M19
+2 Loxodon Line Breaker|M19
+1 Luminous Bonds|M19
+1 Mighty Leap|M19
+3 Mountain|M19|1
+3 Mountain|M19|2
+3 Mountain|M19|3
+4 Mountain|M19|4
+2 Onakke Ogre|M19
+1 Oreskos Swiftclaw|M19
+1 Pegasus Courser|M19
+3 Plains|M19|1
+3 Plains|M19|2
+3 Plains|M19|3
+4 Plains|M19|4
+1 Radiating Lightning|M19
+1 Revitalize|M19
+1 Rustwing Falcon|M19
+1 Serra's Guardian|M19
+1 Shivan Dragon|M19
+1 Shock|M19
+1 Silverbeak Griffin|M19
+1 Sparktongue Dragon|M19
+1 Star-Crowned Stag|M19
+1 Sun Sentinel|M19
+1 Take Vengeance|M19
+1 Trumpet Blast|M19
+1 Volcanic Dragon|M19
diff --git a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck UB.dck b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck UB.dck
new file mode 100644
index 00000000000..3a19c19ef67
--- /dev/null
+++ b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck UB.dck	
@@ -0,0 +1,39 @@
+[metadata]
+Name=Core Set 2019 Welcome Deck UB
+[Main]
+1 Air Elemental|M19
+1 Aven Wind Mage|M19
+1 Befuddle|M19
+1 Bogstomper|M19
+1 Diregraf Ghoul|M19
+2 Divination|M19
+1 Frilled Sea Serpent|M19
+1 Grasping Scoundrel|M19
+1 Gravedigger|M19
+1 Gravewaker|M19
+1 Infernal Scarring|M19
+3 Island|M19|1
+3 Island|M19|2
+3 Island|M19|3
+4 Island|M19|4
+1 Lich's Caress|M19
+1 Mist-Cloaked Herald|M19
+1 Murder|M19
+1 Riddlemaster Sphinx|M19
+1 Skeleton Archer|M19
+1 Skymarch Bloodletter|M19
+1 Sleep|M19
+2 Snapping Drake|M19
+1 Sovereign's Bite|M19
+2 Strangling Spores|M19
+3 Swamp|M19|1
+3 Swamp|M19|2
+3 Swamp|M19|3
+4 Swamp|M19|4
+1 Tattered Mummy|M19
+2 Tolarian Scholar|M19
+1 Uncomfortable Chill|M19
+1 Vampire Sovereign|M19
+2 Walking Corpse|M19
+1 Wall of Mist|M19
+2 Waterknot|M19
diff --git a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck UR.dck b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck UR.dck
new file mode 100644
index 00000000000..7d5e39ee226
--- /dev/null
+++ b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck UR.dck	
@@ -0,0 +1,38 @@
+[metadata]
+Name=Core Set 2019 Welcome Deck UR
+[Main]
+1 Air Elemental|M19
+1 Aven Wind Mage|M19
+1 Befuddle|M19
+2 Divination|M19
+1 Electrify|M19
+1 Fiery Finish|M19
+1 Fire Elemental|M19
+1 Frilled Sea Serpent|M19
+1 Goblin Motivator|M19
+2 Hostile Minotaur|M19
+3 Island|M19|1
+3 Island|M19|2
+3 Island|M19|3
+4 Island|M19|4
+2 Kargan Dragonrider|M19
+1 Lightning Strike|M19
+1 Mist-Cloaked Herald|M19
+3 Mountain|M19|1
+3 Mountain|M19|2
+3 Mountain|M19|3
+4 Mountain|M19|4
+2 Onakke Ogre|M19
+1 Radiating Lightning|M19
+1 Riddlemaster Sphinx|M19
+1 Shivan Dragon|M19
+1 Shock|M19
+1 Sleep|M19
+2 Snapping Drake|M19
+1 Sparktongue Dragon|M19
+2 Tolarian Scholar|M19
+1 Trumpet Blast|M19
+1 Uncomfortable Chill|M19
+1 Volcanic Dragon|M19
+1 Wall of Mist|M19
+2 Waterknot|M19
diff --git a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck WB.dck b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck WB.dck
new file mode 100644
index 00000000000..55923560757
--- /dev/null
+++ b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck WB.dck	
@@ -0,0 +1,42 @@
+[metadata]
+Name=Core Set 2019 Welcome Deck WB
+[Main]
+1 Bogstomper|M19
+1 Diregraf Ghoul|M19
+1 Dwarven Priest|M19
+1 Grasping Scoundrel|M19
+1 Gravedigger|M19
+1 Gravewaker|M19
+1 Herald of Faith|M19
+1 Infernal Scarring|M19
+1 Inspired Charge|M19
+1 Knight's Pledge|M19
+1 Lich's Caress|M19
+2 Loxodon Line Breaker|M19
+1 Luminous Bonds|M19
+1 Mighty Leap|M19
+1 Murder|M19
+1 Oreskos Swiftclaw|M19
+1 Pegasus Courser|M19
+3 Plains|M19|1
+3 Plains|M19|2
+3 Plains|M19|3
+4 Plains|M19|4
+1 Revitalize|M19
+1 Rustwing Falcon|M19
+1 Serra's Guardian|M19
+1 Silverbeak Griffin|M19
+1 Skeleton Archer|M19
+1 Skymarch Bloodletter|M19
+1 Sovereign's Bite|M19
+1 Star-Crowned Stag|M19
+2 Strangling Spores|M19
+1 Sun Sentinel|M19
+3 Swamp|M19|1
+3 Swamp|M19|2
+3 Swamp|M19|3
+4 Swamp|M19|4
+1 Take Vengeance|M19
+1 Tattered Mummy|M19
+1 Vampire Sovereign|M19
+2 Walking Corpse|M19
diff --git a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck WU.dck b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck WU.dck
new file mode 100644
index 00000000000..026421b7c6a
--- /dev/null
+++ b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck WU.dck	
@@ -0,0 +1,40 @@
+[metadata]
+Name=Core Set 2019 Welcome Deck WU
+[Main]
+1 Air Elemental|M19
+1 Aven Wind Mage|M19
+1 Befuddle|M19
+2 Divination|M19
+1 Dwarven Priest|M19
+1 Frilled Sea Serpent|M19
+1 Herald of Faith|M19
+1 Inspired Charge|M19
+3 Island|M19|1
+3 Island|M19|2
+3 Island|M19|3
+4 Island|M19|4
+1 Knight's Pledge|M19
+2 Loxodon Line Breaker|M19
+1 Luminous Bonds|M19
+1 Mighty Leap|M19
+1 Mist-Cloaked Herald|M19
+1 Oreskos Swiftclaw|M19
+1 Pegasus Courser|M19
+3 Plains|M19|1
+3 Plains|M19|2
+3 Plains|M19|3
+4 Plains|M19|4
+1 Revitalize|M19
+1 Riddlemaster Sphinx|M19
+1 Rustwing Falcon|M19
+1 Serra's Guardian|M19
+1 Silverbeak Griffin|M19
+1 Sleep|M19
+2 Snapping Drake|M19
+1 Star-Crowned Stag|M19
+1 Sun Sentinel|M19
+1 Take Vengeance|M19
+2 Tolarian Scholar|M19
+1 Uncomfortable Chill|M19
+1 Wall of Mist|M19
+2 Waterknot|M19
diff --git a/forge-gui/res/quest/precons/Liliana, the Necromancer.dck b/forge-gui/res/quest/precons/Liliana, the Necromancer.dck
new file mode 100644
index 00000000000..3f320870cb5
--- /dev/null
+++ b/forge-gui/res/quest/precons/Liliana, the Necromancer.dck	
@@ -0,0 +1,27 @@
+[metadata]
+Name=Liliana, the Necromancer
+[Main]
+2 Abnormal Endurance|M19
+3 Arisen Gorgon|M19
+2 Blood Divination|M19
+1 Demon of Catastrophes|M19
+2 Diregraf Ghoul|M19
+1 Gravedigger|M19
+1 Gravewaker|M19
+2 Lich's Caress|M19
+2 Liliana's Spoils|M19
+1 Liliana, the Necromancer+|M19
+1 Meteor Golem|M19
+2 Murder|M19
+1 Reassembling Skeleton|M19
+1 Skeleton Archer|M19
+2 Skymarch Bloodletter|M19
+1 Sovereign's Bite|M19
+1 Strangling Spores|M19
+7 Swamp|M19|1
+7 Swamp|M19|2
+6 Swamp|M19|3
+6 Swamp|M19|4
+4 Tattered Mummy|M19
+2 Vampire Sovereign|M19
+2 Walking Corpse|M19
diff --git a/forge-gui/res/quest/precons/Sarkhan, Dragonsoul.dck b/forge-gui/res/quest/precons/Sarkhan, Dragonsoul.dck
new file mode 100644
index 00000000000..9da5e6bce71
--- /dev/null
+++ b/forge-gui/res/quest/precons/Sarkhan, Dragonsoul.dck	
@@ -0,0 +1,27 @@
+[metadata]
+Name=Sarkhan, Dragonsoul
+[Main]
+1 Act of Treason|M19
+1 Demanding Dragon|M19
+2 Electrify|M19
+1 Fiery Finish|M19
+2 Goblin Motivator|M19
+1 Hostile Minotaur|M19
+4 Kargan Dragonrider|M19
+2 Lightning Strike|M19
+1 Meteor Golem|M19
+7 Mountain|M19|1
+7 Mountain|M19|2
+6 Mountain|M19|3
+6 Mountain|M19|4
+2 Onakke Ogre|M19
+2 Sarkhan's Dragonfire|M19
+3 Sarkhan's Whelp|M19
+1 Sarkhan, Dragonsoul+|M19
+1 Shivan Dragon|M19
+2 Shock|M19
+2 Sparktongue Dragon|M19
+1 Thud|M19
+1 Trumpet Blast|M19
+2 Viashino Pyromancer|M19
+2 Volcanic Dragon|M19
diff --git a/forge-gui/res/quest/precons/Tezzeret, Cruel Machinist.dck b/forge-gui/res/quest/precons/Tezzeret, Cruel Machinist.dck
new file mode 100644
index 00000000000..26ff8556b91
--- /dev/null
+++ b/forge-gui/res/quest/precons/Tezzeret, Cruel Machinist.dck	
@@ -0,0 +1,26 @@
+[metadata]
+Name=Tezzeret, Cruel Machinist
+[Main]
+1 Divination|M19
+3 Dwindle|M19
+1 Exclusion Mage|M19
+2 Field Creeper|M19
+2 Gearsmith Guardian|M19
+2 Gearsmith Prodigy|M19
+7 Island|M19|1
+7 Island|M19|2
+6 Island|M19|3
+6 Island|M19|4
+1 Manalith|M19
+2 Meteor Golem|M19
+1 One with the Machine|M19
+4 Pendulum of Patterns|M19
+1 Riddlemaster Sphinx|M19
+1 Scholar of Stars|M19
+2 Skilled Animator|M19
+2 Skyscanner|M19
+2 Snapping Drake|M19
+2 Tezzeret's Gatebreaker|M19
+3 Tezzeret's Strider|M19
+1 Tezzeret, Cruel Machinist+|M19
+1 Uncomfortable Chill|M19
diff --git a/forge-gui/res/quest/precons/Vivien of the Arkbow.dck b/forge-gui/res/quest/precons/Vivien of the Arkbow.dck
new file mode 100644
index 00000000000..140146e2d98
--- /dev/null
+++ b/forge-gui/res/quest/precons/Vivien of the Arkbow.dck	
@@ -0,0 +1,27 @@
+[metadata]
+Name=Vivien of the Arkbow
+[Main]
+1 Aggressive Mammoth|M19
+2 Bristling Boar|M19
+2 Colossal Dreadmaw|M19
+1 Colossal Majesty|M19
+1 Declare Dominance|M19
+2 Druid of the Cowl|M19
+2 Elvish Rejuvenator|M19
+7 Forest|M19|1
+7 Forest|M19|2
+6 Forest|M19|3
+6 Forest|M19|4
+1 Ghastbark Twins|M19
+2 Meteor Golem|M19
+1 Oakenform|M19
+1 Pelakka Wurm|M19
+2 Plummet|M19
+2 Rabid Bite|M19
+1 Reclamation Sage|M19
+2 Skalla Wolf|M19
+1 Thornhide Wolves|M19
+2 Titanic Growth|M19
+4 Ursine Champion|M19
+1 Vivien of the Arkbow+|M19
+3 Vivien's Jaguar|M19

From 43862557f4d03014a14992bfa537efd93bb22468 Mon Sep 17 00:00:00 2001
From: tjtillmancoag <tjtillman@gmail.com>
Date: Thu, 12 Jul 2018 22:18:06 -0700
Subject: [PATCH 3/7] Few M19 Fixes -Ajani, Adversary of Tyrants's first
 ability didn't specify NumCounters and was causing it to crash -Fixed
 capitalization of nontoken to nonToken in Lena, Selfless Champion -Militia
 Bugler was revealing all 4 cards dug to both players, fixed that -Open the
 Graves was naming the zombies "Saproling", fixed to "Zombie" -Made Skyrider
 Patrol work at least the way it was scripted (still isn't technically
 correct, but it works now) -Corrected cost of Vivien Reid's ultimate

---
 forge-gui/res/cardsfolder/a/ajani_adversary_of_tyrants.txt | 2 +-
 forge-gui/res/cardsfolder/l/lena_selfless_champion.txt     | 2 +-
 forge-gui/res/cardsfolder/m/militia_bugler.txt             | 2 +-
 forge-gui/res/cardsfolder/o/open_the_graves.txt            | 2 +-
 forge-gui/res/cardsfolder/s/skyrider_patrol.txt            | 4 ++--
 forge-gui/res/cardsfolder/v/vivien_reid.txt                | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/forge-gui/res/cardsfolder/a/ajani_adversary_of_tyrants.txt b/forge-gui/res/cardsfolder/a/ajani_adversary_of_tyrants.txt
index 361321b1bcc..f23bec84e60 100644
--- a/forge-gui/res/cardsfolder/a/ajani_adversary_of_tyrants.txt
+++ b/forge-gui/res/cardsfolder/a/ajani_adversary_of_tyrants.txt
@@ -1,7 +1,7 @@
 Name:Ajani, Adversary of Tyrants
 ManaCost:2 W W
 Types:Legendary Planeswalker Ajani
-A:AB$ PutCounter | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | CounterType$ P1P1 | TargetMin$ 0 | TargetMax$ 2 | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Put a +1/+1 counter on each of up to two target creatures.
+A:AB$ PutCounter | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | CounterType$ P1P1 | CounterNum$ 1 | TargetMin$ 0 | TargetMax$ 2 | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Put a +1/+1 counter on each of up to two target creatures.
 A:AB$ ChangeZone | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Card.Creature+cmcLE2+YouCtrl | TgtPrompt$ Select target creature card with converted mana cost 2 or less | SpellDescription$ Return target creature card with converted mana cost 2 or less from your graveyard to the battlefield.
 A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem - Ajani, Adversary of Tyrants | Image$ emblem_ajani_adversary_of_tyrants | Triggers$ EffPhase | SVars$ EmblemTrigToken | Duration$ Permanent | SpellDescription$ You get an emblem with "At the beginning of your end step, create three 1/1 white Cat creature tokens with lifelink."
 SVar:EffPhase:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | Execute$ EmblemTrigToken | TriggerDescription$ At the beginning of your end step, create three 1/1 white Cat creature tokens with lifelink.
diff --git a/forge-gui/res/cardsfolder/l/lena_selfless_champion.txt b/forge-gui/res/cardsfolder/l/lena_selfless_champion.txt
index b8ad483aa13..0428fc99cd3 100644
--- a/forge-gui/res/cardsfolder/l/lena_selfless_champion.txt
+++ b/forge-gui/res/cardsfolder/l/lena_selfless_champion.txt
@@ -3,7 +3,7 @@ ManaCost:4 W W
 Types:Legendary Creature Human Knight
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 1/1 white Soldier creature token for each nontoken creature you control.
 SVar:TrigToken:DB$ Token | TokenOwner$ You | TokenAmount$ X | References$ X | TokenPower$ 1 | TokenToughness$ 1 | TokenColors$ White | TokenTypes$ Soldier,Creature | TokenImage$ w 1 1 soldier m19
-SVar:X:Count$Valid Creature.nontoken+YouCtrl
+SVar:X:Count$Valid Creature.nonToken+YouCtrl
 A:AB$ PumpAll | Cost$ Sac<1/CARDNAME> | ValidCards$ Creature.YouCtrl+powerLTY | KW$ Indestructible | SpellDescription$ Creatures you control with power less than CARDNAME's power gain indestructible until end of turn.
 SVar:Y:Count$CardPower
 DeckHas:Ability$Token
diff --git a/forge-gui/res/cardsfolder/m/militia_bugler.txt b/forge-gui/res/cardsfolder/m/militia_bugler.txt
index 9ab6c88a169..af74cc4a914 100644
--- a/forge-gui/res/cardsfolder/m/militia_bugler.txt
+++ b/forge-gui/res/cardsfolder/m/militia_bugler.txt
@@ -3,6 +3,6 @@ ManaCost:2 W
 Types:Creature Human Soldier
 K:Vigilance
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters the battlefield, look at the top four cards of your library. You may reveal a creature card with power 2 or less from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
-SVar:TrigDig:DB$ Dig | DigNum$ 4 | Reveal$ True | ChangeNum$ 1 | ChangeValid$ Creature.powerLE2 | DestinationZone$ Hand | DestinationZone2$ Library | LibraryPosition$ -1 | RestRandomOrder$ True
+SVar:TrigDig:DB$ Dig | DigNum$ 4 | ForceRevealToController$ True | ChangeNum$ 1 | ChangeValid$ Creature.powerLE2 | DestinationZone$ Hand | DestinationZone2$ Library | LibraryPosition$ -1 | RestRandomOrder$ True
 Oracle:Vigilance (Attacking doesn't cause this creature to tap.)\nWhen Militia Bugler enters the battlefield, look at the top four cards of your library. You may reveal a creature card with power 2 or less from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
 PT:2/3
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/o/open_the_graves.txt b/forge-gui/res/cardsfolder/o/open_the_graves.txt
index b05965debd3..b7576b6cb08 100644
--- a/forge-gui/res/cardsfolder/o/open_the_graves.txt
+++ b/forge-gui/res/cardsfolder/o/open_the_graves.txt
@@ -2,6 +2,6 @@ Name:Open the Graves
 ManaCost:3 B B
 Types:Enchantment
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl+nonToken | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever a nontoken creature you control dies, create a 2/2 black zombie creature token.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Saproling | TokenTypes$ Creature,Zombie | TokenOwner$ You | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2 | TokenImage$ b 2 2 zombie M19
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenName$ Zombie | TokenTypes$ Creature,Zombie | TokenOwner$ You | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2 | TokenImage$ b 2 2 zombie M19
 DeckHas:Ability$Token
 Oracle:Whenever a nontoken creature you control dies, create a 2/2 black Zombie creature token.
diff --git a/forge-gui/res/cardsfolder/s/skyrider_patrol.txt b/forge-gui/res/cardsfolder/s/skyrider_patrol.txt
index fcfc89f529d..a814ea2d2ce 100644
--- a/forge-gui/res/cardsfolder/s/skyrider_patrol.txt
+++ b/forge-gui/res/cardsfolder/s/skyrider_patrol.txt
@@ -4,8 +4,8 @@ Types:Creature Elf Scout
 PT:2/3
 K:Flying
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of combat on your turn, you may pay {G}{U}.  When you do, put a +1/+1 counter on another target creature you control, and that creature gains flying until end of turn.
-SVar:TrigPutCounter:DB$ PutCounter | Cost$ G U | ValidTgts$ Creature.Other+YouCtrl | RememberTargets$ True  | TgtPrompt$ Select another target creature you control | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ TrigPump
-SVar:TrigPump:DB$ Pump | ConditionDefined$ Remembered | KW$ Flying | SubAbility$ DBCleanup
+SVar:TrigPutCounter:AB$ PutCounter | Cost$ G U | ValidTgts$ Creature.Other+YouCtrl | RememberTargets$ True  | TgtPrompt$ Select another target creature you control | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ TrigPump
+SVar:TrigPump:DB$ Pump | Defined$ Remembered | KW$ Flying | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 DeckHas:Ability$Counters
 Oracle:Flying\nAt the beginning of combat on your turn, you may pay {G}{U}. When you do, put a +1/+1 counter on another target creature you control, and that creature gains flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/v/vivien_reid.txt b/forge-gui/res/cardsfolder/v/vivien_reid.txt
index 88afd7d4764..33e78a5e490 100644
--- a/forge-gui/res/cardsfolder/v/vivien_reid.txt
+++ b/forge-gui/res/cardsfolder/v/vivien_reid.txt
@@ -3,7 +3,7 @@ ManaCost:3 G G
 Types:Legendary Planeswalker Vivien
 A:AB$ Dig | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | DigNum$ 4 | ChangeNum$ 1 | Optional$ True | ChangeValid$ Creature,Land | ForceRevealToController$ True | SpellDescription$ Look at the top four cards of your library. You may reveal a creature or land card from among them and put it into your hand. Put the rest on the bottom of your library in any order.
 A:AB$ Destroy | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ValidTgts$ Artifact,Enchantment,Creature.withFlying | TgtPrompt$ Select target artifact, enchantment or creature with flying | SpellDescription$ Destroy target artifact, enchantment or creature with flying.
-A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem - Vivien Reid | Image$ emblem_vivien_ried | Duration$ Permanent | StaticAbilities$  STVivien | AILogic$ Always | SpellDescription$  You get an emblem with "Creatures you control get +2/+2 and have vigilance, trample, and indestructible."
+A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem - Vivien Reid | Image$ emblem_vivien_ried | Duration$ Permanent | StaticAbilities$  STVivien | AILogic$ Always | SpellDescription$  You get an emblem with "Creatures you control get +2/+2 and have vigilance, trample, and indestructible."
 SVar:STVivien:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.YouCtrl | AffectedZone$ Battlefield | AddPower$ +2 | AddToughness$ +2 | AddKeyword$ Vigilance & Trample & Indestructible
 Oracle:[+1]: Look at the top four cards of your library. You may reveal a creature or land card from among them and put it into your hand. Put the rest on the bottom of your library in a random order.\n[-3]: Destroy target artifact, enchantment, or creature with flying.\n[-8]: You get an emblem with "Creatures you control get +2/+2 and have vigilance, trample, and indestructible."
 Loyalty:5
\ No newline at end of file

From 53c50afca0fc95997deb3ac08aa244d0d8369c5b Mon Sep 17 00:00:00 2001
From: Rob Schnautz <schnautzr@yahoo.com>
Date: Fri, 13 Jul 2018 14:12:37 +0000
Subject: [PATCH 4/7] M19 now legal in Limited formats

---
 forge-gui/res/formats/Sanctioned/Modern.txt   | 2 +-
 forge-gui/res/formats/Sanctioned/Standard.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-gui/res/formats/Sanctioned/Modern.txt b/forge-gui/res/formats/Sanctioned/Modern.txt
index 2c45138ec37..738145f390b 100644
--- a/forge-gui/res/formats/Sanctioned/Modern.txt
+++ b/forge-gui/res/formats/Sanctioned/Modern.txt
@@ -3,5 +3,5 @@ Name:Modern
 Order:102
 Subtype:Modern
 Type:Sanctioned
-Sets:8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, EVE, SHM, MOR, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM, M14, THS, BNG, JOU, M15, KTK, FRF, DTK, MM2, ORI, BFZ, OGW, SOI, EMN, KLD, AER, AKH, W17, HOU, XLN, RIX, DOM
+Sets:8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, TSB, PLC, FUT, 10E, LRW, EVE, SHM, MOR, ALA, CFX, ARB, M10, ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM, M14, THS, BNG, JOU, M15, KTK, FRF, DTK, MM2, ORI, BFZ, OGW, SOI, EMN, KLD, AER, AKH, W17, HOU, XLN, RIX, DOM, M19
 Banned:Ancient Den; Birthing Pod; Blazing Shoal; Chrome Mox; Cloudpost; Dark Depths; Deathrite Shaman; Dig Through Time; Dread Return; Eye of Ugin; Gitaxian Probe; Glimpse of Nature; Golgari Grave-Troll; Great Furnace; Green Sun's Zenith; Hypergenesis; Mental Misstep; Ponder; Preordain; Punishing Fire; Rite of Flame; Seat of the Synod; Second Sunrise; Seething Song; Sensei's Divining Top; Skullclamp; Splinter Twin; Stoneforge Mystic; Summer Bloom; Treasure Cruise; Tree of Tales; Umezawa's Jitte; Vault of Whispers
diff --git a/forge-gui/res/formats/Sanctioned/Standard.txt b/forge-gui/res/formats/Sanctioned/Standard.txt
index ddbd395bda1..6d8133d15d9 100644
--- a/forge-gui/res/formats/Sanctioned/Standard.txt
+++ b/forge-gui/res/formats/Sanctioned/Standard.txt
@@ -3,5 +3,5 @@ Name:Standard
 Order:101
 Subtype:Standard
 Type:Sanctioned
-Sets:KLD, AER, AKH, W17, HOU, XLN, RIX, DOM
+Sets:KLD, AER, AKH, W17, HOU, XLN, RIX, DOM, M19
 Banned: Attune with Aether; Rogue Refiner; Rampaging Ferocidon; Ramunap Ruins; Smuggler's Copter; Aetherworks Marvel; Felidar Guardian

From e79b2a3ad39e6e39cfc62ff22d99143f6e95fdf7 Mon Sep 17 00:00:00 2001
From: "T.J. Tillman" <tjtillman@gmail.com>
Date: Fri, 13 Jul 2018 16:56:31 +0000
Subject: [PATCH 5/7] Update militia_bugler.txt

---
 forge-gui/res/cardsfolder/m/militia_bugler.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forge-gui/res/cardsfolder/m/militia_bugler.txt b/forge-gui/res/cardsfolder/m/militia_bugler.txt
index af74cc4a914..4d62c8080ef 100644
--- a/forge-gui/res/cardsfolder/m/militia_bugler.txt
+++ b/forge-gui/res/cardsfolder/m/militia_bugler.txt
@@ -3,6 +3,6 @@ ManaCost:2 W
 Types:Creature Human Soldier
 K:Vigilance
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters the battlefield, look at the top four cards of your library. You may reveal a creature card with power 2 or less from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
-SVar:TrigDig:DB$ Dig | DigNum$ 4 | ForceRevealToController$ True | ChangeNum$ 1 | ChangeValid$ Creature.powerLE2 | DestinationZone$ Hand | DestinationZone2$ Library | LibraryPosition$ -1 | RestRandomOrder$ True
+SVar:TrigDig:DB$ Dig | DigNum$ 4 | Optional$ True | ForceRevealToController$ True | ChangeNum$ 1 | ChangeValid$ Creature.powerLE2 | DestinationZone$ Hand | DestinationZone2$ Library | LibraryPosition$ -1 | RestRandomOrder$ True
 Oracle:Vigilance (Attacking doesn't cause this creature to tap.)\nWhen Militia Bugler enters the battlefield, look at the top four cards of your library. You may reveal a creature card with power 2 or less from among them and put it into your hand. Put the rest on the bottom of your library in a random order.
 PT:2/3
\ No newline at end of file

From dfdee167a458d6930586ff69458b1411a9a43214 Mon Sep 17 00:00:00 2001
From: Hanmac <hanmac@gmx.de>
Date: Fri, 13 Jul 2018 19:37:00 +0200
Subject: [PATCH 6/7] CounterPut: fix with CounterNum

---
 .../src/main/java/forge/ai/ability/CountersPutAi.java | 11 ++++++-----
 .../forge/game/ability/effects/CountersPutEffect.java |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java b/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java
index 0f47ca9e9e0..171d3431506 100644
--- a/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java
@@ -125,7 +125,7 @@ public class CountersPutAi extends SpellAbilityAi {
         CardCollection list;
         Card choice = null;
         final String type = sa.getParam("CounterType");
-        final String amountStr = sa.getParam("CounterNum");
+        final String amountStr = sa.getParamOrDefault("CounterNum", "1");
         final boolean divided = sa.hasParam("DividedAsYouChoose");
         final String logic = sa.getParamOrDefault("AILogic", "");
         PhaseHandler ph = ai.getGame().getPhaseHandler();
@@ -580,7 +580,7 @@ public class CountersPutAi extends SpellAbilityAi {
         final String type = sa.getParam("CounterType");
         final String logic = sa.getParamOrDefault("AILogic", "");
 
-        final String amountStr = sa.getParam("CounterNum");
+        final String amountStr = sa.getParamOrDefault("CounterNum", "1");
         final boolean divided = sa.hasParam("DividedAsYouChoose");
         final int amount = AbilityUtils.calculateAmount(sa.getHostCard(), amountStr, sa);
 
@@ -660,7 +660,7 @@ public class CountersPutAi extends SpellAbilityAi {
         boolean preferred = true;
         CardCollection list;
         final String type = sa.getParam("CounterType");
-        final String amountStr = sa.getParam("CounterNum");
+        final String amountStr = sa.getParamOrDefault("CounterNum", "1");
         final boolean divided = sa.hasParam("DividedAsYouChoose");
         final int amount = AbilityUtils.calculateAmount(sa.getHostCard(), amountStr, sa);
         int left = amount;
@@ -803,7 +803,8 @@ public class CountersPutAi extends SpellAbilityAi {
         if (mode == PlayerActionConfirmMode.Tribute) {
             // add counter if that opponent has a giant creature
             final List<Card> creats = player.getCreaturesInPlay();
-            final int tributeAmount = AbilityUtils.calculateAmount(sa.getHostCard(), sa.getParam("CounterNum"), sa);
+            final String amountStr = sa.getParamOrDefault("CounterNum", "1");
+            final int tributeAmount = AbilityUtils.calculateAmount(sa.getHostCard(), amountStr, sa);
 
             final boolean isHaste = source.hasKeyword(Keyword.HASTE);
             List<Card> threatening = CardLists.filter(creats, new Predicate<Card>() {
@@ -862,7 +863,7 @@ public class CountersPutAi extends SpellAbilityAi {
         }
 
         final CounterType type = CounterType.valueOf(sa.getParam("CounterType"));
-        final String amountStr = sa.getParam("CounterNum");
+        final String amountStr = sa.getParamOrDefault("CounterNum", "1");
         final int amount = AbilityUtils.calculateAmount(sa.getHostCard(), amountStr, sa);
 
         final boolean isCurse = sa.isCurse();
diff --git a/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
index 5d73ca81e51..6c05b77a7a5 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
@@ -37,7 +37,7 @@ public class CountersPutEffect extends SpellAbilityEffect {
         final boolean dividedAsYouChoose = sa.hasParam("DividedAsYouChoose");
 
 
-        final int amount = AbilityUtils.calculateAmount(card, sa.getParam("CounterNum"), sa);
+        final int amount = AbilityUtils.calculateAmount(card, sa.getParamOrDefault("CounterNum", "1"), sa);
         if (sa.hasParam("Bolster")) {
             sb.append("Bolster ").append(amount);
             return sb.toString();

From dccfd3ce08b285652223737a43891148140f8340 Mon Sep 17 00:00:00 2001
From: Rob Schnautz <schnautzr@yahoo.com>
Date: Fri, 13 Jul 2018 21:38:27 +0000
Subject: [PATCH 7/7] Add shop and metadata properties

---
 forge-gui/res/quest/precons/Ajani, Wise Counselor.dck |  9 +++++++++
 .../quest/precons/Core Set 2019 Welcome Deck BG.dck   | 11 ++++++++++-
 .../quest/precons/Core Set 2019 Welcome Deck BR.dck   | 11 ++++++++++-
 .../quest/precons/Core Set 2019 Welcome Deck GU.dck   | 11 ++++++++++-
 .../quest/precons/Core Set 2019 Welcome Deck GW.dck   | 11 ++++++++++-
 .../quest/precons/Core Set 2019 Welcome Deck RG.dck   | 11 ++++++++++-
 .../quest/precons/Core Set 2019 Welcome Deck RW.dck   | 11 ++++++++++-
 .../quest/precons/Core Set 2019 Welcome Deck UB.dck   | 11 ++++++++++-
 .../quest/precons/Core Set 2019 Welcome Deck UR.dck   | 11 ++++++++++-
 .../quest/precons/Core Set 2019 Welcome Deck WB.dck   | 11 ++++++++++-
 .../quest/precons/Core Set 2019 Welcome Deck WU.dck   | 11 ++++++++++-
 .../res/quest/precons/Liliana, the Necromancer.dck    |  9 +++++++++
 forge-gui/res/quest/precons/Sarkhan, Dragonsoul.dck   |  9 +++++++++
 .../res/quest/precons/Tezzeret, Cruel Machinist.dck   |  9 +++++++++
 forge-gui/res/quest/precons/Vivien of the Arkbow.dck  |  9 +++++++++
 15 files changed, 145 insertions(+), 10 deletions(-)

diff --git a/forge-gui/res/quest/precons/Ajani, Wise Counselor.dck b/forge-gui/res/quest/precons/Ajani, Wise Counselor.dck
index 91960be39e6..a728faed738 100644
--- a/forge-gui/res/quest/precons/Ajani, Wise Counselor.dck	
+++ b/forge-gui/res/quest/precons/Ajani, Wise Counselor.dck	
@@ -1,5 +1,14 @@
+[shop]
+WinsToUnlock=0
+Credits=1099
+MinDifficulty=0
+MaxDifficulty=5
 [metadata]
 Name=Ajani, Wise Counselor
+Description=A veteran warrior of unmatched skill, Ajani protects the weak and mentors aspiring heroes. Gather battalions of small fighters, bolster their strength, and overwhelm your opponent.
+Deck Type=constructed
+Set=M19
+Image=ajani_wise_counselor.jpg
 [Main]
 2 Ajani's Influence|M19
 2 Ajani's Pridemate|M19
diff --git a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck BG.dck b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck BG.dck
index 6e1c596397f..fc921d481c6 100644
--- a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck BG.dck	
+++ b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck BG.dck	
@@ -1,5 +1,14 @@
+[shop]
+WinsToUnlock=0
+Credits=999
+MinDifficulty=0
+MaxDifficulty=5
 [metadata]
-Name=Core Set 2019 Welcome Deck BG
+Name=Core Set 2019 Welcome Deck (BG)
+Description=As a black mage, you seek power at any price. Every advantage comes at a cost, and you will sacrifice whatever is necessary to control the forces of death and darkness. Boundless ambition drives you to victory!
+Deck Type=constructed
+Set=M19
+Image=m19_black.jpg
 [Main]
 1 Aggressive Mammoth|M19
 1 Bogstomper|M19
diff --git a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck BR.dck b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck BR.dck
index c6a9a32b357..4b48e562264 100644
--- a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck BR.dck	
+++ b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck BR.dck	
@@ -1,5 +1,14 @@
+[shop]
+WinsToUnlock=0
+Credits=999
+MinDifficulty=0
+MaxDifficulty=5
 [metadata]
-Name=Core Set 2019 Welcome Deck BR
+Name=Core Set 2019 Welcome Deck (BR)
+Description=As a black mage, you seek power at any price. Every advantage comes at a cost, and you will sacrifice whatever is necessary to control the forces of death and darkness. Boundless ambition drives you to victory!
+Deck Type=constructed
+Set=M19
+Image=m19_black.jpg
 [Main]
 1 Bogstomper|M19
 1 Diregraf Ghoul|M19
diff --git a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck GU.dck b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck GU.dck
index 83bed766f18..144ec65288b 100644
--- a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck GU.dck	
+++ b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck GU.dck	
@@ -1,5 +1,14 @@
+[shop]
+WinsToUnlock=0
+Credits=999
+MinDifficulty=0
+MaxDifficulty=5
 [metadata]
-Name=Core Set 2019 Welcome Deck GU
+Name=Core Set 2019 Welcome Deck (GU)
+Description=As a green mage, the natural world is at your command - and the power of life itself fuels your magic. Summon enormous beasts to trample your opponents on your way to victory!
+Deck Type=constructed
+Set=M19
+Image=m19_green.jpg
 [Main]
 1 Aggressive Mammoth|M19
 1 Air Elemental|M19
diff --git a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck GW.dck b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck GW.dck
index fef192ddf90..5db61aaf8be 100644
--- a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck GW.dck	
+++ b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck GW.dck	
@@ -1,5 +1,14 @@
+[shop]
+WinsToUnlock=0
+Credits=999
+MinDifficulty=0
+MaxDifficulty=5
 [metadata]
-Name=Core Set 2019 Welcome Deck GW
+Name=Core Set 2019 Welcome Deck (GW)
+Description=As a green mage, the natural world is at your command - and the power of life itself fuels your magic. Summon enormous beasts to trample your opponents on your way to victory!
+Deck Type=constructed
+Set=M19
+Image=m19_green.jpg
 [Main]
 1 Aggressive Mammoth|M19
 1 Bristling Boar|M19
diff --git a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck RG.dck b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck RG.dck
index bad3530a4a3..f0e086bf262 100644
--- a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck RG.dck	
+++ b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck RG.dck	
@@ -1,5 +1,14 @@
+[shop]
+WinsToUnlock=0
+Credits=999
+MinDifficulty=0
+MaxDifficulty=5
 [metadata]
-Name=Core Set 2019 Welcome Deck RG
+Name=Core Set 2019 Welcome Deck (RG)
+Description=As a red mage, you live for freedom. You revel in the chaos of battle, where fire is your weapon and your inspiration - beautiful, powerful, impossible to control. Elemental fury fuels your victory!
+Deck Type=constructed
+Set=M19
+Image=m19_red.jpg
 [Main]
 1 Aggressive Mammoth|M19
 1 Bristling Boar|M19
diff --git a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck RW.dck b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck RW.dck
index 8675096a9de..edbfa460ff3 100644
--- a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck RW.dck	
+++ b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck RW.dck	
@@ -1,5 +1,14 @@
+[shop]
+WinsToUnlock=0
+Credits=999
+MinDifficulty=0
+MaxDifficulty=5
 [metadata]
-Name=Core Set 2019 Welcome Deck RW
+Name=Core Set 2019 Welcome Deck (RW)
+Description=As a red mage, you live for freedom. You revel in the chaos of battle, where fire is your weapon and your inspiration - beautiful, powerful, impossible to control. Elemental fury fuels your victory!
+Deck Type=constructed
+Set=M19
+Image=m19_red.jpg
 [Main]
 1 Dwarven Priest|M19
 1 Electrify|M19
diff --git a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck UB.dck b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck UB.dck
index 3a19c19ef67..1bebbc81fda 100644
--- a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck UB.dck	
+++ b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck UB.dck	
@@ -1,5 +1,14 @@
+[shop]
+WinsToUnlock=0
+Credits=999
+MinDifficulty=0
+MaxDifficulty=5
 [metadata]
-Name=Core Set 2019 Welcome Deck UB
+Name=Core Set 2019 Welcome Deck (UB)
+Description=As a blue mage, your mind is your most powerful weapon. You control the battlefield through illusion, always thinking three steps ahead of your foe. Superior knowledge determines your victory!
+Deck Type=constructed
+Set=M19
+Image=m19_blue.jpg
 [Main]
 1 Air Elemental|M19
 1 Aven Wind Mage|M19
diff --git a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck UR.dck b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck UR.dck
index 7d5e39ee226..b03d8c0b52b 100644
--- a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck UR.dck	
+++ b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck UR.dck	
@@ -1,5 +1,14 @@
+[shop]
+WinsToUnlock=0
+Credits=999
+MinDifficulty=0
+MaxDifficulty=5
 [metadata]
-Name=Core Set 2019 Welcome Deck UR
+Name=Core Set 2019 Welcome Deck (UR)
+Description=As a blue mage, your mind is your most powerful weapon. You control the battlefield through illusion, always thinking three steps ahead of your foe. Superior knowledge determines your victory!
+Deck Type=constructed
+Set=M19
+Image=m19_blue.jpg
 [Main]
 1 Air Elemental|M19
 1 Aven Wind Mage|M19
diff --git a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck WB.dck b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck WB.dck
index 55923560757..802b53b330c 100644
--- a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck WB.dck	
+++ b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck WB.dck	
@@ -1,5 +1,14 @@
+[shop]
+WinsToUnlock=0
+Credits=999
+MinDifficulty=0
+MaxDifficulty=5
 [metadata]
-Name=Core Set 2019 Welcome Deck WB
+Name=Core Set 2019 Welcome Deck (WB)
+Description=As a white mage, you know that true strength lies in cooperation. You command disciplined armies, working as one to overwhelm your enemies. Unity of purpose brings you victory!
+Deck Type=constructed
+Set=M19
+Image=m19_white.jpg
 [Main]
 1 Bogstomper|M19
 1 Diregraf Ghoul|M19
diff --git a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck WU.dck b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck WU.dck
index 026421b7c6a..1b8541c02c1 100644
--- a/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck WU.dck	
+++ b/forge-gui/res/quest/precons/Core Set 2019 Welcome Deck WU.dck	
@@ -1,5 +1,14 @@
+[shop]
+WinsToUnlock=0
+Credits=999
+MinDifficulty=0
+MaxDifficulty=5
 [metadata]
-Name=Core Set 2019 Welcome Deck WU
+Name=Core Set 2019 Welcome Deck (WU)
+Description=As a white mage, you know that true strength lies in cooperation. You command disciplined armies, working as one to overwhelm your enemies. Unity of purpose brings you victory!
+Deck Type=constructed
+Set=M19
+Image=m19_white.jpg
 [Main]
 1 Air Elemental|M19
 1 Aven Wind Mage|M19
diff --git a/forge-gui/res/quest/precons/Liliana, the Necromancer.dck b/forge-gui/res/quest/precons/Liliana, the Necromancer.dck
index 3f320870cb5..8b4c729593b 100644
--- a/forge-gui/res/quest/precons/Liliana, the Necromancer.dck	
+++ b/forge-gui/res/quest/precons/Liliana, the Necromancer.dck	
@@ -1,5 +1,14 @@
+[shop]
+WinsToUnlock=0
+Credits=1099
+MinDifficulty=0
+MaxDifficulty=5
 [metadata]
 Name=Liliana, the Necromancer
+Description=Liliana has mastered death and bends it to her will, defying the laws of nature in pursuit of power. Use her skills to raise an army of undead and drain the lfie from your opponent.
+Deck Type=constructed
+Set=M19
+Image=liliana_the_necromancer.jpg
 [Main]
 2 Abnormal Endurance|M19
 3 Arisen Gorgon|M19
diff --git a/forge-gui/res/quest/precons/Sarkhan, Dragonsoul.dck b/forge-gui/res/quest/precons/Sarkhan, Dragonsoul.dck
index 9da5e6bce71..5826e686a0e 100644
--- a/forge-gui/res/quest/precons/Sarkhan, Dragonsoul.dck	
+++ b/forge-gui/res/quest/precons/Sarkhan, Dragonsoul.dck	
@@ -1,5 +1,14 @@
+[shop]
+WinsToUnlock=0
+Credits=1099
+MinDifficulty=0
+MaxDifficulty=5
 [metadata]
 Name=Sarkhan, Dragonsoul
+Description=Sarkhan worships and communes with dragons, taking on their power as his own. Mobilize his mighty draconic forces to incinerate your opponent's defenses and expose them to an aerial attack.
+Deck Type=constructed
+Set=M19
+Image=sarkhan_dragonsoul.jpg
 [Main]
 1 Act of Treason|M19
 1 Demanding Dragon|M19
diff --git a/forge-gui/res/quest/precons/Tezzeret, Cruel Machinist.dck b/forge-gui/res/quest/precons/Tezzeret, Cruel Machinist.dck
index 26ff8556b91..5bb7e70cbc6 100644
--- a/forge-gui/res/quest/precons/Tezzeret, Cruel Machinist.dck	
+++ b/forge-gui/res/quest/precons/Tezzeret, Cruel Machinist.dck	
@@ -1,5 +1,14 @@
+[shop]
+WinsToUnlock=0
+Credits=1099
+MinDifficulty=0
+MaxDifficulty=5
 [metadata]
 Name=Tezzeret, Cruel Machinist
+Description=Tezzeret uses his ability to manipulate metal to fulfill his dark ambitions. Assemble a host of artifacts and turn them into deadly tools to engineer a cunning victory.
+Deck Type=constructed
+Set=M19
+Image=tezzeret_cruel_machinist.jpg
 [Main]
 1 Divination|M19
 3 Dwindle|M19
diff --git a/forge-gui/res/quest/precons/Vivien of the Arkbow.dck b/forge-gui/res/quest/precons/Vivien of the Arkbow.dck
index 140146e2d98..45afac30fb4 100644
--- a/forge-gui/res/quest/precons/Vivien of the Arkbow.dck	
+++ b/forge-gui/res/quest/precons/Vivien of the Arkbow.dck	
@@ -1,5 +1,14 @@
+[shop]
+WinsToUnlock=0
+Credits=1099
+MinDifficulty=0
+MaxDifficulty=5
 [metadata]
 Name=Vivien of the Arkbow
+Description=Vivien is a keen naturalist-- her magical Arkbow preserves the essence of each creature she encounters, allowing her to summon them at need. Master the wilds and crush your opponents with massive creatures.
+Deck Type=constructed
+Set=M19
+Image=vivien_of_the_arkbow.jpg
 [Main]
 1 Aggressive Mammoth|M19
 2 Bristling Boar|M19