Merge pull request #1455 from kevin-10/master

bug fixes
ServUO · Jan 18, 2017 · 7e04544 · 7e04544
2 parents 11d5bae + 0af5f8b
commit 7e04544
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 4 deletions.
diff --git a/Scripts/Services/PointsSystems/CleanUpBritanniaData.cs b/Scripts/Services/PointsSystems/CleanUpBritanniaData.cs
@@ -27,6 +27,9 @@ public static double GetPoints(Item item)
         {
             double points = 0;
 
+            if (item is IVvVItem && ((IVvVItem)item).IsVvVItem)
+                return points;
+
             Type type = item.GetType();
 
             if (Entries.ContainsKey(type))

diff --git a/Scripts/Spells/Skill Masteries/Core/MasteryInfo.cs b/Scripts/Spells/Skill Masteries/Core/MasteryInfo.cs
@@ -263,16 +263,13 @@ public static void OnMasteryChanged(Mobile m, SkillName oldMastery)
             }
 
             RemovePassiveBuffs(m);
-
             foreach (MasteryInfo info in Infos.Where(i => i.Passive))
             {
                 if (IsActivePassive(m, info.PassiveSpell))
                 {
                     if (info.PassiveSpell == PassiveSpell.AnticipateHit)
                         continue;
 
-                    //Console.WriteLine("Toggling {0} passive spell", info.PassiveSpell.ToString());
-
                     switch (info.PassiveSpell)
                     {
                         case PassiveSpell.EnchantedSummoning:
@@ -370,7 +367,7 @@ public static int GetSpellID(PassiveSpell spell)
             {
                 case PassiveSpell.EnchantedSummoning: return 714;
                 case PassiveSpell.AnticipateHit: return 715;
-                case PassiveSpell.Intuition: return 716;
+                case PassiveSpell.Intuition: return 717;
                 case PassiveSpell.SavingThrow: return 732;
                 case PassiveSpell.Potency: return 738;
                 case PassiveSpell.Knockout: return 741;

diff --git a/Scripts/Spells/Skill Masteries/Core/SkillMasteryPrimer.cs b/Scripts/Spells/Skill Masteries/Core/SkillMasteryPrimer.cs
@@ -112,6 +112,22 @@ public static SkillMasteryPrimer GetRandom(Volume volume = Volume.Three, Volume
             if (available.Count == 0)
                 return null;
 
+            if (volume == Volume.Three && exclude == Volume.One) // Random loot drop, vol 2 is 3x more likely to drop
+            {
+                List<MasteryInfo> copy = new List<MasteryInfo>(available);
+
+                copy.ForEach(i =>
+                    {
+                        if (i.Volume == Volume.Two)
+                        {
+                            available.Add(i);
+                            available.Add(i);
+                        }
+                    });
+
+                ColUtility.Free(copy);
+            }
+
             MasteryInfo random = available[Utility.Random(available.Count)];
 
             SkillMasteryPrimer primer = new SkillMasteryPrimer(random.SpellID, random.MasterySkill);

diff --git a/Scripts/Spells/Skill Masteries/Core/SkillMasterySpell.cs b/Scripts/Spells/Skill Masteries/Core/SkillMasterySpell.cs
@@ -18,6 +18,7 @@ public abstract class SkillMasterySpell : Spell
         public static void Initialize()
         {
             CommandSystem.Register("LearnAllMasteries", AccessLevel.GameMaster, LearnAllSpells);
+            CommandSystem.Register("RandomMastery", AccessLevel.GameMaster, RandomMastery);
         }
 
         public UpkeepTimer Timer { get; set; }
@@ -1085,5 +1086,32 @@ public static void LearnAllSpells(CommandEventArgs e)
                     }
                 });
         }
+
+        [Usage("RandomMastery")]
+        [Description("Drops a random mastery primer on target.")]
+        public static void RandomMastery(CommandEventArgs e)
+        {
+            e.Mobile.BeginTarget(-1, false, TargetFlags.None, (mobile, targeted) =>
+            {
+                Item mastery = SkillMasteryPrimer.GetRandom();
+
+                if (targeted is Mobile)
+                {
+                    Mobile m = targeted as Mobile;
+
+                    m.Backpack.DropItem(mastery);
+
+                    e.Mobile.SendMessage("A mastery has been added to your pack!");
+                }
+                else if (targeted is IPoint3D)
+                {
+                    IPoint3D p = targeted as IPoint3D;
+
+                    mastery.MoveToWorld(new Point3D(p.X, p.Y, p.Z), e.Mobile.Map);
+                }
+                else
+                    mastery.Delete();
+            });
+        }
 	}
 }