Skip to content

Commit

Permalink
Subnautica: cleanup (ArchipelagoMW#2828)
Browse files Browse the repository at this point in the history
  • Loading branch information
Berserker66 authored and EmilyV99 committed Apr 15, 2024
1 parent b960109 commit e560119
Showing 1 changed file with 2 additions and 14 deletions.
16 changes: 2 additions & 14 deletions worlds/subnautica/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def create_items(self):
for i in range(item.count):
subnautica_item = self.create_item(item.name)
if item.name == "Neptune Launch Platform":
self.multiworld.get_location("Aurora - Captain Data Terminal", self.player).place_locked_item(
self.get_location("Aurora - Captain Data Terminal").place_locked_item(
subnautica_item)
else:
pool.append(subnautica_item)
Expand All @@ -128,7 +128,7 @@ def create_items(self):
pool.append(self.create_item(name))
extras -= group_amount

for item_name in self.multiworld.random.sample(
for item_name in self.random.sample(
# list of high-count important fragments as priority filler
[
"Cyclops Engine Fragment",
Expand Down Expand Up @@ -175,18 +175,6 @@ def create_item(self, name: str) -> SubnauticaItem:
item_table[item_id].classification,
item_id, player=self.player)

def create_region(self, name: str, region_locations=None, exits=None):
ret = Region(name, self.player, self.multiworld)
if region_locations:
for location in region_locations:
loc_id = self.location_name_to_id.get(location, None)
location = SubnauticaLocation(self.player, location, loc_id, ret)
ret.locations.append(location)
if exits:
for region_exit in exits:
ret.exits.append(Entrance(self.player, region_exit, ret))
return ret

def get_filler_item_name(self) -> str:
return item_table[self.multiworld.random.choice(items_by_type[ItemType.resource])].name

Expand Down

0 comments on commit e560119

Please sign in to comment.