From ec4a69341bcbbc84472a983a0c3cdfaf7a256ad6 Mon Sep 17 00:00:00 2001 From: Neckbeard Date: Fri, 3 May 2024 07:54:26 -0400 Subject: [PATCH 1/4] [SQL] Add Diabolos pet skills and correct job abilities --- sql/abilities.sql | 22 +++++++++++----------- sql/pet_skills.sql | 13 +++++++++++++ 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/sql/abilities.sql b/sql/abilities.sql index 4fc4218321f..8c74c2f32f0 100644 --- a/sql/abilities.sql +++ b/sql/abilities.sql @@ -508,18 +508,18 @@ INSERT INTO `abilities` VALUES (651,'hydro_breath',0,1,4,0,0,0,0,139,2000,1500,1 INSERT INTO `abilities` VALUES (652,'super_climb',0,50,1,0,0,0,0,140,2000,0,13,18.0,0,0,0,0,0,NULL); INSERT INTO `abilities` VALUES (653,'remove_curse',0,60,2,0,0,0,0,157,2000,1500,13,13.0,0,0,0,0,0,NULL); INSERT INTO `abilities` VALUES (654,'remove_disease',0,80,2,0,0,0,0,158,2000,1500,13,13.0,0,0,0,0,0,NULL); -INSERT INTO `abilities` VALUES (656,'camisado',15,1,4,60,173,0,0,20,2000,0,6,18.0,0,1,60,0,0,NULL); -INSERT INTO `abilities` VALUES (657,'somnolence',15,20,4,60,174,0,0,30,2000,0,6,18.0,0,1,60,0,0,NULL); -INSERT INTO `abilities` VALUES (658,'nightmare',15,29,4,60,174,0,0,42,2000,0,6,18.0,0,1,60,0,0,NULL); -INSERT INTO `abilities` VALUES (659,'ultimate_terror',15,37,4,60,174,0,0,27,2000,0,6,18.0,0,1,60,0,0,NULL); -INSERT INTO `abilities` VALUES (660,'noctoshield',15,49,1,60,174,0,0,92,2000,0,6,18.0,0,1,60,0,0,NULL); -INSERT INTO `abilities` VALUES (661,'dream_shroud',15,56,1,60,174,0,0,121,2000,0,6,18.0,0,1,60,0,0,NULL); -INSERT INTO `abilities` VALUES (662,'nether_blast',15,65,4,60,173,0,0,109,2000,0,6,18.0,0,1,60,0,0,NULL); +INSERT INTO `abilities` VALUES (656,'camisado',15,1,4,60,173,0,0,94,2000,0,6,18.0,0,1,60,0,0,NULL); +INSERT INTO `abilities` VALUES (657,'somnolence',15,20,4,60,174,0,0,94,2000,0,6,18.0,0,1,60,0,0,NULL); +INSERT INTO `abilities` VALUES (658,'nightmare',15,29,4,60,174,0,0,94,2000,0,6,18.0,0,1,60,0,0,NULL); +INSERT INTO `abilities` VALUES (659,'ultimate_terror',15,37,4,60,174,0,0,94,2000,0,6,18.0,0,1,60,0,0,NULL); +INSERT INTO `abilities` VALUES (660,'noctoshield',15,49,1,60,174,0,0,94,2000,0,6,18.0,0,1,60,0,0,NULL); +INSERT INTO `abilities` VALUES (661,'dream_shroud',15,56,1,60,174,0,0,94,2000,0,6,18.0,0,1,60,0,0,NULL); +INSERT INTO `abilities` VALUES (662,'nether_blast',15,65,4,60,173,0,0,94,2000,0,6,18.0,0,1,60,0,0,NULL); -- INSERT INTO `abilities` VALUES (663,'cacodemonia',22,1,1,0,300,0,0,???,2000,0,6,20.0,0,450,900,0,0,NULL); --- INSERT INTO `abilities` VALUES (664,'ruinous_omen',22,1,1,0,300,0,0,???,2000,0,6,20.0,0,450,900,0,0,NULL); --- INSERT INTO `abilities` VALUES (665,'night_terror',22,1,1,0,300,0,0,???,2000,0,6,20.0,0,450,900,0,0,NULL); --- INSERT INTO `abilities` VALUES (666,'pavor_nocturnus',22,1,1,0,300,0,0,???,2000,0,6,20.0,0,450,900,0,0,NULL); --- INSERT INTO `abilities` VALUES (667,'blindside',22,1,1,0,300,0,0,???,2000,0,6,20.0,0,450,900,0,0,NULL); +INSERT INTO `abilities` VALUES (664,'ruinous_omen',15,1,4,60,173,0,0,94,2000,0,6,18.0,0,1,60,0,2,NULL); +INSERT INTO `abilities` VALUES (665,'night_terror',15,80,4,60,173,0,0,94,2000,0,6,18.0,0,1,60,0,0,NULL); +INSERT INTO `abilities` VALUES (666,'pavor_nocturnus',15,98,4,60,174,0,0,94,2000,0,6,18.0,0,1,60,0,0,NULL); +INSERT INTO `abilities` VALUES (667,'blindside',15,99,4,60,173,0,0,94,2000,0,6,18.0,0,1,60,0,0,NULL); -- INSERT INTO `abilities` VALUES (668,'deconstruction',22,1,1,0,300,0,0,???,2000,0,6,20.0,0,450,900,0,0,NULL); -- INSERT INTO `abilities` VALUES (669,'chronoshift',22,1,1,0,300,0,0,???,2000,0,6,20.0,0,450,900,0,0,NULL); -- INSERT INTO `abilities` VALUES (670,'zantetsuken',22,1,1,0,300,0,0,???,2000,0,6,20.0,0,450,900,0,0,NULL); diff --git a/sql/pet_skills.sql b/sql/pet_skills.sql index 25866ffa079..1839c56e88f 100644 --- a/sql/pet_skills.sql +++ b/sql/pet_skills.sql @@ -145,6 +145,19 @@ INSERT INTO `pet_skills` VALUES (632,120,'judgment_bolt',1,18.0,2000,1000,4,317, INSERT INTO `pet_skills` VALUES (633,121,'shock_squall',1,18.0,2000,1000,4,645,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); INSERT INTO `pet_skills` VALUES (634,122,'volt_strike',0,18.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,12,4,0); -- Fragmentation (12), Scission (4) +-- Diabolos +INSERT INTO `pet_skills` VALUES (656,141,'camisado',0,8.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,2,0,0); -- Compression (2) +INSERT INTO `pet_skills` VALUES (657,142,'somnolence',0,8.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); +INSERT INTO `pet_skills` VALUES (658,146,'nightmare',1,18.0,2000,1000,4,146,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); +INSERT INTO `pet_skills` VALUES (659,144,'ultimate_terror',1,8.0,2000,1000,4,144,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); +INSERT INTO `pet_skills` VALUES (660,143,'noctoshield',1,18.0,2000,1000,3,319,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); +INSERT INTO `pet_skills` VALUES (661,145,'dream_shroud',1,14.0,2000,1000,3,414,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); +INSERT INTO `pet_skills` VALUES (662,148,'nether_blast',0,8.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,0,0,0); +INSERT INTO `pet_skills` VALUES (664,149,'ruinous_omen',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 (665,153,'night_terror',0,14.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,0,0,0); +INSERT INTO `pet_skills` VALUES (666,155,'pavor_nocturnus',0,18.0,2000,1000,4,646,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); +INSERT INTO `pet_skills` VALUES (667,173,'blindside',0,18.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,9,1,0); -- Gravitation (9), Transfixion (1) + -- 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); From 7285bd0101f77ac9d4cf8f8a0fc3b4164136c55a Mon Sep 17 00:00:00 2001 From: Neckbeard Date: Fri, 3 May 2024 07:55:19 -0400 Subject: [PATCH 2/4] [LUA] Add Diabolos petskills MP cost --- scripts/globals/job_utils/summoner.lua | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/scripts/globals/job_utils/summoner.lua b/scripts/globals/job_utils/summoner.lua index 1585404e8bb..2213e06bd56 100644 --- a/scripts/globals/job_utils/summoner.lua +++ b/scripts/globals/job_utils/summoner.lua @@ -101,6 +101,17 @@ local function getBaseMPCost(player, ability) [xi.jobAbility.CHAOTIC_STRIKE] = 164, [xi.jobAbility.THUNDERSTORM] = 182, [xi.jobAbility.VOLT_STRIKE] = 229, + -- Diabolos + [xi.jobAbility.CAMISADO] = 20, + [xi.jobAbility.ULTIMATE_TERROR] = 27, + [xi.jobAbility.SOMNOLENCE] = 30, + [xi.jobAbility.NIGHTMARE] = 42, + [xi.jobAbility.NOCTOSHIELD] = 92, + [xi.jobAbility.NETHER_BLAST] = 109, + [xi.jobAbility.DREAM_SHROUD] = 121, + [xi.jobAbility.BLINDSIDE] = 147, + [xi.jobAbility.NIGHT_TERROR] = 177, + [xi.jobAbility.PAVOR_NOCTURNUS] = 246, -- Siren [xi.jobAbility.WELT] = 9, [xi.jobAbility.ROUNDHOUSE] = 52, From 0c6159be50d0bc6fe543fcb9db75f071691accb3 Mon Sep 17 00:00:00 2001 From: MowFord <131182600+MowFord@users.noreply.github.com> Date: Fri, 3 May 2024 10:28:41 -0500 Subject: [PATCH 3/4] [LUA] Update all existing diabolos action lua Put notes in pet_skills.sql for the missing ones --- scripts/actions/abilities/pets/camisado.lua | 9 +-- .../actions/abilities/pets/dream_shroud.lua | 18 +++++- .../actions/abilities/pets/nether_blast.lua | 11 ++-- scripts/actions/abilities/pets/nightmare.lua | 13 +++-- .../actions/abilities/pets/noctoshield.lua | 20 +++++-- scripts/actions/abilities/pets/somnolence.lua | 11 ++-- scripts/enum/msg.lua | 56 ++++++++++--------- sql/pet_skills.sql | 10 ++-- 8 files changed, 87 insertions(+), 61 deletions(-) diff --git a/scripts/actions/abilities/pets/camisado.lua b/scripts/actions/abilities/pets/camisado.lua index 50fea8aab3a..bbdbe7c95ef 100644 --- a/scripts/actions/abilities/pets/camisado.lua +++ b/scripts/actions/abilities/pets/camisado.lua @@ -4,16 +4,17 @@ 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 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) + 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) diff --git a/scripts/actions/abilities/pets/dream_shroud.lua b/scripts/actions/abilities/pets/dream_shroud.lua index 57f69df176d..1bd41bd68de 100644 --- a/scripts/actions/abilities/pets/dream_shroud.lua +++ b/scripts/actions/abilities/pets/dream_shroud.lua @@ -4,10 +4,11 @@ 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) + xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) local bonusTime = utils.clamp(summoner:getSkillLevel(xi.skill.SUMMONING_MAGIC) - 300, 0, 200) local duration = 180 + bonusTime local hour = VanadielHour() @@ -16,7 +17,18 @@ abilityObject.onPetAbility = function(target, pet, skill, summoner) target:delStatusEffect(xi.effect.MAGIC_DEF_BOOST) target:addStatusEffect(xi.effect.MAGIC_ATK_BOOST, buffvalue, 0, duration) target:addStatusEffect(xi.effect.MAGIC_DEF_BOOST, 14 - buffvalue, 0, duration) - skill:setMsg(xi.msg.basic.NONE) + + if target:addStatusEffect(xi.effect.PHALANX, 13, 0, duration) then + if target:getID() == action:getPrimaryTargetID() then + petskill:setMsg(xi.msg.basic.JA_RECEIVES_2_EFFECTS) + else + petskill:setMsg(xi.msg.basic.JA_RECEIVES_2_EFFECTS_2) + end + else + petskill:setMsg(xi.msg.basic.JA_NO_EFFECT_2) + return + end + return 0 end diff --git a/scripts/actions/abilities/pets/nether_blast.lua b/scripts/actions/abilities/pets/nether_blast.lua index 317e82b77e6..3d4d87e9885 100644 --- a/scripts/actions/abilities/pets/nether_blast.lua +++ b/scripts/actions/abilities/pets/nether_blast.lua @@ -4,15 +4,16 @@ 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 level = pet:getMainLvl() local damage = 5 * level + 10 - damage = xi.mobskills.mobMagicalMove(pet, target, skill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) - damage = xi.mobskills.mobAddBonuses(pet, target, damage.dmg, xi.element.DARK, skill) - damage = xi.summon.avatarFinalAdjustments(damage, pet, skill, target, xi.attackType.MAGICAL, xi.damageType.DARK, 1) + damage = xi.mobskills.mobMagicalMove(pet, target, petskill, damage, xi.element.DARK, 1, xi.mobskills.magicalTpBonus.NO_EFFECT, 0) + damage = xi.mobskills.mobAddBonuses(pet, target, damage.dmg, xi.element.DARK, petskill) + damage = xi.summon.avatarFinalAdjustments(damage, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.DARK, 1) target:takeDamage(damage, pet, xi.attackType.MAGICAL, xi.damageType.DARK) target:updateEnmityFromDamage(pet, damage) diff --git a/scripts/actions/abilities/pets/nightmare.lua b/scripts/actions/abilities/pets/nightmare.lua index c59147a33d9..3a169cbfc92 100644 --- a/scripts/actions/abilities/pets/nightmare.lua +++ b/scripts/actions/abilities/pets/nightmare.lua @@ -9,10 +9,11 @@ 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 dotdamage = 2 local sleepTier = 1 @@ -20,7 +21,7 @@ abilityObject.onPetAbility = function(target, pet, skill) local bonus = xi.summon.getSummoningSkillOverCap(pet) local resm = xi.mobskills.applyPlayerResistance(pet, -1, target, dINT, bonus, xi.element.DARK) 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 @@ -32,11 +33,11 @@ abilityObject.onPetAbility = function(target, pet, skill) target:hasStatusEffect(xi.effect.LULLABY) then --No effect - skill:setMsg(xi.msg.basic.JA_NO_EFFECT_2) + petskill:setMsg(xi.msg.basic.JA_NO_EFFECT_2) elseif target:addStatusEffect(xi.effect.SLEEP_I, 1, 0, duration, 0, dotdamage, sleepTier) then - skill:setMsg(xi.msg.basic.JA_GAIN_EFFECT) + petskill:setMsg(xi.msg.basic.JA_GAIN_EFFECT) else - skill:setMsg(xi.msg.basic.JA_MISS_2) + petskill:setMsg(xi.msg.basic.JA_MISS_2) end return xi.effect.SLEEP_I diff --git a/scripts/actions/abilities/pets/noctoshield.lua b/scripts/actions/abilities/pets/noctoshield.lua index 9add91cd11b..551e2218e3e 100644 --- a/scripts/actions/abilities/pets/noctoshield.lua +++ b/scripts/actions/abilities/pets/noctoshield.lua @@ -4,15 +4,25 @@ 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) - local bonusTime = utils.clamp(summoner:getSkillLevel(xi.skill.SUMMONING_MAGIC) - 300, 0, 200) +abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) + xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) + local bonusTime = utils.clamp(summoner:getSkillLevel(xi.skill.SUMMONING_MAGIC) - 300, 0, 200) local duration = 180 + bonusTime - target:addStatusEffect(xi.effect.PHALANX, 13, 0, duration) - skill:setMsg(xi.msg.basic.SKILL_GAIN_EFFECT) + if target:addStatusEffect(xi.effect.PHALANX, 13, 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 xi.effect.PHALANX end diff --git a/scripts/actions/abilities/pets/somnolence.lua b/scripts/actions/abilities/pets/somnolence.lua index fbfc276a0e5..3278a0c9357 100644 --- a/scripts/actions/abilities/pets/somnolence.lua +++ b/scripts/actions/abilities/pets/somnolence.lua @@ -4,19 +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) + xi.job_utils.summoner.onUseBloodPact(target, petskill, summoner, action) local dmg = 10 + pet:getMainLvl() * 2 local resist = xi.mobskills.applyPlayerResistance(pet, -1, target, 0, xi.skill.ELEMENTAL_MAGIC, xi.element.DARK) local duration = 120 dmg = dmg * resist - dmg = xi.mobskills.mobAddBonuses(pet, target, dmg, xi.element.DARK, skill) - - -- TODO: spell is nil here - --dmg = finalMagicAdjustments(pet, target, spell, dmg) + dmg = xi.mobskills.mobAddBonuses(pet, target, dmg, xi.element.DARK, petskill) + dmg = xi.summon.avatarFinalAdjustments(dmg, pet, petskill, target, xi.attackType.MAGICAL, xi.damageType.DARK, 1) if resist < 0.15 then --the gravity effect from this ability is more likely to land than Tail Whip resist = 0 diff --git a/scripts/enum/msg.lua b/scripts/enum/msg.lua index 2cec65dc1a3..9fafaaf9df9 100644 --- a/scripts/enum/msg.lua +++ b/scripts/enum/msg.lua @@ -128,33 +128,35 @@ xi.msg.basic = ABILITIES_RECHARGED = 360, -- uses . All of 's abilities are recharged. -- Job Ability messages - USES_JA = 100, -- The uses .. - USES = 101, -- The uses .. - JA_RECOVERS_HP = 102, -- The uses .. recovers .. HP. - ACC_EVA_DOWN = 144, -- uses . receives the effect of Accuracy Down and Evasion Down. - ACC_EVA_BOOST = 146, -- uses . receives the effect of Accuracy Boost and Evasion Boost. - ACC_EVA_BOOST_2 = 147, -- receives the effect of Accuracy Boost and Evasion Boost. - JA_RECOVERS_HP_2 = 318, -- uses ability. recovers HP. -- Observed on healing breath. - JA_DAMAGE = 110, -- uses . takes damage. - JA_REMOVE_EFFECT = 123, -- uses . successfully removes 's . - JA_ENFEEB_IS = 127, -- uses . is . - JA_NO_EFFECT = 156, -- uses . No effect on . (1 line msg) - JA_MISS = 158, -- uses , but misses. (no name included) - USES_JA_TAKE_DAMAGE = 317, -- The uses .. takes .. points of damage. - JA_GAIN_EFFECT = 266, -- gains the effect of . - JA_RECEIVES_EFFECT = 267, -- receives the effect of . - JA_GAIN_EFFECT_2 = 316, -- uses . gains the effect of . - JA_RECEIVES_EFFECT_2 = 320, -- uses . receives the effect of . - JA_REMOVE_EFFECT_2 = 321, -- uses . 's wears off. - JA_NO_EFFECT_2 = 323, -- uses . No effect on . (2 line msg) - JA_MISS_2 = 324, -- uses , but misses . (includes target name) - JA_RECEIVES_EFFECT_3 = 441, -- receives the effect of . - JA_RECOVERS_MP = 451, -- uses . regains MP. - JA_ATK_ENHANCED = 285, -- 's attacks are enhanced. - STATUS_BOOST = 364, -- uses . All of 's status parameters are boosted. - STATUS_BOOST_2 = 365, -- All of 's status parameters are boosted. - JA_MAGIC_BURST = 379, -- uses . Magic Burst! the takes damage. - JA_ENMITY_DECREASE = 743, -- uses . 's enmity decreases. + USES_JA = 100, -- The uses .. + USES = 101, -- The uses .. + JA_RECOVERS_HP = 102, -- The uses .. recovers .. HP. + ACC_EVA_DOWN = 144, -- uses . receives the effect of Accuracy Down and Evasion Down. + ACC_EVA_BOOST = 146, -- uses . receives the effect of Accuracy Boost and Evasion Boost. + ACC_EVA_BOOST_2 = 147, -- receives the effect of Accuracy Boost and Evasion Boost. + JA_RECOVERS_HP_2 = 318, -- uses ability. recovers HP. -- Observed on healing breath. + JA_DAMAGE = 110, -- uses . takes damage. + JA_REMOVE_EFFECT = 123, -- uses . successfully removes 's . + JA_ENFEEB_IS = 127, -- uses . is . + JA_NO_EFFECT = 156, -- uses . No effect on . (1 line msg) + JA_MISS = 158, -- uses , but misses. (no name included) + USES_JA_TAKE_DAMAGE = 317, -- The uses .. takes .. points of damage. + JA_GAIN_EFFECT = 266, -- gains the effect of . + JA_RECEIVES_EFFECT = 267, -- receives the effect of . + JA_GAIN_EFFECT_2 = 316, -- uses . gains the effect of . + JA_RECEIVES_EFFECT_2 = 320, -- uses . receives the effect of . + JA_RECEIVES_MAB_MDB = 415, -- uses . receives the effect of Magic Attack Boost and Magic Defense Boost. + JA_RECEIVES_MAB_MDB_2 = 414, -- receives the effect of Magic Attack Boost and Magic Defense Boost. + JA_REMOVE_EFFECT_2 = 321, -- uses . 's wears off. + JA_NO_EFFECT_2 = 323, -- uses . No effect on . (2 line msg) + JA_MISS_2 = 324, -- uses , but misses . (includes target name) + JA_RECEIVES_EFFECT_3 = 441, -- receives the effect of . + JA_RECOVERS_MP = 451, -- uses . regains MP. + JA_ATK_ENHANCED = 285, -- 's attacks are enhanced. + STATUS_BOOST = 364, -- uses . All of 's status parameters are boosted. + STATUS_BOOST_2 = 365, -- All of 's status parameters are boosted. + JA_MAGIC_BURST = 379, -- uses . Magic Burst! the takes damage. + JA_ENMITY_DECREASE = 743, -- uses . 's enmity decreases. -- Misc Other DEFEATS_TARG = 6, -- The defeats . diff --git a/sql/pet_skills.sql b/sql/pet_skills.sql index 1839c56e88f..27c3b109dda 100644 --- a/sql/pet_skills.sql +++ b/sql/pet_skills.sql @@ -149,14 +149,14 @@ INSERT INTO `pet_skills` VALUES (634,122,'volt_strike',0,18.0,2000,1000,4,317,@S INSERT INTO `pet_skills` VALUES (656,141,'camisado',0,8.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,2,0,0); -- Compression (2) INSERT INTO `pet_skills` VALUES (657,142,'somnolence',0,8.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); INSERT INTO `pet_skills` VALUES (658,146,'nightmare',1,18.0,2000,1000,4,146,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); -INSERT INTO `pet_skills` VALUES (659,144,'ultimate_terror',1,8.0,2000,1000,4,144,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); +INSERT INTO `pet_skills` VALUES (659,144,'ultimate_terror',1,8.0,2000,1000,4,144,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); -- No LUA yet INSERT INTO `pet_skills` VALUES (660,143,'noctoshield',1,18.0,2000,1000,3,319,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); INSERT INTO `pet_skills` VALUES (661,145,'dream_shroud',1,14.0,2000,1000,3,414,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); INSERT INTO `pet_skills` VALUES (662,148,'nether_blast',0,8.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,0,0,0); -INSERT INTO `pet_skills` VALUES (664,149,'ruinous_omen',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 (665,153,'night_terror',0,14.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,0,0,0); -INSERT INTO `pet_skills` VALUES (666,155,'pavor_nocturnus',0,18.0,2000,1000,4,646,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); -INSERT INTO `pet_skills` VALUES (667,173,'blindside',0,18.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,9,1,0); -- Gravitation (9), Transfixion (1) +INSERT INTO `pet_skills` VALUES (664,149,'ruinous_omen',1,18.0,2000,1000,4,317,@SKILLFLAG_ASTRAL_FLOW | @SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,0,0,0); -- No LUA yet +INSERT INTO `pet_skills` VALUES (665,153,'night_terror',0,14.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,0,0,0); -- No LUA yet +INSERT INTO `pet_skills` VALUES (666,155,'pavor_nocturnus',0,18.0,2000,1000,4,646,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); -- No LUA yet +INSERT INTO `pet_skills` VALUES (667,173,'blindside',0,18.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,9,1,0); -- Gravitation (9), Transfixion (1) -- No LUA yet -- 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) From 643427fb5e4a93cb7bedbd0059530b29852b068b Mon Sep 17 00:00:00 2001 From: MowFord <131182600+MowFord@users.noreply.github.com> Date: Fri, 3 May 2024 11:12:59 -0500 Subject: [PATCH 4/4] Update Diabolos petskill ranges Fix message enums --- .../actions/abilities/pets/dream_shroud.lua | 11 +--- scripts/enum/msg.lua | 58 +++++++++---------- sql/pet_skills.sql | 18 +++--- 3 files changed, 41 insertions(+), 46 deletions(-) diff --git a/scripts/actions/abilities/pets/dream_shroud.lua b/scripts/actions/abilities/pets/dream_shroud.lua index 1bd41bd68de..dc8a25b155b 100644 --- a/scripts/actions/abilities/pets/dream_shroud.lua +++ b/scripts/actions/abilities/pets/dream_shroud.lua @@ -18,15 +18,10 @@ abilityObject.onPetAbility = function(target, pet, petskill, summoner, action) target:addStatusEffect(xi.effect.MAGIC_ATK_BOOST, buffvalue, 0, duration) target:addStatusEffect(xi.effect.MAGIC_DEF_BOOST, 14 - buffvalue, 0, duration) - if target:addStatusEffect(xi.effect.PHALANX, 13, 0, duration) then - if target:getID() == action:getPrimaryTargetID() then - petskill:setMsg(xi.msg.basic.JA_RECEIVES_2_EFFECTS) - else - petskill:setMsg(xi.msg.basic.JA_RECEIVES_2_EFFECTS_2) - end + if target:getID() == action:getPrimaryTargetID() then + petskill:setMsg(xi.msg.basic.JA_RECEIVES_MAB_MDB) else - petskill:setMsg(xi.msg.basic.JA_NO_EFFECT_2) - return + petskill:setMsg(xi.msg.basic.JA_RECEIVES_MAB_MDB_2) end return 0 diff --git a/scripts/enum/msg.lua b/scripts/enum/msg.lua index 9fafaaf9df9..39229f94c89 100644 --- a/scripts/enum/msg.lua +++ b/scripts/enum/msg.lua @@ -128,35 +128,35 @@ xi.msg.basic = ABILITIES_RECHARGED = 360, -- uses . All of 's abilities are recharged. -- Job Ability messages - USES_JA = 100, -- The uses .. - USES = 101, -- The uses .. - JA_RECOVERS_HP = 102, -- The uses .. recovers .. HP. - ACC_EVA_DOWN = 144, -- uses . receives the effect of Accuracy Down and Evasion Down. - ACC_EVA_BOOST = 146, -- uses . receives the effect of Accuracy Boost and Evasion Boost. - ACC_EVA_BOOST_2 = 147, -- receives the effect of Accuracy Boost and Evasion Boost. - JA_RECOVERS_HP_2 = 318, -- uses ability. recovers HP. -- Observed on healing breath. - JA_DAMAGE = 110, -- uses . takes damage. - JA_REMOVE_EFFECT = 123, -- uses . successfully removes 's . - JA_ENFEEB_IS = 127, -- uses . is . - JA_NO_EFFECT = 156, -- uses . No effect on . (1 line msg) - JA_MISS = 158, -- uses , but misses. (no name included) - USES_JA_TAKE_DAMAGE = 317, -- The uses .. takes .. points of damage. - JA_GAIN_EFFECT = 266, -- gains the effect of . - JA_RECEIVES_EFFECT = 267, -- receives the effect of . - JA_GAIN_EFFECT_2 = 316, -- uses . gains the effect of . - JA_RECEIVES_EFFECT_2 = 320, -- uses . receives the effect of . - JA_RECEIVES_MAB_MDB = 415, -- uses . receives the effect of Magic Attack Boost and Magic Defense Boost. - JA_RECEIVES_MAB_MDB_2 = 414, -- receives the effect of Magic Attack Boost and Magic Defense Boost. - JA_REMOVE_EFFECT_2 = 321, -- uses . 's wears off. - JA_NO_EFFECT_2 = 323, -- uses . No effect on . (2 line msg) - JA_MISS_2 = 324, -- uses , but misses . (includes target name) - JA_RECEIVES_EFFECT_3 = 441, -- receives the effect of . - JA_RECOVERS_MP = 451, -- uses . regains MP. - JA_ATK_ENHANCED = 285, -- 's attacks are enhanced. - STATUS_BOOST = 364, -- uses . All of 's status parameters are boosted. - STATUS_BOOST_2 = 365, -- All of 's status parameters are boosted. - JA_MAGIC_BURST = 379, -- uses . Magic Burst! the takes damage. - JA_ENMITY_DECREASE = 743, -- uses . 's enmity decreases. + USES_JA = 100, -- The uses .. + USES = 101, -- The uses .. + JA_RECOVERS_HP = 102, -- The uses .. recovers .. HP. + ACC_EVA_DOWN = 144, -- uses . receives the effect of Accuracy Down and Evasion Down. + ACC_EVA_BOOST = 146, -- uses . receives the effect of Accuracy Boost and Evasion Boost. + ACC_EVA_BOOST_2 = 147, -- receives the effect of Accuracy Boost and Evasion Boost. + JA_RECOVERS_HP_2 = 318, -- uses ability. recovers HP. -- Observed on healing breath. + JA_DAMAGE = 110, -- uses . takes damage. + JA_REMOVE_EFFECT = 123, -- uses . successfully removes 's . + JA_ENFEEB_IS = 127, -- uses . is . + JA_NO_EFFECT = 156, -- uses . No effect on . (1 line msg) + JA_MISS = 158, -- uses , but misses. (no name included) + USES_JA_TAKE_DAMAGE = 317, -- The uses .. takes .. points of damage. + JA_GAIN_EFFECT = 266, -- gains the effect of . + JA_RECEIVES_EFFECT = 267, -- receives the effect of . + JA_GAIN_EFFECT_2 = 316, -- uses . gains the effect of . + JA_RECEIVES_EFFECT_2 = 320, -- uses . receives the effect of . + JA_RECEIVES_MAB_MDB = 415, -- uses . receives the effect of Magic Attack Boost and Magic Defense Boost. + JA_RECEIVES_MAB_MDB_2 = 414, -- receives the effect of Magic Attack Boost and Magic Defense Boost. + JA_REMOVE_EFFECT_2 = 321, -- uses . 's wears off. + JA_NO_EFFECT_2 = 323, -- uses . No effect on . (2 line msg) + JA_MISS_2 = 324, -- uses , but misses . (includes target name) + JA_RECEIVES_EFFECT_3 = 441, -- receives the effect of . + JA_RECOVERS_MP = 451, -- uses . regains MP. + JA_ATK_ENHANCED = 285, -- 's attacks are enhanced. + STATUS_BOOST = 364, -- uses . All of 's status parameters are boosted. + STATUS_BOOST_2 = 365, -- All of 's status parameters are boosted. + JA_MAGIC_BURST = 379, -- uses . Magic Burst! the takes damage. + JA_ENMITY_DECREASE = 743, -- uses . 's enmity decreases. -- Misc Other DEFEATS_TARG = 6, -- The defeats . diff --git a/sql/pet_skills.sql b/sql/pet_skills.sql index 27c3b109dda..a850014ed34 100644 --- a/sql/pet_skills.sql +++ b/sql/pet_skills.sql @@ -147,16 +147,16 @@ INSERT INTO `pet_skills` VALUES (634,122,'volt_strike',0,18.0,2000,1000,4,317,@S -- Diabolos INSERT INTO `pet_skills` VALUES (656,141,'camisado',0,8.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,2,0,0); -- Compression (2) -INSERT INTO `pet_skills` VALUES (657,142,'somnolence',0,8.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); -INSERT INTO `pet_skills` VALUES (658,146,'nightmare',1,18.0,2000,1000,4,146,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); -INSERT INTO `pet_skills` VALUES (659,144,'ultimate_terror',1,8.0,2000,1000,4,144,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); -- No LUA yet +INSERT INTO `pet_skills` VALUES (657,142,'somnolence',0,7.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); +INSERT INTO `pet_skills` VALUES (658,146,'nightmare',1,7.0,2000,1000,4,146,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); +INSERT INTO `pet_skills` VALUES (659,144,'ultimate_terror',1,7.0,2000,1000,4,144,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); -- No LUA yet INSERT INTO `pet_skills` VALUES (660,143,'noctoshield',1,18.0,2000,1000,3,319,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); -INSERT INTO `pet_skills` VALUES (661,145,'dream_shroud',1,14.0,2000,1000,3,414,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); -INSERT INTO `pet_skills` VALUES (662,148,'nether_blast',0,8.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,0,0,0); -INSERT INTO `pet_skills` VALUES (664,149,'ruinous_omen',1,18.0,2000,1000,4,317,@SKILLFLAG_ASTRAL_FLOW | @SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,0,0,0); -- No LUA yet -INSERT INTO `pet_skills` VALUES (665,153,'night_terror',0,14.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,0,0,0); -- No LUA yet -INSERT INTO `pet_skills` VALUES (666,155,'pavor_nocturnus',0,18.0,2000,1000,4,646,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); -- No LUA yet -INSERT INTO `pet_skills` VALUES (667,173,'blindside',0,18.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,9,1,0); -- Gravitation (9), Transfixion (1) -- No LUA yet +INSERT INTO `pet_skills` VALUES (661,145,'dream_shroud',1,18.0,2000,1000,3,414,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); +INSERT INTO `pet_skills` VALUES (662,148,'nether_blast',0,14.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,0,0,0); +INSERT INTO `pet_skills` VALUES (664,149,'ruinous_omen',1,7.0,2000,1000,4,317,@SKILLFLAG_ASTRAL_FLOW | @SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,0,0,0); -- No LUA yet +INSERT INTO `pet_skills` VALUES (665,153,'night_terror',0,6.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,0,0,0); -- No LUA yet +INSERT INTO `pet_skills` VALUES (666,155,'pavor_nocturnus',0,14.0,2000,1000,4,646,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_WARD,0,13,0,0,0,0); -- No LUA yet +INSERT INTO `pet_skills` VALUES (667,173,'blindside',0,12.0,2000,1000,4,317,@SKILLFLAG_SPECIAL | @SKILLFLAG_BLOODPACT_RAGE,0,13,0,9,1,0); -- Gravitation (9), Transfixion (1) -- No LUA yet -- 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)