Crystals that can be hit with pots

Moved the can_hit_crystal() function to rules where it belongs, and applied it to all instances of crystals in rooms that don't have pots.
2021-03-12 17:07:17 +01:00
parent e1ddd02097
commit 8689bd6a4c
6 changed files with 169 additions and 71 deletions
--- a/DoorShuffle.py
+++ b/DoorShuffle.py
@@ -1990,9 +1990,9 @@ logical_connections = [

    ('Hera Lobby to Front Barrier - Blue', 'Hera Front'),
    ('Hera Front to Lobby Barrier - Blue', 'Hera Lobby'),
-    ('Hera Lobby to Crystal', 'Hera Lobby Crystal'),
+    ('Hera Lobby to Crystal', 'Hera Lobby - Crystal'),
    ('Hera Lobby Crystal Exit', 'Hera Lobby'),
-    ('Hera Front to Crystal', 'Hera Front Crystal'),
+    ('Hera Front to Crystal', 'Hera Front - Crystal'),
    ('Hera Front to Back Bypass', 'Hera Back'),
    ('Hera Front Crystal Exit', 'Hera Front'),
    ('Hera Front to Down Stairs Barrier - Blue', 'Hera Down Stairs Landing'),
@@ -2007,6 +2007,12 @@ logical_connections = [
    ('Hera Back to Front Barrier - Orange', 'Hera Front'),
    ('Hera Back to Ranged Crystal', 'Hera Back - Ranged Crystal'),
    ('Hera Back Ranged Crystal Exit', 'Hera Back'),
+    ('Hera Basement Cage to Crystal', 'Hera Basement Cage - Crystal'),
+    ('Hera Basement Cage Crystal Exit', 'Hera Basement Cage'),
+    ('Hera Tridorm to Crystal', 'Hera Tridorm - Crystal'),
+    ('Hera Tridorm Crystal Exit', 'Hera Tridorm'),
+    ('Hera Startile Wide to Crystal', 'Hera Startile Wide - Crystal'),
+    ('Hera Startile Wide Crystal Exit', 'Hera Startile Wide'),
    ('Hera Big Chest Hook Path', 'Hera Big Chest Landing'),
    ('Hera Big Chest Landing Exit', 'Hera 4F'),

@@ -2077,6 +2083,8 @@ logical_connections = [
    ('Swamp Crystal Switch Outer Ranged Crystal Exit', 'Swamp Crystal Switch Outer'),
    ('Swamp Crystal Switch Inner to Outer Barrier - Blue', 'Swamp Crystal Switch Outer'),
    ('Swamp Crystal Switch Inner to Outer Bypass', 'Swamp Crystal Switch Outer'),
+    ('Swamp Crystal Switch Inner to Crystal', 'Swamp Crystal Switch Inner - Crystal'),
+    ('Swamp Crystal Switch Inner Crystal Exit', 'Swamp Crystal Switch Inner'),
    ('Swamp Compass Donut Push Block', 'Swamp Donut Top'),
    ('Swamp Shortcut Blue Barrier', 'Swamp Trench 2 Pots'),
    ('Swamp Trench 2 Pots Blue Barrier', 'Swamp Shortcut'),
@@ -2095,6 +2103,7 @@ logical_connections = [
    ('Swamp Drain Right Switch', 'Swamp Drain Left'),
    ('Swamp Flooded Spot Ladder', 'Swamp Flooded Room'),
    ('Swamp Flooded Room Ladder', 'Swamp Flooded Spot'),
+
    ('Skull Pot Circle Star Path', 'Skull Map Room'),
    ('Skull Big Chest Hookpath', 'Skull 1 Lobby'),
    ('Skull Back Drop Star Path', 'Skull Small Hall'),
@@ -2111,8 +2120,11 @@ logical_connections = [
    ('Thieves Conveyor Block Path', 'Thieves Conveyor Bridge'),
    ("Thieves Blind's Cell Door", "Thieves Blind's Cell Interior"),
    ("Thieves Blind's Cell Exit", "Thieves Blind's Cell"),
+
    ('Ice Cross Bottom Push Block Left', 'Ice Floor Switch'),
    ('Ice Cross Right Push Block Top', 'Ice Bomb Drop'),
+    ('Ice Conveyor to Crystal', 'Ice Conveyor - Crystal'),
+    ('Ice Conveyor Crystal Exit', 'Ice Conveyor'),
    ('Ice Big Key Push Block', 'Ice Dead End'),
    ('Ice Bomb Jump Ledge Orange Barrier', 'Ice Bomb Jump Catwalk'),
    ('Ice Bomb Jump Catwalk Orange Barrier', 'Ice Bomb Jump Ledge'),
@@ -2123,6 +2135,9 @@ logical_connections = [
    ('Ice Crystal Left Blue Barrier', 'Ice Crystal Block'),
    ('Ice Crystal Block Exit', 'Ice Crystal Left'),
    ('Ice Big Chest Landing Push Blocks', 'Ice Big Chest View'),
+    ('Ice Refill to Crystal', 'Ice Refill - Crystal'),
+    ('Ice Refill Crystal Exit', 'Ice Refill'),
+
    ('Mire Lobby Gap', 'Mire Post-Gap'),
    ('Mire Post-Gap Gap', 'Mire Lobby'),
    ('Mire Hub Upper Blue Barrier', 'Mire Hub Switch'),
@@ -2138,6 +2153,8 @@ logical_connections = [
    ('Mire Crystal Dead End Right Barrier', 'Mire Map Spike Side'),
    ('Mire Hidden Shooters Block Path S', 'Mire Hidden Shooters'),
    ('Mire Hidden Shooters Block Path N', 'Mire Hidden Shooters Blocked'),
+    ('Mire Conveyor to Crystal', 'Mire Conveyor - Crystal'),
+    ('Mire Conveyor Crystal Exit', 'Mire Conveyor Crystal'),
    ('Mire Left Bridge Hook Path', 'Mire Right Bridge'),
    ('Mire Tall Dark and Roomy to Ranged Crystal', 'Mire Tall Dark and Roomy - Ranged Crystal'),
    ('Mire Tall Dark and Roomy Ranged Crystal Exit', 'Mire Tall Dark and Roomy'),
@@ -2151,16 +2168,21 @@ logical_connections = [
    ('Mire Compass Chest Exit', 'Mire Compass Room'),
    ('Mire South Fish Blue Barrier', 'Mire Fishbone'),
    ('Mire Fishbone Blue Barrier', 'Mire South Fish'),
+
    ('TR Main Lobby Gap', 'TR Lobby Ledge'),
    ('TR Lobby Ledge Gap', 'TR Main Lobby'),
    ('TR Pipe Ledge Drop Down', 'TR Pipe Pit'),
    ('TR Big Chest Gap', 'TR Big Chest Entrance'),
    ('TR Big Chest Entrance Gap', 'TR Big Chest'),
    ('TR Chain Chomps Top to Bottom Barrier - Orange', 'TR Chain Chomps Bottom'),
+    ('TR Chain Chomps Top to Crystal', 'TR Chain Chomps Top - Crystal'),
+    ('TR Chain Chomps Top Crystal Exit', 'TR Chain Chomps Top'),
    ('TR Chain Chomps Bottom to Top Barrier - Orange', 'TR Chain Chomps Top'),
    ('TR Chain Chomps Bottom to Ranged Crystal', 'TR Chain Chomps Bottom - Ranged Crystal'),
    ('TR Chain Chomps Bottom Ranged Crystal Exit', 'TR Chain Chomps Bottom'),
    ('TR Pokey 2 Top to Bottom Barrier - Blue', 'TR Pokey 2 Bottom'),
+    ('TR Pokey 2 Top to Crystal', 'TR Pokey 2 Top - Crystal'),
+    ('TR Pokey 2 Top Crystal Exit', 'TR Pokey 2 Top'),
    ('TR Pokey 2 Bottom to Top Barrier - Blue', 'TR Pokey 2 Top'),
    ('TR Pokey 2 Bottom to Ranged Crystal', 'TR Pokey 2 Bottom - Ranged Crystal'),
    ('TR Pokey 2 Bottom Ranged Crystal Exit', 'TR Pokey 2 Bottom'),
@@ -2172,13 +2194,18 @@ logical_connections = [
    ('TR Crystaroller Middle to Top Barrier - Orange', 'TR Crystaroller Top'),
    ('TR Crystaroller Middle to Ranged Crystal', 'TR Crystaroller Middle - Ranged Crystal'),
    ('TR Crystaroller Top to Middle Barrier - Orange', 'TR Crystaroller Middle'),
+    ('TR Crystaroller Top to Crystal', 'TR Crystaroller Top - Crystal'),
+    ('TR Crystaroller Top Crystal Exit', 'TR Crystaroller Top'),
    ('TR Crystaroller Chest to Middle Barrier - Blue', 'TR Crystaroller Middle'),
    ('TR Crystaroller Middle Ranged Crystal Exit', 'TR Crystaroller Middle'),
    ('TR Crystaroller Bottom Ranged Crystal Exit', 'TR Crystaroller Bottom'),
    ('TR Crystal Maze Start to Interior Barrier - Blue', 'TR Crystal Maze Interior'),
+    ('TR Crystal Maze Start to Crystal', 'TR Crystal Maze Start - Crystal'),
+    ('TR Crystal Maze Start Crystal Exit', 'TR Crystal Maze Start'),
    ('TR Crystal Maze Interior to End Barrier - Blue', 'TR Crystal Maze End'),
    ('TR Crystal Maze Interior to Start Barrier - Blue', 'TR Crystal Maze Start'),
    ('TR Crystal Maze Interior to End Bypass', 'TR Crystal Maze End'),
+    ('TR Crystal Maze Interior to Start Bypass', 'TR Crystal Maze Start'),
    ('TR Crystal Maze End to Interior Barrier - Blue', 'TR Crystal Maze Interior'),
    ('TR Crystal Maze End to Ranged Crystal', 'TR Crystal Maze End - Ranged Crystal'),
    ('TR Crystal Maze End Ranged Crystal Exit', 'TR Crystal Maze End'),
@@ -2210,6 +2237,9 @@ logical_connections = [
    ('GT Double Switch Pot Corners to Ranged Switches', 'GT Double Switch Pot Corners - Ranged Switches'),
    ('GT Double Switch Pot Corners Ranged Switches Exit', 'GT Double Switch Pot Corners'),
    ('GT Double Switch Exit to Blue Barrier', 'GT Double Switch Pot Corners'),
+    ('GT Spike Crystal Left to Right Barrier - Orange', 'GT Spike Crystal Right'),
+    ('GT Spike Crystal Right to Left Barrier - Orange', 'GT Spike Crystal Left'),
+    ('GT Spike Crystal Left to Right Bypass', 'GT Spike Crystal Right'),
    ('GT Warp Maze - Pit Section Warp Spot', 'GT Warp Maze - Pit Exit Warp Spot'),
    ('GT Warp Maze Exit Section Warp Spot', 'GT Warp Maze - Pit Exit Warp Spot'),
    ('GT Firesnake Room Hook Path', 'GT Firesnake Room Ledge'),