Merge pull request #1044 from MichaelK-UnderscoreUnderscore/fix-bunny…

…-pocket-logic Change Bunny Pocket Logic to require Pegasus Boots
sporchia · Aug 2, 2023 · 5464efc · 5464efc
2 parents 4a85fd7 + 83cfe14
commit 5464efc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/app/Region/Standard/SkullWoods.php b/app/Region/Standard/SkullWoods.php
@@ -114,7 +114,7 @@ public function initalize()
 
         $this->locations["Skull Woods - Bridge Room"]->setRequirements(function ($locations, $items) {
             return $items->has('FireRod') && ($items->has('MoonPearl')
-                || ($this->world->config('canDungeonRevive')
+                || ($this->world->config('canDungeonRevive') && $items->has('PegasusBoots')
                     && ($items->has('MagicMirror') || $items->hasABottle())));
         });
 
@@ -124,9 +124,9 @@ public function initalize()
 
         $this->locations["Skull Woods - Boss"]->setRequirements(function ($locations, $items) {
             return $this->canEnter($locations, $items)
-                && ($items->has('MoonPearl') || ($this->world->config('canDungeonRevive')
+                && $items->has('FireRod') && ($items->has('MoonPearl')
+                || ($this->world->config('canDungeonRevive') && $items->has('PegasusBoots')
                     && ($items->has('MagicMirror') || $items->hasABottle())))
-                && $items->has('FireRod')
                 && ($this->world->config('mode.weapons') == 'swordless' || $items->hasSword())
                 && $items->has('KeyD3', 3)
                 && $this->boss->canBeat($items, $locations)

diff --git a/tests/MajorGlitches/SkullWoodsTest.php b/tests/MajorGlitches/SkullWoodsTest.php
@@ -106,6 +106,7 @@ public function accessPool()
             ["Skull Woods - Bridge Room", false, []],
             ["Skull Woods - Bridge Room", false, [], ['FireRod']],
             ["Skull Woods - Bridge Room", false, [], ['MoonPearl', 'MagicMirror', 'AnyBottle']],
+            ["Skull Woods - Bridge Room", false, [], ['MoonPearl', 'PegasusBoots']],
             ["Skull Woods - Bridge Room", true, ['FireRod', 'MoonPearl']],
 
             ["Skull Woods - Pot Prison", true, []],
@@ -121,16 +122,16 @@ public function accessPool()
             ["Skull Woods - Boss", true, ['KeyD3', 'KeyD3', 'KeyD3', 'FireRod', 'MoonPearl', 'L3Sword']],
             ["Skull Woods - Boss", true, ['KeyD3', 'KeyD3', 'KeyD3', 'FireRod', 'MoonPearl', 'L4Sword']],
             ["Skull Woods - Boss", true, ['KeyD3', 'KeyD3', 'KeyD3', 'FireRod', 'MoonPearl', 'ProgressiveSword']],
-            ["Skull Woods - Boss", true, ['KeyD3', 'KeyD3', 'KeyD3', 'FireRod', 'MagicMirror', 'UncleSword']],
-            ["Skull Woods - Boss", true, ['KeyD3', 'KeyD3', 'KeyD3', 'FireRod', 'MagicMirror', 'MasterSword']],
-            ["Skull Woods - Boss", true, ['KeyD3', 'KeyD3', 'KeyD3', 'FireRod', 'MagicMirror', 'L3Sword']],
-            ["Skull Woods - Boss", true, ['KeyD3', 'KeyD3', 'KeyD3', 'FireRod', 'MagicMirror', 'L4Sword']],
-            ["Skull Woods - Boss", true, ['KeyD3', 'KeyD3', 'KeyD3', 'FireRod', 'MagicMirror', 'ProgressiveSword']],
-            ["Skull Woods - Boss", true, ['KeyD3', 'KeyD3', 'KeyD3', 'FireRod', 'Bottle', 'UncleSword']],
-            ["Skull Woods - Boss", true, ['KeyD3', 'KeyD3', 'KeyD3', 'FireRod', 'Bottle', 'MasterSword']],
-            ["Skull Woods - Boss", true, ['KeyD3', 'KeyD3', 'KeyD3', 'FireRod', 'Bottle', 'L3Sword']],
-            ["Skull Woods - Boss", true, ['KeyD3', 'KeyD3', 'KeyD3', 'FireRod', 'Bottle', 'L4Sword']],
-            ["Skull Woods - Boss", true, ['KeyD3', 'KeyD3', 'KeyD3', 'FireRod', 'Bottle', 'ProgressiveSword']],
+            ["Skull Woods - Boss", true, ['KeyD3', 'KeyD3', 'KeyD3', 'FireRod', 'MagicMirror', 'UncleSword', 'PegasusBoots']],
+            ["Skull Woods - Boss", true, ['KeyD3', 'KeyD3', 'KeyD3', 'FireRod', 'MagicMirror', 'MasterSword', 'PegasusBoots']],
+            ["Skull Woods - Boss", true, ['KeyD3', 'KeyD3', 'KeyD3', 'FireRod', 'MagicMirror', 'L3Sword', 'PegasusBoots']],
+            ["Skull Woods - Boss", true, ['KeyD3', 'KeyD3', 'KeyD3', 'FireRod', 'MagicMirror', 'L4Sword', 'PegasusBoots']],
+            ["Skull Woods - Boss", true, ['KeyD3', 'KeyD3', 'KeyD3', 'FireRod', 'MagicMirror', 'ProgressiveSword', 'PegasusBoots']],
+            ["Skull Woods - Boss", true, ['KeyD3', 'KeyD3', 'KeyD3', 'FireRod', 'Bottle', 'UncleSword', 'PegasusBoots']],
+            ["Skull Woods - Boss", true, ['KeyD3', 'KeyD3', 'KeyD3', 'FireRod', 'Bottle', 'MasterSword', 'PegasusBoots']],
+            ["Skull Woods - Boss", true, ['KeyD3', 'KeyD3', 'KeyD3', 'FireRod', 'Bottle', 'L3Sword', 'PegasusBoots']],
+            ["Skull Woods - Boss", true, ['KeyD3', 'KeyD3', 'KeyD3', 'FireRod', 'Bottle', 'L4Sword', 'PegasusBoots']],
+            ["Skull Woods - Boss", true, ['KeyD3', 'KeyD3', 'KeyD3', 'FireRod', 'Bottle', 'ProgressiveSword', 'PegasusBoots']],
         ];
     }
 }
diff --git a/tests/OverworldGlitches/SkullWoodsTest.php b/tests/OverworldGlitches/SkullWoodsTest.php
@@ -112,6 +112,7 @@ public function accessPool()
 
             ["Skull Woods - Bridge Room", false, []],
             ["Skull Woods - Bridge Room", false, [], ['MoonPearl', 'MagicMirror']],
+            ["Skull Woods - Bridge Room", false, [], ['MoonPearl', 'PegasusBoots']],
             ["Skull Woods - Bridge Room", false, [], ['FireRod']],
             ["Skull Woods - Bridge Room", true, ['MoonPearl', 'PegasusBoots', 'FireRod']],
             ["Skull Woods - Bridge Room", true, ['MagicMirror', 'PegasusBoots', 'FireRod']],