From 9bec7391f109b583e091fa926d6d6bc7dcbca04d Mon Sep 17 00:00:00 2001
From: CookieCat <spyroisbest@hotmail.ca>
Date: Sun, 18 Feb 2024 21:36:58 -0500
Subject: [PATCH] No more loading the data package

---
 worlds/ahit/DeathWishLocations.py | 6 ++++++
 worlds/ahit/Options.py            | 8 +++++++-
 worlds/ahit/__init__.py           | 9 ++++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/worlds/ahit/DeathWishLocations.py b/worlds/ahit/DeathWishLocations.py
index 470e8087c9..75758ab853 100644
--- a/worlds/ahit/DeathWishLocations.py
+++ b/worlds/ahit/DeathWishLocations.py
@@ -81,11 +81,17 @@ annoying_bonuses = [
     "So You're Back From Outer Space",
     "Encore! Encore!",
     "Snatcher's Hit List",
+	"Vault Codes in the Wind",
     "10 Seconds until Self-Destruct",
     "Killing Two Birds",
     "Zero Jumps",
+	"Boss Rush",
     "Bird Sanctuary",
+	"The Mustache Gauntlet",
     "Wound-Up Windmill",
+	"Camera Tourist",
+	"Rift Collapse: Deep Sea",
+	"Cruisin' for a Bruisin'",
     "Seal the Deal",
 ]
 
diff --git a/worlds/ahit/Options.py b/worlds/ahit/Options.py
index af21dae4c9..b6b4eaa786 100644
--- a/worlds/ahit/Options.py
+++ b/worlds/ahit/Options.py
@@ -566,7 +566,13 @@ class DWExcludeAnnoyingBonuses(Toggle):
     - Zero Jumps
     - Bird Sanctuary
     - Wound-Up Windmill
-    - Seal the Deal"""
+	- Vault Codes in the Wind
+    - Boss Rush
+    - Camera Tourist
+    - The Mustache Gauntlet
+    - Rift Collapse: Deep Sea
+    - Cruisin' for a Bruisin'
+	- Seal the Deal"""
     display_name = "Exclude Annoying Death Wish Full Completions"
     default = 1
 
diff --git a/worlds/ahit/__init__.py b/worlds/ahit/__init__.py
index f8527e95f4..e7775fae28 100644
--- a/worlds/ahit/__init__.py
+++ b/worlds/ahit/__init__.py
@@ -1,4 +1,4 @@
-from BaseClasses import Item, ItemClassification, Tutorial
+from BaseClasses import Item, ItemClassification, Tutorial, Location
 from .Items import item_table, create_item, relic_groups, act_contracts, create_itempool
 from .Regions import create_regions, randomize_act_entrances, chapter_act_info, create_events, get_shuffled_region
 from .Locations import location_table, contract_locations, is_location_valid, get_location_names, TASKSANITY_START_ID, \
@@ -229,6 +229,13 @@ class HatInTimeWorld(World):
                 for i in range(len(shuffled_dws)):
                     slot_data[f"dw_{i}"] = dw_classes[shuffled_dws[i]]
 
+        shop_item_names: Dict[str, str] = {}
+        for name in self.shop_locs:
+            loc: Location = self.multiworld.get_location(name, self.player)
+            shop_item_names.setdefault(str(loc.address), loc.item.name)
+
+        slot_data["ShopItemNames"] = shop_item_names
+
         for name, value in self.options.as_dict(*self.options_dataclass.type_hints).items():
             if name in slot_data_options:
                 slot_data[name] = value