Core/Misc: More DBC std::array refactors, stricter |Hitem checks, and more hyperlink unit tests

3 files changed, 53 insertions, 21 deletions

diff --git a/src/server/game/Chat/HyperlinkTags.cpp b/src/server/game/Chat/HyperlinkTags.cpp
index d511265c537..35c47c04c0d 100644
--- a/src/server/game/Chat/HyperlinkTags.cpp
+++ b/src/server/game/Chat/HyperlinkTags.cpp
@@ -113,9 +113,47 @@ bool Trinity::Hyperlinks::LinkTags::item::StoreTo(ItemLinkData& val, std::string
     if (!t.TryConsumeTo(itemId))
         return false;
     val.Item = sObjectMgr->GetItemTemplate(itemId);
-    return val.Item && t.TryConsumeTo(val.EnchantId) && t.TryConsumeTo(val.GemEnchantId[0]) && t.TryConsumeTo(val.GemEnchantId[1]) &&
-        t.TryConsumeTo(val.GemEnchantId[2]) && t.TryConsumeTo(dummy) && t.TryConsumeTo(val.RandomPropertyId) && t.TryConsumeTo(val.RandomPropertySeed) &&
-        t.TryConsumeTo(val.RenderLevel) && t.IsEmpty() && !dummy;
+
+    int randomPropertyId;
+    if (!(val.Item && t.TryConsumeTo(val.EnchantId) && t.TryConsumeTo(val.GemEnchantId[0]) && t.TryConsumeTo(val.GemEnchantId[1]) &&
+        t.TryConsumeTo(val.GemEnchantId[2]) && t.TryConsumeTo(dummy) && t.TryConsumeTo(randomPropertyId) && t.TryConsumeTo(val.RandomSuffixBaseAmount) &&
+        t.TryConsumeTo(val.RenderLevel) && t.IsEmpty() && !dummy))
+        return false;
+
+    if (randomPropertyId < 0)
+    {
+        if (!val.Item->RandomSuffix)
+            return false;
+        if (ItemRandomSuffixEntry const* suffixEntry = sItemRandomSuffixStore.LookupEntry(-randomPropertyId))
+        {
+            val.RandomSuffix = suffixEntry;
+            val.RandomProperty = nullptr;
+        }
+        else
+            return false;
+    }
+    else if (randomPropertyId > 0)
+    {
+        if (!val.Item->RandomProperty)
+            return false;
+        if (ItemRandomPropertiesEntry const* propEntry = sItemRandomPropertiesStore.LookupEntry(randomPropertyId))
+        {
+            val.RandomSuffix = nullptr;
+            val.RandomProperty = propEntry;
+        }
+        else
+            return false;
+    }
+    else
+    {
+        val.RandomSuffix = nullptr;
+        val.RandomProperty = nullptr;
+    }
+
+    if ((val.RandomSuffix && !val.RandomSuffixBaseAmount) || (val.RandomSuffixBaseAmount && !val.RandomSuffix))
+        return false;
+
+    return true;
 }
 
 bool Trinity::Hyperlinks::LinkTags::quest::StoreTo(QuestLinkData& val, std::string_view text)
diff --git a/src/server/game/Chat/Hyperlinks.cpp b/src/server/game/Chat/Hyperlinks.cpp
index 308ec33d46d..8b82cb1e38c 100644
--- a/src/server/game/Chat/Hyperlinks.cpp
+++ b/src/server/game/Chat/Hyperlinks.cpp
@@ -132,21 +132,11 @@ struct LinkValidator<LinkTags::item>
     {
         ItemLocale const* locale = sObjectMgr->GetItemLocale(data.Item->ItemId);
 
-        char const* const* randomSuffixes = nullptr; // this is a c-style array of c strings (and i don't want to touch DBCStructure.h right now)
-        if (data.RandomPropertyId < 0)
-        {
-            if (ItemRandomSuffixEntry const* suffixEntry = sItemRandomSuffixStore.LookupEntry(-data.RandomPropertyId))
-                randomSuffixes = suffixEntry->Name;
-            else
-                return false;
-        }
-        else if (data.RandomPropertyId > 0)
-        {
-            if (ItemRandomPropertiesEntry const* propEntry = sItemRandomPropertiesStore.LookupEntry(data.RandomPropertyId))
-                randomSuffixes = propEntry->Name;
-            else
-                return false;
-        }
+        std::array<char const*, 16> const* randomSuffixes = nullptr;
+        if (data.RandomProperty)
+            randomSuffixes = &data.RandomProperty->Name;
+        else if (data.RandomSuffix)
+            randomSuffixes = &data.RandomSuffix->Name;
 
         for (uint8 i = 0; i < TOTAL_LOCALES; ++i)
         {
@@ -157,8 +147,9 @@ struct LinkValidator<LinkTags::item>
                 continue;
             if (randomSuffixes)
             {
-                std::string_view randomSuffix(randomSuffixes[i]);
+                std::string_view randomSuffix((*randomSuffixes)[i]);
                 if (
+                  (!randomSuffix.empty()) &&
                   (text.length() == (name.length() + 1 + randomSuffix.length())) &&
                   (text.substr(0, name.length()) == name) &&
                   (text[name.length()] == ' ') &&
diff --git a/src/server/game/Chat/Hyperlinks.h b/src/server/game/Chat/Hyperlinks.h
index 69bfdb28ff0..4a263df4a01 100644
--- a/src/server/game/Chat/Hyperlinks.h
+++ b/src/server/game/Chat/Hyperlinks.h
@@ -29,6 +29,8 @@
 struct AchievementEntry;
 struct GlyphPropertiesEntry;
 struct GlyphSlotEntry;
+struct ItemRandomPropertiesEntry;
+struct ItemRandomSuffixEntry;
 struct ItemTemplate;
 class SpellInfo;
 class Quest;
@@ -59,8 +61,9 @@ namespace Trinity::Hyperlinks
         ItemTemplate const* Item;
         uint32 EnchantId;
         std::array<uint32, 3> GemEnchantId;
-        int32 RandomPropertyId;
-        int32 RandomPropertySeed;
+        ItemRandomPropertiesEntry const* RandomProperty;
+        ItemRandomSuffixEntry const* RandomSuffix;
+        uint32 RandomSuffixBaseAmount;
         uint8 RenderLevel;
     };