YGO06: fixes non-deterministic bug by changing sets to lists (#3674)

This commit is contained in:
Rensen3 2024-07-22 01:27:10 +02:00 committed by GitHub
parent 7039b17bf6
commit d7d4565429
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 120 additions and 116 deletions

View File

@ -1,13 +1,13 @@
from typing import Dict, Set from typing import Dict, List
booster_contents: Dict[str, Set[str]] = { booster_contents: Dict[str, List[str]] = {
"LEGEND OF B.E.W.D.": { "LEGEND OF B.E.W.D.": [
"Exodia", "Exodia",
"Dark Magician", "Dark Magician",
"Polymerization", "Polymerization",
"Skull Servant" "Skull Servant"
}, ],
"METAL RAIDERS": { "METAL RAIDERS": [
"Petit Moth", "Petit Moth",
"Cocoon of Evolution", "Cocoon of Evolution",
"Time Wizard", "Time Wizard",
@ -30,8 +30,8 @@ booster_contents: Dict[str, Set[str]] = {
"Solemn Judgment", "Solemn Judgment",
"Dream Clown", "Dream Clown",
"Heavy Storm" "Heavy Storm"
}, ],
"PHARAOH'S SERVANT": { "PHARAOH'S SERVANT": [
"Beast of Talwar", "Beast of Talwar",
"Jinzo", "Jinzo",
"Gearfried the Iron Knight", "Gearfried the Iron Knight",
@ -43,8 +43,8 @@ booster_contents: Dict[str, Set[str]] = {
"The Shallow Grave", "The Shallow Grave",
"Nobleman of Crossout", "Nobleman of Crossout",
"Magic Drain" "Magic Drain"
}, ],
"PHARAONIC GUARDIAN": { "PHARAONIC GUARDIAN": [
"Don Zaloog", "Don Zaloog",
"Reasoning", "Reasoning",
"Dark Snake Syndrome", "Dark Snake Syndrome",
@ -71,8 +71,8 @@ booster_contents: Dict[str, Set[str]] = {
"Book of Taiyou", "Book of Taiyou",
"Dust Tornado", "Dust Tornado",
"Raigeki Break" "Raigeki Break"
}, ],
"SPELL RULER": { "SPELL RULER": [
"Ritual", "Ritual",
"Messenger of Peace", "Messenger of Peace",
"Megamorph", "Megamorph",
@ -94,8 +94,8 @@ booster_contents: Dict[str, Set[str]] = {
"Senju of the Thousand Hands", "Senju of the Thousand Hands",
"Sonic Bird", "Sonic Bird",
"Mystical Space Typhoon" "Mystical Space Typhoon"
}, ],
"LABYRINTH OF NIGHTMARE": { "LABYRINTH OF NIGHTMARE": [
"Destiny Board", "Destiny Board",
"Spirit Message 'I'", "Spirit Message 'I'",
"Spirit Message 'N'", "Spirit Message 'N'",
@ -119,8 +119,8 @@ booster_contents: Dict[str, Set[str]] = {
"United We Stand", "United We Stand",
"Earthbound Spirit", "Earthbound Spirit",
"The Masked Beast" "The Masked Beast"
}, ],
"LEGACY OF DARKNESS": { "LEGACY OF DARKNESS": [
"Last Turn", "Last Turn",
"Yata-Garasu", "Yata-Garasu",
"Opticlops", "Opticlops",
@ -143,8 +143,8 @@ booster_contents: Dict[str, Set[str]] = {
"Maharaghi", "Maharaghi",
"Susa Soldier", "Susa Soldier",
"Emergency Provisions", "Emergency Provisions",
}, ],
"MAGICIAN'S FORCE": { "MAGICIAN'S FORCE": [
"Huge Revolution", "Huge Revolution",
"Oppressed People", "Oppressed People",
"United Resistance", "United Resistance",
@ -185,8 +185,8 @@ booster_contents: Dict[str, Set[str]] = {
"Royal Magical Library", "Royal Magical Library",
"Spell Shield Type-8", "Spell Shield Type-8",
"Tribute Doll", "Tribute Doll",
}, ],
"DARK CRISIS": { "DARK CRISIS": [
"Final Countdown", "Final Countdown",
"Ojama Green", "Ojama Green",
"Dark Scorpion Combination", "Dark Scorpion Combination",
@ -213,8 +213,8 @@ booster_contents: Dict[str, Set[str]] = {
"Spell Reproduction", "Spell Reproduction",
"Contract with the Abyss", "Contract with the Abyss",
"Dark Master - Zorc" "Dark Master - Zorc"
}, ],
"INVASION OF CHAOS": { "INVASION OF CHAOS": [
"Ojama Delta Hurricane", "Ojama Delta Hurricane",
"Ojama Yellow", "Ojama Yellow",
"Ojama Black", "Ojama Black",
@ -241,8 +241,8 @@ booster_contents: Dict[str, Set[str]] = {
"Cursed Seal of the Forbidden Spell", "Cursed Seal of the Forbidden Spell",
"Stray Lambs", "Stray Lambs",
"Manju of the Ten Thousand Hands" "Manju of the Ten Thousand Hands"
}, ],
"ANCIENT SANCTUARY": { "ANCIENT SANCTUARY": [
"Monster Gate", "Monster Gate",
"Wall of Revealing Light", "Wall of Revealing Light",
"Mystik Wok", "Mystik Wok",
@ -255,8 +255,8 @@ booster_contents: Dict[str, Set[str]] = {
"King of the Swamp", "King of the Swamp",
"Enemy Controller", "Enemy Controller",
"Enchanting Fitting Room" "Enchanting Fitting Room"
}, ],
"SOUL OF THE DUELIST": { "SOUL OF THE DUELIST": [
"Ninja Grandmaster Sasuke", "Ninja Grandmaster Sasuke",
"Mystic Swordsman LV2", "Mystic Swordsman LV2",
"Mystic Swordsman LV4", "Mystic Swordsman LV4",
@ -272,8 +272,8 @@ booster_contents: Dict[str, Set[str]] = {
"Level Up!", "Level Up!",
"Howling Insect", "Howling Insect",
"Mobius the Frost Monarch" "Mobius the Frost Monarch"
}, ],
"RISE OF DESTINY": { "RISE OF DESTINY": [
"Homunculus the Alchemic Being", "Homunculus the Alchemic Being",
"Thestalos the Firestorm Monarch", "Thestalos the Firestorm Monarch",
"Roc from the Valley of Haze", "Roc from the Valley of Haze",
@ -283,8 +283,8 @@ booster_contents: Dict[str, Set[str]] = {
"Ultimate Insect Lv3", "Ultimate Insect Lv3",
"Divine Wrath", "Divine Wrath",
"Serial Spell" "Serial Spell"
}, ],
"FLAMING ETERNITY": { "FLAMING ETERNITY": [
"Insect Knight", "Insect Knight",
"Chiron the Mage", "Chiron the Mage",
"Granmarg the Rock Monarch", "Granmarg the Rock Monarch",
@ -297,8 +297,8 @@ booster_contents: Dict[str, Set[str]] = {
"Golem Sentry", "Golem Sentry",
"Rescue Cat", "Rescue Cat",
"Blade Rabbit" "Blade Rabbit"
}, ],
"THE LOST MILLENIUM": { "THE LOST MILLENIUM": [
"Ritual", "Ritual",
"Megarock Dragon", "Megarock Dragon",
"D.D. Survivor", "D.D. Survivor",
@ -311,8 +311,8 @@ booster_contents: Dict[str, Set[str]] = {
"Elemental Hero Thunder Giant", "Elemental Hero Thunder Giant",
"Aussa the Earth Charmer", "Aussa the Earth Charmer",
"Brain Control" "Brain Control"
}, ],
"CYBERNETIC REVOLUTION": { "CYBERNETIC REVOLUTION": [
"Power Bond", "Power Bond",
"Cyber Dragon", "Cyber Dragon",
"Cyber Twin Dragon", "Cyber Twin Dragon",
@ -322,8 +322,8 @@ booster_contents: Dict[str, Set[str]] = {
"Miracle Fusion", "Miracle Fusion",
"Elemental Hero Bubbleman", "Elemental Hero Bubbleman",
"Jerry Beans Man" "Jerry Beans Man"
}, ],
"ELEMENTAL ENERGY": { "ELEMENTAL ENERGY": [
"V-Tiger Jet", "V-Tiger Jet",
"W-Wing Catapult", "W-Wing Catapult",
"VW-Tiger Catapult", "VW-Tiger Catapult",
@ -344,8 +344,8 @@ booster_contents: Dict[str, Set[str]] = {
"Elemental Hero Bladedge", "Elemental Hero Bladedge",
"Pot of Avarice", "Pot of Avarice",
"B.E.S. Tetran" "B.E.S. Tetran"
}, ],
"SHADOW OF INFINITY": { "SHADOW OF INFINITY": [
"Hamon, Lord of Striking Thunder", "Hamon, Lord of Striking Thunder",
"Raviel, Lord of Phantasms", "Raviel, Lord of Phantasms",
"Uria, Lord of Searing Flames", "Uria, Lord of Searing Flames",
@ -357,8 +357,8 @@ booster_contents: Dict[str, Set[str]] = {
"Gokipon", "Gokipon",
"Demise, King of Armageddon", "Demise, King of Armageddon",
"Anteatereatingant" "Anteatereatingant"
}, ],
"GAME GIFT COLLECTION": { "GAME GIFT COLLECTION": [
"Ritual", "Ritual",
"Valkyrion the Magna Warrior", "Valkyrion the Magna Warrior",
"Alpha the Magnet Warrior", "Alpha the Magnet Warrior",
@ -383,8 +383,8 @@ booster_contents: Dict[str, Set[str]] = {
"Card Destruction", "Card Destruction",
"Dark Magic Ritual", "Dark Magic Ritual",
"Calamity of the Wicked" "Calamity of the Wicked"
}, ],
"Special Gift Collection": { "Special Gift Collection": [
"Gate Guardian", "Gate Guardian",
"Scapegoat", "Scapegoat",
"Gil Garth", "Gil Garth",
@ -398,8 +398,8 @@ booster_contents: Dict[str, Set[str]] = {
"Curse of Vampire", "Curse of Vampire",
"Elemental Hero Flame Wingman", "Elemental Hero Flame Wingman",
"Magician of Black Chaos" "Magician of Black Chaos"
}, ],
"Fairy Collection": { "Fairy Collection": [
"Silpheed", "Silpheed",
"Dunames Dark Witch", "Dunames Dark Witch",
"Hysteric Fairy", "Hysteric Fairy",
@ -416,8 +416,8 @@ booster_contents: Dict[str, Set[str]] = {
"Asura Priest", "Asura Priest",
"Manju of the Ten Thousand Hands", "Manju of the Ten Thousand Hands",
"Senju of the Thousand Hands" "Senju of the Thousand Hands"
}, ],
"Dragon Collection": { "Dragon Collection": [
"Victory D.", "Victory D.",
"Chaos Emperor Dragon - Envoy of the End", "Chaos Emperor Dragon - Envoy of the End",
"Kaiser Glider", "Kaiser Glider",
@ -434,16 +434,16 @@ booster_contents: Dict[str, Set[str]] = {
"Troop Dragon", "Troop Dragon",
"Horus the Black Flame Dragon LV4", "Horus the Black Flame Dragon LV4",
"Pitch-Dark Dragon" "Pitch-Dark Dragon"
}, ],
"Warrior Collection A": { "Warrior Collection A": [
"Gate Guardian", "Gate Guardian",
"Gearfried the Iron Knight", "Gearfried the Iron Knight",
"Dimensional Warrior", "Dimensional Warrior",
"Command Knight", "Command Knight",
"The Last Warrior from Another Planet", "The Last Warrior from Another Planet",
"Dream Clown" "Dream Clown"
}, ],
"Warrior Collection B": { "Warrior Collection B": [
"Don Zaloog", "Don Zaloog",
"Dark Scorpion - Chick the Yellow", "Dark Scorpion - Chick the Yellow",
"Dark Scorpion - Meanae the Thorn", "Dark Scorpion - Meanae the Thorn",
@ -467,8 +467,8 @@ booster_contents: Dict[str, Set[str]] = {
"Blade Knight", "Blade Knight",
"Marauding Captain", "Marauding Captain",
"Toon Goblin Attack Force" "Toon Goblin Attack Force"
}, ],
"Fiend Collection A": { "Fiend Collection A": [
"Sangan", "Sangan",
"Castle of Dark Illusions", "Castle of Dark Illusions",
"Barox", "Barox",
@ -480,8 +480,8 @@ booster_contents: Dict[str, Set[str]] = {
"Spear Cretin", "Spear Cretin",
"Versago the Destroyer", "Versago the Destroyer",
"Toon Summoned Skull" "Toon Summoned Skull"
}, ],
"Fiend Collection B": { "Fiend Collection B": [
"Raviel, Lord of Phantasms", "Raviel, Lord of Phantasms",
"Yata-Garasu", "Yata-Garasu",
"Helpoemer", "Helpoemer",
@ -505,15 +505,15 @@ booster_contents: Dict[str, Set[str]] = {
"Jowls of Dark Demise", "Jowls of Dark Demise",
"D. D. Trainer", "D. D. Trainer",
"Earthbound Spirit" "Earthbound Spirit"
}, ],
"Machine Collection A": { "Machine Collection A": [
"Cyber-Stein", "Cyber-Stein",
"Mechanicalchaser", "Mechanicalchaser",
"Jinzo", "Jinzo",
"UFO Turtle", "UFO Turtle",
"Cyber-Tech Alligator" "Cyber-Tech Alligator"
}, ],
"Machine Collection B": { "Machine Collection B": [
"X-Head Cannon", "X-Head Cannon",
"Y-Dragon Head", "Y-Dragon Head",
"Z-Metal Tank", "Z-Metal Tank",
@ -531,8 +531,8 @@ booster_contents: Dict[str, Set[str]] = {
"Red Gadget", "Red Gadget",
"Yellow Gadget", "Yellow Gadget",
"B.E.S. Tetran" "B.E.S. Tetran"
}, ],
"Spellcaster Collection A": { "Spellcaster Collection A": [
"Exodia", "Exodia",
"Dark Sage", "Dark Sage",
"Dark Magician", "Dark Magician",
@ -544,8 +544,8 @@ booster_contents: Dict[str, Set[str]] = {
"Injection Fairy Lily", "Injection Fairy Lily",
"Cosmo Queen", "Cosmo Queen",
"Magician of Black Chaos" "Magician of Black Chaos"
}, ],
"Spellcaster Collection B": { "Spellcaster Collection B": [
"Jowgen the Spiritualist", "Jowgen the Spiritualist",
"Tsukuyomi", "Tsukuyomi",
"Manticore of Darkness", "Manticore of Darkness",
@ -574,8 +574,8 @@ booster_contents: Dict[str, Set[str]] = {
"Royal Magical Library", "Royal Magical Library",
"Aussa the Earth Charmer", "Aussa the Earth Charmer",
}, ],
"Zombie Collection": { "Zombie Collection": [
"Skull Servant", "Skull Servant",
"Regenerating Mummy", "Regenerating Mummy",
"Ryu Kokki", "Ryu Kokki",
@ -590,8 +590,8 @@ booster_contents: Dict[str, Set[str]] = {
"Des Lacooda", "Des Lacooda",
"Wandering Mummy", "Wandering Mummy",
"Royal Keeper" "Royal Keeper"
}, ],
"Special Monsters A": { "Special Monsters A": [
"X-Head Cannon", "X-Head Cannon",
"Y-Dragon Head", "Y-Dragon Head",
"Z-Metal Tank", "Z-Metal Tank",
@ -626,8 +626,8 @@ booster_contents: Dict[str, Set[str]] = {
"Fushi No Tori", "Fushi No Tori",
"Maharaghi", "Maharaghi",
"Susa Soldier" "Susa Soldier"
}, ],
"Special Monsters B": { "Special Monsters B": [
"Polymerization", "Polymerization",
"Mystic Swordsman LV2", "Mystic Swordsman LV2",
"Mystic Swordsman LV4", "Mystic Swordsman LV4",
@ -656,8 +656,8 @@ booster_contents: Dict[str, Set[str]] = {
"Level Up!", "Level Up!",
"Ultimate Insect Lv3", "Ultimate Insect Lv3",
"Ultimate Insect Lv5" "Ultimate Insect Lv5"
}, ],
"Reverse Collection": { "Reverse Collection": [
"Magical Merchant", "Magical Merchant",
"Castle of Dark Illusions", "Castle of Dark Illusions",
"Magician of Faith", "Magician of Faith",
@ -675,8 +675,8 @@ booster_contents: Dict[str, Set[str]] = {
"Spear Cretin", "Spear Cretin",
"Nobleman of Crossout", "Nobleman of Crossout",
"Aussa the Earth Charmer" "Aussa the Earth Charmer"
}, ],
"LP Recovery Collection": { "LP Recovery Collection": [
"Mystik Wok", "Mystik Wok",
"Poison of the Old Man", "Poison of the Old Man",
"Hysteric Fairy", "Hysteric Fairy",
@ -691,8 +691,8 @@ booster_contents: Dict[str, Set[str]] = {
"Elemental Hero Steam Healer", "Elemental Hero Steam Healer",
"Fushi No Tori", "Fushi No Tori",
"Emergency Provisions" "Emergency Provisions"
}, ],
"Special Summon Collection A": { "Special Summon Collection A": [
"Perfectly Ultimate Great Moth", "Perfectly Ultimate Great Moth",
"Dark Sage", "Dark Sage",
"Polymerization", "Polymerization",
@ -726,8 +726,8 @@ booster_contents: Dict[str, Set[str]] = {
"Morphing Jar #2", "Morphing Jar #2",
"Spear Cretin", "Spear Cretin",
"Dark Magic Curtain" "Dark Magic Curtain"
}, ],
"Special Summon Collection B": { "Special Summon Collection B": [
"Monster Gate", "Monster Gate",
"Chaos Emperor Dragon - Envoy of the End", "Chaos Emperor Dragon - Envoy of the End",
"Ojama Trio", "Ojama Trio",
@ -756,8 +756,8 @@ booster_contents: Dict[str, Set[str]] = {
"Tribute Doll", "Tribute Doll",
"Enchanting Fitting Room", "Enchanting Fitting Room",
"Stray Lambs" "Stray Lambs"
}, ],
"Special Summon Collection C": { "Special Summon Collection C": [
"Hamon, Lord of Striking Thunder", "Hamon, Lord of Striking Thunder",
"Raviel, Lord of Phantasms", "Raviel, Lord of Phantasms",
"Uria, Lord of Searing Flames", "Uria, Lord of Searing Flames",
@ -782,13 +782,13 @@ booster_contents: Dict[str, Set[str]] = {
"Ultimate Insect Lv5", "Ultimate Insect Lv5",
"Rescue Cat", "Rescue Cat",
"Anteatereatingant" "Anteatereatingant"
}, ],
"Equipment Collection": { "Equipment Collection": [
"Megamorph", "Megamorph",
"Cestus of Dagla", "Cestus of Dagla",
"United We Stand" "United We Stand"
}, ],
"Continuous Spell/Trap A": { "Continuous Spell/Trap A": [
"Destiny Board", "Destiny Board",
"Spirit Message 'I'", "Spirit Message 'I'",
"Spirit Message 'N'", "Spirit Message 'N'",
@ -801,8 +801,8 @@ booster_contents: Dict[str, Set[str]] = {
"Solemn Wishes", "Solemn Wishes",
"Embodiment of Apophis", "Embodiment of Apophis",
"Toon World" "Toon World"
}, ],
"Continuous Spell/Trap B": { "Continuous Spell/Trap B": [
"Hamon, Lord of Striking Thunder", "Hamon, Lord of Striking Thunder",
"Uria, Lord of Searing Flames", "Uria, Lord of Searing Flames",
"Wave-Motion Cannon", "Wave-Motion Cannon",
@ -815,8 +815,8 @@ booster_contents: Dict[str, Set[str]] = {
"Skull Zoma", "Skull Zoma",
"Pitch-Black Power Stone", "Pitch-Black Power Stone",
"Metal Reflect Slime" "Metal Reflect Slime"
}, ],
"Quick/Counter Collection": { "Quick/Counter Collection": [
"Mystik Wok", "Mystik Wok",
"Poison of the Old Man", "Poison of the Old Man",
"Scapegoat", "Scapegoat",
@ -841,8 +841,8 @@ booster_contents: Dict[str, Set[str]] = {
"Book of Moon", "Book of Moon",
"Serial Spell", "Serial Spell",
"Mystical Space Typhoon" "Mystical Space Typhoon"
}, ],
"Direct Damage Collection": { "Direct Damage Collection": [
"Hamon, Lord of Striking Thunder", "Hamon, Lord of Striking Thunder",
"Chaos Emperor Dragon - Envoy of the End", "Chaos Emperor Dragon - Envoy of the End",
"Dark Snake Syndrome", "Dark Snake Syndrome",
@ -868,8 +868,8 @@ booster_contents: Dict[str, Set[str]] = {
"Jowls of Dark Demise", "Jowls of Dark Demise",
"Stealth Bird", "Stealth Bird",
"Elemental Hero Bladedge", "Elemental Hero Bladedge",
}, ],
"Direct Attack Collection": { "Direct Attack Collection": [
"Victory D.", "Victory D.",
"Dark Scorpion Combination", "Dark Scorpion Combination",
"Spirit Reaper", "Spirit Reaper",
@ -880,8 +880,8 @@ booster_contents: Dict[str, Set[str]] = {
"Toon Mermaid", "Toon Mermaid",
"Toon Summoned Skull", "Toon Summoned Skull",
"Toon Dark Magician Girl" "Toon Dark Magician Girl"
}, ],
"Monster Destroy Collection": { "Monster Destroy Collection": [
"Hamon, Lord of Striking Thunder", "Hamon, Lord of Striking Thunder",
"Inferno", "Inferno",
"Ninja Grandmaster Sasuke", "Ninja Grandmaster Sasuke",
@ -912,12 +912,12 @@ booster_contents: Dict[str, Set[str]] = {
"Offerings to the Doomed", "Offerings to the Doomed",
"Divine Wrath", "Divine Wrath",
"Dream Clown" "Dream Clown"
}, ],
} }
def get_booster_locations(booster: str) -> Dict[str, str]: def get_booster_locations(booster: str) -> Dict[str, str]:
return { return {
f"{booster} {i}": content f"{booster} {i}": content
for i, content in enumerate(booster_contents[booster]) for i, content in enumerate(booster_contents[booster], 1)
} }

View File

@ -1,7 +1,7 @@
from typing import Dict, Set from typing import Dict, List
structure_contents: Dict[str, Set] = { structure_contents: Dict[str, List[str]] = {
"dragons_roar": { "dragons_roar": [
"Luster Dragon", "Luster Dragon",
"Armed Dragon LV3", "Armed Dragon LV3",
"Armed Dragon LV5", "Armed Dragon LV5",
@ -14,9 +14,9 @@ structure_contents: Dict[str, Set] = {
"Stamping Destruction", "Stamping Destruction",
"Heavy Storm", "Heavy Storm",
"Dust Tornado", "Dust Tornado",
"Mystical Space Typhoon", "Mystical Space Typhoon"
}, ],
"zombie_madness": { "zombie_madness": [
"Pyramid Turtle", "Pyramid Turtle",
"Regenerating Mummy", "Regenerating Mummy",
"Ryu Kokki", "Ryu Kokki",
@ -26,9 +26,9 @@ structure_contents: Dict[str, Set] = {
"Reload", "Reload",
"Heavy Storm", "Heavy Storm",
"Dust Tornado", "Dust Tornado",
"Mystical Space Typhoon", "Mystical Space Typhoon"
}, ],
"blazing_destruction": { "blazing_destruction": [
"Inferno", "Inferno",
"Solar Flare Dragon", "Solar Flare Dragon",
"UFO Turtle", "UFO Turtle",
@ -38,9 +38,9 @@ structure_contents: Dict[str, Set] = {
"Level Limit - Area B", "Level Limit - Area B",
"Heavy Storm", "Heavy Storm",
"Dust Tornado", "Dust Tornado",
"Mystical Space Typhoon", "Mystical Space Typhoon"
}, ],
"fury_from_the_deep": { "fury_from_the_deep": [
"Mother Grizzly", "Mother Grizzly",
"Water Beaters", "Water Beaters",
"Gravity Bind", "Gravity Bind",
@ -48,9 +48,9 @@ structure_contents: Dict[str, Set] = {
"Mobius the Frost Monarch", "Mobius the Frost Monarch",
"Heavy Storm", "Heavy Storm",
"Dust Tornado", "Dust Tornado",
"Mystical Space Typhoon", "Mystical Space Typhoon"
}, ],
"warriors_triumph": { "warriors_triumph": [
"Gearfried the Iron Knight", "Gearfried the Iron Knight",
"D.D. Warrior Lady", "D.D. Warrior Lady",
"Marauding Captain", "Marauding Captain",
@ -60,9 +60,9 @@ structure_contents: Dict[str, Set] = {
"Reload", "Reload",
"Heavy Storm", "Heavy Storm",
"Dust Tornado", "Dust Tornado",
"Mystical Space Typhoon", "Mystical Space Typhoon"
}, ],
"spellcasters_judgement": { "spellcasters_judgement": [
"Dark Magician", "Dark Magician",
"Apprentice Magician", "Apprentice Magician",
"Breaker the Magical Warrior", "Breaker the Magical Warrior",
@ -70,14 +70,18 @@ structure_contents: Dict[str, Set] = {
"Skilled Dark Magician", "Skilled Dark Magician",
"Tsukuyomi", "Tsukuyomi",
"Magical Dimension", "Magical Dimension",
"Mage PowerSpell-Counter Cards", "Mage Power",
"Spell-Counter Cards",
"Heavy Storm", "Heavy Storm",
"Dust Tornado", "Dust Tornado",
"Mystical Space Typhoon", "Mystical Space Typhoon"
}, ],
"none": {}, "none": [],
} }
def get_deck_content_locations(deck: str) -> Dict[str, str]: def get_deck_content_locations(deck: str) -> Dict[str, str]:
return {f"{deck} {i}": content for i, content in enumerate(structure_contents[deck])} return {
f"{deck} {i}": content
for i, content in enumerate(structure_contents[deck], 1)
}