morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Core: move multiple Item properties into a single Flag (#638)

Browse Source
This commit is contained in:
Fabian Dill
2022-06-17 03:23:27 +02:00
committed by GitHub
parent 5be00e28dd
commit 6c525e1fe6
45 changed files with 559 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
worlds/subnautica/__init__.py
View File

@@ -11,7 +11,7 @@ from .Regions import create_regions
from .Rules import set_rules
from .Options import options
from BaseClasses import Region, Entrance, Location, MultiWorld, Item, Tutorial
from BaseClasses import Region, Entrance, Location, MultiWorld, Item, Tutorial, ItemClassification, RegionType
from ..AutoWorld import World, WebWorld
@@ -74,7 +74,7 @@ class SubnauticaWorld(World):
self.world.get_location("Aurora - Captain Data Terminal", self.player).place_locked_item(
neptune_launch_platform)
self.world.get_location("Neptune Launch", self.player).place_locked_item(
SubnauticaItem("Victory", True, None, player=self.player))
SubnauticaItem("Victory", ItemClassification.progression, None, player=self.player))
def set_rules(self):
set_rules(self.world, self.player)
@@ -88,10 +88,13 @@ class SubnauticaWorld(World):
def create_item(self, name: str) -> Item:
item = lookup_name_to_item[name]
return SubnauticaItem(name, item["progression"], item["id"], player=self.player)
return SubnauticaItem(name,
ItemClassification.progression if item["progression"] else ItemClassification.filler,
item["id"], player=self.player)
def create_region(world: MultiWorld, player: int, name: str, locations=None, exits=None):
ret = Region(name, None, name, player)
ret = Region(name, RegionType.Generic, name, player)
ret.world = world
if locations:
for location in locations: