removed home points

Author: FabulaFey

worlds/crystal_project/__init__.py

@@ -23,7 +23,7 @@
 from .options import CrystalProjectOptions, create_option_groups
 from .rules import CrystalProjectLogic
 from .mod_helper import ModLocationData, get_modded_items, get_modded_locations, get_modded_home_points, \
-    get_modded_shopsanity_locations, get_modded_bosses, build_condition_rule, update_item_classification, get_mod_info, get_removed_locations
+    get_modded_shopsanity_locations, get_modded_bosses, build_condition_rule, update_item_classification, get_mod_info, get_removed_locations, get_removed_home_points
 from typing import List, Set, Dict, Any
 from worlds.AutoWorld import World, WebWorld
 from BaseClasses import Item, Tutorial, MultiWorld, CollectionState, ItemClassification
@@ -104,6 +104,7 @@ class CrystalProjectWorld(World):
         item_name_groups.setdefault(MOD, set()).add(modded_home_point.name)
 
     removed_locations = get_removed_locations(mod_info)
+    removed_home_points = get_removed_home_points(mod_info)
 
     web = CrystalProjectWeb()
 
@@ -229,11 +230,16 @@ def create_regions(self) -> None:
 
         if self.options.home_point_hustle.value != self.options.home_point_hustle.option_disabled:
             home_points = get_home_points()
+            removed_code_list = [home_point.code for home_point in self.removed_home_points]
 
-            # todo removed home points
             for home_point in home_points:
-                home_point_location = LocationData(home_point.ap_region, home_point.name, (home_point.code + home_point_location_index_offset), home_point.rule)
-                locations.append(home_point_location)
+                should_add = True
+                if self.options.use_mods.value == self.options.use_mods.option_true:
+                    should_add = home_point.code not in removed_code_list
+
+                if should_add:
+                    home_point_location = LocationData(home_point.ap_region, home_point.name, (home_point.code + home_point_location_index_offset), home_point.rule)
+                    locations.append(home_point_location)
 
             if self.options.use_mods.value == self.options.use_mods.option_true:
                 for modded_home_point in self.modded_home_points:
@@ -787,6 +793,10 @@ def fill_slot_data(self) -> Dict[str, Any]:
                 slot_data_removed_locations.append({"Id": location.code,
                                             "APRegion": location.ap_region})
 
+            for home_point in self.removed_home_points:
+                slot_data_removed_home_points.append({"Id": home_point.code,
+                                            "APRegion": location.ap_region})
+
             #TODO removed home points
 
         # look into replacing this big chonky return block with self.options.as_dict() and then just adding the extras to the dict after
@@ -829,6 +839,7 @@ def fill_slot_data(self) -> Dict[str, Any]:
             "moddedLocations": slot_data_locations,
             "moddedHomePoints": slot_data_home_points,
             "removedLocations": slot_data_removed_locations,
+            "removedHomePoints": slot_data_removed_home_points,
             # "moddedLocationsForUT": self.modded_locations,
             # "moddedShopsForUT": self.modded_shops,
             "prefillMap": bool(self.options.fill_full_map.value),

worlds/crystal_project/mod_helper.py

@@ -413,6 +413,31 @@ def get_removed_locations(mod_info: List[ModInfoModel]) -> List[LocationData]:
 
     return removed_locations
 
+def get_removed_home_points(mod_info: List[ModInfoModel]) -> List[LocationData]:
+    removed_locations: List[LocationData] = []
+    vanilla_home_points = get_home_points()
+
+    for mod in mod_info:
+        for location in mod.data_model.Entities:
+            location_id = location['ID']
+            has_no_npc_info = location['NpcData'] is None or not location['NpcData']['Pages']
+            entity_type = location['EntityType']
+            should_be_removed_because_no_npc_info: bool = False
+
+            if has_no_npc_info and location['SignData'] is None and location['SparkData'] is None and location[
+                'DoorData'] is None and location['HomePointData'] is None and location['TreasureData'] is None and \
+                    location['CrystalData'] is None and location['MarkerData'] is None:
+                should_be_removed_because_no_npc_info = True
+
+            for home_point in vanilla_home_points:
+                if (home_point.code == location_id and (should_be_removed_because_no_npc_info
+                                                             # If the item's entity type is definitely not a home point, then remove the vanilla location, because it's type was changed by the mod
+                                                             or entity_type != HOME_POINT_ENTITY_TYPE)):
+                    removed_locations.append(LocationData(home_point.ap_region, home_point.name, location_id))
+                    break
+
+    return removed_locations
+
 def get_mod_directory() -> str:
     current_directory = getcwd()
     mod_directory = join(current_directory, 'crystal_project_mods')