Skip to content

Commit

Permalink
Fix issue with not enabling all metroids failing generation
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ehseezed
Ehseezed committed Sep 8, 2024
1 parent ab87aef commit dcd234d
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
20 changes: 10 additions & 10 deletions worlds/am2r/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,24 +93,24 @@ def create_items(self) -> None:
self.multiworld.get_location("Industrial Complex: And then there\'s this Asshole",self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("Inside Industrial: Guardian of Doom Treadmill",self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("Inside Industrial: Rawsome1234 by the Lava Lake",self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("Dual Alphas: Marco", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("Dual Alphas: Polo", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("Research Camp Dual Alphas: Marco", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("Research Camp Dual Alphas: Polo", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("Mines: Unga", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("Mines: Gunga", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("The Tower: Patricia", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("The Tower: Variable \"GUH\"", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("Ruler of The Tower: Slagathor", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("The Tower: Slagathor, the Ruler", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("The Tower: Mr.Sandman", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("The Tower: Anakin", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("The Tower: Xander", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("EMP: Sir Zeta Commander of the Alpha Squadron", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("Alpha Squadron: Timmy", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("Alpha Squadron: Tommy", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("Alpha Squadron: Terry", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("Alpha Squadron: Telly", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("Alpha Squadron: Martin", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("Underwater: Gamma Bros Mario", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("Underwater: Gamma Bros Luigi", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("Distribution Center Alpha Squadron: Timmy", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("Distribution Center Alpha Squadron: Tommy", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("Distribution Center Alpha Squadron: Terry", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("Distribution Center Alpha Squadron: Telly", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("Distribution Center Alpha Squadron: Martin", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("Distribution Center: Gamma Bros Mario", self.player).place_locked_item(self.create_item("Metroid"))
self.multiworld.get_location("Distribution Center: Gamma Bros Luigi", self.player).place_locked_item(self.create_item("Metroid"))

if self.options.LocationSettings == LocationSettings.option_items_no_A6 or self.options.LocationSettings == LocationSettings.option_add_metroids_no_A6:
self.multiworld.exclude_locations[self.player].value.add("Deep Caves: Drivel Ballspark")
Expand Down
10 changes: 5 additions & 5 deletions worlds/am2r/locations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,11 @@ def get_location_datas(world: Optional[MultiWorld], player: Optional[int]):

LocationData("Pipe Hell BL", "EMP: Sir Zeta Commander of the Alpha Squadron", 108680133, 343, logic.AM2R_can_bomb), # Lucina

LocationData("Pipe Hell R", "Alpha Squadron: Timmy", 108680134, 346), # Lucina
LocationData("Pipe Hell R", "Alpha Squadron: Tommy", 108680135, 345), # Lucina
LocationData("Pipe Hell R", "Alpha Squadron: Terry", 108680136, 348), # Lucina
LocationData("Pipe Hell R", "Alpha Squadron: Telly", 108680137, 347), # Lucina
LocationData("Pipe Hell R", "Alpha Squadron: Martin", 108680138, 344),
LocationData("Pipe Hell R", "Distribution Center Alpha Squadron: Timmy", 108680134, 346), # Lucina
LocationData("Pipe Hell R", "Distribution Center Alpha Squadron: Tommy", 108680135, 345), # Lucina
LocationData("Pipe Hell R", "Distribution Center Alpha Squadron: Terry", 108680136, 348), # Lucina
LocationData("Pipe Hell R", "Distribution Center Alpha Squadron: Telly", 108680137, 347), # Lucina
LocationData("Pipe Hell R", "Distribution Center Alpha Squadron: Martin", 108680138, 344),

LocationData("Underwater Distro Connection", "Distribution Center: Gamma Bros Mario", 108680139, 349), # Lucina
LocationData("Underwater Distro Connection", "Distribution Center: Gamma Bros Luigi", 108680140, 350), # Lucina
Expand Down

0 comments on commit dcd234d

Please sign in to comment.