Core/Items: Extract GetRandomPropertyPoints logic from GenerateEnchSuffixFactor

(cherry picked from commit 6437084)

Author: Shauren

src/server/game/Entities/Item/ItemEnchantmentMgr.cpp

@@ -174,72 +174,67 @@ uint32 GenerateEnchSuffixFactor(uint32 item_id)
     if (!itemProto->RandomSuffix)
         return 0;
 
-    RandPropPointsEntry const* randomProperty = sRandPropPointsStore.LookupEntry(itemProto->ItemLevel);
-    if (!randomProperty)
-        return 0;
+    return GetRandomPropertyPoints(itemProto->ItemLevel, itemProto->Quality, itemProto->InventoryType);
+}
 
-    uint32 suffixFactor;
-    switch (itemProto->InventoryType)
+uint32 GetRandomPropertyPoints(uint32 itemLevel, uint32 quality, uint32 inventoryType)
+{
+    uint32 propIndex;
+
+    switch (inventoryType)
     {
-        // Items of that type don`t have points
-        case INVTYPE_NON_EQUIP:
-        case INVTYPE_BAG:
-        case INVTYPE_TABARD:
-        case INVTYPE_AMMO:
-        case INVTYPE_QUIVER:
-        case INVTYPE_RELIC:
-            return 0;
-            // Select point coefficient
         case INVTYPE_HEAD:
         case INVTYPE_BODY:
         case INVTYPE_CHEST:
         case INVTYPE_LEGS:
         case INVTYPE_2HWEAPON:
         case INVTYPE_ROBE:
-            suffixFactor = 0;
+            propIndex = 0;
             break;
         case INVTYPE_SHOULDERS:
         case INVTYPE_WAIST:
         case INVTYPE_FEET:
         case INVTYPE_HANDS:
         case INVTYPE_TRINKET:
-            suffixFactor = 1;
+            propIndex = 1;
             break;
         case INVTYPE_NECK:
         case INVTYPE_WRISTS:
         case INVTYPE_FINGER:
         case INVTYPE_SHIELD:
         case INVTYPE_CLOAK:
         case INVTYPE_HOLDABLE:
-            suffixFactor = 2;
+            propIndex = 2;
             break;
         case INVTYPE_WEAPON:
         case INVTYPE_WEAPONMAINHAND:
         case INVTYPE_WEAPONOFFHAND:
-            suffixFactor = 3;
+            propIndex = 3;
             break;
         case INVTYPE_RANGED:
         case INVTYPE_THROWN:
         case INVTYPE_RANGEDRIGHT:
-            suffixFactor = 4;
+            propIndex = 4;
             break;
         default:
             return 0;
     }
-    // Select rare/epic modifier
-    switch (itemProto->Quality)
+
+    RandPropPointsEntry const* randPropPointsEntry = sRandPropPointsStore.LookupEntry(itemLevel);
+    if (!randPropPointsEntry)
+        return 0;
+
+    switch (quality)
     {
         case ITEM_QUALITY_UNCOMMON:
-            return randomProperty->Good[suffixFactor];
+            return randPropPointsEntry->Good[propIndex];
         case ITEM_QUALITY_RARE:
-            return randomProperty->Superior[suffixFactor];
+            return randPropPointsEntry->Superior[propIndex];
         case ITEM_QUALITY_EPIC:
-            return randomProperty->Epic[suffixFactor];
-        case ITEM_QUALITY_LEGENDARY:
-        case ITEM_QUALITY_ARTIFACT:
-            return 0;                                       // not have random properties
+            return randPropPointsEntry->Epic[propIndex];
         default:
             break;
     }
+
     return 0;
 }

src/server/game/Entities/Item/ItemEnchantmentMgr.h

@@ -24,5 +24,6 @@ TC_GAME_API void LoadRandomEnchantmentsTable();
 TC_GAME_API int32 GenerateItemRandomPropertyId(uint32 item_id);
 TC_GAME_API uint32 GetItemEnchantMod(int32 entry);
 TC_GAME_API uint32 GenerateEnchSuffixFactor(uint32 item_id);
+TC_GAME_API uint32 GetRandomPropertyPoints(uint32 itemLevel, uint32 quality, uint32 inventoryType);
 
 #endif