From 2a7564df8ff9f4b8e036cad3b4b4da5eb2c26eaf Mon Sep 17 00:00:00 2001
From: CookieCat <spyroisbest@hotmail.ca>
Date: Sat, 11 May 2024 20:30:14 -0400
Subject: [PATCH] Even more review stuff - we're almost done

---
 worlds/ahit/Items.py   | 13 ++-----------
 worlds/ahit/Regions.py |  4 ++--
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/worlds/ahit/Items.py b/worlds/ahit/Items.py
index c4d3c776e5..4197065d26 100644
--- a/worlds/ahit/Items.py
+++ b/worlds/ahit/Items.py
@@ -2,6 +2,7 @@ from BaseClasses import Item, ItemClassification
 from .Types import HatDLC, HatType, hat_type_to_item, Difficulty, ItemData, HatInTimeItem
 from .Locations import get_total_locations
 from .Rules import get_difficulty
+from .Options import get_total_time_pieces
 from typing import Optional, List, Dict, TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -65,17 +66,7 @@ def create_itempool(world: "HatInTimeWorld") -> List[Item]:
             continue
 
         if name == "Time Piece":
-            tp_count = 40
-            max_extra = 0
-            if world.is_dlc1():
-                max_extra += 6
-
-            if world.is_dlc2():
-                max_extra += 10
-
-            tp_count += min(max_extra, world.options.MaxExtraTimePieces.value)
-            tp_list: List[Item] = create_multiple_items(world, name, tp_count, item_type)
-
+            tp_list: List[Item] = create_multiple_items(world, name, get_total_time_pieces(world), item_type)
             for i in range(int(len(tp_list) * (0.01 * world.options.TimePieceBalancePercent.value))):
                 tp_list[i].classification = ItemClassification.progression
 
diff --git a/worlds/ahit/Regions.py b/worlds/ahit/Regions.py
index 9aa93ca65c..2fb5cb16cd 100644
--- a/worlds/ahit/Regions.py
+++ b/worlds/ahit/Regions.py
@@ -886,8 +886,8 @@ def get_shuffled_region(world: "HatInTimeWorld", region: str) -> str:
 
 
 def create_thug_shops(world: "HatInTimeWorld"):
-    min_items: int = min(world.options.NyakuzaThugMinShopItems.value, world.options.NyakuzaThugMaxShopItems.value)
-    max_items: int = max(world.options.NyakuzaThugMaxShopItems.value, world.options.NyakuzaThugMinShopItems.value)
+    min_items: int = world.options.NyakuzaThugMinShopItems.value
+    max_items: int = world.options.NyakuzaThugMaxShopItems.value
     count = -1
     step = 0
     old_name = ""