Minor cleanup

Items.py

@@ -284,6 +284,7 @@ def get_item_for_options(
         ItemClassification.progression,
         3,
     ),
+
     # These aren't used in item generation but are referenced in the client
     SuitUpgrade.Power_Charge_Beam.value: ItemData(
         SuitUpgrade.Power_Charge_Beam.value, 47, ItemClassification.progression, 1

Metroid Prime.yaml

@@ -121,6 +121,7 @@ Metroid Prime:
 
   randomize_starting_beam:
     # If enabled, the starting beam will be randomized to a random beam that is not the Power Beam. Note that if vanilla start is used, the hive mecha boss will be disabled.
+    # Note that if you don't randomize door colors, this can lead to you getting BK'd immediately
     "false": 50
     "true": 0
 

PrimeOptions.py

@@ -349,7 +349,9 @@ class IncludeMorphBallBombDoors(Toggle):
 
 
 class RandomizeStartingBeam(Toggle):
-    """If enabled, the starting beam will be randomized to a random beam that is not the Power Beam. Note that if vanilla start is used, the hive mecha boss will be disabled."""
+    """If enabled, the starting beam will be randomized to a random beam that is not the Power Beam. Note that if vanilla start is used, the hive mecha boss will be disabled.
+    Note that if you don't randomize door colors, this can lead to you getting BK'd immediately
+    """
 
     display_name = "Randomize Starting Beam"
     default = False

__init__.py

@@ -35,7 +35,7 @@
     default_elevator_mappings,
     get_random_elevator_mapping,
 )
-from .config import make_config
+from .Config import make_config
 from .Regions import create_regions
 from .Locations import every_location
 from .PrimeOptions import (

data/DoorData.py

@@ -47,7 +47,7 @@ def get_door_data_by_room_names(
 ) -> Optional[tuple[DoorData, int]]:
     region_data = world.game_region_data.get(area)
 
-    assert region_data is not None
+    assert region_data
 
     source_room_data = region_data.rooms.get(source_room)
     if not source_room_data:

test/TestBlastShieldRando.py

@@ -10,7 +10,7 @@
     BlastShieldType,
 )
 from ..DoorRando import DoorLockType
-from ..config import make_config
+from ..Config import make_config
 from ..data.RoomNames import RoomName
 from ..Items import ProgressiveUpgrade, SuitUpgrade
 from . import MetroidPrimeTestBase

test/TestDoorRando.py

@@ -2,7 +2,7 @@
 from ..Items import SuitUpgrade
 from ..DoorRando import DoorLockType
 
-from ..config import make_config
+from ..Config import make_config
 from ..data.AreaNames import MetroidPrimeArea
 from ..data.RoomNames import RoomName
 from . import MetroidPrimeTestBase

test/TestOutputGeneration.py

@@ -2,7 +2,7 @@
 import os
 from typing import Any, Dict
 from Fill import distribute_items_restrictive
-from ..config import make_config
+from ..Config import make_config
 from . import MetroidPrimeTestBase
 
 OUTPUT_DIR = os.path.join(os.path.dirname(__file__), "test_output")

test/TestStartingBeamRando.py

@@ -1,5 +1,5 @@
 import typing
-from ..config import make_config
+from ..Config import make_config
 from Fill import distribute_items_restrictive
 from ..Items import SuitUpgrade
 from .. import MetroidPrimeWorld