diff --git a/forge-gui/res/blockdata/blocks.txt b/forge-gui/res/blockdata/blocks.txt index 1d7ec93740f..bf3b9fd39e3 100644 --- a/forge-gui/res/blockdata/blocks.txt +++ b/forge-gui/res/blockdata/blocks.txt @@ -144,3 +144,4 @@ Tarkir Dragonstorm, 3/6/TDM, TDM Final Fantasy, 3/6/FIN, FIN Alchemy: Innistrad, 3/6/ISD, YMID Edge of Eternities, 3/6/EOE, EOE +Marvel's Spider-Man, 3/6/SPM, SPM diff --git a/forge-gui/res/draft/rankings/spm.rnk b/forge-gui/res/draft/rankings/spm.rnk new file mode 100644 index 00000000000..f1fff822bf8 --- /dev/null +++ b/forge-gui/res/draft/rankings/spm.rnk @@ -0,0 +1,233 @@ +//Rank|Name|Rarity|Set +#1|Arachne, Psionic Weaver|R|SPM +#2|Origin of Spider-Man|R|SPM +#3|Spectacular Spider-Man|R|SPM +#4|Silk, Web Weaver|R|SPM +#5|Rite of Replication|M|SPM +#6|Skithiryx, the Blight Dragon|M|SPM +#7|Goblin Bombardment|M|SPM +#8|Najeela, the Blade-Blossom|M|SPM +#9|Lizard, Connors's Curse|R|SPM +#10|Sandman, Shifting Scoundrel|R|SPM +#11|Biorganic Carapace|R|SPM +#12|Doctor Octopus, Master Planner|M|SPM +#13|The Spot, Living Portal|R|SPM +#14|Agent Venom|R|SPM +#15|Gwenom, Remorseless|M|SPM +#16|Miles Morales|M|SPM +#17|Arana, Heart of the Spider|R|SPM +#18|Mister Negative|M|SPM +#19|Scarlet Spider, Ben Reilly|R|SPM +#20|Symbiote Spider-Man|R|SPM +#21|Ultimate Green Goblin|R|SPM +#22|Arasta of the Endless Web|M|SPM +#23|Mysterio, Master of Illusion|R|SPM +#24|Villainous Wrath|R|SPM +#25|Strength of Will|R|SPM +#26|Iron Spider, Stark Upgrade|R|SPM +#27|Anti-Venom, Horrifying Healer|M|SPM +#28|Friendly Neighborhood|R|SPM +#29|Peter Parker|M|SPM +#30|With Great Power|R|SPM +#31|Hydro-Man, Fluid Felon|R|SPM +#32|Impostor Syndrome|M|SPM +#33|Behold the Sinister Six!|M|SPM +#34|Black Cat, Cunning Thief|R|SPM +#35|Eddie Brock|M|SPM +#36|Morlun, Devourer of Spiders|R|SPM +#37|Spider-Punk|R|SPM +#38|Spinneret and Spiderling|R|SPM +#39|Kraven's Last Hunt|R|SPM +#40|Spider-Ham, Peter Porker|R|SPM +#41|Carnage, Crimson Chaos|R|SPM +#42|Cheering Crowd|R|SPM +#43|Cosmic Spider-Man|M|SPM +#44|Kraven the Hunter|R|SPM +#45|Mary Jane Watson|R|SPM +#46|Rhino, Barreling Brute|U|SPM +#47|Spider-Man 2099|R|SPM +#48|Mystic Confluence|M|SPM +#49|Savage Beating|M|SPM +#50|Silkguard|M|SPM +#51|Norman Osborn|M|SPM +#52|Gwen Stacy|M|SPM +#53|Green Goblin, Revenant|U|SPM +#54|Morbius the Living Vampire|U|SPM +#55|SP//Piloted by Peni|U|SPM +#56|Spider-Woman, Stunning Savior|R|SPM +#57|Doc Ock's Tentacles|R|SPM +#58|Silver Sable, Mercenary Leader|U|SPM +#59|Spectacular Tactics|C|SPM +#60|Spider-Man, Web-Slinger|C|SPM +#61|Spider-UK|U|SPM +#62|Whoosh!|C|SPM +#63|Scorpion's Sting|C|SPM +#64|Electro, Assaulting Battery|R|SPM +#65|J. Jonah Jameson|R|SPM +#66|Radioactive Spider|R|SPM +#67|Spiders-Man, Heroic Horde|U|SPM +#68|Terrific Team-Up|U|SPM +#69|Gallant Citizen|C|SPM +#70|Kraven, Proud Predator|U|SPM +#71|Superior Spider-Man|R|SPM +#72|Rocket-Powered Goblin Glider|R|SPM +#73|Urban Retreat|R|SPM +#74|Vibrant Cityscape|C|SPM +#75|Oscorp Industries|R|SPM +#76|Leyline Binding|M|SPM +#77|Lorthos, the Tidemaker|M|SPM +#78|Shock MAR|M|SPM +#79|Arachnogenesis|M|SPM +#80|Alibou, Ancient Witness|M|SPM +#81|Daily Bugle Reporters|C|SPM +#82|Web Up|C|SPM +#83|Doc Ock, Sinister Scientist|C|SPM +#84|Madame Web, Clairvoyant|U|SPM +#85|Spider-Byte, Web Warden|U|SPM +#86|The Death of Gwen Stacy|R|SPM +#87|Spider-Man Noir|U|SPM +#88|The Spot's Portal|U|SPM +#89|Tombstone, Career Criminal|U|SPM +#90|Electro's Bolt|C|SPM +#91|Shadow of the Goblin|R|SPM +#92|Shock|C|SPM +#93|Shocker, Unshakable|U|SPM +#94|Damage Control Crew|U|SPM +#95|Kapow!|C|SPM +#96|Scout the City|C|SPM +#97|Spider-Man, Brooklyn Visionary|C|SPM +#98|Wall Crawl|U|SPM +#99|Prowler, Clawed Thief|U|SPM +#100|Rhino's Rampage|U|SPM +#101|Scarlet Spider, Kaine|U|SPM +#102|Spider-Girl, Legacy Hero|U|SPM +#103|Spider-Man India|U|SPM +#104|Wraith, Vicious Vigilante|U|SPM +#105|Clever Impersonator|M|SPM +#106|Ponder|M|SPM +#107|Infernal Grasp|M|SPM +#108|Saw in Half|M|SPM +#109|Terminate|M|SPM +#110|Aunt May|U|SPM +#111|Flash Thompson, Spider-Fan|U|SPM +#112|Selfless Police Captain|C|SPM +#113|Wild Pack Squad|C|SPM +#114|Chameleon, Master of Disguise|U|SPM +#115|Flying Octobot|U|SPM +#116|Robotics Mastery|U|SPM +#117|School Daze|U|SPM +#118|Secret Identity|U|SPM +#119|Scorpion, Seething Striker|U|SPM +#120|Spider-Gwen, Free Spirit|C|SPM +#121|Spider-Islanders|C|SPM +#122|Ezekiel Sims, Spider-Totem|U|SPM +#123|Pictures of Spider-Man|U|SPM +#124|Pumpkin Bombardment|C|SPM +#125|Shriek, Treblemaker|U|SPM +#126|Spider Manifestation|C|SPM +#127|Path to Exile|M|SPM +#128|Beetle, Legacy Criminal|C|SPM +#129|The Clone Saga|R|SPM +#130|Mysterio's Phantasm|C|SPM +#131|Prison Break|U|SPM +#132|Superior Foes of Spider-Man|U|SPM +#133|Guy in the Chair|C|SPM +#134|Skyward Spider|C|SPM +#135|Spider-Bot|C|SPM +#136|Ominous Asylum|C|SPM +#137|Savage Mansion|C|SPM +#138|Sinister Hideout|C|SPM +#139|Suburban Sanctuary|C|SPM +#140|University Campus|C|SPM +#141|Reprieve|M|SPM +#142|Opposition Agent|M|SPM +#143|Relentless Assault|M|SPM +#144|City Pigeon|C|SPM +#145|Sudden Strike|U|SPM +#146|Thwip!|C|SPM +#147|Amazing Acrobatics|C|SPM +#148|Doc Ock's Henchmen|C|SPM +#149|Spider-Man No More|C|SPM +#150|Unstable Experiment|C|SPM +#151|Common Crook|C|SPM +#152|Swarm, Being of Bees|C|SPM +#153|Venom, Evil Unleashed|C|SPM +#154|Venomized Cat|C|SPM +#155|Venom's Hunger|C|SPM +#156|Angry Rabble|C|SPM +#157|Hobgoblin, Mantled Marauder|U|SPM +#158|Masked Meower|C|SPM +#159|Raging Goblinoids|U|SPM +#160|Romantic Rendezvous|C|SPM +#161|Stegron the Dinosaur Man|C|SPM +#162|Taxi Driver|C|SPM +#163|Wisecrack|U|SPM +#164|Grow Extra Arms|C|SPM +#165|Kraven's Cats|C|SPM +#166|Lurking Lizards|C|SPM +#167|Professional Wrestler|C|SPM +#168|Supportive Parents|U|SPM +#169|Mob Lookout|C|SPM +#170|Eerie Gravestone|C|SPM +#171|Living Brain, Mechanical Marvel|U|SPM +#172|Mechanical Mobster|C|SPM +#173|Spider-Slayer, Hatred Honed|U|SPM +#174|Spider-Suit|U|SPM +#175|Counterspell|M|SPM +#176|Feed the Swarm|M|SPM +#177|Thrill of Possibility|M|SPM +#178|Unexpected Windfall|M|SPM +#179|Costume Closet|U|SPM +#180|Starling, Aerial Ally|C|SPM +#181|Web-Shooters|U|SPM +#182|Oscorp Research Team|C|SPM +#183|Inner Demons Gangsters|C|SPM +#184|Merciless Enforcers|C|SPM +#185|Risky Research|C|SPM +#186|Sandman's Quicksand|U|SPM +#187|Heroes' Hangout|U|SPM +#188|Spider-Rex, Daring Dino|C|SPM +#189|Web-Warriors|U|SPM +#190|Passenger Ferry|C|SPM +#191|Subway Train|C|SPM +#192|Vulture, Scheming Scavenger|U|SPM +#193|Hot Dog Cart|C|SPM +#194|Interdimensional Web Watch|R|SPM +#195|Spider-Mobile|U|SPM +#196|Steel Wrecking Ball|C|SPM +#197|Rent Is Due|R|SPM +#198|Hide on the Ceiling|R|SPM +#199|Lady Octopus, Inspired Inventor|R|SPM +#200|Alien Symbiosis|U|SPM +#201|Molten Man, Inferno Incarnate|U|SPM +#202|Spider-Verse|M|SPM +#203|Web of Life and Destiny|M|SPM +#204|Jackal, Genius Geneticist|R|SPM +#205|Sun-Spider, Nimble Webber|U|SPM +#206|Bagel and Schmear|C|SPM +#207|Peter Parker's Camera|R|SPM +#208|Daily Bugle Building|U|SPM +#209|Multiversal Passage|R|SPM +#210|Comeuppance|M|SPM +#211|Traumatize|M|SPM +#212|Reanimate|M|SPM +#213|Heroic Intervention|M|SPM +#214|News Helicopter|C|SPM +#215|Parallel Lives|M|SPM +#216|Hex|M|SPM +#217|Tangle|M|SPM +#218|Spider-Sense|R|SPM +#219|Parker Luck|R|SPM +#220|The Soul Stone|M|SPM +#221|Maximum Carnage|R|SPM +#222|Nine Lives|M|SPM +#223|Rest in Peace|M|SPM +#224|Mindbreak Trap|M|SPM +#225|Winds of Change|M|SPM +#226|Beast Within|M|SPM +#227|Hunter's Insight|M|SPM +#228|Plains|C|SPM +#229|Island|C|SPM +#230|Swamp|C|SPM +#231|Mountain|C|SPM +#232|Forest|C|SPM diff --git a/forge-gui/res/editions/Marvel's Spider-Man.txt b/forge-gui/res/editions/Marvel's Spider-Man.txt index 743cb180fbb..5ed64e26818 100644 --- a/forge-gui/res/editions/Marvel's Spider-Man.txt +++ b/forge-gui/res/editions/Marvel's Spider-Man.txt @@ -6,6 +6,66 @@ Type=Expansion ScryfallCode=SPM DoublePick=WhenPodSizeIs4 RecommendedPodSize=4 +#https://magic.wizards.com/en/news/feature/collecting-marvels-spider-man +BoosterSlots=Common,Common-Borderless,Uncommon,RareMythic,Land,Wildcard,WildcardFoil +Booster=6 Common, 1 Common-Borderless, 3 Uncommon, 1 RareMythic, 1 Wildcard, 1 WildcardFoil+, 1 Land +Prerelease=6 Boosters, 1 RareMythic+ +BoosterBox=30 + +[Common] +Base=Common:fromSheet("SPM cards") + +[Common-Borderless] +Base=Common:fromSheet("SPM cards") +Replace=.0416F fromSheet("SPM borderless") + +[Uncommon] +Base=Uncommon:fromSheet("SPM cards") +Replace=0.0517 Uncommon:fromSheet("SPM scene cards") + +[RareMythic] +Base=Rare:fromSheet("SPM cards") +Replace=.117F Mythic:fromSheet("SPM cards") +Replace=.012F Rare:fromSheet("SPM webslinger") +Replace=.004F Mythic:fromSheet("SPM webslinger") +Replace=.021F Rare:fromSheet("SPM panel cards") +Replace=.004F Mythic:fromSheet("SPM panel cards") +Replace=.01F Rare:fromSheet("SPM scene cards") +Replace=.0005F Mythic:fromSheet("SPM scene cards") + +[Wildcard] +Base=Common:fromSheet("SPM cards") +Replace=0.041F Uncommon:fromSheet("SPM cards") +Replace=0.209F Rare:fromSheet("SPM cards") +Replace=0.0029F Mythic:fromSheet("SPM cards") +Replace=.0012F Rare:fromSheet("SPM webslinger") +Replace=.0004F Mythic:fromSheet("SPM webslinger") +Replace=.0021F Rare:fromSheet("SPM panel cards") +Replace=.0004F Mythic:fromSheet("SPM panel cards") +Replace=.007F Uncommon:fromSheet("SPM scene cards") +Replace=.001F Rare:fromSheet("SPM scene cards") +Replace=.00005F Mythic:fromSheet("SPM scene cards") + +[WildcardFoil] +Base=Common:fromSheet("SPM cards") +Replace=0.241F Uncommon:fromSheet("SPM cards") +Replace=0.078F Rare:fromSheet("SPM cards") +Replace=0.011F Mythic:fromSheet("SPM cards") +Replace=.0012F Rare:fromSheet("SPM webslinger") +Replace=.0004F Mythic:fromSheet("SPM webslinger") +Replace=.0021F Rare:fromSheet("SPM panel cards") +Replace=.0004F Mythic:fromSheet("SPM panel cards") +Replace=.007F Uncommon:fromSheet("SPM scene cards") +Replace=.001F Rare:fromSheet("SPM scene cards") +Replace=.00005F Mythic:fromSheet("SPM scene cards") + +[Land] +Base=fromSheet("SPM allied lands") +Replace=0.125F fromSheet("SPM allied lands")+ +Replace=0.20F BasicLand:fromSheet("SPM full art") +Replace=0.05F BasicLand:fromSheet("SPM full art")+ +Replace=0.20F BasicLand:fromSheet("SPM cards"):!fromSheet("SPM allied lands") +Replace=0.05F BasicLand:fromSheet("SPM cards")!fromSheet("SPM allied lands") [cards] 1 M Anti-Venom, Horrifying Healer @Néstor Ossandón Leal @@ -188,24 +248,28 @@ RecommendedPodSize=4 178 C Subway Train @Jonas De Ro 179 U Daily Bugle Building @David Álvarez 180 R Multiversal Passage @Pablo Mendoza -181 C Ominous Asylum @Pavel Kolomeyets +181 L Ominous Asylum @Pavel Kolomeyets 182 R Oscorp Industries @Bastien Grivet -183 C Savage Mansion @David Álvarez -184 C Sinister Hideout @Pavel Kolomeyets -185 C Suburban Sanctuary @David Frasheski -186 C University Campus @David Álvarez +183 L Savage Mansion @David Álvarez +184 L Sinister Hideout @Pavel Kolomeyets +185 L Suburban Sanctuary @David Frasheski +186 L University Campus @David Álvarez 187 R Urban Retreat @Jonas De Ro 188 C Vibrant Cityscape @Wei Guan -189 L Plains @Sarah Finnigan -190 L Island @Sarah Finnigan -191 L Swamp @Sarah Finnigan -192 L Mountain @Sarah Finnigan -193 L Forest @Sarah Finnigan 194 L Plains @Jonas De Ro 195 L Island @Jonas De Ro 196 L Swamp @Jonas De Ro 197 L Mountain @Jonas De Ro 198 L Forest @Jonas De Ro + +[full art] +189 L Plains @Sarah Finnigan +190 L Island @Sarah Finnigan +191 L Swamp @Sarah Finnigan +192 L Mountain @Sarah Finnigan +193 L Forest @Sarah Finnigan + +[borderless] 199 U SP//dr, Piloted by Peni @Jim Cheung & Jay David Ramos 200 M Miles Morales @Jim Cheung & Jay David Ramos 201 R Spider-Ham, Peter Porker @Jim Cheung & Jay David Ramos @@ -242,6 +306,9 @@ RecommendedPodSize=4 232 M Peter Parker @Jack Kirby & Steve Ditko 233 M Eddie Brock @Todd McFarlane & Bob Sharen 234 M Miles Morales @Sara Pichelli & Justin Ponsor +242 M The Soul Stone @Madeline Boni + +[etched] 235 R Spectacular Spider-Man @Roberta Ingranata 236 R Spectacular Spider-Man @Roberta Ingranata 237 R Spectacular Spider-Man @Roberta Ingranata @@ -249,7 +316,8 @@ RecommendedPodSize=4 239 R Spectacular Spider-Man @Roberta Ingranata 240 R Spectacular Spider-Man @Roberta Ingranata 241 R Spectacular Spider-Man @Roberta Ingranata -242 M The Soul Stone @Madeline Boni + +[extended art] 243 M The Soul Stone @Leinil Francis Yu & Sunny Gho 244 M Anti-Venom, Horrifying Healer @Néstor Ossandón Leal 245 R Arachne, Psionic Weaver @Steve Argyle @@ -291,10 +359,63 @@ RecommendedPodSize=4 281 R Rocket-Powered Goblin Glider @Pavel Kolomeyets 282 R Oscorp Industries @Bastien Grivet 283 R Urban Retreat @Jonas De Ro + +[promo] 284 R Spider-Sense @David Álvarez 285 R Radioactive Spider @Toni Infante 286 M Gwenom, Remorseless @Jesper Ejsing +[allied lands] +1 Ominous Asylum|SPM +1 Savage Mansion|SPM +1 Sinister Hideout|SPM +1 Suburban Sanctuary|SPM +1 University Campus|SPM + +[scene cards] +1 SP//dr, Piloted by Peni|SPM|[199] +1 Miles Morales|SPM|[200] +1 Spider-Ham, Peter Porker|SPM|[201] +1 Gwen Stacy|SPM|[202] +1 Web-Warriors|SPM|[203] +1 Spider-Man Noir|SPM|[204] +1 Spider-Man 2099|SPM|[205] +1 Multiversal Passage|SPM|[206] +1 Spider-Punk|SPM|[207] + +[webslinger] +1 Peter Parker|SPM|[208] +1 Gwen Stacy|SPM|[209] +1 Spider-Punk|SPM|[210] +1 Miles Morales|SPM|[211] +1 Radioactive Spider|SPM|[212] +1 Araña, Heart of the Spider|SPM|[213] +1 Scarlet Spider, Ben Reilly|SPM|[214] +1 Silk, Web Weaver|SPM|[215] +1 Spider-Man 2099|SPM|[216] +1 Symbiote Spider-Man|SPM|[217] + +[panel cards] +1 Origin of Spider-Man|SPM|[218] +1 The Clone Saga|SPM|[219] +1 Norman Osborn|SPM|[220] +1 Behold the Sinister Six!|SPM|[221] +1 Black Cat, Cunning Thief|SPM|[222] +1 The Death of Gwen Stacy|SPM|[223] +1 Eddie Brock|SPM|[224] +1 Maximum Carnage|SPM|[225] +1 Kraven's Last Hunt|SPM|[226] +1 Carnage, Crimson Chaos|SPM|[227] +1 Doctor Octopus, Master Planner|SPM|[228] +1 Mary Jane Watson|SPM|[229] +1 Spider-Woman, Stunning Savior|SPM|[230] +1 The Spot, Living Portal|SPM|[231] + +[classic comic] +1 Peter Parker|SPM|[232] +1 Eddie Brock|SPM|[233] +1 Miles Morales|SPM|[234] + [tokens] 2 u_3_3_illusion_villain @Anthony Devine 3 g_2_1_spider_reach @Domenico Cava diff --git a/forge-gui/tools/RankingScraper.py b/forge-gui/tools/RankingScraper.py index 4bee7d3534e..06570937901 100644 --- a/forge-gui/tools/RankingScraper.py +++ b/forge-gui/tools/RankingScraper.py @@ -3,7 +3,7 @@ import json import requests -def draftsimRankings(edition='FIN', extra=None): +def draftsimRankings(edition='SPM', extra=None): edition = edition.upper() url1 = 'https://draftsim.com/generated/%s/' % (edition) url2 = '%s' % edition