bug fix for generation with mods needing to mark items as progression

Author: FabulaFey

worlds/crystal_project/__init__.py

@@ -17,7 +17,7 @@
 from .options import CrystalProjectOptions, IncludedRegions, create_option_groups
 from .rules import CrystalProjectLogic
 from .mod_helper import ModLocationData, get_mod_titles, get_modded_items, get_modded_locations, \
-    get_modded_shopsanity_locations, build_condition_rule
+    get_modded_shopsanity_locations, build_condition_rule, update_item_classification
 from typing import List, Set, Dict, Any
 from worlds.AutoWorld import World, WebWorld
 from BaseClasses import Item, Tutorial, MultiWorld, CollectionState
@@ -398,6 +398,9 @@ def get_item_pool(self, excluded_items: Set[str]) -> List[Item]:
 
         if self.options.useMods:
             for modded_item in self.modded_items:
+                combined_locations: List[ModLocationData] = list(self.modded_locations.values())
+                combined_locations.extend(list(self.modded_shops.values()))
+                update_item_classification(modded_item, [location.rule_condition for location in combined_locations], self)
                 item = self.create_item(modded_item.name)
                 pool.append(item)
 

worlds/crystal_project/mod_helper.py

@@ -96,7 +96,7 @@ def get_modded_items() -> List[Item]:
             name = 'Item - ' + item['Name'] + ' - ' + str(item_id)
 
             if not item_in_pool and not excluded:
-                mod_item = Item(name, ItemClassification.progression, item_id, empty_player_value)
+                mod_item = Item(name, ItemClassification.filler, item_id, empty_player_value)
 
                 if length_hint([item for (index, item) in enumerate(items) if item.code == mod_item.code]) == 0:
                     items.append(mod_item)
@@ -120,6 +120,30 @@ def get_modded_items() -> List[Item]:
 
     return items
 
+def update_item_classification(item: Item, rule_condition, world: "CrystalProjectWorld") -> None:
+    for condition in rule_condition:
+        if condition is not None:
+            loot_type = condition['Data']['LootType']
+            loot_id = condition['Data']['LootValue']
+        else:
+            continue
+
+        if loot_type == 1:
+            archipelago_loot_id = loot_id + item_index_offset
+        elif loot_type == 2:
+            archipelago_loot_id = loot_id + equipment_index_offset
+        else:
+            continue
+
+        if archipelago_loot_id in world.item_id_to_name:
+            item_name = world.item_id_to_name[archipelago_loot_id]
+            if item.name == item_name:
+                item.classification = ItemClassification.progression
+        else:
+            continue
+
+    return None
+
 def get_modded_locations() -> Dict[str, ModLocationData]:
     locations: Dict[str, ModLocationData] = {}
     location_codes: List[int] = []