diff --git a/scripts/actions/mobskills/pl_hellstorm.lua b/scripts/actions/mobskills/hellstorm.lua similarity index 86% rename from scripts/actions/mobskills/pl_hellstorm.lua rename to scripts/actions/mobskills/hellstorm.lua index 4a95a596664..3bdbca2ef0c 100644 --- a/scripts/actions/mobskills/pl_hellstorm.lua +++ b/scripts/actions/mobskills/hellstorm.lua @@ -5,13 +5,7 @@ local mobskillObject = {} mobskillObject.onMobSkillCheck = function(target, mob, skill) - local mobSkin = mob:getModelId() - - if mobSkin == 281 then - return 0 - else - return 1 - end + return 0 end mobskillObject.onMobWeaponSkill = function(target, mob, skill) diff --git a/scripts/actions/mobskills/pl_vulcanian_impact.lua b/scripts/actions/mobskills/vulcanian_impact.lua similarity index 60% rename from scripts/actions/mobskills/pl_vulcanian_impact.lua rename to scripts/actions/mobskills/vulcanian_impact.lua index 5bb949815ec..fc779780aec 100644 --- a/scripts/actions/mobskills/pl_vulcanian_impact.lua +++ b/scripts/actions/mobskills/vulcanian_impact.lua @@ -5,27 +5,21 @@ local mobskillObject = {} mobskillObject.onMobSkillCheck = function(target, mob, skill) - local mobSkin = mob:getModelId() - - if mobSkin == 281 then - return 0 - else - return 1 - end + return 0 end mobskillObject.onMobWeaponSkill = function(target, mob, skill) - local targetcurrentHP = target:getHP() - local targetmaxHP = target:getMaxHP() - local hpset = targetmaxHP * 0.10 - local dmg = 0 - xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BIND, 1, 0, 30) + local targetHP = target:getHP() + local targetHPP = math.floor(target:getMaxHP() / 10) + local dmg = 0 - if targetcurrentHP > hpset then - dmg = targetcurrentHP - hpset + if targetHP >= targetHPP then + dmg = targetHP - targetHPP end target:takeDamage(dmg, mob, xi.attackType.MAGICAL, xi.damageType.FIRE, { breakBind = false }) + xi.mobskills.mobStatusEffectMove(mob, target, xi.effect.BIND, 1, 0, 30) + return dmg end diff --git a/sql/mob_skills.sql b/sql/mob_skills.sql index 542e63dbd9f..2c73d8696e1 100644 --- a/sql/mob_skills.sql +++ b/sql/mob_skills.sql @@ -607,10 +607,10 @@ INSERT INTO `mob_skills` VALUES (588,398,'death_trap',1,0.0,30.0,2000,2000,4,0,0 INSERT INTO `mob_skills` VALUES (590,334,'goblin_rush',0,0.0,6.0,2000,1500,4,0,0,1,0,0,0); INSERT INTO `mob_skills` VALUES (591,335,'bomb_toss',2,0.0,13.5,2000,2000,4,0,0,0,0,0,0); INSERT INTO `mob_skills` VALUES (592,336,'bomb_toss_suicide',1,0.0,13.5,2000,2000,4,0,0,0,0,0,0); --- INSERT INTO `mob_skills` VALUES (593,337,'berserk',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0); -INSERT INTO `mob_skills` VALUES (594,880,'pl_vulcanian_impact',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0); --- INSERT INTO `mob_skills` VALUES (595,881,'heat_wave',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0); -INSERT INTO `mob_skills` VALUES (596,882,'pl_hellstorm',1,0.0,15.0,2000,1500,4,0,0,0,0,0,0); +INSERT INTO `mob_skills` VALUES (593,879,'berserk',0,0.0,7.0,2000,1500,1,0,0,0,0,0,0); +INSERT INTO `mob_skills` VALUES (594,880,'vulcanian_impact',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0); +INSERT INTO `mob_skills` VALUES (595,881,'heat_wave',1,0.0,15.0,2000,1500,4,0,0,0,0,0,0); +INSERT INTO `mob_skills` VALUES (596,882,'hellstorm',1,0.0,15.0,2000,1500,4,0,0,0,0,0,0); -- INSERT INTO `mob_skills` VALUES (597,883,'self-destruct',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0); INSERT INTO `mob_skills` VALUES (598,1598,'berserk',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0); INSERT INTO `mob_skills` VALUES (599,885,'arctic_impact',1,0.0,15.0,2000,2000,4,0,0,0,0,0,0);