In Items: Added Spring Ball.

In Logic: Wrote glitchless logic for accessing regions and subregions.

worlds/metroidprime/Items.py

@@ -39,7 +39,7 @@ class MetroidPrimeItem(Item):
     "Varia Suit": ItemData(5031022, ItemClassification.progression),
     "Phazon Suit": ItemData(5031023, ItemClassification.progression),
     "Energy Tank": ItemData(5031024, ItemClassification.useful),
-    # "Placeholder 1": ItemData(5031025, ItemClassification.filler),
+    "Spring Ball": ItemData(5031025, ItemClassification.useful),
     # item 026 is a health refill
     # "Placeholder 2": ItemData(5031027, ItemClassification.filler)
     "Wavebuster": ItemData(5031028, ItemClassification.filler),

worlds/metroidprime/Logic.py

@@ -3,12 +3,14 @@
 
 
 class MetroidPrimeLogic(LogicMixin):
+
+    # logic rules related to needing a combination of items
     def _prime_has_missiles(self, world: MultiWorld, player: int) -> bool:
-        return self.has_any({'Missile Launcher', 'Missile Expansion'}, player)
+        return self.has_any({'Main Missile', 'Missile Expansion'}, player)
 
     def _prime_has_missile_count(self, world: MultiWorld, player: int) -> int:
         count = 0
-        if self.has({'Missile Launcher'}, player):
+        if self.has({'Main Missile'}, player):
             count = 1
         count += self.prog_items['Missile Expansion', player] * 5
         return count
@@ -23,7 +25,94 @@ def _prime_can_spider(self, world: MultiWorld, player: int) -> bool:
         return self.has({'Morph Ball', 'Spider Ball'})
 
     def _prime_can_pb(self, world: MultiWorld, player: int) -> bool:
-        return self.has({'Morph Ball', 'Power Bomb'})
+        return self.has({'Morph Ball'}) and self.has_any({'Power Bomb', 'Power Bomb Expansion'})
 
     def _prime_can_super(self, world: MultiWorld, player: int) -> bool:
         return self._prime_has_missiles(world, player) and self.has({'Charge Beam', 'Super Missile'})
+
+    def _prime_can_heat(self, world: MultiWorld, player: int) -> bool:
+        return self.has_any({'Varia Suit, Gravity Suit, Phazon Suit'})
+
+    # logic rules related to accessing regions or subregions
+
+    def _prime_late_chozo(self, world: MultiWorld, player: int) -> bool:
+        return (self._prime_has_missiles(world, player) and self._prime_can_bomb(world, player) and
+                self._prime_can_spider(world, player) and
+                ((self.has({'Wave Beam'}) and self._prime_can_boost(world, player)) or
+                 self.has({'Ice Beam', 'Space Jump Boots'})))
+
+    def _prime_reflecting_pool(self, world: MultiWorld, player: int) -> bool:
+        return (self._prime_late_chozo(world, player) and self._prime_can_boost(world, player) and
+                self.has({'Space Jump Boots', 'Wave Beam'}))
+
+    def _prime_frigate(self, world: MultiWorld, player: int) -> bool:
+        return (self._prime_has_missiles(world, player) and
+                self.has({'Morph Ball, Space Jump Boots, Ice Beam, Wave Beam',
+                          'Gravity Suit', 'Thermal Visor'}))
+
+    def _prime_magma_pool(self, world: MultiWorld, player: int) -> bool:
+        return self._prime_can_heat(world, player) and self.has({'Grapple Beam'})
+
+    def _prime_tower_of_light(self, world: MultiWorld, player: int) -> bool:
+        return (self._prime_has_missiles(world, player) and self._prime_can_boost(world, player) and
+                self._prime_can_spider(world, player) and self.has({'Wave Beam', 'Space Jump Boots'}))
+
+    def _prime_early_magmoor(self, world: MultiWorld, player: int) -> bool:
+        return (self._prime_can_heat(world, player) and self._prime_has_missiles(world, player)
+                and self.has({'Morph Ball'}) and (self.has({'Grapple Beam'}) or
+                                                  (self._prime_can_bomb(world, player) or
+                                                   self._prime_can_pb(world, player))))
+
+    def _prime_late_magmoor(self, world: MultiWorld, player: int) -> bool:
+        # through early magmoor
+        return ((self._prime_can_heat(world, player) and self._prime_has_missiles(world, player)
+                 and self._prime_can_spider(world, player) and self.has({'Wave Beam', 'Space Jump Boots'}))
+                # from tallon elevator past frigate
+                or (self._prime_frigate(world, player) and self._prime_can_bomb(world, player) and
+                    self._prime_can_pb(world, player) and self._prime_can_spider(world, player)))
+
+    def _prime_front_phen(self, world: MultiWorld, player: int) -> bool:
+        # from early magmoor to shorelines elevator
+        return ((self._prime_early_magmoor(world, player) and self._prime_can_bomb(world, player))
+                # backwards from quarantine cave
+                or (self._prime_late_magmoor(world, player) and self._prime_can_bomb(world, player)
+                    and self._prime_can_spider(world, player) and self.has({'Thermal Visor', 'Wave Beam'})))
+
+    # basically just ruined courtyard
+    def _prime_middle_phen(self, world: MultiWorld, player: int) -> bool:
+        return (self._prime_front_phen(world, player) and self.has({'Space Jump Boots', 'Wave Beam'}) and
+                ((self._prime_can_bomb(world, player) and self._prime_can_boost(world, player)) or
+                 self._prime_can_spider(world, player)))
+
+    def _prime_quarantine_cave(self, world: MultiWorld, player: int) -> bool:
+        # from ruined courtyard
+        return ((self._prime_middle_phen(world, player) and self._prime_can_super(world, player) and
+                 self.has({'Thermal Visor'}))
+                # from late magmoor
+                or (self._prime_late_magmoor(world, player) and self._prime_can_bomb(world, player)))
+
+    def _prime_far_phen(self, world: MultiWorld, player: int) -> bool:
+        return (self._prime_middle_phen(world, player) and self.has({'Ice Beam'}) and
+                # from labs
+                ((self._prime_can_bomb(world, player) and self.has({'Boost Ball, Space Jump Boots'})) or
+                 # from late magmoor elevator
+                 (self._prime_can_spider(world, player) and self._prime_can_super(world, player) and
+                  self.has({'Thermal Visor'}))))
+
+    def _prime_labs(self, world: MultiWorld, player: int) -> bool:
+        return (self._prime_middle_phen(world, player) and self._prime_can_bomb(world, player)
+                and self.has({'Boost Ball', 'Space Jump Boots'}))
+        # or self._prime_far_phen(world, player)     [reverse labs]
+
+    def _prime_upper_mines(self, world: MultiWorld, player: int) -> bool:
+        # from main quarry via tallon
+        return ((self._prime_frigate(world, player) and self._prime_can_bomb(world, player)) or
+                # from PPC via magmoor
+                (self._prime_late_magmoor(world, player) and self._prime_can_bomb(world, player)
+                 and self._prime_can_pb(world, player) and self.has({'Spider Ball', 'Ice Beam'})))
+
+    # should also cover reverse lower mines since upper mines can logically expect magmoor elevator
+    def _prime_lower_mines(self, world: MultiWorld, player: int) -> bool:
+        return (self._prime_upper_mines(world, player) and self._prime_can_pb(world, player) and
+                self.has('Morph Ball Bombs', 'Boost Ball', 'Spider Ball', 'Plasma Beam',
+                         'X-Ray Visor', 'Grapple Beam'))