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

10
worlds/meritous/Items.py
View File

@@ -5,7 +5,7 @@
import typing
from BaseClasses import Item
from BaseClasses import Item, ItemClassification
# pedestal_credit_text: str = "and the Unknown Item"
@@ -145,12 +145,14 @@ class MeritousItem(Item):
game: str = "Meritous"
def __init__(self, name, advancement, code, player):
super(MeritousItem, self).__init__(name, advancement, code, player)
super(MeritousItem, self).__init__(name,
ItemClassification.progression if advancement else ItemClassification.filler,
code, player)
if code is None:
self.type = "Event"
elif "Trap" in name:
self.type = "Trap"
self.trap = True
self.classification = ItemClassification.trap
elif "PSI Key" in name:
self.type = "PSI Key"
elif "upgrade" in name:
@@ -167,7 +169,7 @@ class MeritousItem(Item):
self.type = "Important Artifact"
else:
self.type = "Artifact"
self.never_exclude = True
self.classification = ItemClassification.useful
if name in LttPCreditsText:
lttp = LttPCreditsText[name]