YGO06: create proper rules for TD04 Ritual Summon

Rensen3 · Nov 11, 2023 · 5dea004 · 5dea004
1 parent f250a4c
commit 5dea004
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 12 deletions.
diff --git a/worlds/yugioh06/BoosterPacks.py b/worlds/yugioh06/BoosterPacks.py
@@ -85,7 +85,9 @@
         "Toon Summoned Skull",
         "Toon World",
         "Rush Recklessly",
-        "The Reliable Guardian"
+        "The Reliable Guardian",
+        "Senju of the Thousand Hands",
+        "Sonic Bird"
     },
     "LABYRINTH OF NIGHTMARE": {
         "Destiny Board",
@@ -109,7 +111,8 @@
         "Cure Mermaid",
         "The Last Warrior from Another Planet",
         "United We Stand",
-        "Earthbound Spirit"
+        "Earthbound Spirit",
+        "The Masked Beast"
     },
     "LEGACY OF DARKNESS": {
         "Last Turn",
@@ -201,7 +204,9 @@
         "Vampire Lord",
         "Metallizing Parasite - Lunatite",
         "D. D. Trainer",
-        "Spell Reproduction"
+        "Spell Reproduction",
+        "Contract with the Abyss",
+        "Dark Master - Zorc"
     },
     "INVASION OF CHAOS": {
         "Ojama Delta Hurricane",
@@ -228,7 +233,8 @@
         "Stealth Bird",
         "Reload",
         "Cursed Seal of the Forbidden Spell",
-        "Stray Lambs"
+        "Stray Lambs",
+        "Manju of the Ten Thousand Hands"
     },
     "ANCIENT SANCTUARY": {
         "Monster Gate",
@@ -328,7 +334,8 @@
         "Elemental Hero Shining Flare Wingman",
         "Elemental Hero WildEdge",
         "Elemental Hero Wildheart",
-        "Elemental Hero Bladedge"
+        "Elemental Hero Bladedge",
+        "Pot of Avarice"
     },
     "SHADOW OF INFINITY": {
         "Hamon, Lord of Striking Thunder",
@@ -339,7 +346,8 @@
         "Saber Beetle",
         "Tenkabito Shien",
         "Princess Pikeru",
-        "Gokipon"
+        "Gokipon",
+        "Demise, King of Armageddon"
     },
     "GAME GIFT COLLECTION": {
         "Ritual",
@@ -363,7 +371,8 @@
         "Graceful Dice",
         "Negate Attack",
         "Foolish Burial",
-        "Card Destruction"
+        "Card Destruction",
+        "Dark Magic Ritual"
     },
     "Special Gift Collection": {
         "Gate Guardian",
@@ -377,7 +386,8 @@
         "Dandylion",
         "Blade Knight",
         "Curse of Vampire",
-        "Elemental Hero Flame Wingman"
+        "Elemental Hero Flame Wingman",
+        "Magician of Black Chaos"
     },
     "Fairy Collection": {
         "Silpheed",
@@ -393,7 +403,9 @@
         "Protective Soul Ailin",
         "Marshmallon",
         "Goddess with the Third Eye",
-        "Asura Priest"
+        "Asura Priest",
+        "Manju of the Ten Thousand Hands",
+        "Senju of the Thousand Hands"
     },
     "Dragon Collection": {
         "Victory D.",
@@ -519,7 +531,8 @@
         "Dark Elf",
         "Gemini Elf",
         "Injection Fairy Lily",
-        "Cosmo Queen"
+        "Cosmo Queen",
+        "Magician of Black Chaos"
     },
     "Spellcaster Collection B": {
         "Jowgen the Spiritualist",

diff --git a/worlds/yugioh06/Rules.py b/worlds/yugioh06/Rules.py
@@ -216,9 +216,18 @@ def set_rules(world):
             lambda state: state.has("Fairy Box", player) and state.yugioh06_difficulty(player, 1),
         "TD03 Normal Summon":
             lambda state: only_normal(state, player) and state.yugioh06_difficulty(player, 3),
-        # TODO: Need Specific deck
         "TD04 Ritual Summon":
-            lambda state: state.yugioh06_difficulty(player, 18),
+            lambda state: state.yugioh06_difficulty(player, 8) and
+                          state.has_all(["Contract with the Abyss",
+                                         "Manju of the Ten Thousand Hands",
+                                         "Senju of the Thousand Hands",
+                                         "Sonic Bird",
+                                         "Pot of Avarice",
+                                         "Dark Master - Zorc",
+                                         "Demise, King of Armageddon",
+                                         "The Masked Beast",
+                                         "Magician of Black Chaos",
+                                         "Dark Magic Ritual"], player),
         "TD05 Special Summon A":
             lambda state: state.yugioh06_difficulty(player, 3),
         "TD06 20x Spell":