diff --git a/forge-core/src/main/java/forge/ImageKeys.java b/forge-core/src/main/java/forge/ImageKeys.java index 9e88336b61d..e6b2c166685 100644 --- a/forge-core/src/main/java/forge/ImageKeys.java +++ b/forge-core/src/main/java/forge/ImageKeys.java @@ -31,6 +31,8 @@ public final class ImageKeys { public static final String MONARCH_IMAGE = "monarch"; public static final String THE_RING_IMAGE = "the_ring"; public static final String RADIATION_IMAGE = "radiation"; + public static final String SPEED_IMAGE = "speed"; + public static final String MAX_SPEED_IMAGE = "max_speed"; public static final String BACKFACE_POSTFIX = "$alt"; public static final String SPECFACE_W = "$wspec"; diff --git a/forge-core/src/main/java/forge/util/ImageUtil.java b/forge-core/src/main/java/forge/util/ImageUtil.java index 358d85abb76..a6594512378 100644 --- a/forge-core/src/main/java/forge/util/ImageUtil.java +++ b/forge-core/src/main/java/forge/util/ImageUtil.java @@ -207,8 +207,6 @@ public class ImageUtil { else editionCode = cp.getEdition().toLowerCase(); String cardCollectorNumber = cp.getCollectorNumber(); - // Hack to account for variations in Arabian Nights - cardCollectorNumber = cardCollectorNumber.replace("+", "†"); // override old planechase sets from their modified id since scryfall move the planechase cards outside their original setcode if (cardCollectorNumber.startsWith("OHOP")) { editionCode = "ohop"; @@ -252,6 +250,11 @@ public class ImageUtil { : "&face=front"); } + if (cardCollectorNumber.endsWith("☇")) { + faceParam = "&face=back"; + cardCollectorNumber = cardCollectorNumber.substring(0, cardCollectorNumber.length() - 1); + } + return String.format("%s/%s/%s?format=image&version=%s%s", editionCode, encodeUtf8(cardCollectorNumber), langCode, versionParam, faceParam); } @@ -261,6 +264,10 @@ public class ImageUtil { if (!faceParam.isEmpty()) { faceParam = (faceParam.equals("back") ? "&face=back" : "&face=front"); } + if (collectorNumber.endsWith("☇")) { + faceParam = "&face=back"; + collectorNumber = collectorNumber.substring(0, collectorNumber.length() - 1); + } return String.format("%s/%s/%s?format=image&version=%s%s", setCode, encodeUtf8(collectorNumber), langCode, versionParam, faceParam); } @@ -281,8 +288,7 @@ public class ImageUtil { char c; for (int i = 0; i < in.length(); i++) { c = in.charAt(i); - if ((c == '"') || (c == '/') || (c == ':') || (c == '?')) { - } else { + if ((c != '"') && (c != '/') && (c != ':') && (c != '?')) { out.append(c); } } diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java index 007ccefff14..ff2e3e02d4d 100644 --- a/forge-game/src/main/java/forge/game/player/Player.java +++ b/forge-game/src/main/java/forge/game/player/Player.java @@ -1966,10 +1966,11 @@ public class Player extends GameEntity implements Comparable { CardState speedFront = speedEffect.getState(CardStateName.Original); CardState speedBack = speedEffect.getState(CardStateName.Backside); - speedFront.setImageKey("t:speed"); + + speedFront.setImageKey(StaticData.instance().getOtherImageKey(ImageKeys.SPEED_IMAGE, CardEdition.UNKNOWN_CODE)); speedFront.setName("Start Your Engines!"); - speedBack.setImageKey("t:max_speed"); + speedBack.setImageKey(StaticData.instance().getOtherImageKey(ImageKeys.MAX_SPEED_IMAGE, CardEdition.UNKNOWN_CODE)); speedBack.setName("Max Speed!"); String label = Localizer.getInstance().getMessage("lblSpeed", this.speed); diff --git a/forge-gui/res/editions/Aetherdrift.txt b/forge-gui/res/editions/Aetherdrift.txt index c5d90fff761..cd8201ffa54 100644 --- a/forge-gui/res/editions/Aetherdrift.txt +++ b/forge-gui/res/editions/Aetherdrift.txt @@ -648,4 +648,6 @@ Replace=.011F Mythic:fromSheet("DFT cards") 12 c_3_2_a_vehicle_crew_1 @Devin Elle Kurtz [other] -14 emblem_chandra_spark_hunter @Devin Elle Kurtz +13 emblem_chandra_spark_hunter @Devin Elle Kurtz +14 speed @Josiah "Jo" Cameron +14☇ max_speed @Josiah "Jo" Cameron \ No newline at end of file diff --git a/forge-gui/res/editions/Commander Legends Battle for Baldur's Gate.txt b/forge-gui/res/editions/Commander Legends Battle for Baldur's Gate.txt index f39cf042490..491370350ca 100644 --- a/forge-gui/res/editions/Commander Legends Battle for Baldur's Gate.txt +++ b/forge-gui/res/editions/Commander Legends Battle for Baldur's Gate.txt @@ -961,7 +961,7 @@ ScryfallCode=CLB 936 R Elder Brain @Nino Is [dungeons] -S Undercity +20 Undercity [foils] Abdel Adrian, Gorion's Ward+|CLB @@ -1193,3 +1193,6 @@ Zevlor, Elturel Exile|CLB 46 rg_2_2_satyr_haste @Johann Bodin 47 c_a_clue_draw @Campbell White 48 c_a_gold_sac @Yeong-Hao Han + +[other] +20☇ initiative @Ioannis Fiore \ No newline at end of file diff --git a/forge-gui/res/editions/Jurassic World Collection.txt b/forge-gui/res/editions/Jurassic World Collection.txt index c0c5034bdff..47658aaee55 100644 --- a/forge-gui/res/editions/Jurassic World Collection.txt +++ b/forge-gui/res/editions/Jurassic World Collection.txt @@ -27,17 +27,17 @@ ScryfallCode=REX 19 R Swooping Pteranodon @Slawomir Maniak 20 R Dino DNA @Leonardo Santanna 21 L Plains @Véronique Meignaud -21b L Plains @Véronique Meignaud +21☇ L Plains @Véronique Meignaud 22 L Island @Svetlin Velinov -22b L Island @Svetlin Velinov +22☇ L Island @Svetlin Velinov 23 L Swamp @Pablo Mendoza -23b L Swamp @Pablo Mendoza +23☇ L Swamp @Pablo Mendoza 24 L Mountain @Simon Dominic -24b L Mountain @Simon Dominic +24☇ L Mountain @Simon Dominic 25 L Forest @Yeong-Hao Han -25b L Forest @Yeong-Hao Han +25☇ L Forest @Yeong-Hao Han 26 C Command Tower @Xabi Gaztelua -26b C Command Tower @Xabi Gaztelua +26☇ C Command Tower @Xabi Gaztelua 27 R Don't Move @Inkognit 28 R Cresting Mosasaurus @Chris Rallis 29 R Spitting Dilophosaurus @Francisco Badilla diff --git a/forge-gui/res/editions/Secret Lair Drop Series.txt b/forge-gui/res/editions/Secret Lair Drop Series.txt index a6d07f5b0b4..8110e95c0cd 100644 --- a/forge-gui/res/editions/Secret Lair Drop Series.txt +++ b/forge-gui/res/editions/Secret Lair Drop Series.txt @@ -356,20 +356,20 @@ TokensCode=SLD 376 M Craterhoof Behemoth @Kira 377 R Metalwork Colossus @Chris Rahn 378 R Metalwork Colossus @Hyan Tran -379a R Zndrsplt, Eye of Wisdom @Alexis Ziritt -379b R Zndrsplt, Eye of Wisdom @Alexis Ziritt -379c R Zndrsplt, Eye of Wisdom @Alexis Ziritt -379d R Zndrsplt, Eye of Wisdom @Alexis Ziritt -380a R Okaun, Eye of Chaos @Alexis Ziritt -380b R Okaun, Eye of Chaos @Alexis Ziritt -380c R Okaun, Eye of Chaos @Alexis Ziritt -380d R Okaun, Eye of Chaos @Alexis Ziritt -381a R Propaganda @Scott Balmer -381b R Propaganda @Scott Balmer -382a R Stitch in Time @Micha Huigen -382b R Stitch in Time @Micha Huigen -383a R Krark's Thumb @Wooden Cyclops -383b R Krark's Thumb @Wooden Cyclops +379 R Zndrsplt, Eye of Wisdom @Alexis Ziritt +379☇ R Zndrsplt, Eye of Wisdom @Alexis Ziritt +379★ R Zndrsplt, Eye of Wisdom @Alexis Ziritt +379★☇ R Zndrsplt, Eye of Wisdom @Alexis Ziritt +380 R Okaun, Eye of Chaos @Alexis Ziritt +380☇ R Okaun, Eye of Chaos @Alexis Ziritt +380★ R Okaun, Eye of Chaos @Alexis Ziritt +380★☇ R Okaun, Eye of Chaos @Alexis Ziritt +381 R Propaganda @Scott Balmer +381☇ R Propaganda @Scott Balmer +382 R Stitch in Time @Micha Huigen +382☇ R Stitch in Time @Micha Huigen +383 R Krark's Thumb @Wooden Cyclops +383☇ R Krark's Thumb @Wooden Cyclops 384 R Swamp @Jeanne D'Angelo 385 R Island @Jeanne D'Angelo 386 R Island @Jeanne D'Angelo @@ -579,7 +579,7 @@ TokensCode=SLD 593 R Persistent Petitioners @Brandi Milne 595 R Persistent Petitioners @Casimir Lee 596 R Persistent Petitioners @CROM -597 R Persistent Petitioners @Death Burger +597 R Persistent Petitioners @Deathburger 598 R Persistent Petitioners @Feifei Ruan 599 R Persistent Petitioners @Galen Dara 600 R Persistent Petitioners @NIARK1 @@ -611,10 +611,10 @@ TokensCode=SLD 631 R Dregscape Sliver @Zack Stella 632 R Leeching Sliver @Svetlin Velinov 633 R Plague Sliver @Dave Allsop -633b R Plague Sliver @Dave Allsop +633Φ R Plague Sliver @Dave Allsop 634 R Syphon Sliver @Tyler Jacobson 635 R Toxin Sliver @Lars Grant-West -635b R Toxin Sliver @Lars Grant-West +635Φ R Toxin Sliver @Lars Grant-West 636 R Belligerent Sliver @Raymond Swanland 637 R Blur Sliver @Daarken 638 R Fury Sliver @Paolo Parente @@ -637,7 +637,7 @@ TokensCode=SLD 656 R Root Sliver @Matt Thompson 657 R Tempered Sliver @Mitchell Malloy 659 R Virulent Sliver @Franz Vohwinkel -659b R Virulent Sliver @Franz Vohwinkel +659Φ R Virulent Sliver @Franz Vohwinkel 660 R Cloudshredder Sliver @Filip Burburan 661 R Crystalline Sliver @Allen Williams 662 R Frenetic Sliver @Luca Zontini @@ -660,7 +660,7 @@ TokensCode=SLD 679 R Ghost Quarter @Sidharth Chaturvedi 680 R Shadowborn Apostle @AlbaBG 681 R Shadowborn Apostle @Boneface -681b R Shadowborn Apostle @Boneface +681Φ R Shadowborn Apostle @Boneface 682 R Shadowborn Apostle @Diego Andrade 683 R Shadowborn Apostle @Jakub Rebelka 684 R Shadowborn Apostle @Laynes @@ -721,17 +721,17 @@ TokensCode=SLD 741★ R Chaos Warp @Zack Stella 744 R Command Tower @Serena Malyon 745 M Ajani Goldmane @Fay Dalton & Scott Okumura -745b M Ajani Goldmane @Fay Dalton & Scott Okumura +745☇ M Ajani Goldmane @Fay Dalton & Scott Okumura 746 M Jace Beleren @Fay Dalton & Scott Okumura -746b M Jace Beleren @Fay Dalton & Scott Okumura +746☇ M Jace Beleren @Fay Dalton & Scott Okumura 747 M Liliana Vess @Fay Dalton & Scott Okumura -747b M Liliana Vess @Fay Dalton & Scott Okumura +747☇ M Liliana Vess @Fay Dalton & Scott Okumura 748 M Chandra Nalaar @Fay Dalton & Scott Okumura -748b M Chandra Nalaar @Fay Dalton & Scott Okumura +748☇ M Chandra Nalaar @Fay Dalton & Scott Okumura 749 M Garruk Wildspeaker @Fay Dalton & Scott Okumura -749b M Garruk Wildspeaker @Fay Dalton & Scott Okumura +749☇ M Garruk Wildspeaker @Fay Dalton & Scott Okumura 750 R Terror @Sidharth Chaturvedi & Scott Okumura -750b R Terror @Sidharth Chaturvedi & Scott Okumura +750☇ R Terror @Sidharth Chaturvedi & Scott Okumura 752 R Relentless Rats @Ellie Livingston 754 R Relentless Rats @Sachin Teng 755 R Relentless Rats @Sadboi @@ -763,16 +763,13 @@ TokensCode=SLD 786 R Frilled Mystic @Randy Vargas 788 R Poison-Tip Archer @Dmitry Burmak 789 R Shaman of the Pack @Dan Murayama Scott -790 R Codex Shredder @AKQA 790★ R Codex Shredder @AKQA 791 R Solemn Simulacrum @Dani Pendergast 791★ R Solemn Simulacrum @Dani Pendergast 792 R Command Tower @Kamila Szutenberg 793 R Nine Lives @Fiona Hsieh 794 M Yoshimaru, Ever Faithful @Fiona Hsieh -795 R Wastes @AKQA 795★ R Wastes @AKQA -796 M Mana Vault @AKQA 796★ M Mana Vault @AKQA 797 R Seraph Sanctuary @Alayna Danner F798 M Discord, Lord of Disharmony @Narendra Bintara Adi @@ -804,7 +801,7 @@ F798 M Discord, Lord of Disharmony @Narendra Bintara Adi 825 R Goblin Bombardment @Craig J Spearing 826 R Kezzerdrix @Bill McConkey 827 R Norin the Wary @Jarel Threat -827b R Norin the Wary @Jarel Threat +827☇ R Norin the Wary @Jarel Threat 828 R Keen Duelist @Thanh Tuấn 834 R Cleaver Skaab @Johann Bodin 835 R Fatestitcher @E. M. Gist @@ -955,12 +952,12 @@ F869 R Blacker Lotus @Scott Okumura 1076 R Goblin Settler @Roman Klonek 1077 R Collector Ouphe @Roman Klonek 1078 M Vengevine @Roman Klonek -1079a M Blightsteel Colossus @Volta Creation -1079b M Blightsteel Colossus @Volta Creation -1080a R Doubling Cube @Volta Creation -1080b R Doubling Cube @Volta Creation -1081a M Darksteel Colossus @Volta Creation -1081b M Darksteel Colossus @Volta Creation +1079 M Blightsteel Colossus @Volta Creation +1079☇ M Blightsteel Colossus @Volta Creation +1080 R Doubling Cube @Volta Creation +1080☇ R Doubling Cube @Volta Creation +1081 M Darksteel Colossus @Volta Creation +1081☇ M Darksteel Colossus @Volta Creation 1082 R True Conviction @Volta Creation 1083 R Dramatic Reversal @Volta Creation 1084 R Fabricate @Volta Creation @@ -997,12 +994,12 @@ F869 R Blacker Lotus @Scott Okumura 1115 R Doomsday @Junji Ito 1116 R Plaguecrafter @Junji Ito 1117 R Thoughtseize @Junji Ito -1122a M Ulamog, the Ceaseless Hunger @Mike Burns -1122b M Ulamog, the Ceaseless Hunger @Mike Burns -1123a R Etali, Primal Storm @Mike Burns -1123b R Etali, Primal Storm @Mike Burns -1124a R Ghalta, Primal Hunger @Mike Burns -1124b R Ghalta, Primal Hunger @Mike Burns +1122 M Ulamog, the Ceaseless Hunger @Mike Burns +1122☇ M Ulamog, the Ceaseless Hunger @Mike Burns +1123 R Etali, Primal Storm @Mike Burns +1123☇ R Etali, Primal Storm @Mike Burns +1124 R Ghalta, Primal Hunger @Mike Burns +1124☇ R Ghalta, Primal Hunger @Mike Burns 1125 R Serra Ascendant @kozyndan 1126 R Rapid Hybridization @kozyndan 1127 R Demonic Consultation @kozyndan @@ -1204,13 +1201,13 @@ F869 R Blacker Lotus @Scott Okumura 1323 R Secluded Glen @Hari & Deepti 1324 R Wanderwine Hub @Hari & Deepti 1325 R Estrid's Invocation @Simen Meyer -1325b R Estrid's Invocation @Simen Meyer +1325☇ R Estrid's Invocation @Simen Meyer 1326 R Steely Resolve @Yehrin Tong -1326b R Steely Resolve @Yehrin Tong +1326☇ R Steely Resolve @Yehrin Tong 1327 M Estrid, the Masked @Jessica Hische -1327b M Estrid, the Masked @Jessica Hische +1327☇ M Estrid, the Masked @Jessica Hische 1328 M Tuvasa the Sunlit @Teagan White -1328b M Tuvasa the Sunlit @Teagan White +1328☇ M Tuvasa the Sunlit @Teagan White 1329 R Gargos, Vicious Watcher @CatDirty 1330 M Primordial Hydra @CatDirty 1331 M Unbound Flourishing @CatDirty @@ -1344,25 +1341,25 @@ F869 R Blacker Lotus @Scott Okumura 1451 M Samut, Voice of Dissent @Ekaterina Burmak 1452 R Marchesa, the Black Rose @Andreas Zafiratos 1453 M Ajani Goldmane @Fay Dalton & Scott Okumura -1453b M Ajani Goldmane @Fay Dalton & Scott Okumura +1453☇ M Ajani Goldmane @Fay Dalton & Scott Okumura 1454 M Jace Beleren @Fay Dalton & Scott Okumura -1454b M Jace Beleren @Fay Dalton & Scott Okumura +1454☇ M Jace Beleren @Fay Dalton & Scott Okumura 1455 M Liliana Vess @Fay Dalton & Scott Okumura -1455b M Liliana Vess @Fay Dalton & Scott Okumura +1455☇ M Liliana Vess @Fay Dalton & Scott Okumura 1456 M Chandra Nalaar @Fay Dalton & Scott Okumura -1456b M Chandra Nalaar @Fay Dalton & Scott Okumura +1456☇ M Chandra Nalaar @Fay Dalton & Scott Okumura 1457 M Garruk Wildspeaker @Fay Dalton & Scott Okumura -1457b M Garruk Wildspeaker @Fay Dalton & Scott Okumura +1457☇ M Garruk Wildspeaker @Fay Dalton & Scott Okumura 1458 R Death Baron @Michael Walsh & Scott Okumura -1458b R Death Baron @Michael Walsh & Scott Okumura +1458☇ R Death Baron @Michael Walsh & Scott Okumura 1459 R Noxious Ghoul @Jarel Threat & Scott Okumura -1459b R Noxious Ghoul @Jarel Threat & Scott Okumura +1459☇ R Noxious Ghoul @Jarel Threat & Scott Okumura 1460 R Zombie Master @Andrea De Dominicis & Scott Okumura -1460b R Zombie Master @Andrea De Dominicis & Scott Okumura +1460☇ R Zombie Master @Andrea De Dominicis & Scott Okumura 1461 M Grimgrin, Corpse-Born @Greg Staples & Scott Okumura -1461b M Grimgrin, Corpse-Born @Greg Staples & Scott Okumura +1461☇ M Grimgrin, Corpse-Born @Greg Staples & Scott Okumura 1462 R Unholy Grotto @Cabrol & Scott Okumura -1462b R Unholy Grotto @Cabrol & Scott Okumura +1462☇ R Unholy Grotto @Cabrol & Scott Okumura 1463 R Giver of Runes @Jesse LeDoux 1463★ R Giver of Runes @Jesse LeDoux 1464 R Distant Melody @Jesse LeDoux @@ -1436,15 +1433,15 @@ F869 R Blacker Lotus @Scott Okumura 1505 R Shadowspear @Bartek Fedyczak 1506 R Academy Ruins @Eliz Roxs 1508 M Rin and Seri, Inseparable @Andrea Radeck -1508b M Rin and Seri, Inseparable @Andrea Radeck +1508☇ M Rin and Seri, Inseparable @Andrea Radeck 1509 M Jetmir, Nexus of Revels @Nicole Gustafsson -1509b M Jetmir, Nexus of Revels @Nicole Gustafsson +1509☇ M Jetmir, Nexus of Revels @Nicole Gustafsson 1510 R Jinnie Fay, Jetmir's Second @Jack Hughes -1510b R Jinnie Fay, Jetmir's Second @Jack Hughes +1510☇ R Jinnie Fay, Jetmir's Second @Jack Hughes 1511 R Anointed Procession @Jakob Eirich -1511b R Anointed Procession @Jakob Eirich +1511☇ R Anointed Procession @Jakob Eirich 1512 R Sol Ring @Nana Qi -1512b R Sol Ring @Nana Qi +1512☇ R Sol Ring @Nana Qi 1513 R Plains @Alayna Danner 1514 R Mountain @Alayna Danner 1515 R Forest @Alayna Danner @@ -1482,21 +1479,13 @@ F1538 M Fluttershy @Anna Steinbauer F1539 M Pinkie Pie @Rudy Siswanto F1540 M Rainbow Dash @John Thacker 1541 M Sakashima of a Thousand Faces @Mike Burns & Scott Okumura -1541b M Sakashima of a Thousand Faces @Mike Burns & Scott Okumura -1541c M Sakashima of a Thousand Faces @Mike Burns & Scott Okumura -1541d M Sakashima of a Thousand Faces @Mike Burns & Scott Okumura +1541☇ M Sakashima of a Thousand Faces @Mike Burns & Scott Okumura 1542 R Yargle, Glutton of Urborg @Mike Burns & Scott Okumura -1542b R Yargle, Glutton of Urborg @Mike Burns & Scott Okumura -1542c R Yargle, Glutton of Urborg @Mike Burns & Scott Okumura -1542d R Yargle, Glutton of Urborg @Mike Burns & Scott Okumura +1542☇ R Yargle, Glutton of Urborg @Mike Burns & Scott Okumura 1543 R Krark, the Thumbless @Mike Burns & Scott Okumura -1543b R Krark, the Thumbless @Mike Burns & Scott Okumura -1543c R Krark, the Thumbless @Mike Burns & Scott Okumura -1543d R Krark, the Thumbless @Mike Burns & Scott Okumura +1543☇ R Krark, the Thumbless @Mike Burns & Scott Okumura 1544 M Adrix and Nev, Twincasters @Mike Burns & Scott Okumura -1544b M Adrix and Nev, Twincasters @Mike Burns & Scott Okumura -1544c M Adrix and Nev, Twincasters @Mike Burns & Scott Okumura -1544d M Adrix and Nev, Twincasters @Mike Burns & Scott Okumura +1544☇ M Adrix and Nev, Twincasters @Mike Burns & Scott Okumura 1545 R Arcane Denial @Graham Yarrington 1545★ R Arcane Denial @Graham Yarrington 1546 R Nightscape Familiar @Graham Yarrington @@ -1512,11 +1501,11 @@ F1540 M Rainbow Dash @John Thacker 1552 R Deflecting Swat @Jesper Ejsing 1553 R Llanowar Elves @Jesper Ejsing 1554 M Rin and Seri, Inseparable @Andrea Radeck -1554b M Rin and Seri, Inseparable @Andrea Radeck +1554☇ M Rin and Seri, Inseparable @Andrea Radeck 1555 M Jetmir, Nexus of Revels @Nicole Gustafsson -1555b M Jetmir, Nexus of Revels @Nicole Gustafsson +1555☇ M Jetmir, Nexus of Revels @Nicole Gustafsson 1556 R Jinnie Fay, Jetmir's Second @Jack Hughes -1556b R Jinnie Fay, Jetmir's Second @Jack Hughes +1556☇ R Jinnie Fay, Jetmir's Second @Jack Hughes 1557 M Najeela, the Blade-Blossom @Clint Cearley & Diana Cearley 1558 M Kelsien, the Plague @Dan Watson 1559 M Queen Marchesa @Narendra Bintara Adi @@ -1524,7 +1513,7 @@ F1540 M Rainbow Dash @John Thacker 1561 M Admiral Beckett Brass @Fajareka Setiawan 1562 M Skithiryx, the Blight Dragon @Abigail Larson 1563 M Kaalia of the Vast @Abigail Larson -1564 U Angel of Despair @Abigail Larson +1564 R Angel of Despair @Abigail Larson 1565 M Master of Cruelties @Abigail Larson 1566 R Gonti, Lord of Luxury @Ivan Shavrin 1566★ R Gonti, Lord of Luxury @Ivan Shavrin @@ -1577,7 +1566,7 @@ F1540 M Rainbow Dash @John Thacker 1601 R Brago, King Eternal @Micah Epstein 1602 R Feather, the Redeemed @Yuko Shimizu 1602★ R Feather, the Redeemed @Yuko Shimizu -1603 R Song of Creation @PE-nekoR +1603 R Song of Creation @Penekor 1604 R Sol Ring @Narendra Bintara Adi 1605 R Inspiring Vantage @Dani Pendergast 1605★ R Inspiring Vantage @Dani Pendergast @@ -1670,7 +1659,7 @@ F1540 M Rainbow Dash @John Thacker 1673 R Buried Alive @Filipe Pagliuso 1674 R Dismember @Greg Staples 1675 R Birds of Paradise @Stephen Andrade -1675b R Birds of Paradise @Stephen Andrade +1675☇ R Birds of Paradise @Stephen Andrade 1676 R Three Visits @Chris Rallis 1678 R Door to Nothingness @Sam Hogg 1679 R Ashnod's Altar @Dmitry Burmak @@ -1685,20 +1674,13 @@ F1540 M Rainbow Dash @John Thacker 1689 M Dack Fayden @Dibujante Nocturno 1690 R Greasefang, Okiba Boss @Michael Walsh 1691 R Teferi's Protection @Steve Argyle -1691★ R Teferi's Protection @Steve Argyle 1692 R Eladamri's Vineyard @Alayna Danner -1692★ R Eladamri's Vineyard @Alayna Danner 1693 R Greater Good @Johannes Voss -1693★ R Greater Good @Johannes Voss 1694 R Inkshield @Donato Giancola -1694★ R Inkshield @Donato Giancola 1695 M Ruhan of the Fomori @Livia Prima -1695★ M Ruhan of the Fomori @Livia Prima 1696 R Sol Ring @Lindsey Look -1696★ R Sol Ring @Lindsey Look 1697 R Command Tower @Titus Lunter -1697★ R Command Tower @Titus Lunter -1698 R Sorin Markov @Leonardo Santanna +1698 M Sorin Markov @Leonardo Santanna 1699 M Huatli, Radiant Champion @Nathaniel Himawan 1700 R Kiora, Behemoth Beckoner @Justin Gerard 1701 M Tezzeret, Master of the Bridge @Javier Charro @@ -1806,7 +1788,7 @@ F1540 M Rainbow Dash @John Thacker 1805 R Thrill of Possibility @Johannes Voss 1806 R Dolmen Gate @Justyna Dura 1807 M Kardur, Doomscourge @Tomasz Zarucki & Thomas Roach -1807b M Kardur, Doomscourge @Tomasz Zarucki & Thomas Roach +1807☇ M Kardur, Doomscourge @Tomasz Zarucki & Thomas Roach 1808 R Phyrexian Reclamation @Justine Cruz 1809 R Varragoth, Bloodsky Sire @Domenico Cava 1810 R Twinflame @Sean Vo @@ -1863,13 +1845,13 @@ F1540 M Rainbow Dash @John Thacker 1871 R Lightning Bolt @Evyn Fong 1872 R Heroic Intervention @Justyna Dura 1873 M Aesi, Tyrant of Gyre Strait @Stephen Andrade & Scott Okumura -1873b M Aesi, Tyrant of Gyre Strait @Stephen Andrade & Scott Okumura +1873☇ M Aesi, Tyrant of Gyre Strait @Stephen Andrade & Scott Okumura 1874 M Anje Falkenrath @Stephen Andrade & Scott Okumura -1874b M Anje Falkenrath @Stephen Andrade & Scott Okumura +1874☇ M Anje Falkenrath @Stephen Andrade & Scott Okumura 1875 M Chulane, Teller of Tales @Stephen Andrade & Scott Okumura -1875b M Chulane, Teller of Tales @Stephen Andrade & Scott Okumura +1875☇ M Chulane, Teller of Tales @Stephen Andrade & Scott Okumura 1876 R Radha, Heart of Keld @Stephen Andrade & Scott Okumura -1876b R Radha, Heart of Keld @Stephen Andrade & Scott Okumura +1876☇ R Radha, Heart of Keld @Stephen Andrade & Scott Okumura 1877 R Light-Paws, Emperor's Voice @Mitsuhiro Arita 1878 M Murktide Regent @Mitsuhiro Arita 1879 R Lightning Bolt @Mitsuhiro Arita @@ -1890,7 +1872,7 @@ F1540 M Rainbow Dash @John Thacker 1900 M Avenger of Zendikar @Wojtek Łebski 1901 R Kindred Summons @Caroline Gariba 1902 R Tendershoot Dryad @Meel Tamphanon -1903 C Coat of Arms @Nathan Jurevicius +1903 R Coat of Arms @Nathan Jurevicius 1904 R Maskwood Nexus @Rian Gonzales 1905 R Sol Ring @Ejiwa "Edge" Ebenebe 1910 M Rin and Seri, Inseparable @Leesha Hannigan @@ -1936,26 +1918,26 @@ F1540 M Rainbow Dash @John Thacker 1961 R Liesa, Shroud of Dusk @Craig Drake 1962 M Oloro, Ageless Ascetic @Craig Drake 1963 R Sythis, Harvest's Hand @Craig Drake -1964 C Parhelion II @Ivan Shavrin & Rob Pavic -1964b C Parhelion II @Doogie Horner +1964 R Parhelion II @Ivan Shavrin & Rob Pavic +1964☇ R Parhelion II @Doogie Horner 1965 R Mechtitan Core @Ivan Shavrin & Rob Pavic -1965b R Mechtitan Core @Doogie Horner +1965☇ R Mechtitan Core @Doogie Horner 1966 R Peacewalker Colossus @Ivan Shavrin & Rob Pavic -1966b R Peacewalker Colossus @Doogie Horner +1966☇ R Peacewalker Colossus @Doogie Horner 1967 R Reckoner Bankbuster @Ivan Shavrin & Rob Pavic -1967b R Reckoner Bankbuster @Doogie Horner +1967☇ R Reckoner Bankbuster @Doogie Horner 1968 R Smuggler's Copter @Ivan Shavrin & Rob Pavic -1968b R Smuggler's Copter @Doogie Horner +1968☇ R Smuggler's Copter @Doogie Horner 1970 M Dragonlord Atarka @Antonio José Manzanedo -1970b M Dragonlord Atarka @Antonio José Manzanedo +1970☇ M Dragonlord Atarka @Antonio José Manzanedo 1971 M Dragonlord Dromoka @Allen Douglas -1971b M Dragonlord Dromoka @Allen Douglas +1971☇ M Dragonlord Dromoka @Allen Douglas 1972 M Dragonlord Kolaghan @Brooklyn Smith -1972b M Dragonlord Kolaghan @Brooklyn Smith +1972☇ M Dragonlord Kolaghan @Brooklyn Smith 1973 M Dragonlord Ojutai @Crystal Sully -1973b M Dragonlord Ojutai @Crystal Sully +1973☇ M Dragonlord Ojutai @Crystal Sully 1974 M Dragonlord Silumgar @Alison Johnstun -1974b M Dragonlord Silumgar @Alison Johnstun +1974☇ M Dragonlord Silumgar @Alison Johnstun 1980 R Deadly Dispute @Frank Frazetta 1981 R Murderous Rider @Frank Frazetta 1982 R Zulaport Cutthroat @Frank Frazetta @@ -1975,7 +1957,7 @@ F1540 M Rainbow Dash @John Thacker 2025 R Orcish Lumberjack @Phil Foglio 2026 R Constant Mists @Phil Foglio 2027 R Song of the Dryads @Phil Foglio -2028 R Consecrated Sphinx @Imiri Sakabashira +2028 M Consecrated Sphinx @Imiri Sakabashira 2029 R Resculpt @Imiri Sakabashira 2030 R Mirage Mirror @Imiri Sakabashira 2031 M Scion of Draco @Imiri Sakabashira @@ -2014,7 +1996,7 @@ F1540 M Rainbow Dash @John Thacker 2071 R Cultural Exchange @Bene Rohlmann 2072 R Folio of Fancies @Bráulio Amado 2073 R Concordant Crossroads @Jay Ryan -2074 R Rites of Flourishing @Max Loeffler +2074 R Rites of Flourishing @Max Löffler 2075 R Font of Mythos @Jesse LeDoux 2076 R Plains @Dan Black 2077 R Island @Jessica Seamans @@ -2089,8 +2071,8 @@ F1540 M Rainbow Dash @John Thacker 9997 R Geralf's Messenger @Chris Seaman 9998 R Empress Galina @Matt Stewart 9999 R Sisay, Weatherlight Captain @Volkan Baǵa -VS C Viscera Seer @John Stanko SCTLR R Counterspell @Mark Poole +VS C Viscera Seer @John Stanko [tokens] 13 b_1_1_faerie_rogue_flying @Olena Richards @@ -2133,6 +2115,7 @@ SCTLR R Counterspell @Mark Poole 1909 u_2_2_shapeshifter_changeling @Aeron Ng 1938 c_a_food_sac @Tyler Walpole 1969 mechtitan @Ivan Shavrin & Rob Pavic +1969☇ mechtitan @Doogie Horner 2010 c_a_food_sac @MAOMOMIJI 2011 c_a_food_sac @MAOMOMIJI 2012 c_a_food_sac @MAOMOMIJI diff --git a/forge-gui/res/editions/Tarkir Dragonstorm.txt b/forge-gui/res/editions/Tarkir Dragonstorm.txt index 8564a92f8f7..0747d2859ae 100644 --- a/forge-gui/res/editions/Tarkir Dragonstorm.txt +++ b/forge-gui/res/editions/Tarkir Dragonstorm.txt @@ -3,7 +3,7 @@ Code=TDM Date=2025-04-11 Name=Tarkir: Dragonstorm Type=Expansion -TokensCode=TTDM +ScryfallCode=TDM # https://mtgscribe.com/2025/03/20/play-booster-fact-sheet-dragonstorm/ BoosterSlots=Common,Common-Guest,Uncommon,RareMythic,AnyLand,Wildcard,FoilWildcard Booster=6 Common, 1 Common-Guest, 3 Uncommon, 1 RareMythic, 1 AnyLand, 1 Wildcard, 1 FoilWildcard @@ -427,17 +427,17 @@ Replace=.012F Mythic:fromSheet("TDM cards") 375 R Yathan Roadwatcher @Kevin Glint 376 R Zurgo, Thunder's Decree @Chuck Lukacs 377 R Clarion Conqueror @Crystal Sully -377b R Clarion Conqueror @Crystal Sully +377☇ R Clarion Conqueror @Crystal Sully 378 R Marang River Regent @Brian Valeza -378b R Marang River Regent @Brian Valeza +378☇ R Marang River Regent @Brian Valeza 379 R Scavenger Regent @Allen Douglas -379b R Scavenger Regent @Allen Douglas +379☇ R Scavenger Regent @Allen Douglas 380 R Magmatic Hellkite @Alison Johnstun -380b R Magmatic Hellkite @Alison Johnstun +380☇ R Magmatic Hellkite @Alison Johnstun 381 R Bloomvine Regent @Brooklyn Smith -381b R Bloomvine Regent @Brooklyn Smith +381☇ R Bloomvine Regent @Brooklyn Smith 382 M Ugin, Eye of the Storms @Antonio José Manzanedo -382b M Ugin, Eye of the Storms @Antonio José Manzanedo +382☇ M Ugin, Eye of the Storms @Antonio José Manzanedo 399 M Ugin, Eye of the Storms @Joshua Raphael 400 M Clarion Conqueror @Nathaniel Himawan 401 M Elspeth, Storm Slayer @Ekaterina Burmak diff --git a/forge-gui/src/main/java/forge/util/ImageFetcher.java b/forge-gui/src/main/java/forge/util/ImageFetcher.java index 7035786e6ed..5f8716806c1 100644 --- a/forge-gui/src/main/java/forge/util/ImageFetcher.java +++ b/forge-gui/src/main/java/forge/util/ImageFetcher.java @@ -236,7 +236,6 @@ public abstract class ImageFetcher { } final String cardCollectorNumber = paperCard.getCollectorNumber(); if (!cardCollectorNumber.equals(IPaperCard.NO_COLLECTOR_NUMBER)) { - // This function adds to downloadUrls for us this.getScryfallDownloadURL(paperCard, face, useArtCrop, hasSetLookup, filename, downloadUrls); } } else if (ImageKeys.getTokenKey(ImageKeys.HIDDEN_CARD).equals(imageKey)) {