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

2
worlds/generic/Rules.py
View File

@@ -45,7 +45,7 @@ def exclusion_rules(world, player: int, exclude_locations: typing.Set[str]):
if loc_name not in world.worlds[player].location_name_to_id:
raise Exception(f"Unable to exclude location {loc_name} in player {player}'s world.") from e
else:
add_item_rule(location, lambda i: not (i.advancement or i.never_exclude))
add_item_rule(location, lambda i: not (i.advancement or i.useful))
location.progress_type = LocationProgressType.EXCLUDED

4
worlds/generic/__init__.py
View File

@@ -1,7 +1,7 @@
from typing import NamedTuple, Union
import logging
from BaseClasses import Item, Tutorial
from BaseClasses import Item, Tutorial, ItemClassification
from ..AutoWorld import World, WebWorld
from NetUtils import SlotType
@@ -46,7 +46,7 @@ class GenericWorld(World):
def create_item(self, name: str) -> Item:
if name == "Nothing":
return Item(name, False, -1, self.player)
return Item(name, ItemClassification.filler, -1, self.player)
raise KeyError(name)