Merge pull request #5476 from CatsAndBoats/shiva_pet_skills_rework

[SMN] Correct Shiva animations & Blood Pact abilities

scripts/actions/abilities/pets/axe_kick.lua

@@ -4,16 +4,18 @@
 local abilityObject = {}
 
 abilityObject.onAbilityCheck = function(player, target, ability)
-    return 0, 0
+    return xi.job_utils.summoner.canUseBloodPact(player, player:getPet(), target, ability)
 end
 
-abilityObject.onPetAbility = function(target, pet, skill)
+abilityObject.onPetAbility = function(target, pet, petskill, summoner, action)
     local numhits = 1
     local accmod = 1
     local dmgmod = 3.5
 
-    local damage = xi.summon.avatarPhysicalMove(pet, target, skill, numhits, accmod, dmgmod, 0, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3)
-    local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, numhits)
+    xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action)
+
+    local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, 0, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3)
+    local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, numhits)
     target:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.BLUNT)
     target:updateEnmityFromDamage(pet, totaldamage)
 

scripts/actions/abilities/pets/blizzard_ii.lua

@@ -1,21 +1,23 @@
 -----------------------------------
--- Aero 2
+-- Blizzard II
 -----------------------------------
 local abilityObject = {}
 
 abilityObject.onAbilityCheck = function(player, target, ability)
-    return 0, 0
+    return xi.job_utils.summoner.canUseBloodPact(player, player:getPet(), target, ability)
 end
 
-abilityObject.onPetAbility = function(target, pet, skill)
+abilityObject.onPetAbility = function(target, pet, petskill, summoner, action)
     local dINT = math.floor(pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT))
     local tp   = pet:getTP()
 
+    xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action)
+
     local damage = math.floor(45 + 0.025 * tp)
     damage = damage + (dINT * 1.5)
-    damage = xi.mobskills.mobMagicalMove(pet, target, skill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0)
+    damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0)
     damage = xi.mobskills.mobAddBonuses(pet, target, damage.dmg, xi.element.ICE)
-    damage = xi.summon.avatarFinalAdjustments(damage, pet, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, 1)
+    damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.ICE, 1)
 
     target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.ICE)
     target:updateEnmityFromDamage(pet, damage)

scripts/actions/abilities/pets/blizzard_iv.lua

@@ -1,21 +1,23 @@
 -----------------------------------
--- Aero 2
+-- Blizzard IV
 -----------------------------------
 local abilityObject = {}
 
 abilityObject.onAbilityCheck = function(player, target, ability)
-    return 0, 0
+    return xi.job_utils.summoner.canUseBloodPact(player, player:getPet(), target, ability)
 end
 
-abilityObject.onPetAbility = function(target, pet, skill)
+abilityObject.onPetAbility = function(target, pet, petskill, summoner, action)
     local dINT = math.floor(pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT))
     local tp   = pet:getTP()
 
+    xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action)
+
     local damage = math.floor(325 + 0.025 * tp)
     damage = damage + (dINT * 1.5)
-    damage = xi.mobskills.mobMagicalMove(pet, target, skill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0)
+    damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0)
     damage = xi.mobskills.mobAddBonuses(pet, target, damage.dmg, xi.element.ICE)
-    damage = xi.summon.avatarFinalAdjustments(damage, pet, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, 1)
+    damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.ICE, 1)
 
     target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.ICE)
     target:updateEnmityFromDamage(pet, damage)

scripts/actions/abilities/pets/diamond_dust.lua

@@ -4,26 +4,22 @@
 local abilityObject = {}
 
 abilityObject.onAbilityCheck = function(player, target, ability)
-    local level = player:getMainLvl() * 2
-
-    if player:getMP() < level then
-        return 87, 0
-    end
-
-    return 0, 0
+    return xi.job_utils.summoner.canUseBloodPact(player, player:getPet(), target, ability)
 end
 
-abilityObject.onPetAbility = function(target, pet, skill, master)
+abilityObject.onPetAbility = function(target, pet, petskill, summoner, action)
     local dINT = math.floor(pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT))
 
+    xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action)
+
     local level = pet:getMainLvl()
     local damage = 48 + (level * 8)
     damage = damage + (dINT * 1.5)
-    damage = xi.mobskills.mobMagicalMove(pet, target, skill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0)
+    damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0)
     damage = xi.mobskills.mobAddBonuses(pet, target, damage.dmg, xi.element.ICE)
-    damage = xi.summon.avatarFinalAdjustments(damage, pet, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, 1)
+    damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.ICE, 1)
 
-    master:setMP(0)
+    summoner:setMP(0)
     target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.ICE)
     target:updateEnmityFromDamage(pet, damage)
 

scripts/actions/abilities/pets/double_slap.lua

@@ -4,17 +4,19 @@
 local abilityObject = {}
 
 abilityObject.onAbilityCheck = function(player, target, ability)
-    return 0, 0
+    return xi.job_utils.summoner.canUseBloodPact(player, player:getPet(), target, ability)
 end
 
-abilityObject.onPetAbility = function(target, pet, skill)
+abilityObject.onPetAbility = function(target, pet, petskill, summoner, action)
     local numhits = 2
     local accmod = 1
     local dmgmod = 6
     local dmgmodsubsequent = 2
 
-    local damage = xi.summon.avatarPhysicalMove(pet, target, skill, numhits, accmod, dmgmod, dmgmodsubsequent, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3)
-    local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, skill, target, xi.attackType.PHYSICAL, xi.damageType.H2H, numhits)
+    xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action)
+
+    local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, dmgmodsubsequent, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3)
+    local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.H2H, numhits)
     target:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.H2H)
     target:updateEnmityFromDamage(pet, totaldamage)
 

scripts/actions/abilities/pets/frost_armor.lua

@@ -4,17 +4,30 @@
 local abilityObject = {}
 
 abilityObject.onAbilityCheck = function(player, target, ability)
-    return 0, 0
+    return xi.job_utils.summoner.canUseBloodPact(player, player:getPet(), target, ability)
 end
 
-abilityObject.onPetAbility = function(target, pet, skill, summoner)
+abilityObject.onPetAbility = function(target, pet, petskill, summoner, action)
     local bonusTime = utils.clamp(summoner:getSkillLevel(xi.skill.SUMMONING_MAGIC) - 300, 0, 200)
     local duration = 180 + bonusTime
 
-    target:delStatusEffect(xi.effect.ICE_SPIKES)
-    target:addStatusEffect(xi.effect.ICE_SPIKES, 15, 0, duration)
-    skill:setMsg(xi.msg.basic.SKILL_GAIN_EFFECT)
-    return xi.effect.ICE_SPIKES
+    xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action)
+
+    local typeEffect = xi.effect.ICE_SPIKES
+    target:delStatusEffect(typeEffect)
+
+    if target:addStatusEffect(typeEffect, 15, 0, duration) then
+        if target:getID() == action:getPrimaryTargetID() then
+            petskill:setMsg(xi.msg.basic.SKILL_GAIN_EFFECT_2)
+        else
+            petskill:setMsg(xi.msg.basic.JA_GAIN_EFFECT)
+        end
+    else
+        petskill:setMsg(xi.msg.basic.JA_NO_EFFECT_2)
+        return
+    end
+
+    return typeEffect
 end
 
 return abilityObject

scripts/actions/abilities/pets/heavenly_strike.lua

@@ -1,20 +1,21 @@
 -----------------------------------
--- Geocrush
+-- Heavenly Strike
 -----------------------------------
 local abilityObject = {}
 
 abilityObject.onAbilityCheck = function(player, target, ability)
-    return 0, 0
+    return xi.job_utils.summoner.canUseBloodPact(player, player:getPet(), target, ability)
 end
 
-abilityObject.onPetAbility = function(target, pet, skill)
+abilityObject.onPetAbility = function(target, pet, petskill, summoner, action)
     local dINT   = math.floor(pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT))
     local tp     = pet:getTP() / 10
-    local master = pet:getMaster()
     local merits = 0
 
-    if master ~= nil and master:isPC() then
-        merits = master:getMerit(xi.merit.HEAVENLY_STRIKE)
+    xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action)
+
+    if summoner ~= nil and summoner:isPC() then
+        merits = summoner:getMerit(xi.merit.HEAVENLY_STRIKE)
     end
 
     tp = tp + (merits - 40)
@@ -25,9 +26,9 @@ abilityObject.onPetAbility = function(target, pet, skill)
     --note: this formula is only accurate for level 75 - 76+ may have a different intercept and/or slope
     local damage = math.floor(512 + 1.72 * (tp + 1))
     damage = damage + (dINT * 1.5)
-    damage = xi.mobskills.mobMagicalMove(pet, target, skill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0)
+    damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.ICE, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0)
     damage = xi.mobskills.mobAddBonuses(pet, target, damage.dmg, xi.element.ICE)
-    damage = xi.summon.avatarFinalAdjustments(damage, pet, skill, target, xi.attackType.MAGICAL, xi.damageType.ICE, 1)
+    damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.ICE, 1)
 
     target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.ICE)
     target:updateEnmityFromDamage(pet, damage)

scripts/actions/abilities/pets/rush.lua

@@ -4,17 +4,19 @@
 local abilityObject = {}
 
 abilityObject.onAbilityCheck = function(player, target, ability)
-    return 0, 0
+    return xi.job_utils.summoner.canUseBloodPact(player, player:getPet(), target, ability)
 end
 
-abilityObject.onPetAbility = function(target, pet, skill)
+abilityObject.onPetAbility = function(target, pet, petskill, summoner, action)
     local numhits = 5
     local accmod = 1
     local dmgmod = 5
     local dmgmodsubsequent = 2
 
-    local damage = xi.summon.avatarPhysicalMove(pet, target, skill, numhits, accmod, dmgmod, dmgmodsubsequent, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3)
-    local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, skill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, numhits)
+    xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action)
+
+    local damage = xi.summon.avatarPhysicalMove(pet, target, petskill, numhits, accmod, dmgmod, dmgmodsubsequent, xi.mobskills.magicalTpBonus.NO_EFFECT, 1, 2, 3)
+    local totaldamage = xi.summon.avatarFinalAdjustments(damage.dmg, pet, petskill, target, xi.attackType.PHYSICAL, xi.damageType.BLUNT, numhits)
     target:takeDamage(totaldamage, pet, xi.attackType.PHYSICAL, xi.damageType.BLUNT)
     target:updateEnmityFromDamage(pet, totaldamage)
 

scripts/actions/abilities/pets/sleepga.lua

@@ -4,34 +4,46 @@
 local abilityObject = {}
 
 abilityObject.onAbilityCheck = function(player, target, ability)
-    return 0, 0
+    return xi.job_utils.summoner.canUseBloodPact(player, player:getPet(), target, ability)
 end
 
-abilityObject.onPetAbility = function(target, pet, skill)
+abilityObject.onPetAbility = function(target, pet, petskill, summoner, action)
+    xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action)
+
     local duration = 90
     local dINT = pet:getStat(xi.mod.INT) - target:getStat(xi.mod.INT)
     local bonus = xi.summon.getSummoningSkillOverCap(pet)
     local resm = xi.mobskills.applyPlayerResistance(pet, -1, target, dINT, bonus, xi.element.ICE)
+
     if resm < 0.5 then
-        skill:setMsg(xi.msg.basic.JA_MISS_2) -- resist message
+        petskill:setMsg(xi.msg.basic.JA_MISS_2) -- resist message
         return xi.effect.SLEEP_I
     end
 
     duration = duration * resm
+
     if
         target:hasImmunity(1) or
         target:hasStatusEffect(xi.effect.SLEEP_I) or
         target:hasStatusEffect(xi.effect.SLEEP_II) or
         target:hasStatusEffect(xi.effect.LULLABY)
     then
-        --No effect
-        skill:setMsg(xi.msg.basic.SKILL_NO_EFFECT)
+        if target:getID() == action:getPrimaryTargetID() then
+            petskill:setMsg(xi.msg.basic.JA_NO_EFFECT_2)
+        else
+            petskill:setMsg(xi.msg.basic.NO_EFFECT)
+        end
     else
-        skill:setMsg(xi.msg.basic.SKILL_ENFEEB)
-
         target:addStatusEffect(xi.effect.SLEEP_I, 1, 0, duration)
+        if target:getID() == action:getPrimaryTargetID() then
+            petskill:setMsg(xi.msg.basic.JA_RECEIVES_EFFECT_2)
+        else
+            petskill:setMsg(xi.msg.basic.JA_RECEIVES_EFFECT)
+        end
     end
 
+    target:updateEnmity(pet)
+
     return xi.effect.SLEEP_I
 end
 

scripts/globals/job_utils/summoner.lua

@@ -79,6 +79,17 @@ local function getBaseMPCost(player, ability)
         [xi.jobAbility.ECLIPSE_BITE]     = 109,
         [xi.jobAbility.LUNAR_BAY]        = 174,
         [xi.jobAbility.IMPACT]           = 222,
+        -- Shiva
+        [xi.jobAbility.AXE_KICK]         =  10,
+        [xi.jobAbility.BLIZZARD_II]      =  24,
+        [xi.jobAbility.SLEEPGA]          =  56,
+        [xi.jobAbility.FROST_ARMOR]      =  63,
+        [xi.jobAbility.DOUBLE_SLAP]      =  96,
+        [xi.jobAbility.BLIZZARD_IV]      = 118,
+        [xi.jobAbility.DIAMOND_STORM]    = 138,
+        [xi.jobAbility.RUSH]             = 164,
+        [xi.jobAbility.HEAVENLY_STRIKE]  = 182,
+        [xi.jobAbility.CRYSTAL_BLESSING] = 201,
         -- Siren
         [xi.jobAbility.WELT]             =   9,
         [xi.jobAbility.ROUNDHOUSE]       =  52,

sql/abilities.sql

@@ -470,17 +470,17 @@ INSERT INTO `abilities` VALUES (599,'wind_blade',15,75,4,60,173,0,0,94,2000,0,6,
 INSERT INTO `abilities` VALUES (600,'aerial_blast',15,1,4,60,173,0,0,94,2000,0,6,18.0,1,1,60,0,2,NULL);
 INSERT INTO `abilities` VALUES (601,'fleet_wind',15,86,1,60,174,0,0,94,2000,0,6,18.0,0,1,60,0,0,NULL);
 INSERT INTO `abilities` VALUES (602,'hastega_ii',15,99,1,60,174,0,0,94,2000,0,6,18.0,0,1,60,0,0,NULL);
-INSERT INTO `abilities` VALUES (608,'axe_kick',15,1,4,60,173,0,0,10,2000,0,6,18.0,0,1,60,0,0,NULL);
-INSERT INTO `abilities` VALUES (609,'blizzard_ii',15,10,4,60,173,0,0,24,2000,0,6,18.0,0,1,60,0,0,NULL);
-INSERT INTO `abilities` VALUES (610,'frost_armor',15,28,1,60,174,0,0,63,2000,0,6,18.0,0,1,60,0,0,NULL);
-INSERT INTO `abilities` VALUES (611,'sleepga',15,39,4,60,174,0,0,56,2000,0,6,18.0,0,1,60,0,0,NULL);
-INSERT INTO `abilities` VALUES (612,'double_slap',15,50,4,60,173,0,0,96,2000,0,6,18.0,0,1,60,0,0,NULL);
-INSERT INTO `abilities` VALUES (613,'blizzard_iv',15,60,4,60,173,0,0,118,2000,0,6,18.0,0,1,60,0,0,NULL);
-INSERT INTO `abilities` VALUES (614,'rush',15,70,4,60,173,0,0,164,2000,0,6,18.0,0,1,60,0,0,NULL);
-INSERT INTO `abilities` VALUES (615,'heavenly_strike',15,75,4,60,173,0,0,182,2000,0,6,18.0,0,1,60,2946,1,'TOAU');
-INSERT INTO `abilities` VALUES (616,'diamond_dust',15,1,4,60,173,0,0,0,2000,0,6,18.0,0,1,60,0,2,NULL);
--- INSERT INTO `abilities` VALUES (617,'diamond_storm',22,1,1,0,300,0,0,???,2000,0,6,20.0,0,450,900,0,0,NULL);
--- INSERT INTO `abilities` VALUES (618,'crystal_blessing',22,1,1,0,300,0,0,???,2000,0,6,20.0,0,450,900,0,0,NULL);
+INSERT INTO `abilities` VALUES (608,'axe_kick',15,1,4,60,173,0,0,94,2000,0,6,18.0,0,1,60,0,0,NULL);
+INSERT INTO `abilities` VALUES (609,'blizzard_ii',15,10,4,60,173,0,0,94,2000,0,6,18.0,0,1,60,0,0,NULL);
+INSERT INTO `abilities` VALUES (610,'frost_armor',15,28,1,60,174,0,0,94,2000,0,6,18.0,0,1,60,0,0,NULL);
+INSERT INTO `abilities` VALUES (611,'sleepga',15,39,4,60,174,0,0,94,2000,0,6,18.0,0,1,60,0,0,NULL);
+INSERT INTO `abilities` VALUES (612,'double_slap',15,50,4,60,173,0,0,94,2000,0,6,18.0,0,1,60,0,0,NULL);
+INSERT INTO `abilities` VALUES (613,'blizzard_iv',15,60,4,60,173,0,0,94,2000,0,6,18.0,0,1,60,0,0,NULL);
+INSERT INTO `abilities` VALUES (614,'rush',15,70,4,60,173,0,0,94,2000,0,6,18.0,0,1,60,0,0,NULL);
+INSERT INTO `abilities` VALUES (615,'heavenly_strike',15,75,4,60,173,0,0,94,2000,0,6,18.0,0,1,60,2946,1,'TOAU');
+INSERT INTO `abilities` VALUES (616,'diamond_dust',15,1,4,60,173,0,0,94,2000,0,6,18.0,0,1,60,0,2,NULL);
+INSERT INTO `abilities` VALUES (617,'diamond_storm',15,90,4,60,174,0,0,94,2000,0,6,18.0,0,1,60,0,0,NULL);
+INSERT INTO `abilities` VALUES (618,'crystal_blessing',15,99,1,60,174,0,0,94,2000,0,6,18.0,0,1,60,0,0,NULL);
 INSERT INTO `abilities` VALUES (624,'shock_strike',15,1,4,60,173,0,0,6,2000,0,6,18.0,0,1,60,0,0,NULL);
 INSERT INTO `abilities` VALUES (625,'thunder_ii',15,10,4,60,173,0,0,24,2000,0,6,18.0,0,1,60,0,0,NULL);
 INSERT INTO `abilities` VALUES (626,'rolling_thunder',15,31,1,60,174,0,0,52,2000,0,6,18.0,0,1,60,0,0,NULL);

sql/pet_skills.sql

@@ -119,6 +119,19 @@ INSERT INTO `pet_skills` VALUES (600,88,'aerial_blast',1,18.0,2000,1000,4,317,@S
 INSERT INTO `pet_skills` VALUES (601,89,'fleet_wind',1,18.0,2000,1000,3,319,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0);
 INSERT INTO `pet_skills` VALUES (602,90,'hastega_ii',1,18.0,2000,1000,3,319,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0);
 
+-- Shiva
+INSERT INTO `pet_skills` VALUES (608,96,'axe_kick',0,8.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,7,0,0); -- Induration (7)
+INSERT INTO `pet_skills` VALUES (609,97,'blizzard_ii',0,14.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,0,0,0);
+INSERT INTO `pet_skills` VALUES (610,98,'frost_armor',1,18.0,2000,1000,3,319,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0);
+INSERT INTO `pet_skills` VALUES (611,99,'sleepga',1,18.0,2000,1000,4,320,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0);
+INSERT INTO `pet_skills` VALUES (612,100,'double_slap',0,8.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,4,0,0); -- Scission (4)
+INSERT INTO `pet_skills` VALUES (613,101,'blizzard_iv',0,14.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,0,0,0);
+INSERT INTO `pet_skills` VALUES (614,102,'rush',0,8.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,10,4,0); -- Distortion (10), Scission (4)
+INSERT INTO `pet_skills` VALUES (615,103,'heavenly_strike',0,14.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,0,0,0);
+INSERT INTO `pet_skills` VALUES (616,104,'diamond_dust',1,18.0,2000,1000,4,317,@SKILLFLAG_ASTRAL_FLOW | @SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,0,0,0);
+INSERT INTO `pet_skills` VALUES (617,105,'diamond_storm',1,18.0,2000,1000,4,320,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0);
+INSERT INTO `pet_skills` VALUES (618,106,'crystal_blessing',1,18.0,2000,1000,3,319,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0);
+
 -- Cait Sith
 INSERT INTO `pet_skills` VALUES (521,161,'regal_scratch',0,18.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,4,0,0); -- Scission (4)
 INSERT INTO `pet_skills` VALUES (522,162,'mewing_lullaby',1,12.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0);

src/map/mobskill.cpp

@@ -175,12 +175,6 @@ uint16 CMobSkill::getAnimationID() const
 
 uint16 CMobSkill::getPetAnimationID() const
 {
-    // shiva
-    if (m_AnimID >= 578 && m_AnimID <= 586)
-    {
-        return m_AnimID - 482;
-    }
-
     // rumah
     if (m_AnimID >= 591 && m_AnimID <= 599)
     {