adding PetDevice and EncapsulatedSpirit to updated loot system

Source/ACE.Server/Factories/Enum/TreasureItemType_Orig.cs

@@ -37,5 +37,13 @@ public enum TreasureItemType_Orig
         BowWeapon,
         CrossbowWeapon,
         AtlatlWeapon,*/
+
+        // from analysis of magloot corpse logs, these appeared to be top-level items
+        // PetDevices appeared to only be in the non-magical item tables
+        // if a creature didn't drop non-magical items, there were no traces of it dropping a PetDevice
+        // similarly, if a creature didn't drop non-magical or mundane items,
+        // it was still found to drop EncapsulatedSpirit
+        PetDevice,
+        EncapsulatedSpirit
     }
 }

Source/ACE.Server/Factories/LootGenerationFactory.cs

@@ -2611,6 +2611,16 @@ public static TreasureRoll RollWcid(TreasureDeath treasureDeath, TreasureItemCat
 
                     treasureRoll.Wcid = SpellComponentWcids.Roll(treasureDeath);
                     break;
+
+                case TreasureItemType_Orig.PetDevice:
+
+                    treasureRoll.Wcid = PetDeviceWcids.Roll(treasureDeath);
+                    break;
+
+                case TreasureItemType_Orig.EncapsulatedSpirit:
+
+                    treasureRoll.Wcid = WeenieClassName.ace49485_encapsulatedspirit;
+                    break;
             }
             return treasureRoll;
         }
@@ -2623,13 +2633,13 @@ public static TreasureItemType_Orig RollItemType(TreasureDeath treasureDeath, Tr
             switch (category)
             {
                 case TreasureItemCategory.Item:
-                    return TreasureItemTypeChances_Orig.Roll(treasureDeath.ItemTreasureTypeSelectionChances);
+                    return TreasureProfile_Item.Roll(treasureDeath.ItemTreasureTypeSelectionChances);
 
                 case TreasureItemCategory.MagicItem:
-                    return TreasureMagicItemTypeChances_Orig.Roll(treasureDeath.MagicItemTreasureTypeSelectionChances);
+                    return TreasureProfile_MagicItem.Roll(treasureDeath.MagicItemTreasureTypeSelectionChances);
 
                 case TreasureItemCategory.MundaneItem:
-                    return TreasureMundaneItemTypeChances_Orig.Roll(treasureDeath.MundaneItemTypeSelectionChances);
+                    return TreasureProfile_Mundane.Roll(treasureDeath.MundaneItemTypeSelectionChances);
             }
             return TreasureItemType_Orig.Undef;
         }
@@ -2738,6 +2748,10 @@ public static WorldObject CreateAndMutateWcid(TreasureDeath treasureDeath, Treas
                     wo = CreateRandomScroll(treasureDeath, treasureRoll);     // using original method
                     break;
 
+                case TreasureItemType_Orig.PetDevice:
+                    MutatePetDevice(wo, treasureDeath.Tier);
+                    break;
+
                 // other mundane items (mana stones, food/drink, healing kits, lockpicks, and spell components/peas) don't get mutated
             }
             return wo;

Source/ACE.Server/Factories/LootGenerationFactory_Magic.cs

@@ -364,8 +364,10 @@ private static WorldObject CreateSummoningEssence(int tier, bool mutate = true)
             return petDevice;
         }
 
-        private static void MutatePetDevice(PetDevice petDevice, int tier)
+        private static void MutatePetDevice(WorldObject petDevice, int tier)
         {
+            if (!(petDevice is PetDevice)) return;
+
             var ratingChance = 0.5f;
 
             // add rng ratings to pet device

Source/ACE.Server/Factories/Tables/PetDeviceChance.cs

@@ -0,0 +1,75 @@
+using System.Collections.Generic;
+
+using ACE.Database.Models.World;
+using ACE.Server.Factories.Entity;
+
+namespace ACE.Server.Factories.Tables
+{
+    public static class PetDeviceChance
+    {
+        private static readonly ChanceTable<int> T1_T3_PetLevelChances = new ChanceTable<int>()
+        {
+            ( 50, 1.0f )
+        };
+
+        private static readonly ChanceTable<int> T4_PetLevelChances = new ChanceTable<int>()
+        {
+            ( 50, 0.75f ),
+            ( 80, 0.25f )
+        };
+
+        private static readonly ChanceTable<int> T5_PetLevelChances = new ChanceTable<int>()
+        {
+            ( 50,  0.15f ),
+            ( 80,  0.65f ),
+            ( 100, 0.20f ),
+        };
+
+        private static readonly ChanceTable<int> T6_PetLevelChances = new ChanceTable<int>()
+        {
+            ( 80,  0.15f ),
+            ( 100, 0.25f ),
+            ( 125, 0.50f ),
+            ( 150, 0.10f ),
+        };
+
+        private static readonly ChanceTable<int> T7_PetLevelChances = new ChanceTable<int>()
+        {
+            ( 100, 0.15f ),
+            ( 125, 0.25f ),
+            ( 150, 0.50f ),
+            ( 180, 0.10f ),
+        };
+
+        private static readonly ChanceTable<int> T8_PetLevelChances = new ChanceTable<int>()
+        {
+            ( 100, 0.0125f ),
+            ( 125, 0.025f ),
+            ( 150, 0.05f ),
+            ( 180, 0.50f ),
+            ( 200, 0.4125f ),
+        };
+
+        private static readonly List<ChanceTable<int>> petLevelChances = new List<ChanceTable<int>>()
+        {
+            T1_T3_PetLevelChances,
+            T1_T3_PetLevelChances,
+            T1_T3_PetLevelChances,
+            T4_PetLevelChances,
+            T5_PetLevelChances,
+            T6_PetLevelChances,
+            T7_PetLevelChances,
+            T8_PetLevelChances,
+        };
+
+        /// <summary>
+        /// Rolls for a CombatPet level for a PetDevice
+        /// </summary>
+        public static int Roll(TreasureDeath profile)
+        {
+            var table = petLevelChances[profile.Tier - 1];
+
+            return table.Roll(profile.LootQualityMod);
+        }
+    }
+}