added summons and other non-spark bosses to boss locations; also added Deity Eyes and STEM WARD to the end-game item pool since Gabriel requires them, and adjusted the place they're added for true astley wincon accordingly

Author: dragonsbutalsorabbits

worlds/crystal_project/__init__.py

@@ -321,7 +321,7 @@ def get_item_pool(self, excluded_items: Set[str]) -> List[Item]:
                     if self.options.shopsanity.value != self.options.shopsanity.option_disabled:
                         amount = amount + int(data.endGameShops or 0)
 
-                # Make sure new world pass is included if region sanity of on and its required for the goal
+                # Make sure new world pass is included if regionsanity is on and its required for the goal
                 if (self.options.regionsanity.value == self.options.regionsanity.option_true and
                         (self.options.goal.value == self.options.goal.option_astley or self.options.goal.value == self.options.goal.option_true_astley) and
                         name == THE_NEW_WORLD_PASS):
@@ -331,6 +331,9 @@ def get_item_pool(self, excluded_items: Set[str]) -> List[Item]:
                         self.options.goal.value == self.options.goal.option_true_astley and
                         name == THE_OLD_WORLD_PASS):
                     amount = 1
+                # adds true Astley goal required items if they don't already exist
+                if self.options.goal.value == self.options.goal.option_true_astley and (name == STEM_WARD or name == DEITY_EYE):
+                    amount = amount + int(data.advancedAmount or 0) + int(data.expertAmount or 0) + int(data.endGameAmount or 0)
 
                 for _ in range(amount):
                     item = self.set_classifications(name)
@@ -344,13 +347,6 @@ def get_item_pool(self, excluded_items: Set[str]) -> List[Item]:
                 item = self.set_classifications(PROGRESSIVE_LEVEL)
                 pool.append(item)
 
-        if self.options.goal.value == self.options.goal.option_true_astley:
-            for _ in range(4):
-                item = self.set_classifications(DEITY_EYE)
-                pool.append(item)
-            item = self.set_classifications(STEM_WARD)
-            pool.append(item)
-
         #7 spells randomly chosen from the entire pool (they have Reverse Polarity as default to merc Gran)
         if self.options.includedRegions == self.options.includedRegions.option_beginner:
             for scholar_ability in self.get_optional_scholar_abilities(7):

worlds/crystal_project/items.py

@@ -188,8 +188,8 @@ class Job(NamedTuple):
     SPECIAL_MILK: ItemData(ITEM, 230 + item_index_offset, ItemClassification.progression, 0, 1),
     SPECIAL_FRESH_SALMON: ItemData(ITEM, 231 + item_index_offset, ItemClassification.progression, 0, 1),
     SPECIAL_ROTTEN_SALMON: ItemData(ITEM, 232 + item_index_offset, ItemClassification.progression, 0, 1),
-    DEITY_EYE: ItemData(ITEM, 176 + item_index_offset, ItemClassification.progression, 0), #Used for true astley win con
-    STEM_WARD: ItemData(ITEM, 177 + item_index_offset, ItemClassification.progression, 0), #Used for true astley win con
+    DEITY_EYE: ItemData(ITEM, 176 + item_index_offset, ItemClassification.progression, 0, 0, 0, 4), #Used for true astley win con and fighting Gabriel in Kill Bosses mode
+    STEM_WARD: ItemData(ITEM, 177 + item_index_offset, ItemClassification.progression, 0, 0, 0, 1), #Used for true astley win con and fighting Gabriel in Kill Bosses mode
     PROOF_OF_MERIT: ItemData(ITEM, 191 + item_index_offset, ItemClassification.filler, 0), #We don't use this so it's filler to prevent it from being jsonified
 
     #Passes for Regionsanity