From 6fa3023ae0749fc00ccd67eafa14018ace012ec8 Mon Sep 17 00:00:00 2001
From: Anna <git@anna.lgbt>
Date: Tue, 23 Nov 2021 16:09:52 -0500
Subject: [PATCH] refactor: pull out hq offset into const

---
 Glamaholic/GameFunctions.cs          | 4 ++--
 Glamaholic/Ui/Helpers/TryOnHelper.cs | 5 ++---
 Glamaholic/Ui/MainInterface.cs       | 2 +-
 Glamaholic/Util.cs                   | 2 ++
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Glamaholic/GameFunctions.cs b/Glamaholic/GameFunctions.cs
index bea6e7a..12006e5 100755
--- a/Glamaholic/GameFunctions.cs
+++ b/Glamaholic/GameFunctions.cs
@@ -203,7 +203,7 @@ namespace Glamaholic {
                 var source = MirageSource.GlamourDresser;
                 var info = (0, 0u, (byte) 0);
                 // find an item in the dresser that matches
-                var matchingIds = dresser.FindAll(mirage => mirage.ItemId % 1_000_000 == item.ItemId);
+                var matchingIds = dresser.FindAll(mirage => mirage.ItemId % Util.HqItemOffset == item.ItemId);
                 if (matchingIds.Count == 0) {
                     // if not in the glamour dresser, look in the armoire
                     if (this.ArmoireIndexIfPresent(item.ItemId) is { } armoireIdx) {
@@ -334,7 +334,7 @@ namespace Glamaholic {
                 this._filterIds.Add(itemId);
             }
 
-            this._tryOn(0xFF, itemId % 1_000_000, stainId, 0, 0);
+            this._tryOn(0xFF, itemId % Util.HqItemOffset, stainId, 0, 0);
         }
     }
 
diff --git a/Glamaholic/Ui/Helpers/TryOnHelper.cs b/Glamaholic/Ui/Helpers/TryOnHelper.cs
index 4d21213..00fbbe1 100755
--- a/Glamaholic/Ui/Helpers/TryOnHelper.cs
+++ b/Glamaholic/Ui/Helpers/TryOnHelper.cs
@@ -31,9 +31,8 @@ namespace Glamaholic.Ui.Helpers {
 
         private void DrawDropdown() {
             if (ImGui.Selectable("Create glamour plate")) {
-                var items = GetTryOnItems();
                 this.Ui.Plugin.Config.AddPlate(new SavedPlate("Fitting Room") {
-                    Items = items,
+                    Items = GetTryOnItems(),
                 });
                 this.Ui.Plugin.SaveConfig();
 
@@ -62,7 +61,7 @@ namespace Glamaholic.Ui.Helpers {
                 // TODO: remove this logic in endwalker
                 var slot = item->Slot > 5 ? item->Slot - 1 : item->Slot;
                 items[(PlateSlot) slot] =new SavedGlamourItem {
-                    ItemId = itemId % 1_000_000,
+                    ItemId = itemId % Util.HqItemOffset,
                     StainId = item->StainId,
                 };
             }
diff --git a/Glamaholic/Ui/MainInterface.cs b/Glamaholic/Ui/MainInterface.cs
index c1f7ade..ad08613 100755
--- a/Glamaholic/Ui/MainInterface.cs
+++ b/Glamaholic/Ui/MainInterface.cs
@@ -442,7 +442,7 @@ namespace Glamaholic.Ui {
 
             // check for item
             if (mirage != null && mirage.ItemId != 0 && editingPlate) {
-                var has = GameFunctions.DresserContents.Any(saved => saved.ItemId % 1_000_000 == mirage.ItemId) || this.Ui.Plugin.Functions.IsInArmoire(mirage.ItemId);
+                var has = GameFunctions.DresserContents.Any(saved => saved.ItemId % Util.HqItemOffset == mirage.ItemId) || this.Ui.Plugin.Functions.IsInArmoire(mirage.ItemId);
                 if (!has) {
                     borderColour = ImGuiColors.DalamudYellow;
                 }
diff --git a/Glamaholic/Util.cs b/Glamaholic/Util.cs
index 1b2379c..7b106cd 100755
--- a/Glamaholic/Util.cs
+++ b/Glamaholic/Util.cs
@@ -11,6 +11,8 @@ namespace Glamaholic {
         private const string BoxAddon = "MiragePrismPrismBox";
         private const string ArmoireAddon = "CabinetWithdraw";
 
+        internal const uint HqItemOffset = 1_000_000;
+
         private static unsafe bool IsOpen(AtkUnitBase* addon) {
             return addon != null && addon->IsVisible;
         }