Some corrections to Ledges and OWG connections

OWEdges.py

@@ -1405,8 +1405,6 @@ OWExitTypes = {
             'Zora Waterfall Water Drop',
             'Bonk Rock Ledge Drop',
             'Graveyard Ledge Drop',
-            'River Bend Water Drop',
-            'River Bend East Water Drop',
             'Potion Shop Water Drop',
             'Potion Shop Northeast Water Drop',
             'Zora Approach Bottom Ledge Drop',
@@ -1446,13 +1444,9 @@ OWExitTypes = {
             'Dam Cliff Ledge Drop',
             'Bombos Tablet Drop',
             'Cave 45 Ledge Drop',
-            'Lake Hylia Water Drop',
             'Lake Hylia South Water Drop',
-            'Lake Hylia Northeast Water Drop',
-            'Lake Hylia Central Water Drop',
             'Lake Hylia Island Water Drop',
             'Desert Pass Ledge Drop',
-            'Octoballoon Water Drop',
             'Octoballoon Waterfall Water Drop',
             'Dark Death Mountain Drop (West)',
             'Dark Death Mountain Drop (East)',
@@ -1462,7 +1456,6 @@ OWExitTypes = {
             'Bumper Cave Ledge Drop',
             'Bumper Cave Entrance Drop',
             'Qirn Jump Water Drop',
-            'Qirn Jump East Water Drop',
             'Dark Witch Water Drop',
             'Dark Witch Northeast Water Drop',
             'Catfish Approach Bottom Ledge Drop',
@@ -1485,6 +1478,7 @@ OWExitTypes = {
             'Dark Bonk Rocks Cliff Ledge Drop',
             'Bomb Shop Cliff Ledge Drop',
             'Hammer Bridge South Cliff Ledge Drop',
+            'Ice Lake Moat Bomb Jump',
             'Ice Lake Area Cliff Ledge Drop',
             'Ice Palace Island FAWT Ledge Drop',
             'Hammer Bridge EC Cliff Water Drop',
@@ -1501,10 +1495,8 @@ OWExitTypes = {
             'Swamp Nook Cliff Ledge Drop',
             'Swamp Cliff Ledge Drop',
             'Ice Lake Water Drop',
-            'Ice Lake Northeast Water Drop',
             'Ice Lake Southwest Water Drop',
             'Ice Lake Southeast Water Drop',
-            'Bomber Corner Water Drop',
             'Bomber Corner Waterfall Water Drop'
         ],
     'OWTerrain': ['Lost Woods Bush (West)',
@@ -1530,7 +1522,9 @@ OWExitTypes = {
                 'Graveyard Ladder (Bottom)',
                 'Graveyard Ladder (Top)',
                 'Kings Grave Inner Rocks',
+                'River Bend Water Drop',
                 'River Bend West Pier',
+                'River Bend East Water Drop',
                 'River Bend East Pier',
                 'Potion Shop Rock (South)',
                 'Potion Shop Rock (North)',
@@ -1568,15 +1562,19 @@ OWExitTypes = {
                 'C Whirlpool Rock (Top)',
                 'Statues Water Entry',
                 'Statues Landing',
+                'Lake Hylia Central Water Drop',
                 'Lake Hylia Central Island Pier',
                 'Lake Hylia Island Pier',
+                'Lake Hylia Water Drop',
                 'Lake Hylia West Pier',
+                'Lake Hylia Northeast Water Drop',
                 'Lake Hylia East Pier',
                 'Desert Pass Ladder (South)',
                 'Desert Pass Rocks (North)',
                 'Desert Pass Rocks (South)',
                 'Desert Pass Ladder (North)',
                 'Middle Aged Man',
+                'Octoballoon Water Drop',
                 'Octoballoon Pier',
                 'Skull Woods Bush Rock (East)',
                 'Skull Woods Bush Rock (West)',
@@ -1593,6 +1591,7 @@ OWExitTypes = {
                 'Skull Woods Pass Rock (Bottom)',
                 'Dark Graveyard Bush (South)',
                 'Dark Graveyard Bush (North)',
+                'Qirn Jump East Water Drop',
                 'Qirn Jump Pier',
                 'Dark Witch Rock (South)',
                 'Dark Witch Rock (North)',
@@ -1621,11 +1620,12 @@ OWExitTypes = {
                 'Dark C Whirlpool Rock (Top)',
                 'Hype Cave Water Entry',
                 'Hype Cave Landing',
+                'Ice Lake Northeast Water Drop',
                 'Ice Lake Northeast Pier',
                 'Ice Lake Moat Water Entry',
-                'Ice Lake Northeast Pier Bomb Jump',
                 'Ice Palace Approach',
                 'Ice Palace Leave',
+                'Bomber Corner Water Drop',
                 'Bomber Corner Pier'
             ],
     'Portal': ['West Death Mountain Teleporter',

OverworldShuffle.py

@@ -1025,7 +1025,8 @@ mandatory_connections = [# Intra-tile OW Connections
                          ('Dark Bonk Rocks Cliff Ledge Drop', 'Dark Bonk Rocks Area'),
                          ('Hammer Bridge South Cliff Ledge Drop', 'Hammer Bridge South Area'),
                          ('Ice Lake Area Cliff Ledge Drop', 'Ice Lake Area'),
-                         ('Ice Lake Northeast Pier Bomb Jump', 'Ice Lake Northeast Bank'),
+                         ('Ice Lake Northeast Pier Hop', 'Ice Lake Northeast Bank'),
+                         ('Ice Lake Moat Bomb Jump', 'Ice Lake Moat'),
                          ('Dark C Whirlpool Cliff Ledge Drop', 'Dark C Whirlpool Area'),
                          ('Dark C Whirlpool Outer Cliff Ledge Drop', 'Dark C Whirlpool Outer Area'),
                          ('Hype Cliff Ledge Drop', 'Hype Cave Area'),

Regions.py

@@ -208,8 +208,8 @@ def create_regions(world, player):
         create_dw_region(player, 'Ice Lake Northeast Bank', None, ['Ice Lake Northeast Water Drop', 'Lake Hylia Northeast Mirror Spot', 'Ice Lake NE']),
         create_dw_region(player, 'Ice Lake Ledge (West)', None, ['Ice Lake Southwest Water Drop', 'South Shore Mirror Spot', 'Ice Lake WS']),
         create_dw_region(player, 'Ice Lake Ledge (East)', None, ['Ice Lake Southeast Water Drop', 'South Shore East Mirror Spot', 'Ice Lake ES']),
-        create_dw_region(player, 'Ice Lake Water', None, ['Ice Lake Northeast Pier', 'Lake Hylia Island Mirror Spot', 'Ice Lake NC', 'Ice Lake EC'], Terrain.Water),
+        create_dw_region(player, 'Ice Lake Water', None, ['Ice Lake Northeast Pier', 'Ice Lake Moat Bomb Jump', 'Lake Hylia Island Mirror Spot', 'Ice Lake NC', 'Ice Lake EC'], Terrain.Water),
-        create_dw_region(player, 'Ice Lake Moat', None, ['Ice Lake Moat Water Entry', 'Ice Lake Northeast Pier Bomb Jump', 'Ice Palace Approach', 'Lake Hylia Water Mirror Spot']),
+        create_dw_region(player, 'Ice Lake Moat', None, ['Ice Lake Moat Water Entry', 'Ice Lake Northeast Pier Hop', 'Ice Palace Approach', 'Lake Hylia Water Mirror Spot']),
         create_dw_region(player, 'Ice Palace Area', None, ['Ice Palace Leave', 'Ice Palace', 'Ice Palace Teleporter', 'Lake Hylia Central Island Mirror Spot']),
         create_dw_region(player, 'Shopping Mall Area', None, ['Dark Lake Hylia Ledge Fairy', 'Dark Lake Hylia Ledge Hint', 'Dark Lake Hylia Ledge Spike Cave', 'Ice Cave Mirror Spot', 'Shopping Mall SW', 'Shopping Mall SE']),
         create_dw_region(player, 'Swamp Nook Area', None, ['Desert Pass Ledge Mirror Spot', 'Desert Pass Mirror Spot', 'Swamp Nook EC', 'Swamp Nook ES']),

Rules.py

@@ -58,7 +58,6 @@ def set_rules(world, player):
     elif world.goal[player] == 'triforcehunt':
         add_rule(world.get_location('Murahdahla', player), lambda state: state.item_count('Triforce Piece', player) + state.item_count('Power Star', player) >= int(state.world.treasure_hunt_count[player]))
 
-
     # if swamp and dam have not been moved we require mirror for swamp palace
     if not world.swamp_patch_required[player]:
         add_rule(world.get_entrance('Swamp Lobby Moat', player), lambda state: state.has_Mirror(player))
@@ -1640,10 +1639,6 @@ def find_rules_for_zelda_delivery(world, player):
     raise Exception('No path to Sanctuary found')
 
 
-        
-        
-
-
 def set_bunny_rules(world, player, inverted):
 
     # regions for the exits of multi-entrace caves/drops that bunny cannot pass