From 5d3b4c8efd413c3b808d6d5b979ea3736da0a078 Mon Sep 17 00:00:00 2001
From: Felix R <50271878+FelicitusNeko@users.noreply.github.com>
Date: Fri, 27 May 2022 19:52:14 -0300
Subject: [PATCH] Meritous: Minor logic change (#584)

---
 worlds/meritous/Items.py    | 3 +++
 worlds/meritous/Regions.py  | 9 ++++++---
 worlds/meritous/__init__.py | 7 ++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/worlds/meritous/Items.py b/worlds/meritous/Items.py
index a2d9c86c..4f02ee9d 100644
--- a/worlds/meritous/Items.py
+++ b/worlds/meritous/Items.py
@@ -163,6 +163,8 @@ class MeritousItem(Item):
             self.type = name
         elif name == "Extra Life":
             self.type = "Other"
+        elif self.advancement:
+            self.type = "Important Artifact"
         else:
             self.type = "Artifact"
             self.never_exclude = True
@@ -210,5 +212,6 @@ item_groups = {
     "Artifacts": ["Map", "Shield Boost", "Crystal Efficiency", "Circuit Booster",
                   "Metabolism", "Dodge Enhancer", "Ethereal Monocle", "Crystal Gatherer",
                   "Portable Compass"],
+    "Important Artifacts": ["Shield Boost", "Circuit Booster", "Metabolism", "Dodge Enhancer"],
     "Crystals": ["Crystals x500", "Crystals x1000", "Crystals x2000"]
 }
diff --git a/worlds/meritous/Regions.py b/worlds/meritous/Regions.py
index 502a4097..2fdafb69 100644
--- a/worlds/meritous/Regions.py
+++ b/worlds/meritous/Regions.py
@@ -68,7 +68,8 @@ def create_regions(world: MultiWorld, player: int):
     entrance_map = {
         "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",
@@ -76,7 +77,8 @@ def create_regions(world: MultiWorld, player: int):
         },
         "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",
@@ -84,7 +86,8 @@ def create_regions(world: MultiWorld, player: int):
         },
         "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",
diff --git a/worlds/meritous/__init__.py b/worlds/meritous/__init__.py
index b2632190..2f59f782 100644
--- a/worlds/meritous/__init__.py
+++ b/worlds/meritous/__init__.py
@@ -24,6 +24,8 @@ class MeritousWeb(WebWorld):
         "setup/en",
         ["KewlioMZX"]
     )]
+    theme = "ice"
+    bug_report_page = "https://github.com/FelicitusNeko/meritous-ap/issues"
 
 
 class MeritousWorld(World):
@@ -60,7 +62,10 @@ class MeritousWorld(World):
 
     @staticmethod
     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:
         return MeritousItem(name, self._is_progression(