Adding built-in spells to casting items

Source/ACE.Server/Managers/EnchantmentManager.cs

@@ -147,7 +147,6 @@ public virtual AddEnchantmentResult Add(Spell spell, WorldObject caster)
                 newEntry.LayerId = 1;
                 WorldObject.Biota.AddEnchantment(newEntry, WorldObject.BiotaDatabaseLock);
                 WorldObject.ChangesDetected = true;
-                //WorldObject.SaveBiotaToDatabase();
 
                 result.Enchantment = newEntry;
                 result.StackType = StackType.Initial;

Source/ACE.Server/Network/Structure/AppraiseInfo.cs

@@ -131,6 +131,9 @@ private void AddPropertyEnchantments(WorldObject wo, WorldObject wielder)
 
             if (wielder != null && PropertiesFloat.ContainsKey(PropertyFloat.WeaponDefense) && !(wo is Ammunition))
                 PropertiesFloat[PropertyFloat.WeaponDefense] += wielder.EnchantmentManager.GetDefenseMod();
+
+            if (wo.ItemSkillLimit != null)
+                PropertiesInt[PropertyInt.AppraisalItemSkill] = (int)wo.ItemSkillLimit;
         }
 
         private void BuildSpells(WorldObject wo)

Source/ACE.Server/WorldObjects/Creature_Magic.cs

@@ -81,6 +81,13 @@ public void CreateCreatureSpell(uint spellId)
 
         public uint CalculateManaUsage(Creature caster, Spell spell, WorldObject target = null)
         {
+            var baseCost = spell.BaseMana;
+
+            // for casting spells built into a casting implement, use the ItemManaCost
+            var castItem = caster.GetEquippedWand();
+            if (castItem != null && (castItem.SpellDID ?? 0) == spell.Id)
+                baseCost = (uint)(castItem.ItemManaCost ?? 0);
+
             uint mana_conversion_skill = caster.GetCreatureSkill(Skill.ManaConversion).Current;
             uint difficulty = spell.PowerMod;   // modified power difficulty
 
@@ -97,10 +104,10 @@ public uint CalculateManaUsage(Creature caster, Spell spell, WorldObject target
                 int numTargetItems = 1;
                 if (targetPlayer != null)
                     numTargetItems = targetPlayer.EquippedObjects.Count;
-                preCost = (uint)Math.Round((spell.BaseMana + (spell.ManaMod * numTargetItems)) * baseManaPercent);
+                preCost = (uint)Math.Round((baseCost + (spell.ManaMod * numTargetItems)) * baseManaPercent);
             }
             else
-                preCost = (uint)Math.Round(spell.BaseMana * baseManaPercent);
+                preCost = (uint)Math.Round(baseCost * baseManaPercent);
 
             if (preCost < 1) preCost = 1;
 

Source/ACE.Server/WorldObjects/Player_Inventory.cs

@@ -931,6 +931,21 @@ private WeenieError CheckWieldRequirement(WorldObject item)
             return WeenieError.None;
         }
 
+        private Skill CheckActivationRequirement(WorldObject item)
+        {
+            if (item.ItemDifficulty != null)
+            {
+                if (GetCreatureSkill(Skill.ArcaneLore).Current < item.ItemDifficulty.Value)
+                    return Skill.ArcaneLore;
+            }
+
+            if (item.ItemSkillLimit != null && item.ItemSkillLevelLimit != null)
+            {
+                if (GetCreatureSkill((Skill)item.ItemSkillLimit.Value).Current < item.ItemSkillLevelLimit.Value)
+                    return (Skill)item.ItemSkillLimit.Value;
+            }
+            return Skill.None;
+        }
 
         // =========================================
         // Game Action Handlers - Inventory Stacking 

Source/ACE.Server/WorldObjects/Player_Magic.cs

@@ -493,8 +493,15 @@ public void CreatePlayerSpell(WorldObject target, TargetCategory targetCategory,
             else
                 player.IsBusy = true;
 
+            // if casting implement has spell built in,
+            // use spellcraft from the item, instead of player's magic skill?
+            var caster = GetEquippedWand();
+            var isWeaponSpell = IsWeaponSpell(spell);
+
             // Grab player's skill level in the spell's Magic School
             var magicSkill = player.GetCreatureSkill(spell.School).Current;
+            if (isWeaponSpell && caster.ItemSpellcraft != null)
+                magicSkill = (uint)caster.ItemSpellcraft;
 
             if (targetCategory == TargetCategory.WorldObject)
             {
@@ -548,7 +555,11 @@ public void CreatePlayerSpell(WorldObject target, TargetCategory targetCategory,
             // Calculate mana usage
             uint manaUsed = CalculateManaUsage(player, spell, target);
 
-            if (manaUsed > player.Mana.Current)
+            var currentMana = player.Mana.Current;
+            if (isWeaponSpell)
+                currentMana = (uint)(caster.ItemCurMana ?? 0);
+
+            if (manaUsed > currentMana)
             {
                 player.Session.Network.EnqueueSend(new GameEventUseDone(player.Session, WeenieError.YouDontHaveEnoughManaToCast));
                 IsBusy = false; // delay?
@@ -557,7 +568,11 @@ public void CreatePlayerSpell(WorldObject target, TargetCategory targetCategory,
 
             // begin spellcasting
             Proficiency.OnSuccessUse(player, player.GetCreatureSkill(Skill.ManaConversion), spell.PowerMod);
-            player.UpdateVitalDelta(player.Mana, -(int)manaUsed);
+
+            if (!isWeaponSpell)
+                player.UpdateVitalDelta(player.Mana, -(int)manaUsed);
+            else
+                caster.ItemCurMana -= (int)manaUsed;
 
             spell.Formula.GetPlayerFormula(player);
 
@@ -587,7 +602,11 @@ public void CreatePlayerSpell(WorldObject target, TargetCategory targetCategory,
             // cast spell
             spellChain.AddAction(this, () =>
             {
-                var motionCastSpell = new Motion(MotionStance.Magic, spell.Formula.CastGesture, castSpeed);
+                var castGesture = spell.Formula.CastGesture;
+                if (isWeaponSpell && caster.UseUserAnimation != 0)
+                    castGesture = caster.UseUserAnimation;
+
+                var motionCastSpell = new Motion(MotionStance.Magic, castGesture, castSpeed);
                 EnqueueBroadcastMotion(motionCastSpell);
             });
 
@@ -596,7 +615,8 @@ public void CreatePlayerSpell(WorldObject target, TargetCategory targetCategory,
 
             spellChain.AddAction(this, () =>
             {
-                TryBurnComponents(spell);
+                if (!isWeaponSpell)
+                    TryBurnComponents(spell);
             });
 
             var checkPKStatusVsTarget = CheckPKStatusVsTarget(player, target, spell);
@@ -1189,5 +1209,18 @@ public bool HasFoci(MagicSchool school)
             var wcid = FociWCIDs[school];
             return Inventory.Values.FirstOrDefault(i => i.WeenieClassId == wcid) != null;
         }
+
+        /// <summary>
+        /// Returns TRUE if the currently equipped casting implement
+        /// has a built-in spell
+        /// </summary>
+        public bool IsWeaponSpell(Spell spell)
+        {
+            var caster = GetEquippedWand();
+            if (caster == null || caster.SpellDID == null)
+                return false;
+
+            return caster.SpellDID == spell.Id;
+        }
     }
 }

Source/ACE.Server/WorldObjects/Player_Use.cs

@@ -44,6 +44,30 @@ public void HandleActionUseWithTarget(uint sourceObjectGuid, uint targetObjectGu
             var invTarget = GetInventoryItem(targetObjectGuid);
             var invWielded = GetEquippedItem(targetObjectGuid);
 
+            if (invSource == null)
+            {
+                // is this caster with a built-in spell?
+                var caster = GetEquippedItem(sourceObjectGuid);
+                if (caster != null && caster.SpellDID != null)
+                {
+                    // check activation requirements
+                    var skillFailed = CheckActivationRequirement(caster);
+                    if (skillFailed != Skill.None)
+                    {
+                        Session.Network.EnqueueSend(new GameEventWeenieErrorWithString(Session, WeenieErrorWithString.Your_IsTooLowToUseItemMagic, skillFailed.ToSentence()));
+                        SendUseDoneEvent(WeenieError.SkillTooLow);
+                        return;
+                    }
+                    HandleActionCastTargetedSpell(targetObjectGuid, caster.SpellDID ?? 0);
+                    return;
+                }
+                else
+                {
+                    log.Warn($"{Name}.HandleActionUseWithTarget({sourceObjectGuid:X8}, {targetObjectGuid:X8}): couldn't find {sourceObjectGuid:X8}");
+                    SendUseDoneEvent(WeenieError.None);
+                }
+            }
+
             var worldTarget = (invTarget == null) ? CurrentLandblock?.GetObject(targetObjectGuid) : null;
 
             if (invTarget != null)

Source/ACE.Server/WorldObjects/WorldObject_Magic.cs

@@ -240,7 +240,7 @@ public static bool MagicDefenseCheck(uint casterMagicSkill, uint targetMagicDefe
                 magicSkill = caster.GetCreatureSkill(spell.School).Current;
             else
                 // Retrieve casting item's spellcraft
-                magicSkill = (uint)ItemSpellcraft;
+                magicSkill = (uint)(ItemSpellcraft ?? 0);
 
             var player = caster as Player;
             var targetPlayer = target as Player;

Source/ACE.Server/WorldObjects/WorldObject_Properties.cs

@@ -1644,6 +1644,12 @@ public string Inscription
             set { if (!value.HasValue) RemoveProperty(PropertyFloat.ManaRate); else SetProperty(PropertyFloat.ManaRate, value.Value); }
         }
 
+        public int? ItemManaCost
+        {
+            get => GetProperty(PropertyInt.ItemManaCost);
+            set { if (!value.HasValue) RemoveProperty(PropertyInt.ItemManaCost); else SetProperty(PropertyInt.ItemManaCost, value.Value); }
+        }
+
         public int? ItemDifficulty
         {
             get => GetProperty(PropertyInt.ItemDifficulty);
@@ -1656,6 +1662,12 @@ public string Inscription
             set { if (!value.HasValue) RemoveProperty(PropertyInt.AppraisalItemSkill); else SetProperty(PropertyInt.AppraisalItemSkill, value.Value); }
         }
 
+        public uint? ItemSkillLimit
+        {
+            get => GetProperty(PropertyDataId.ItemSkillLimit);
+            set { if (!value.HasValue) RemoveProperty(PropertyDataId.ItemSkillLimit); else SetProperty(PropertyDataId.ItemSkillLimit, value.Value); }
+        }
+
         public int? ItemSkillLevelLimit
         {
             get => GetProperty(PropertyInt.ItemSkillLevelLimit);
@@ -1710,10 +1722,10 @@ public string Use
             set { if (!value.HasValue) RemoveProperty(PropertyDataId.Spell); else SetProperty(PropertyDataId.Spell, value.Value); }
         }
 
-        public int ItemSpellcraft
+        public int? ItemSpellcraft
         {
-            get => GetProperty(PropertyInt.ItemSpellcraft) ?? 0;
-            set { if (value == 0) RemoveProperty(PropertyInt.ItemSpellcraft); else SetProperty(PropertyInt.ItemSpellcraft, value); }
+            get => GetProperty(PropertyInt.ItemSpellcraft);
+            set { if (value.HasValue) RemoveProperty(PropertyInt.ItemSpellcraft); else SetProperty(PropertyInt.ItemSpellcraft, value.Value); }
         }
 
         public int? BoostEnum