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

Meritous: Minor logic change (#584)

This commit is contained in:
Felix R 2022-05-27 19:52:14 -03:00 committed by GitHub
parent 8adc0dd7eb
commit 5d3b4c8efd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
worlds/meritous/Items.py
View File

@ -163,6 +163,8 @@ class MeritousItem(Item):
self.type = name self.type = name
elif name == "Extra Life": elif name == "Extra Life":
self.type = "Other" self.type = "Other"
elif self.advancement:
self.type = "Important Artifact"
else: else:
self.type = "Artifact" self.type = "Artifact"
self.never_exclude = True self.never_exclude = True
@ -210,5 +212,6 @@ item_groups = {
"Artifacts": ["Map", "Shield Boost", "Crystal Efficiency", "Circuit Booster", "Artifacts": ["Map", "Shield Boost", "Crystal Efficiency", "Circuit Booster",
"Metabolism", "Dodge Enhancer", "Ethereal Monocle", "Crystal Gatherer", "Metabolism", "Dodge Enhancer", "Ethereal Monocle", "Crystal Gatherer",
"Portable Compass"], "Portable Compass"],
"Important Artifacts": ["Shield Boost", "Circuit Booster", "Metabolism", "Dodge Enhancer"],
"Crystals": ["Crystals x500", "Crystals x1000", "Crystals x2000"] "Crystals": ["Crystals x500", "Crystals x1000", "Crystals x2000"]
} }

9
worlds/meritous/Regions.py
View File

@ -68,7 +68,8 @@ def create_regions(world: MultiWorld, player: int):
entrance_map = { entrance_map = {
"To Meridian": { "To Meridian": {
"to": "Meridian", "to": "Meridian",
"rule": lambda state: state.has_group("PSI Keys", player, 1) "rule": lambda state: state.has_group("PSI Keys", player, 1) and
state.has_group("Important Artifacts", player, 1)
}, },
"To Second Quarter": { "To Second Quarter": {
"to": "Second Quarter", "to": "Second Quarter",
@ -76,7 +77,8 @@ def create_regions(world: MultiWorld, player: int):
}, },
"To Ataraxia": { "To Ataraxia": {
"to": "Ataraxia", "to": "Ataraxia",
"rule": lambda state: state.has_group("PSI Keys", player, 2) "rule": lambda state: state.has_group("PSI Keys", player, 2) and
state.has_group("Important Artifacts", player, 2)
}, },
"To Third Quarter": { "To Third Quarter": {
"to": "Third Quarter", "to": "Third Quarter",
@ -84,7 +86,8 @@ def create_regions(world: MultiWorld, player: int):
}, },
"To Merodach": { "To Merodach": {
"to": "Merodach", "to": "Merodach",
"rule": lambda state: state.has_group("PSI Keys", player, 3) "rule": lambda state: state.has_group("PSI Keys", player, 3) and
state.has_group("Important Artifacts", player, 3)
}, },
"To Last Quarter": { "To Last Quarter": {
"to": "Last Quarter", "to": "Last Quarter",

7
worlds/meritous/__init__.py
View File

@ -24,6 +24,8 @@ class MeritousWeb(WebWorld):
"setup/en", "setup/en",
["KewlioMZX"] ["KewlioMZX"]
)] )]
theme = "ice"
bug_report_page = "https://github.com/FelicitusNeko/meritous-ap/issues"
class MeritousWorld(World): class MeritousWorld(World):
@ -60,7 +62,10 @@ class MeritousWorld(World):
@staticmethod @staticmethod
def _is_progression(name): def _is_progression(name):
return "PSI Key" in name or name in ["Cursed Seal", "Agate Knife"] return "PSI Key" in name or name in [
"Cursed Seal", "Agate Knife", "Dodge Enhancer",
"Shield Boost", "Metabolism", "Circuit Booster"
]
def create_item(self, name: str) -> Item: def create_item(self, name: str) -> Item:
return MeritousItem(name, self._is_progression( return MeritousItem(name, self._is_progression(