monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Subnautica: cleanup (#2828)

This commit is contained in:
Fabian Dill 2024-03-03 06:33:48 +01:00 committed by GitHub
parent 01cf60f48d
commit b65a3b7464
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
worlds/subnautica/__init__.py
View File

@ -115,7 +115,7 @@ class SubnauticaWorld(World):
for i in range(item.count): for i in range(item.count):
subnautica_item = self.create_item(item.name) subnautica_item = self.create_item(item.name)
if item.name == "Neptune Launch Platform": 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) subnautica_item)
else: else:
pool.append(subnautica_item) pool.append(subnautica_item)
@ -128,7 +128,7 @@ class SubnauticaWorld(World):
pool.append(self.create_item(name)) pool.append(self.create_item(name))
extras -= group_amount 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 # list of high-count important fragments as priority filler
[ [
"Cyclops Engine Fragment", "Cyclops Engine Fragment",
@ -175,18 +175,6 @@ class SubnauticaWorld(World):
item_table[item_id].classification, item_table[item_id].classification,
item_id, player=self.player) 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: def get_filler_item_name(self) -> str:
return item_table[self.multiworld.random.choice(items_by_type[ItemType.resource])].name return item_table[self.multiworld.random.choice(items_by_type[ItemType.resource])].name