From 27f14e82a6e6869bbe8571c8a3fd8889926794ba Mon Sep 17 00:00:00 2001 From: Sol Date: Sat, 9 May 2015 23:48:47 +0000 Subject: [PATCH] - Adding Tempest Remastered in to Forge (Marked as "Online" type, so it's not unlockable in Quest Mode) --- .gitattributes | 1 + .../src/main/java/forge/card/CardEdition.java | 1 + forge-gui/res/blockdata/blocks.txt | 1 + forge-gui/res/draft/rankings.txt | 250 ++++++++++++++++ forge-gui/res/editions/Tempest Remastered.txt | 279 ++++++++++++++++++ forge-gui/tools/formats.txt | 4 +- 6 files changed, 534 insertions(+), 2 deletions(-) create mode 100644 forge-gui/res/editions/Tempest Remastered.txt diff --git a/.gitattributes b/.gitattributes index 4f38a8af4df..be5a3d17bcd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -16263,6 +16263,7 @@ forge-gui/res/editions/Shards[!!-~]of[!!-~]Alara.txt -text forge-gui/res/editions/Starter[!!-~]1999.txt -text forge-gui/res/editions/Starter[!!-~]2000.txt -text forge-gui/res/editions/Stronghold.txt -text +forge-gui/res/editions/Tempest[!!-~]Remastered.txt -text forge-gui/res/editions/Tempest.txt -text forge-gui/res/editions/Tenth[!!-~]Edition.txt -text forge-gui/res/editions/The[!!-~]Dark.txt -text diff --git a/forge-core/src/main/java/forge/card/CardEdition.java b/forge-core/src/main/java/forge/card/CardEdition.java index 5704c7413b6..8c046cd860a 100644 --- a/forge-core/src/main/java/forge/card/CardEdition.java +++ b/forge-core/src/main/java/forge/card/CardEdition.java @@ -62,6 +62,7 @@ public final class CardEdition implements Comparable { // immutable EXPANSION, REPRINT, + ONLINE, STARTER, DUEL_DECKS, diff --git a/forge-gui/res/blockdata/blocks.txt b/forge-gui/res/blockdata/blocks.txt index 9dd19562f50..de86d896440 100644 --- a/forge-gui/res/blockdata/blocks.txt +++ b/forge-gui/res/blockdata/blocks.txt @@ -55,4 +55,5 @@ Theros, 3/6/THS, THS BNG JOU Magic 2015, 3/6/M15, M15 Khans of Tarkir, 3/6/KTK, KTK FRF Dragons of Tarkir, 3/6/DTK, DTK FRF +Tempest Remastered, 3/6/TPR, TPR Modern Masters 2015, 3/6/M15, MM2 \ No newline at end of file diff --git a/forge-gui/res/draft/rankings.txt b/forge-gui/res/draft/rankings.txt index 10b183b59f1..86e4437480f 100644 --- a/forge-gui/res/draft/rankings.txt +++ b/forge-gui/res/draft/rankings.txt @@ -1,4 +1,254 @@ //Rank|Name|Rarity|Set +#1|Cataclysm|M|TPR +#2|Cursed Scroll|M|TPR +#3|Dream Halls|M|TPR +#4|Grindstone|M|TPR +#5|Humility|M|TPR +#6|Living Death|M|TPR +#7|Mox Diamond|M|TPR +#8|Oath of Druids|M|TPR +#9|Recurring Nightmare|M|TPR +#10|Shard Phoenix|M|TPR +#11|Sliver Queen|M|TPR +#12|Starke of Rath|M|TPR +#13|Survival of the Fittest|M|TPR +#14|Time Warp|M|TPR +#15|Volrath's Stronghold|M|TPR +#16|Aluren|R|TPR +#17|City of Traitors|R|TPR +#18|Coat of Arms|R|TPR +#19|Coffin Queen|R|TPR +#20|Commander Greven il-Vec|R|TPR +#21|Corpse Dance|R|TPR +#22|Crovax the Cursed|R|TPR +#23|Death Pits of Rath|R|TPR +#24|Dracoplasm|R|TPR +#25|Ephemeron|R|TPR +#26|Erratic Portal|R|TPR +#27|Exalted Dragon|R|TPR +#28|Fanning the Flames|R|TPR +#29|Field of Souls|R|TPR +#30|Flame Wave|R|TPR +#31|Forbid|R|TPR +#32|Gerrard's Battle Cry|R|TPR +#33|Heartwood Giant|R|TPR +#34|Intuition|R|TPR +#35|Jinxed Idol|R|TPR +#36|Kezzerdrix|R|TPR +#37|Krakilin|R|TPR +#38|Legacy's Allure|R|TPR +#39|Magmasaur|R|TPR +#40|Manabond|R|TPR +#41|Mawcor|R|TPR +#42|Meditate|R|TPR +#43|Mindless Automaton|R|TPR +#44|Mirri, Cat Warrior|R|TPR +#45|Mogg Infestation|R|TPR +#46|Necrologia|R|TPR +#47|Ogre Shaman|R|TPR +#48|Orim, Samite Healer|R|TPR +#49|Paladin en-Vec|R|TPR +#50|Pandemonium|R|TPR +#51|Rathi Dragon|R|TPR +#52|Recycle|R|TPR +#53|Selenia, Dark Angel|R|TPR +#54|Shaman en-Kor|R|TPR +#55|Silver Wyvern|R|TPR +#56|Soltari Guerrillas|R|TPR +#57|Spike Hatcher|R|TPR +#58|Spirit Mirror|R|TPR +#59|Spitting Hydra|R|TPR +#60|Stronghold Assassin|R|TPR +#61|Thopter Squadron|R|TPR +#62|Tradewind Rider|R|TPR +#63|Verdant Force|R|TPR +#64|Vhati il-Dal|R|TPR +#65|Volrath's Laboratory|R|TPR +#66|Wasteland|R|TPR +#67|Winds of Rath|R|TPR +#68|Wood Sage|R|TPR +#69|Acidic Sliver|U|TPR +#70|Angelic Protector|U|TPR +#71|Avenging Angel|U|TPR +#72|Caldera Lake|U|TPR +#73|Cannibalize|U|TPR +#74|Capsize|U|TPR +#75|Carnassid|U|TPR +#76|Cinder Marsh|U|TPR +#77|Counterspell|U|TPR +#78|Crashing Boars|U|TPR +#79|Crystalline Sliver|U|TPR +#80|Curiosity|U|TPR +#81|Dauthi Marauder|U|TPR +#82|Dauthi Slayer|U|TPR +#83|Dauthi Warlord|U|TPR +#84|Deadshot|U|TPR +#85|Dismiss|U|TPR +#86|Dream Prowler|U|TPR +#87|Emmessi Tome|U|TPR +#88|Evincar's Justice|U|TPR +#89|Fighting Drake|U|TPR +#90|Flowstone Mauler|U|TPR +#91|Flowstone Wyvern|U|TPR +#92|Fugue|U|TPR +#93|Gallantry|U|TPR +#94|Goblin Bombardment|U|TPR +#95|Hermit Druid|U|TPR +#96|Hibernation Sliver|U|TPR +#97|Killer Whale|U|TPR +#98|Kor Chant|U|TPR +#99|Legerdemain|U|TPR +#100|Lotus Petal|U|TPR +#101|Lowland Basilisk|U|TPR +#102|Mage il-Vec|U|TPR +#103|Maze of Shadows|U|TPR +#104|Mogg Hollows|U|TPR +#105|Mogg Maniac|U|TPR +#106|Needle Storm|U|TPR +#107|Overrun|U|TPR +#108|Pacifism|U|TPR +#109|Pegasus Stampede|U|TPR +#110|Phyrexian Hulk|U|TPR +#111|Pine Barrens|U|TPR +#112|Reanimate|U|TPR +#113|Renegade Warlord|U|TPR +#114|Repentance|U|TPR +#115|Revenant|U|TPR +#116|Rolling Thunder|U|TPR +#117|Rootbreaker Wurm|U|TPR +#118|Rootwater Depths|U|TPR +#119|Rootwater Hunter|U|TPR +#120|Sabertooth Wyvern|U|TPR +#121|Salt Flats|U|TPR +#122|Sarcomancy|U|TPR +#123|Scabland|U|TPR +#124|Screeching Harpy|U|TPR +#125|Searing Touch|U|TPR +#126|Shadowstorm|U|TPR +#127|Skyshroud Forest|U|TPR +#128|Skyshroud Vampire|U|TPR +#129|Soltari Champion|U|TPR +#130|Soltari Monk|U|TPR +#131|Soltari Priest|U|TPR +#132|Spellshock|U|TPR +#133|Spike Breeder|U|TPR +#134|Spike Feeder|U|TPR +#135|Spined Sliver|U|TPR +#136|Stalking Stones|U|TPR +#137|Thalakos Drifters|U|TPR +#138|Thalakos Lowlands|U|TPR +#139|Tranquility|U|TPR +#140|Vec Townships|U|TPR +#141|Verdant Touch|U|TPR +#142|Victual Sliver|U|TPR +#143|Volrath's Curse|U|TPR +#144|Wall of Blossoms|U|TPR +#145|Wall of Essence|U|TPR +#146|Wall of Souls|U|TPR +#147|Warrior en-Kor|U|TPR +#148|Wind Dancer|U|TPR +#149|Aftershock|C|TPR +#150|Anarchist|C|TPR +#151|Angelic Blessing|C|TPR +#152|Anoint|C|TPR +#153|Armor Sliver|C|TPR +#154|Armored Pegasus|C|TPR +#155|Bandage|C|TPR +#156|Barbed Sliver|C|TPR +#157|Bottle Gnomes|C|TPR +#158|Canopy Spider|C|TPR +#159|Canyon Wildcat|C|TPR +#160|Carnophage|C|TPR +#161|Charging Paladin|C|TPR +#162|Clot Sliver|C|TPR +#163|Coercion|C|TPR +#164|Coiled Tinviper|C|TPR +#165|Conviction|C|TPR +#166|Craven Giant|C|TPR +#167|Cursed Flesh|C|TPR +#168|Dark Banishing|C|TPR +#169|Dark Ritual|C|TPR +#170|Dauthi Horror|C|TPR +#171|Dauthi Jackal|C|TPR +#172|Death Stroke|C|TPR +#173|Death's Duet|C|TPR +#174|Diabolic Edict|C|TPR +#175|Disenchant|C|TPR +#176|Dungeon Shade|C|TPR +#177|Elven Rite|C|TPR +#178|Elvish Fury|C|TPR +#179|Endangered Armodon|C|TPR +#180|Flowstone Blade|C|TPR +#181|Furnace Brood|C|TPR +#182|Gaseous Form|C|TPR +#183|Gravedigger|C|TPR +#184|Hammerhead Shark|C|TPR +#185|Harrow|C|TPR +#186|Heartwood Dryad|C|TPR +#187|Horned Sliver|C|TPR +#188|Horned Turtle|C|TPR +#189|Kindle|C|TPR +#190|Lab Rats|C|TPR +#191|Lightning Blast|C|TPR +#192|Lowland Giant|C|TPR +#193|Mana Leak|C|TPR +#194|Maniacal Rage|C|TPR +#195|Master Decoy|C|TPR +#196|Merfolk Looter|C|TPR +#197|Metallic Sliver|C|TPR +#198|Mnemonic Sliver|C|TPR +#199|Mogg Conscripts|C|TPR +#200|Mogg Fanatic|C|TPR +#201|Mogg Flunkies|C|TPR +#202|Mounted Archers|C|TPR +#203|Mulch|C|TPR +#204|Muscle Sliver|C|TPR +#205|Nomads en-Kor|C|TPR +#206|Patchwork Gnomes|C|TPR +#207|Provoke|C|TPR +#208|Rampant Growth|C|TPR +#209|Rats of Rath|C|TPR +#210|Reality Anchor|C|TPR +#211|Rootwalla|C|TPR +#212|Sandstone Warrior|C|TPR +#213|Scrivener|C|TPR +#214|Sea Monster|C|TPR +#215|Seething Anger|C|TPR +#216|Serpent Warrior|C|TPR +#217|Shackles|C|TPR +#218|Shadow Rift|C|TPR +#219|Shatter|C|TPR +#220|Sift|C|TPR +#221|Skyshaper|C|TPR +#222|Skyshroud Elf|C|TPR +#223|Skyshroud Troll|C|TPR +#224|Smite|C|TPR +#225|Soltari Lancer|C|TPR +#226|Soltari Trooper|C|TPR +#227|Spell Blast|C|TPR +#228|Spike Colony|C|TPR +#229|Spinal Graft|C|TPR +#230|Spined Wurm|C|TPR +#231|Spirit en-Kor|C|TPR +#232|Standing Troops|C|TPR +#233|Staunch Defenders|C|TPR +#234|Stun|C|TPR +#235|Telethopter|C|TPR +#236|Thalakos Scout|C|TPR +#237|Thalakos Seer|C|TPR +#238|Thrull Surgeon|C|TPR +#239|Time Ebb|C|TPR +#240|Trained Armodon|C|TPR +#241|Twitch|C|TPR +#242|Vampire Hounds|C|TPR +#243|Verdigris|C|TPR +#244|Wall of Diffusion|C|TPR +#245|Wayward Soul|C|TPR +#246|Whispers of the Muse|C|TPR +#247|Wind Drake|C|TPR +#248|Winged Sliver|C|TPR +#249|Youthful Knight|C|TPR +//Rank|Name|Rarity|Set #1|Narset Transcendent|M|DTK #2|Dragonlord Kolaghan|M|DTK #3|Dragonlord Dromoka|M|DTK diff --git a/forge-gui/res/editions/Tempest Remastered.txt b/forge-gui/res/editions/Tempest Remastered.txt new file mode 100644 index 00000000000..827487000bc --- /dev/null +++ b/forge-gui/res/editions/Tempest Remastered.txt @@ -0,0 +1,279 @@ +[metadata] +Code=TPR +Date=2015-05-06 +Name=Tempest Remastered +Type=Reprint +BoosterCovers=1 +Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand TPR +FoilChanceInBooster=100 + +[cards] +M Cataclysm +M Cursed Scroll +M Dream Halls +M Grindstone +M Humility +M Living Death +M Mox Diamond +M Oath of Druids +M Recurring Nightmare +M Shard Phoenix +M Sliver Queen +M Starke of Rath +M Survival of the Fittest +M Time Warp +M Volrath's Stronghold +R Aluren +R City of Traitors +R Coat of Arms +R Coffin Queen +R Commander Greven il-Vec +R Corpse Dance +R Crovax the Cursed +R Death Pits of Rath +R Dracoplasm +R Ephemeron +R Erratic Portal +R Exalted Dragon +R Fanning the Flames +R Field of Souls +R Flame Wave +R Forbid +R Gerrard's Battle Cry +R Heartwood Giant +R Intuition +R Jinxed Idol +R Kezzerdrix +R Krakilin +R Legacy's Allure +R Magmasaur +R Manabond +R Mawcor +R Meditate +R Mindless Automaton +R Mirri, Cat Warrior +R Mogg Infestation +R Necrologia +R Ogre Shaman +R Orim, Samite Healer +R Paladin en-Vec +R Pandemonium +R Rathi Dragon +R Recycle +R Selenia, Dark Angel +R Shaman en-Kor +R Silver Wyvern +R Soltari Guerrillas +R Spike Hatcher +R Spirit Mirror +R Spitting Hydra +R Stronghold Assassin +R Thopter Squadron +R Tradewind Rider +R Verdant Force +R Vhati il-Dal +R Volrath's Laboratory +R Wasteland +R Winds of Rath +R Wood Sage +U Acidic Sliver +U Angelic Protector +U Avenging Angel +U Caldera Lake +U Cannibalize +U Capsize +U Carnassid +U Cinder Marsh +U Counterspell +U Crashing Boars +U Crystalline Sliver +U Curiosity +U Dauthi Marauder +U Dauthi Slayer +U Dauthi Warlord +U Deadshot +U Dismiss +U Dream Prowler +U Emmessi Tome +U Evincar's Justice +U Fighting Drake +U Flowstone Mauler +U Flowstone Wyvern +U Fugue +U Gallantry +U Goblin Bombardment +U Hermit Druid +U Hibernation Sliver +U Killer Whale +U Kor Chant +U Legerdemain +U Lotus Petal +U Lowland Basilisk +U Mage il-Vec +U Maze of Shadows +U Mogg Hollows +U Mogg Maniac +U Needle Storm +U Overrun +U Pacifism +U Pegasus Stampede +U Phyrexian Hulk +U Pine Barrens +U Reanimate +U Renegade Warlord +U Repentance +U Revenant +U Rolling Thunder +U Rootbreaker Wurm +U Rootwater Depths +U Rootwater Hunter +U Sabertooth Wyvern +U Salt Flats +U Sarcomancy +U Scabland +U Screeching Harpy +U Searing Touch +U Shadowstorm +U Skyshroud Forest +U Skyshroud Vampire +U Soltari Champion +U Soltari Monk +U Soltari Priest +U Spellshock +U Spike Breeder +U Spike Feeder +U Spined Sliver +U Stalking Stones +U Thalakos Drifters +U Thalakos Lowlands +U Tranquility +U Vec Townships +U Verdant Touch +U Victual Sliver +U Volrath's Curse +U Wall of Blossoms +U Wall of Essence +U Wall of Souls +U Warrior en-Kor +U Wind Dancer +C Aftershock +C Anarchist +C Angelic Blessing +C Anoint +C Armor Sliver +C Armored Pegasus +C Bandage +C Barbed Sliver +C Bottle Gnomes +C Canopy Spider +C Canyon Wildcat +C Carnophage +C Charging Paladin +C Clot Sliver +C Coercion +C Coiled Tinviper +C Conviction +C Craven Giant +C Cursed Flesh +C Dark Banishing +C Dark Ritual +C Dauthi Horror +C Dauthi Jackal +C Death Stroke +C Death's Duet +C Diabolic Edict +C Disenchant +C Dungeon Shade +C Elven Rite +C Elvish Fury +C Endangered Armodon +C Flowstone Blade +C Furnace Brood +C Gaseous Form +C Gravedigger +C Hammerhead Shark +C Harrow +C Heartwood Dryad +C Horned Sliver +C Horned Turtle +C Kindle +C Lab Rats +C Lightning Blast +C Lowland Giant +C Mana Leak +C Maniacal Rage +C Master Decoy +C Merfolk Looter +C Metallic Sliver +C Mnemonic Sliver +C Mogg Conscripts +C Mogg Fanatic +C Mogg Flunkies +C Mounted Archers +C Mulch +C Muscle Sliver +C Nomads en-Kor +C Patchwork Gnomes +C Provoke +C Rampant Growth +C Rats of Rath +C Reality Anchor +C Rootwalla +C Sandstone Warrior +C Scrivener +C Sea Monster +C Seething Anger +C Serpent Warrior +C Shackles +C Shadow Rift +C Shatter +C Sift +C Skyshaper +C Skyshroud Elf +C Skyshroud Troll +C Smite +C Soltari Lancer +C Soltari Trooper +C Spell Blast +C Spike Colony +C Spinal Graft +C Spined Wurm +C Spirit en-Kor +C Standing Troops +C Staunch Defenders +C Stun +C Telethopter +C Thalakos Scout +C Thalakos Seer +C Thrull Surgeon +C Time Ebb +C Trained Armodon +C Twitch +C Vampire Hounds +C Verdigris +C Wall of Diffusion +C Wayward Soul +C Whispers of the Muse +C Wind Drake +C Winged Sliver +C Youthful Knight +L Forest +L Forest +L Forest +L Forest +L Island +L Island +L Island +L Island +L Mountain +L Mountain +L Mountain +L Mountain +L Plains +L Plains +L Plains +L Plains +L Swamp +L Swamp +L Swamp +L Swamp diff --git a/forge-gui/tools/formats.txt b/forge-gui/tools/formats.txt index 4e20266d9f2..e9b67e28d19 100644 --- a/forge-gui/tools/formats.txt +++ b/forge-gui/tools/formats.txt @@ -1,5 +1,5 @@ -Name:Standard|Sets:THS, BNG, JOU, M15, KTK, FRF +Name:Standard|Sets:THS, BNG, JOU, M15, KTK, FRF, DTK Name:Extended|Sets:ZEN, WWK, ROE, M11, SOM, MBS, NPH, M12, ISD, DKA, AVR, M13, RTR, GTC, DGM, M14|Banned:Stoneforge Mystic; Jace, the Mind Sculptor; Ponder; Preordain; Mental Misstep -Name:Modern|Sets:8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, 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 +Name:Modern|Sets:8ED, MRD, DST, 5DN, CHK, BOK, SOK, 9ED, RAV, GPT, DIS, CSP, TSP, 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 Name:Legacy Name:Vintage \ No newline at end of file