Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change Bunny Pocket Logic to require Pegasus Boots #1044

Merged
merged 1 commit into from
Aug 2, 2023
Merged

Change Bunny Pocket Logic to require Pegasus Boots #1044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/Region/Standard/SkullWoods.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())));
});

Expand All @@ -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)
Expand Down
21 changes: 11 additions & 10 deletions tests/MajorGlitches/SkullWoodsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, []],
Expand All @@ -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']],
];
}
}
1 change: 1 addition & 0 deletions tests/OverworldGlitches/SkullWoodsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']],
Expand Down