Renamed Hammer Pegs regions

This commit is contained in:
codemann8
2021-07-06 14:44:13 -05:00
parent 26ee44fa21
commit 0dd5516e07
5 changed files with 11 additions and 11 deletions

View File

@@ -967,8 +967,8 @@ OWTileGroups = {
'Bat Cave Ledge' 'Bat Cave Ledge'
], ],
[ [
'Hammer Peg Area', 'Hammer Pegs Area',
'Hammer Peg Entry' 'Hammer Pegs Entry'
] ]
), ),
("Dunes", "Regular"): ( ("Dunes", "Regular"): (

View File

@@ -254,11 +254,11 @@ def get_boots_clip_exits_dw(inverted):
yield ('VoO To Dig Game Clip', 'Village of Outcasts Area', 'Dig Game Area') yield ('VoO To Dig Game Clip', 'Village of Outcasts Area', 'Dig Game Area')
yield ('VoO To Dig Game Hook Clip', 'Village of Outcasts Area', 'Dig Game Ledge') #requires hookshot yield ('VoO To Dig Game Hook Clip', 'Village of Outcasts Area', 'Dig Game Ledge') #requires hookshot
yield ('Broken Bridge To Dunes Clip', 'Broken Bridge West', 'Dark Dunes Area') yield ('Broken Bridge To Dunes Clip', 'Broken Bridge West', 'Dark Dunes Area')
yield ('Broken Bridge To Hammer Pegs Clip', 'Broken Bridge West', 'Hammer Peg Area') #fake flipper yield ('Broken Bridge To Hammer Pegs Clip', 'Broken Bridge West', 'Hammer Pegs Area') #fake flipper
yield ('Broken Bridge To Bomb Shop Clip', 'Broken Bridge West', 'Big Bomb Shop Area') #fake flipper yield ('Broken Bridge To Bomb Shop Clip', 'Broken Bridge West', 'Big Bomb Shop Area') #fake flipper
yield ('PoD To Cliff Clip', 'Palace of Darkness Area', 'Darkness Cliff') yield ('PoD To Cliff Clip', 'Palace of Darkness Area', 'Darkness Cliff')
yield ('Dark Dunes To Cliff Clip', 'Dark Dunes Area', 'Darkness Cliff') yield ('Dark Dunes To Cliff Clip', 'Dark Dunes Area', 'Darkness Cliff')
yield ('Dark Dunes To Hammer Pegs Clip', 'Dark Dunes Area', 'Hammer Peg Area') yield ('Dark Dunes To Hammer Pegs Clip', 'Dark Dunes Area', 'Hammer Pegs Area')
yield ('Dark Dunes To Bomb Shop Clip', 'Dark Dunes Area', 'Big Bomb Shop Area') yield ('Dark Dunes To Bomb Shop Clip', 'Dark Dunes Area', 'Big Bomb Shop Area')
yield ('Dig Game To Mire Clip', 'Dig Game Area', 'Misery Mire Area') yield ('Dig Game To Mire Clip', 'Dig Game Area', 'Misery Mire Area')
@@ -267,7 +267,7 @@ def get_boots_clip_exits_dw(inverted):
yield ('Bomb Shop To Cliff Clip', 'Big Bomb Shop Area', 'Dark Central Cliffs') yield ('Bomb Shop To Cliff Clip', 'Big Bomb Shop Area', 'Dark Central Cliffs')
yield ('Bomb Shop To Hammer Bridge FAWT Clip', 'Big Bomb Shop Area', 'Hammer Bridge North Area') yield ('Bomb Shop To Hammer Bridge FAWT Clip', 'Big Bomb Shop Area', 'Hammer Bridge North Area')
yield ('Hammer Bridge To Bomb Shop Clip', 'Hammer Bridge North Area', 'Big Bomb Shop Area') yield ('Hammer Bridge To Bomb Shop Clip', 'Hammer Bridge North Area', 'Big Bomb Shop Area')
yield ('Hammer Bridge To Hammer Pegs Clip', 'Hammer Bridge North Area', 'Hammer Peg Area') yield ('Hammer Bridge To Hammer Pegs Clip', 'Hammer Bridge North Area', 'Hammer Pegs Area')
yield ('Hammer Bridge To Cliff Clip', 'Hammer Bridge South Area', 'Dark Central Cliffs') yield ('Hammer Bridge To Cliff Clip', 'Hammer Bridge South Area', 'Dark Central Cliffs')
yield ('Dark Tree Line Water Clip', 'Dark Tree Line Area', 'Dark Tree Line Water') #requires flippers yield ('Dark Tree Line Water Clip', 'Dark Tree Line Area', 'Dark Tree Line Water') #requires flippers
yield ('PoD Nook To Shopping Mall FAWT Clip', 'Palace of Darkness Nook Area', 'Shopping Mall Area') yield ('PoD Nook To Shopping Mall FAWT Clip', 'Palace of Darkness Nook Area', 'Shopping Mall Area')

View File

@@ -640,8 +640,8 @@ mandatory_connections = [('Flute Away', 'Flute Sky'),
('Broken Bridge Water Drop', 'Broken Bridge Water'), #flippers ('Broken Bridge Water Drop', 'Broken Bridge Water'), #flippers
('Broken Bridge Northeast Water Drop', 'Broken Bridge Water'), #flippers ('Broken Bridge Northeast Water Drop', 'Broken Bridge Water'), #flippers
('Broken Bridge West Water Drop', 'Broken Bridge Water'), #flippers ('Broken Bridge West Water Drop', 'Broken Bridge Water'), #flippers
('Peg Area Rocks (West)', 'Hammer Peg Area'), #mitts ('Peg Area Rocks (West)', 'Hammer Pegs Area'), #mitts
('Peg Area Rocks (East)', 'Hammer Peg Entry'), #mitts ('Peg Area Rocks (East)', 'Hammer Pegs Entry'), #mitts
('Dig Game To Ledge Drop', 'Dig Game Ledge'), #mitts ('Dig Game To Ledge Drop', 'Dig Game Ledge'), #mitts
('Dig Game Ledge Drop', 'Dig Game Area'), ('Dig Game Ledge Drop', 'Dig Game Area'),
('Frog Ledge Drop', 'Archery Game Area'), ('Frog Ledge Drop', 'Archery Game Area'),
@@ -923,8 +923,8 @@ ow_connections = {
('Blacksmith Entry Mirror Spot', 'Blacksmith Area'), ('Blacksmith Entry Mirror Spot', 'Blacksmith Area'),
('Bat Cave Ledge Mirror Spot', 'Bat Cave Ledge') ('Bat Cave Ledge Mirror Spot', 'Bat Cave Ledge')
], [ ], [
('Hammer Pegs Mirror Spot', 'Hammer Peg Area'), ('Hammer Pegs Mirror Spot', 'Hammer Pegs Area'),
('Hammer Pegs Entry Mirror Spot', 'Hammer Peg Entry') ('Hammer Pegs Entry Mirror Spot', 'Hammer Pegs Entry')
]), ]),
0x25: ([ 0x25: ([
('Sand Dunes Mirror Spot', 'Sand Dunes Area') ('Sand Dunes Mirror Spot', 'Sand Dunes Area')

View File

@@ -171,8 +171,8 @@ def create_regions(world, player):
create_dw_region(player, 'Broken Bridge Water', None, ['Broken Bridge NC']), create_dw_region(player, 'Broken Bridge Water', None, ['Broken Bridge NC']),
create_dw_region(player, 'Palace of Darkness Area', None, ['Palace of Darkness Hint', 'Palace of Darkness', 'Eastern Palace Mirror Spot', 'Palace of Darkness SW', 'Palace of Darkness SE']), create_dw_region(player, 'Palace of Darkness Area', None, ['Palace of Darkness Hint', 'Palace of Darkness', 'Eastern Palace Mirror Spot', 'Palace of Darkness SW', 'Palace of Darkness SE']),
create_dw_region(player, 'Darkness Cliff', None, ['Dark Dunes Ledge Drop', 'Hammer Bridge North Ledge Drop', 'Dark Tree Line Ledge Drop', 'Palace of Darkness Ledge Drop']), create_dw_region(player, 'Darkness Cliff', None, ['Dark Dunes Ledge Drop', 'Hammer Bridge North Ledge Drop', 'Dark Tree Line Ledge Drop', 'Palace of Darkness Ledge Drop']),
create_dw_region(player, 'Hammer Peg Entry', None, ['Peg Area Rocks (West)', 'Blacksmith Entry Mirror Spot', 'Hammer Pegs WS']), create_dw_region(player, 'Hammer Pegs Entry', None, ['Peg Area Rocks (West)', 'Blacksmith Entry Mirror Spot', 'Hammer Pegs WS']),
create_dw_region(player, 'Hammer Peg Area', ['Dark Blacksmith Ruins'], ['Peg Area Rocks (East)', 'Dark World Hammer Peg Cave', 'Blacksmith Mirror Spot', 'Bat Cave Ledge Mirror Spot']), create_dw_region(player, 'Hammer Pegs Area', ['Dark Blacksmith Ruins'], ['Peg Area Rocks (East)', 'Dark World Hammer Peg Cave', 'Blacksmith Mirror Spot', 'Bat Cave Ledge Mirror Spot']),
create_dw_region(player, 'Dark Dunes Area', None, ['Sand Dunes Mirror Spot', 'Dark Dunes NW', 'Dark Dunes WN', 'Dark Dunes SC']), create_dw_region(player, 'Dark Dunes Area', None, ['Sand Dunes Mirror Spot', 'Dark Dunes NW', 'Dark Dunes WN', 'Dark Dunes SC']),
create_dw_region(player, 'Dig Game Area', ['Digging Game'], ['Dig Game To Ledge Drop', 'Maze Race Mirror Spot', 'Dig Game ES']), create_dw_region(player, 'Dig Game Area', ['Digging Game'], ['Dig Game To Ledge Drop', 'Maze Race Mirror Spot', 'Dig Game ES']),
create_dw_region(player, 'Dig Game Ledge', None, ['Dig Game Ledge Drop', 'Maze Race Ledge Mirror Spot', 'Dig Game EC']), create_dw_region(player, 'Dig Game Ledge', None, ['Dig Game Ledge Drop', 'Maze Race Ledge Mirror Spot', 'Dig Game EC']),

Binary file not shown.