Skip to content

Commit

Permalink
Remove unnecessary comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@NoiseCrush
NoiseCrush committed Aug 23, 2024
1 parent b807f87 commit b1fb542
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 49 deletions.
96 changes: 48 additions & 48 deletions locations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,83 +22,83 @@ def __init__(self, reg, id):
"Brinstar Morph Ball Cannon": LocationData("Brinstar Start", AP_MZM_ID_BASE + 1),
"Brinstar Long Beam": LocationData("Brinstar Main", AP_MZM_ID_BASE + 2),
"Brinstar Ceiling E-Tank": LocationData("Brinstar Start", AP_MZM_ID_BASE + 3),
"Brinstar Main Shaft Left Alcove": LocationData("Brinstar Main", AP_MZM_ID_BASE + 4), #TODO Renamed
"Brinstar Ballspark": LocationData("Brinstar Main", AP_MZM_ID_BASE + 5), #TODO Renamed
"Brinstar Ripper Climb": LocationData("Brinstar Main", AP_MZM_ID_BASE + 6), # TODO Renamed
"Brinstar Speed Booster Shortcut": LocationData("Brinstar Main", AP_MZM_ID_BASE + 7), #TODO Renamed
"Brinstar Varia Suit": LocationData("Brinstar Top", AP_MZM_ID_BASE + 8), #may change region
"Brinstar Main Shaft Left Alcove": LocationData("Brinstar Main", AP_MZM_ID_BASE + 4),
"Brinstar Ballspark": LocationData("Brinstar Main", AP_MZM_ID_BASE + 5),
"Brinstar Ripper Climb": LocationData("Brinstar Main", AP_MZM_ID_BASE + 6),
"Brinstar Speed Booster Shortcut": LocationData("Brinstar Main", AP_MZM_ID_BASE + 7),
"Brinstar Varia Suit": LocationData("Brinstar Top", AP_MZM_ID_BASE + 8),
"Brinstar Worm drop": LocationData("Brinstar Main", AP_MZM_ID_BASE + 9),
"Brinstar Acid near Varia": LocationData("Brinstar Top", AP_MZM_ID_BASE + 10), #may change region
"Brinstar Acid near Varia": LocationData("Brinstar Top", AP_MZM_ID_BASE + 10),
"Brinstar First Missile": LocationData("Brinstar Main", AP_MZM_ID_BASE + 11),
"Brinstar Behind Hive": LocationData("Brinstar Main", AP_MZM_ID_BASE + 12),
"Brinstar Under Bridge": LocationData("Brinstar Main", AP_MZM_ID_BASE + 13),
"Brinstar Post-Hive In Wall": LocationData("Brinstar Past Hives", AP_MZM_ID_BASE + 14), #TODO renamed
"Brinstar Upper Pillar": LocationData("Brinstar Top", AP_MZM_ID_BASE + 15), #TODO renamed
"Brinstar Post-Hive In Wall": LocationData("Brinstar Past Hives", AP_MZM_ID_BASE + 14),
"Brinstar Upper Pillar": LocationData("Brinstar Top", AP_MZM_ID_BASE + 15),
"Brinstar Behind Bombs": LocationData("Brinstar Past Hives", AP_MZM_ID_BASE + 16),
"Brinstar Bomb": LocationData("Brinstar Past Hives", AP_MZM_ID_BASE + 17),
"Brinstar Post-Hive Pillar": LocationData("Brinstar Past Hives", AP_MZM_ID_BASE + 18) #TODO renamed
"Brinstar Post-Hive Pillar": LocationData("Brinstar Past Hives", AP_MZM_ID_BASE + 18)
}

kraid_location_table = {
"Kraid Behind Giant Hoppers": LocationData("Kraid Left Shaft", AP_MZM_ID_BASE + 19), #TODO Renamed
"Kraid Save Room Tunnel": LocationData("Kraid Main", AP_MZM_ID_BASE + 20), #TODO renamed
"Kraid Zipline Morph Jump": LocationData("Kraid Main", AP_MZM_ID_BASE + 21), #TODO renamed
"Kraid Behind Giant Hoppers": LocationData("Kraid Left Shaft", AP_MZM_ID_BASE + 19),
"Kraid Save Room Tunnel": LocationData("Kraid Main", AP_MZM_ID_BASE + 20),
"Kraid Zipline Morph Jump": LocationData("Kraid Main", AP_MZM_ID_BASE + 21),
"Kraid Quad Ball Cannon Room": LocationData("Kraid Left Shaft", AP_MZM_ID_BASE + 22),
"Kraid Unknown Item Statue": LocationData("Kraid Left Shaft", AP_MZM_ID_BASE + 23), #TODO Renamed
"Kraid Unknown Item Statue": LocationData("Kraid Left Shaft", AP_MZM_ID_BASE + 23),
"Kraid Acid Ballspark": LocationData("Kraid Main", AP_MZM_ID_BASE + 24),
"Kraid Speed Booster": LocationData("Kraid Bottom", AP_MZM_ID_BASE + 25),
"Kraid Under Acid Worm": LocationData("Kraid Acid Worm Area", AP_MZM_ID_BASE + 26), #TODO renamed
"Kraid Right Hall Pillar": LocationData("Kraid Main", AP_MZM_ID_BASE + 27), #TODO renamed
"Kraid Under Acid Worm": LocationData("Kraid Acid Worm Area", AP_MZM_ID_BASE + 26),
"Kraid Right Hall Pillar": LocationData("Kraid Main", AP_MZM_ID_BASE + 27),
"Kraid Acid Fall": LocationData("Kraid Bottom", AP_MZM_ID_BASE + 28),
"Kraid Zipline Activator Room": LocationData("Kraid Acid Worm Area", AP_MZM_ID_BASE + 29), #TODO renamed
"Kraid Zipline Activator Room": LocationData("Kraid Acid Worm Area", AP_MZM_ID_BASE + 29),
"Kraid Speed Jump": LocationData("Kraid Main", AP_MZM_ID_BASE + 30),
"Kraid Upper Right Morph Ball Cannon": LocationData("Kraid Main", AP_MZM_ID_BASE + 31),
"Kraid": LocationData("Kraid Bottom", None)
}

norfair_location_table = {
"Norfair Lava Dive Left": LocationData("Lower Norfair", AP_MZM_ID_BASE + 32), #TODO Renamed
"Norfair Lava Dive Right": LocationData("Lower Norfair", AP_MZM_ID_BASE + 33), #TODO renamed
"Norfair Lava Dive Left": LocationData("Lower Norfair", AP_MZM_ID_BASE + 32),
"Norfair Lava Dive Right": LocationData("Lower Norfair", AP_MZM_ID_BASE + 33),
"Norfair Screw Attack": LocationData("Norfair Screw Attack Area", AP_MZM_ID_BASE + 34),
"Norfair Next to Screw Attack": LocationData("Norfair Screw Attack Area", AP_MZM_ID_BASE + 35), #TODO renamed
"Norfair Hallway to Crateria": LocationData("Norfair Main", AP_MZM_ID_BASE + 36), #TODO renamed
"Norfair Next to Screw Attack": LocationData("Norfair Screw Attack Area", AP_MZM_ID_BASE + 35),
"Norfair Hallway to Crateria": LocationData("Norfair Main", AP_MZM_ID_BASE + 36),
"Norfair Under Crateria Elevator": LocationData("Norfair Main", AP_MZM_ID_BASE + 37),
"Norfair Wave Beam": LocationData("Lower Norfair", AP_MZM_ID_BASE + 38),
"Norfair Bomb Trap": LocationData("Norfair Lower Right Shaft", AP_MZM_ID_BASE + 39), #TODO may change region
"Norfair Heated Room Below Wave - Left": LocationData("Lower Norfair", AP_MZM_ID_BASE + 40), #TODO Renamed
"Norfair Heated Room Below Wave - Right": LocationData("Lower Norfair", AP_MZM_ID_BASE + 41), #TODO Renamed
"Norfair Heated Room Under Brinstar Elevator": LocationData("Norfair Lower Right Shaft", AP_MZM_ID_BASE + 42), #TODO may change region
"Norfair Behind Lower Super Missile Door - Right": LocationData("Norfair Behind Super Door", AP_MZM_ID_BASE + 43), #TODO Renamed
"Norfair Behind Lower Super Missile Door - Left": LocationData("Norfair Behind Super Door", AP_MZM_ID_BASE + 44), #TODO renamed
"Norfair Bomb Trap": LocationData("Norfair Lower Right Shaft", AP_MZM_ID_BASE + 39),
"Norfair Heated Room Below Wave - Left": LocationData("Lower Norfair", AP_MZM_ID_BASE + 40),
"Norfair Heated Room Below Wave - Right": LocationData("Lower Norfair", AP_MZM_ID_BASE + 41),
"Norfair Heated Room Under Brinstar Elevator": LocationData("Norfair Lower Right Shaft", AP_MZM_ID_BASE + 42),
"Norfair Behind Lower Super Missile Door - Right": LocationData("Norfair Behind Super Door", AP_MZM_ID_BASE + 43),
"Norfair Behind Lower Super Missile Door - Left": LocationData("Norfair Behind Super Door", AP_MZM_ID_BASE + 44),
"Norfair Ice Beam": LocationData("Norfair Upper Right Shaft", AP_MZM_ID_BASE + 45),
"Norfair Heated Room above Ice Beam": LocationData("Norfair Upper Right Shaft", AP_MZM_ID_BASE + 46),
"Norfair Hi-Jump": LocationData("Norfair Lower Right Shaft", AP_MZM_ID_BASE + 47),
"Norfair Big Room": LocationData("Norfair Right Shaft", AP_MZM_ID_BASE + 48),
"Norfair Behind Top Chozo Statue": LocationData("Norfair Behind Ice Beam", AP_MZM_ID_BASE + 49),
"Norfair Larva Ceiling": LocationData("Norfair Bottom", AP_MZM_ID_BASE + 50), #TODO Renamed
"Norfair Right Shaft Near Hi-Jump": LocationData("Norfair Lower Right Shaft", AP_MZM_ID_BASE + 51), #TODO Renamed
"Norfair Larva Ceiling": LocationData("Norfair Bottom", AP_MZM_ID_BASE + 50),
"Norfair Right Shaft Near Hi-Jump": LocationData("Norfair Lower Right Shaft", AP_MZM_ID_BASE + 51),
"Norfair Right Shaft Bottom": LocationData("Norfair Bottom", AP_MZM_ID_BASE + 52)
}

ridley_location_table = {
"Ridley Southwest Puzzle Top": LocationData("Ridley SW Puzzle", AP_MZM_ID_BASE + 53),
"Ridley Southwest Puzzle Bottom": LocationData("Ridley SW Puzzle", AP_MZM_ID_BASE + 54),
"Ridley West Pillar": LocationData("Ridley Left Shaft", AP_MZM_ID_BASE + 55),
"Ridley Behind Unknown Statue": LocationData("Ridley Room", AP_MZM_ID_BASE + 56), #TODO Renamed
"Ridley Unknown Item Statue": LocationData("Ridley Room", AP_MZM_ID_BASE + 57), #TODO Renamed
"Ridley Fake Floor": LocationData("Ridley Left Shaft", AP_MZM_ID_BASE + 58), #TODO Renamed
"Ridley Upper Ball Cannon Puzzle": LocationData("Central Ridley", AP_MZM_ID_BASE + 59), #TODO may change region
"Ridley Lower Ball Cannon Puzzle": LocationData("Central Ridley", AP_MZM_ID_BASE + 60), #TODO may change region
"Ridley Behind Unknown Statue": LocationData("Ridley Room", AP_MZM_ID_BASE + 56),
"Ridley Unknown Item Statue": LocationData("Ridley Room", AP_MZM_ID_BASE + 57),
"Ridley Fake Floor": LocationData("Ridley Left Shaft", AP_MZM_ID_BASE + 58),
"Ridley Upper Ball Cannon Puzzle": LocationData("Central Ridley", AP_MZM_ID_BASE + 59),
"Ridley Lower Ball Cannon Puzzle": LocationData("Central Ridley", AP_MZM_ID_BASE + 60),
"Ridley Imago Super Missile": LocationData("Ridley Main", AP_MZM_ID_BASE + 61),
"Ridley After Sidehopper Hall Upper": LocationData("Central Ridley", AP_MZM_ID_BASE + 62),
"Ridley After Sidehopper Hall Lower": LocationData("Central Ridley", AP_MZM_ID_BASE + 63),
"Ridley Long Hall": LocationData("Ridley Left Shaft", AP_MZM_ID_BASE + 64),
"Ridley Center Pillar": LocationData("Central Ridley", AP_MZM_ID_BASE + 65), #TODO Renamed
"Ridley Ball Room Lower": LocationData("Central Ridley", AP_MZM_ID_BASE + 66), #TODO Renamed
"Ridley Ball Room Upper": LocationData("Central Ridley", AP_MZM_ID_BASE + 67), #TODO Renamed
"Ridley Fake Lava Under Floor": LocationData("Ridley Right Shaft", AP_MZM_ID_BASE + 68), #TODO Renamed
"Ridley Under Owls": LocationData("Central Ridley", AP_MZM_ID_BASE + 69), #TODO Renamed
"Ridley Northeast Corner": LocationData("Ridley Right Shaft", AP_MZM_ID_BASE + 70), #TODO Renamed
"Ridley Center Pillar": LocationData("Central Ridley", AP_MZM_ID_BASE + 65),
"Ridley Ball Room Lower": LocationData("Central Ridley", AP_MZM_ID_BASE + 66),
"Ridley Ball Room Upper": LocationData("Central Ridley", AP_MZM_ID_BASE + 67),
"Ridley Fake Lava Under Floor": LocationData("Ridley Right Shaft", AP_MZM_ID_BASE + 68),
"Ridley Under Owls": LocationData("Central Ridley", AP_MZM_ID_BASE + 69),
"Ridley Northeast Corner": LocationData("Ridley Right Shaft", AP_MZM_ID_BASE + 70),
"Ridley Bomb Puzzle": LocationData("Ridley Speed Puzzles", AP_MZM_ID_BASE + 71),
"Ridley Speed Jump": LocationData("Ridley Speed Puzzles", AP_MZM_ID_BASE + 72),
"Ridley": LocationData("Ridley Room", None)
Expand All @@ -115,7 +115,7 @@ def __init__(self, reg, id):
"Crateria Power Grip": LocationData("Upper Crateria", AP_MZM_ID_BASE + 76),
"Crateria Moat": LocationData("Crateria", AP_MZM_ID_BASE + 77),
"Crateria Statue Water": LocationData("Upper Crateria", AP_MZM_ID_BASE + 78),
"Crateria Unknown Item Statue": LocationData("Upper Crateria", AP_MZM_ID_BASE + 79), #TODO renamed
"Crateria Unknown Item Statue": LocationData("Upper Crateria", AP_MZM_ID_BASE + 79),
"Crateria East Ballspark": LocationData("Upper Crateria", AP_MZM_ID_BASE + 80),
"Crateria Northeast Corner": LocationData("Upper Crateria", AP_MZM_ID_BASE + 81)
}
Expand All @@ -124,19 +124,19 @@ def __init__(self, reg, id):
"Chozodia Upper Crateria Door": LocationData("Chozodia Ruins", AP_MZM_ID_BASE + 82),
"Chozodia Bomb Maze": LocationData("Chozodia Under Tube", AP_MZM_ID_BASE + 83),
"Chozodia Zoomer Maze": LocationData("Chozodia Under Tube", AP_MZM_ID_BASE + 84),
"Chozodia Ruins East of Upper Crateria Door": LocationData("Chozodia Ruins", AP_MZM_ID_BASE + 85), #TODO renamed
"Chozodia Ruins East of Upper Crateria Door": LocationData("Chozodia Ruins", AP_MZM_ID_BASE + 85),
"Chozodia Chozo Ghost Area Morph Tunnel Above Water": LocationData("Chozodia Ruins Test Area", AP_MZM_ID_BASE + 86),
"Chozodia Chozo Ghost Area Underwater": LocationData("Chozodia Ruins Test Area", AP_MZM_ID_BASE + 87),
"Chozodia Triple Crawling Pirates": LocationData("Chozodia Ruins", AP_MZM_ID_BASE + 88), #TODO renamed
"Chozodia Left of Glass Tube": LocationData("Chozodia Under Tube", AP_MZM_ID_BASE + 89), #TODO renamed
"Chozodia Lava Dive": LocationData("Chozodia Ruins Test Area", AP_MZM_ID_BASE + 90), #TODO Renamed
"Chozodia Triple Crawling Pirates": LocationData("Chozodia Ruins", AP_MZM_ID_BASE + 88),
"Chozodia Left of Glass Tube": LocationData("Chozodia Under Tube", AP_MZM_ID_BASE + 89),
"Chozodia Lava Dive": LocationData("Chozodia Ruins Test Area", AP_MZM_ID_BASE + 90),
"Chozodia Original Power Bomb": LocationData("Chozodia Original Power Bomb Room", AP_MZM_ID_BASE + 91),
"Chozodia Next to Original Power Bomb": LocationData("Chozodia Original Power Bomb Room", AP_MZM_ID_BASE + 92),
"Chozodia Right of Glass Tube": LocationData("Chozodia Under Tube", AP_MZM_ID_BASE + 93), #TODO Renamed
"Chozodia Right of Glass Tube": LocationData("Chozodia Under Tube", AP_MZM_ID_BASE + 93),
"Chozodia Chozo Ghost Area Long Shinespark": LocationData("Chozodia Ruins Test Area", AP_MZM_ID_BASE + 94),
"Chozodia Pirate Pitfall Trap": LocationData("Chozodia Mothership Central", AP_MZM_ID_BASE + 95), #TODO renamed
"Chozodia Behind Workbot": LocationData("Chozodia Mothership Central", AP_MZM_ID_BASE + 96), #TODO Renamed
"Chozodia Ceiling Near Map Station": LocationData("Chozodia Mothership Central", AP_MZM_ID_BASE + 97), #TODO renamed
"Chozodia Pirate Pitfall Trap": LocationData("Chozodia Mothership Central", AP_MZM_ID_BASE + 95),
"Chozodia Behind Workbot": LocationData("Chozodia Mothership Central", AP_MZM_ID_BASE + 96),
"Chozodia Ceiling Near Map Station": LocationData("Chozodia Mothership Central", AP_MZM_ID_BASE + 97),
"Chozodia Under Mecha Ridley Hallway": LocationData("Chozodia Mecha Ridley Hallway", AP_MZM_ID_BASE + 98),
"Chozodia Southeast Corner In Hull": LocationData("Chozodia Mothership Central", AP_MZM_ID_BASE + 99),
"Chozo Ghost": LocationData("Chozodia Ruins Test Area", None),
Expand Down
1 change: 0 additions & 1 deletion logic.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,6 @@ def cockpit_to_original_pb():
)


# This one stupid room is so randomly complicated lol
def cockpit_to_mecha_ridley():
return all(
CanBombTunnelBlock,
Expand Down

0 comments on commit b1fb542

Please sign in to comment.