Added Mixed OWG Logic

2022-10-24 17:48:25 -05:00
parent f28fc45a46
commit 7546251911
6 changed files with 15 additions and 11 deletions
--- a/EntranceShuffle.py
+++ b/EntranceShuffle.py
@@ -1508,7 +1508,8 @@ def connect_inaccessible_regions(world, lw_entrances, dw_entrances, caves, playe
    for region_name in inaccessible_regions.copy():
        region = world.get_region(region_name, player)
        if region.type not in [RegionType.LightWorld, RegionType.DarkWorld] or not any((not exit.connected_region and exit.spot_type == 'Entrance') for exit in region.exits) \
-                or (region_name == 'Pyramid Exit Ledge' and world.shuffle[player] != 'insanity' or world.is_tile_swapped(0x1b, player)):
+                or (region_name == 'Pyramid Exit Ledge' and world.shuffle[player] != 'insanity' or world.is_tile_swapped(0x1b, player)) \
+                or region_name in ['Hyrule Castle Water', 'Pyramid Water']:
            inaccessible_regions.remove(region_name)
        elif region.type == (RegionType.LightWorld if not invFlag else RegionType.DarkWorld):
            must_exit_regions.append(region_name)
--- a/OWEdges.py
+++ b/OWEdges.py
@@ -1481,7 +1481,6 @@ OWExitTypes = {
            'Tree Line WC Cliff Water Drop',
            'C Whirlpool Outer Cliff Ledge Drop',
            'C Whirlpool Cliff Ledge Drop',
-            'South Teleporter Cliff Ledge Drop',
            'Statues Cliff Ledge Drop',
            'Desert Ledge Drop',
            'Checkerboard Ledge Drop',
@@ -1538,7 +1537,6 @@ OWExitTypes = {
            'Dark C Whirlpool Outer Cliff Ledge Drop',
            'Dark C Whirlpool Cliff Ledge Drop',
            'Hype Cliff Ledge Drop',
-            'Dark South Teleporter Cliff Ledge Drop',
            'Misery Mire Teleporter Ledge Drop',
            'Mire Cliff Ledge Drop',
            'Dark Checkerboard Cliff Ledge Drop',
--- a/OverworldGlitchRules.py
+++ b/OverworldGlitchRules.py
@@ -297,7 +297,12 @@ def overworld_glitches_rules(world, player):
    add_additional_rule(world.get_entrance('VoO To Dig Game Hook Clip', player), lambda state: state.has('Hookshot', player))
    add_additional_rule(world.get_entrance('Tree Line Water Clip', player), lambda state: state.has('Flippers', player))
    add_additional_rule(world.get_entrance('Dark Tree Line Water Clip', player), lambda state: state.has('Flippers', player))
-    
+    if not world.is_tile_swapped(0x33, player):
+        add_additional_rule(world.get_entrance('South Teleporter Cliff Ledge Drop', player), lambda state: state.can_lift_rocks(player) and state.has_Pearl(player))
+        world.get_entrance('Dark South Teleporter Cliff Ledge Drop', player).access_rule = lambda state: False
+    else:
+        add_additional_rule(world.get_entrance('Dark South Teleporter Cliff Ledge Drop', player), lambda state: state.can_lift_rocks(player) and state.has_Pearl(player))
+        world.get_entrance('South Teleporter Cliff Ledge Drop', player).access_rule = lambda state: False

 def add_alternate_rule(entrance, rule):
    old_rule = entrance.access_rule
@@ -314,6 +319,7 @@ def create_no_logic_connections(player, world, connections):
        parent = world.get_region(parent_region, player)
        target = world.get_region(target_region, player)
        connection = Entrance(player, entrance, parent)
+        connection.spot_type = 'Ledge'
        parent.exits.append(connection)
        connection.connect(target)

@@ -457,6 +463,7 @@ boots_clips = [

    (['C Whirlpool To Cliff Clip', 'Dark C Whirlpool To Cliff Clip'], ['C Whirlpool Area', 'Dark C Whirlpool Area'], ['Central Cliffs', 'Dark Central Cliffs']),
    (['C Whirlpool Outer To Cliff Clip', 'Dark C Whirlpool Outer To Cliff Clip'], ['C Whirlpool Outer Area', 'Dark C Whirlpool Outer Area'], ['Central Cliffs', 'Dark Central Cliffs']),
+    (['South Teleporter Cliff Ledge Drop', 'Dark South Teleporter Cliff Ledge Drop'], ['C Whirlpool Area', 'Dark C Whirlpool Area'], ['Dark Central Cliffs', 'Central Cliffs']), # glove/pearl

    (['Statues To Cliff Clip', 'Hype To Cliff Clip'], ['Statues Area', 'Hype Cave Area'], ['Central Cliffs', 'Dark Central Cliffs']),

--- a/OverworldShuffle.py
+++ b/OverworldShuffle.py
@@ -1694,7 +1694,6 @@ ow_connections = {
            ('C Whirlpool Mirror Spot', 'C Whirlpool Area'),
            ('C Whirlpool Outer Mirror Spot', 'C Whirlpool Outer Area'),
            ('South Hyrule Teleporter', 'Dark C Whirlpool Area'),
-            ('South Teleporter Cliff Ledge Drop', 'Dark Central Cliffs'), # OWG only, needs glove
            ('C Whirlpool Cliff Ledge Drop', 'C Whirlpool Area'), # OWG
            ('Dark C Whirlpool Cliff Ledge Drop', 'Dark C Whirlpool Area'), # OWG
            ('C Whirlpool Outer Cliff Ledge Drop', 'C Whirlpool Outer Area'), # OWG
@@ -1705,7 +1704,6 @@ ow_connections = {
            ('Dark C Whirlpool Mirror Spot', 'Dark C Whirlpool Area'),
            ('Dark C Whirlpool Outer Mirror Spot', 'Dark C Whirlpool Outer Area'),
            ('South Dark World Teleporter', 'C Whirlpool Area'),
-            ('Dark South Teleporter Cliff Ledge Drop', 'Central Cliffs'), # OWG, needs glove/pearl
            ('C Whirlpool Cliff Ledge Drop', 'Dark C Whirlpool Area'), # OWG
            ('Dark C Whirlpool Cliff Ledge Drop', 'C Whirlpool Area'), # OWG
            ('C Whirlpool Outer Cliff Ledge Drop', 'Dark C Whirlpool Outer Area'), # OWG
@@ -1954,7 +1952,9 @@ isolated_regions = [
    'Dark Death Mountain Ledge',
    'Dark Death Mountain Isolated Ledge',
    'Bumper Cave Ledge',
-    'Pyramid Exit Ledge'
+    'Pyramid Exit Ledge',
+    'Hyrule Castle Water',
+    'Pyramid Water'
 ]

 flute_data = {
--- a/Regions.py
+++ b/Regions.py
@@ -87,7 +87,7 @@ def create_regions(world, player):
        create_lw_region(player, 'Stone Bridge Area', None, ['Hammer Bridge North Mirror Spot', 'Hammer Bridge South Mirror Spot', 'Stone Bridge NC', 'Stone Bridge EN', 'Stone Bridge WS', 'Stone Bridge SC']),
        create_lw_region(player, 'Stone Bridge Water', None, ['Dark Hobo Mirror Spot', 'Stone Bridge WC', 'Stone Bridge EC'], 'Light World', Terrain.Water),
        create_lw_region(player, 'Hobo Bridge', ['Hobo'], ['Hobo EC'], 'Light World', Terrain.Water),
-        create_lw_region(player, 'Central Cliffs', None, ['Central Bonk Rocks Cliff Ledge Drop', 'Links House Cliff Ledge Drop', 'Stone Bridge Cliff Ledge Drop', 'Lake Hylia Area Cliff Ledge Drop', 'Lake Hylia Island FAWT Ledge Drop', 'Stone Bridge EC Cliff Water Drop', 'Tree Line WC Cliff Water Drop', 'C Whirlpool Outer Cliff Ledge Drop', 'C Whirlpool Cliff Ledge Drop', 'South Teleporter Cliff Ledge Drop', 'Statues Cliff Ledge Drop']),
+        create_lw_region(player, 'Central Cliffs', None, ['Central Bonk Rocks Cliff Ledge Drop', 'Links House Cliff Ledge Drop', 'Stone Bridge Cliff Ledge Drop', 'Lake Hylia Area Cliff Ledge Drop', 'Lake Hylia Island FAWT Ledge Drop', 'Stone Bridge EC Cliff Water Drop', 'Tree Line WC Cliff Water Drop', 'C Whirlpool Outer Cliff Ledge Drop', 'C Whirlpool Cliff Ledge Drop', 'Statues Cliff Ledge Drop']),
        create_lw_region(player, 'Tree Line Area', None, ['Lake Hylia Fairy', 'Dark Tree Line Mirror Spot', 'Tree Line WN', 'Tree Line NW', 'Tree Line SE']),
        create_lw_region(player, 'Tree Line Water', None, ['Tree Line WC', 'Tree Line SC'], 'Light World', Terrain.Water),
        create_lw_region(player, 'Eastern Nook Area', None, ['Long Fairy Cave', 'Darkness Nook Mirror Spot', 'East Hyrule Teleporter', 'Eastern Nook NE']),
@@ -197,7 +197,7 @@ def create_regions(world, player):
        create_dw_region(player, 'Hammer Bridge South Area', None, ['Hammer Bridge Pegs (South)', 'Stone Bridge South Mirror Spot', 'Hammer Bridge WS', 'Hammer Bridge SC']),
        create_dw_region(player, 'Hammer Bridge Water', None, ['Hammer Bridge Pier', 'Hobo Mirror Spot', 'Hammer Bridge EC'], 'Dark World', Terrain.Water),
        create_dw_region(player, 'Dark Central Cliffs', None, ['Dark Bonk Rocks Cliff Ledge Drop', 'Bomb Shop Cliff Ledge Drop', 'Hammer Bridge South Cliff Ledge Drop', 'Ice Lake Area Cliff Ledge Drop', 'Ice Palace Island FAWT Ledge Drop',
-                                                                'Hammer Bridge EC Cliff Water Drop', 'Dark Tree Line WC Cliff Water Drop', 'Dark C Whirlpool Outer Cliff Ledge Drop', 'Dark C Whirlpool Cliff Ledge Drop', 'Hype Cliff Ledge Drop', 'Dark South Teleporter Cliff Ledge Drop']),
+                                                                'Hammer Bridge EC Cliff Water Drop', 'Dark Tree Line WC Cliff Water Drop', 'Dark C Whirlpool Outer Cliff Ledge Drop', 'Dark C Whirlpool Cliff Ledge Drop', 'Hype Cliff Ledge Drop']),
        create_dw_region(player, 'Dark Tree Line Area', None, ['Dark Lake Hylia Fairy', 'Tree Line Mirror Spot', 'Dark Tree Line WN', 'Dark Tree Line NW', 'Dark Tree Line SE']),
        create_dw_region(player, 'Dark Tree Line Water', None, ['Dark Tree Line WC', 'Dark Tree Line SC'], 'Dark World', Terrain.Water),
        create_dw_region(player, 'Palace of Darkness Nook Area', None, ['East Dark World Hint', 'East Dark World Teleporter', 'Eastern Nook Mirror Spot', 'Palace of Darkness Nook NE']),
--- a/Rules.py
+++ b/Rules.py
@@ -1260,12 +1260,10 @@ def ow_inverted_rules(world, player):
        set_rule(world.get_entrance('C Whirlpool Mirror Spot', player), lambda state: state.has_Mirror(player))
        set_rule(world.get_entrance('C Whirlpool Outer Mirror Spot', player), lambda state: state.has_Mirror(player))
        set_rule(world.get_entrance('South Hyrule Teleporter', player), lambda state: state.has('Hammer', player) and state.can_lift_rocks(player) and state.has_Pearl(player)) # bunny cannot use hammer
-        set_rule(world.get_entrance('South Teleporter Cliff Ledge Drop', player), lambda state: state.can_lift_rocks(player) and state.has_Pearl(player)) # OWG only, can bomb clip out
    else:
        set_rule(world.get_entrance('Dark C Whirlpool Mirror Spot', player), lambda state: state.has_Mirror(player))
        set_rule(world.get_entrance('Dark C Whirlpool Outer Mirror Spot', player), lambda state: state.has_Mirror(player))
        set_rule(world.get_entrance('South Dark World Teleporter', player), lambda state: state.has('Hammer', player) and state.can_lift_rocks(player) and state.has_Pearl(player))
-        set_rule(world.get_entrance('Dark South Teleporter Cliff Ledge Drop', player), lambda state: state.can_lift_rocks(player) and state.has_Pearl(player))
        
    if not world.is_tile_swapped(0x34, player):
        set_rule(world.get_entrance('Statues Mirror Spot', player), lambda state: state.has_Mirror(player))