diff --git a/forge-gui-desktop/src/test/java/forge/card/CardDbCardMockTestCase.java b/forge-gui-desktop/src/test/java/forge/card/CardDbCardMockTestCase.java index 0af3293a755..62a36d4e0d6 100644 --- a/forge-gui-desktop/src/test/java/forge/card/CardDbCardMockTestCase.java +++ b/forge-gui-desktop/src/test/java/forge/card/CardDbCardMockTestCase.java @@ -2029,7 +2029,7 @@ public class CardDbCardMockTestCase extends CardMockTestCase { militantAngel = this.cardDb.getCard(cnMilitantAngel); assertNotNull(militantAngel); - assertEquals(militantAngel.getEdition(), "GNT"); + assertEquals(militantAngel.getEdition(), "PZ2"); legacyMilitantAngel = this.legacyCardDb.getCardFromEdition(cnMilitantAngel, LegacyCardDb.LegacySetPreference.Earliest); @@ -2039,7 +2039,7 @@ public class CardDbCardMockTestCase extends CardMockTestCase { // Loyal Unicorn: Available in Forge in The List and COMMANDER 2018 loyalUnicorn = this.cardDb.getCard(cnLoyalUnicorn); assertNotNull(loyalUnicorn); - assertEquals(loyalUnicorn.getEdition(), "C18"); + assertEquals(loyalUnicorn.getEdition(), "PZ2"); legacyLoyalUnicorn = this.legacyCardDb.getCardFromEdition(cnLoyalUnicorn, LegacyCardDb.LegacySetPreference.Earliest); @@ -2072,7 +2072,7 @@ public class CardDbCardMockTestCase extends CardMockTestCase { militantAngel = this.cardDb.getCard(cnMilitantAngel); assertNotNull(militantAngel); - assertEquals(militantAngel.getEdition(), "GNT"); + assertEquals(militantAngel.getEdition(), "PZ2"); legacyMilitantAngel = this.legacyCardDb.getCardFromEdition(cnMilitantAngel, LegacyCardDb.LegacySetPreference.EarliestCoreExp); @@ -2387,4 +2387,4 @@ public class CardDbCardMockTestCase extends CardMockTestCase { assertEquals(adCard.getName(), deserterSide); } -} \ No newline at end of file +} diff --git a/forge-gui/res/editions/Legacy Championship.txt b/forge-gui/res/editions/Legacy Championship.txt index 9bf5b076b6d..16beb99b4c0 100644 --- a/forge-gui/res/editions/Legacy Championship.txt +++ b/forge-gui/res/editions/Legacy Championship.txt @@ -30,3 +30,6 @@ ScryfallCode=OLGC 2022A M Gaea's Cradle @Ralph Horsley 2022B M Scrubland @Raoul Vitale 2022C M The Tabernacle at Pendrell Vale @Milivoj Ćeran +2023 M Lightning Bolt @rk post +2023A M Volcanic Island @Mark Tedin +2023EU M Force of Will @Alan Pollack diff --git a/forge-gui/res/editions/Treasure Chests.txt b/forge-gui/res/editions/Treasure Chests.txt index 90ae2051a99..398d29f712a 100644 --- a/forge-gui/res/editions/Treasure Chests.txt +++ b/forge-gui/res/editions/Treasure Chests.txt @@ -79,6 +79,215 @@ ScryfallCode=PZ2 71 R Prismatic Geoscope @Steven Belledin 72 C Ash Barrens @Jonas De Ro 73 R Throne of the High City @Titus Lunter +65669 R Hammer of Nazahn @Victor Adame Minguez +65671 R Traverse the Outlands @Daarken +65673 R Fortunate Few @Jesper Ejsing +65675 M The Ur-Dragon @Jaime Jones +65677 R Alms Collector @Bram Sels +65679 C Path of Ancestry @Alayna Danner +65681 R Fractured Identity @Yongjae Choi +65683 U Heirloom Blade @Carmen Sinek +65685 R Magus of the Mind @John Stanko +65687 R Boneyard Scourge @Grzegorz Rutkowski +65689 R Scalelord Reckoner @Even Amundsen +65691 R Territorial Hellkite @Jonas De Ro +65693 M Edgar Markov @Volkan Baǵa +65695 R Disrupt Decorum @Sidharth Chaturvedi +65697 R Crimson Honor Guard @Kieran Yanner +65699 R Bloodsworn Steward @Daarken +65701 R Teferi's Protection @Chase Stone +65703 R Shifting Shadow @Christopher Burdett +65705 R Wasitora, Nekoru Queen @Cynthia Sheppard +65707 M Mirri, Weatherlight Duelist @Magali Villeneuve +65709 R Qasali Slingers @Izzy +65711 R Hungry Lynx @Shreya Shetty +65713 R Bloodforged Battle-Axe @Alayna Danner +65715 R Taigam, Sidisi's Hand @Simon Dominic +65717 R Kindred Boon @McLean Kendree +65719 R Kindred Summons @Ryan Pancoast +65721 R Kindred Charge @Dan Murayama Scott +65723 R Kindred Dominance @Bram Sels +65725 R Kindred Discovery @Lake Hurwitz +65727 R Patron of the Vein @Tommy Arnold +65729 M Licia, Sanguine Tribune @Magali Villeneuve +65731 U Herald's Horn @Jason Felix +65733 M O-Kagachi, Vengeful Kami @Daarken +65735 M Arahbo, Roar of the World @Jesper Ejsing +65737 M Inalla, Archmage Ritualist @Yongjae Choi +65739 R Taigam, Ojutai Master @Simon Dominic +65741 R Izzet Chemister @Svetlin Velinov +65743 U Curse of Disturbance @Kieran Yanner +65745 U Curse of Opulence @Kieran Yanner +65747 U Curse of Bounty @Kieran Yanner +65749 M Ramos, Dragon Engine @Joseph Meehan +65751 U Mirror of the Forebears @Kieran Yanner +65753 U Bloodline Necromancer @Joe Slucher +65755 R Galecaster Colossus @Darek Zabrocki +65757 R Balan, Wandering Knight @Svetlin Velinov +65759 M Mathas, Fiend Seeker @Joe Slucher +65761 R Kheru Mind-Eater @Igor Kieryluk +65763 M Kess, Dissident Mage @Izzy +65765 U Curse of Vitality @Kieran Yanner +65767 U Curse of Verbosity @Kieran Yanner +65769 R Stalking Leonin @Zoltan Boros +65771 M Nazahn, Revered Bladesmith @Victor Adame Minguez +65773 C Sinuous Vermin @Jason Kang +65775 C Borderland Explorer @Lucas Graciano +65777 C Skittering Crustacean @Jason Felix +65779 U Treasonous Ogre @Randy Gallegos +65781 C Custodi Squire @Alex Horley-Orlandelli +65783 C Entourage of Trest @Anthony Palumbo +65785 M Expropriate @Zack Stella +65787 R Selvala's Stampede @Svetlin Velinov +65789 C Salvage @Keith Parkinson +65791 R Conqueror's Flail @Franz Vohwinkel +65793 U Stream of Acid @DiTerlizzi +65795 C Brainwash @Terese Nielsen +65797 R Cruel Tutor @Kev Walker +65799 R Xun Yu, Wei Advisor @Jack Wei +65801 R Huang Zhong, Shu General @Quan Xuejun +65803 R Lady Sun @Miao Aili +65805 R Zuo Ci, the Mocking Sage @Wang Yuqun +65807 R Ma Chao, Western Warrior @Koji +65809 R Lu Su, Wu Advisor @Zhao Tan +65811 R Lady Zhurong, Warrior Queen @Miao Aili +65813 R Pang Tong, "Young Phoenix" @Li Tie +65815 R Sima Yi, Wei Field Marshal @Gao Yan +65817 R Cao Ren, Wei Commander @Junko Taguchi +65819 R Aspect of Wolf @Janine Johnston +65821 R Game of Chaos @Thomas Gianni +65823 C Pit Scorpion @Ian Miller +65825 U Plant Elemental @Ted Naifeh +65827 C Drafna's Restoration @Ioan Dumitrescu +65829 C Flood @Jonas De Ro +65831 R Field of Dreams @Sam Burley +65833 C Burnt Offering @Rick O'Brien +65835 C Cemetery Gate @Thomas M. Baxa +65837 C Energy Tap @Mike Bierek +65839 C Metamorphosis @Michael Sutfin +65841 R The Unspeakable @Daarken +65843 R Zo-Zu the Punisher @Wayne Reynolds +65845 U Guttural Response @Ben Wootten +65847 M Jhoira of the Ghitu @Magali Villeneuve +65849 M Lovisa Coldeyes @Anna Steinbauer +65851 U Desperate Ritual @Wayne Reynolds +65853 M Warren Instigator @Svetlin Velinov +65855 U Gempalm Incinerator @Mark Behm +65857 R Goblin Goon @Steve Prescott +65859 M Master of Waves @Svetlin Velinov +65861 U Tidal Courier @Slawomir Maniak +65863 C Lonely Sandbar @Noah Bradley +65865 C Aquitect's Will @Dimitar Marinski +68076 R Firesong and Sunspeaker @Zoltan Boros +70649 R Nesting Dragon @Jehan Choo +70651 R Yuriko, the Tiger's Shadow @Yongjae Choi +70653 R Treasure Nabber @Alex Konstad +70655 R Nylea's Colossus @Grzegorz Rutkowski +70657 R Whiptongue Hydra @Tomasz Jedruszek +70659 R Sower of Discord @Wisnu Tan +70661 M Gyrus, Waker of Corpses @Slawomir Maniak +70663 R Myth Unbound @Alexander Forssberg +70665 R Ever-Watching Threshold @Ravenna Tran +70667 M Lord Windgrace @Bram Sels +70669 R Windgrace's Judgment @Grzegorz Rutkowski +70671 M Thantis, the Warweaver @Jehan Choo +70673 R Coveted Jewel @Jason A. Engle +70675 R Saheeli's Directive @Craig J Spearing +70677 R Magus of the Balance @Kev Walker +70679 C Forge of Heroes @Titus Lunter +70681 R Genesis Storm @Mark Poole +70683 R Endless Atlas @Titus Lunter +70685 M Saheeli, the Gifted @Ryan Pancoast +70687 M Tawnos, Urza's Apprentice @Matt Stewart +70689 R Bloodtracker @Magali Villeneuve +70691 M Tuvasa the Sunlit @Eric Deschamps +70693 R Crash of Rhino Beetles @Mike Burns +70695 R Echo Storm @Mark Poole +70697 R Retrofitter Foundry @Dmitry Burmak +70699 M Kestia, the Cultivator @Zezhou Chen +70701 R Empyrial Storm @Mark Poole +70703 R Enchanter's Bane @Steve Prescott +70705 R Heavenly Blademaster @Zack Stella +70707 R Isolated Watchtower @Alexander Forssberg +70709 M Brudiclad, Telchor Engineer @Daarken +70711 R Turntimber Sower @Craig J Spearing +70713 R Skull Storm @Mark Poole +70715 R Arixmethes, Slumbering Isle @Dimitar Marinski +70717 R Boreas Charger @Christine Choi +70719 R Xantcha, Sleeper Agent @Mark Winters +70721 U Loyal Guardian @Robbie Trevino +70723 R Reality Scramble @Simon Dominic +70725 R Octopus Umbra @Howard Lyon +70727 U Geode Golem @Yeong-Hao Han +70729 U Loyal Unicorn @Volkan Baǵa +70731 R Vedalken Humiliator @Jehan Choo +70733 R Primordial Mist @Titus Lunter +70735 U Loyal Subordinate @Tomasz Jedruszek +70737 R Ravenous Slime @Filip Burburan +70739 M Estrid, the Masked @Johannes Voss +70741 M Varina, Lich Queen @Igor Kieryluk +70743 R Entreat the Dead @Deruchenko Alexander +70745 R Aminatou's Augury @Seb McKinnon +70747 M Yennett, Cryptic Sovereign @Chris Rahn +70749 R Night Incarnate @Anthony Palumbo +70751 R Fury Storm @Mark Poole +70753 U Loyal Apprentice @Joe Slucher +70755 R Ancient Stone Idol @Josh Hass +70757 U Loyal Drake @Bayard Wu +70759 R Varchild, Betrayer of Kjeldor @Lucas Graciano +70761 R Emissary of Grudges @Stanton Feng +70763 M Aminatou, the Fateshifter @Seb McKinnon +70765 R Estrid's Invocation @Johannes Voss +70767 R Angelic Guardian @Sara Winters +70769 R Angler Turtle @Alex Konstad +70771 R Vengeant Vampire @Mitchell Malloy +70773 R Immortal Phoenix @Daarken +70775 R Rampaging Brontodon @Lars Grant-West +70777 M Militant Angel @Victor Adame Minguez +70779 M Inspired Sphinx @Jesper Ejsing +70781 M Rot Hulk @Grzegorz Rutkowski +70783 M Goblin Goliath @Slawomir Maniak +70785 M Avatar of Growth @Grzegorz Rutkowski +70787 C Hardened-Scale Armor @Tan Yan Yao +70789 C Leopard-Spotted Jiao @Shinchuen Chen +70791 C Feiyi Snake @Qiu De En +70793 M Jiang Yanggu @Tingting Yeh +70795 M Mu Yanling @林玄泰 +70797 C Timber Gorge @Babyson Chen & Uzhen Lin +70799 C Meandering River @Gaga Zeng +70801 L Plains @Tingting Yeh +70803 L Island @Babyson Chen & Uzhen Lin +70805 L Mountain @Gaga Zeng +70807 L Forest @Xin-Yu Liu +70809 C Armored Whirl Turtle @Tingting Yeh +70811 C Colorful Feiyi Sparrow @Kee Lo +70813 C Purple-Crystal Crab @Tan Yan Yao +70815 C Welkin Tern @Yutaka Li +70817 C Vivid Flying Fish @Tingting Yeh +70819 C Nine-Tail White Fox @林玄泰 +70821 C Earth-Origin Yak @Tan Yan Yao +70823 U Moon-Eating Dog @Tingting Yeh +70825 U Stormcloud Spirit @Kee Lo +70827 C Heavenly Qilin @Xin-Yu Liu +70829 R Ancestor Dragon @Shinchuen Chen +70831 C Dragon's Presence @Tan Yan Yao +70833 U Brilliant Plan @Yutaka Li +70835 C Cloak of Mists @Tingting Yeh +70837 C Drown in Shapelessness @Pon Lee +70839 R Rhythmic Water Vortex @Xin-Yu Liu +70841 C Qilin's Blessing @Wolk Sheep +70843 U Sacred White Deer @G-host Lee +70845 C Reckless Pangolin @Wolk Sheep +70847 C Ferocious Zheng @Yutaka Li +70849 C Giant Spider @Qiu De En +70851 U Fire-Omen Crane @Tan Yan Yao +70853 C Earthshaking Si @Shinchuen Chen +70855 C Aggressive Instinct @Wolk Sheep +70857 C Confidence from Strength @Shinchuen Chen +70859 C Breath of Fire @Xin-Yu Liu +70861 R Journey for the Elixir @Qiu De En +70863 R Screeching Phoenix @Tingting Yeh +70865 C Cleansing Screech @Tingting Yeh [tokens] w_1_1_bird_flying diff --git a/forge-gui/res/editions/Vintage Championship.txt b/forge-gui/res/editions/Vintage Championship.txt index 5b523a08b74..4623dadd3f5 100644 --- a/forge-gui/res/editions/Vintage Championship.txt +++ b/forge-gui/res/editions/Vintage Championship.txt @@ -38,3 +38,6 @@ ScryfallCode=OVNT 2022A M Bazaar of Baghdad @Chris Seaman 2022B M Time Walk @Tyler Walpole 2022C M Ancestral Recall @Volkan Baǵa +2023A M Black Lotus @Jarel Threat +2023EU M Black Lotus @Raoul Vitale +2023NA M Black Lotus @Scott M. Fischer