diff --git a/scripts/actions/mobskills/photosynthesis.lua b/scripts/actions/mobskills/photosynthesis_mandragora.lua similarity index 86% rename from scripts/actions/mobskills/photosynthesis.lua rename to scripts/actions/mobskills/photosynthesis_mandragora.lua index 7e53b9ce656..48bf3f1647c 100644 --- a/scripts/actions/mobskills/photosynthesis.lua +++ b/scripts/actions/mobskills/photosynthesis_mandragora.lua @@ -1,7 +1,7 @@ ----------------------------------- -- Photosynthesis --- --- Description: Adds a Regen xi.effect. +-- Family : Mandragora +-- Description : Adds Regen Effect -- Type: Enhancing -- Utsusemi/Blink absorb: N/A -- Range: Self @@ -24,7 +24,7 @@ mobskillObject.onMobSkillCheck = function(target, mob, skill) end mobskillObject.onMobWeaponSkill = function(mob, target, skill, action) - local power = math.floor(mob:getMainLvl() / 10) + local power = 1 + math.floor(mob:getMainLvl() / 10) skill:setMsg(xi.mobskills.mobBuffMove(mob, xi.effect.REGEN, power, 0, 120)) diff --git a/scripts/actions/mobskills/photosynthesis_sabotender.lua b/scripts/actions/mobskills/photosynthesis_sabotender.lua new file mode 100644 index 00000000000..4fdada3b893 --- /dev/null +++ b/scripts/actions/mobskills/photosynthesis_sabotender.lua @@ -0,0 +1,34 @@ +----------------------------------- +-- Photosynthesis +-- Family : Sabotender +-- Description: Adds Regen Effect +-- Type: Enhancing +-- Utsusemi/Blink absorb: N/A +-- Range: Self +-- Notes: Only available during daytime. +----------------------------------- +---@type TMobSkill +local mobskillObject = {} + +mobskillObject.onMobSkillCheck = function(target, mob, skill) + -- only used during daytime + local currentTime = VanadielHour() + if + not mob:hasStatusEffect(xi.effect.REGEN) and + currentTime >= 6 and currentTime <= 18 + then + return 0 + end + + return 1 +end + +mobskillObject.onMobWeaponSkill = function(mob, target, skill, action) + local power = 1 + math.floor(mob:getMainLvl() / 5) -- TODO: Checked roughly. Needs more spot checks. + + skill:setMsg(xi.mobskills.mobBuffMove(mob, xi.effect.REGEN, power, 0, 180)) + + return xi.effect.REGEN +end + +return mobskillObject diff --git a/sql/mob_skills.sql b/sql/mob_skills.sql index 5d3a0d9deeb..78414e9ebeb 100644 --- a/sql/mob_skills.sql +++ b/sql/mob_skills.sql @@ -332,7 +332,7 @@ INSERT INTO `mob_skills` VALUES (300,44,'head_butt',0,0.0,7.0,1500,800,4,0,0,0,0 INSERT INTO `mob_skills` VALUES (301,45,'dream_flower',1,0.0,15.0,2000,1200,4,0,0,0,0,0,0); INSERT INTO `mob_skills` VALUES (302,46,'wild_oats',0,0.0,7.0,2000,800,4,0,0,0,0,0,0); -- INSERT INTO `mob_skills` VALUES (303,47,'hundred_fists',0,0.0,7.0,2000,0,1,4,0,0,0,0,0); -INSERT INTO `mob_skills` VALUES (304,48,'photosynthesis',0,0.0,7.0,2000,800,1,0,0,0,0,0,0); +INSERT INTO `mob_skills` VALUES (304,48,'photosynthesis_mandragora',0,0.0,7.0,2000,800,1,0,0,0,0,0,0); INSERT INTO `mob_skills` VALUES (305,49,'leaf_dagger',0,0.0,7.0,2000,1200,4,0,0,0,0,0,0); INSERT INTO `mob_skills` VALUES (306,50,'scream',1,0.0,15.0,2000,800,4,0,0,0,0,0,0); INSERT INTO `mob_skills` VALUES (307,439,'substitute',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0); @@ -352,7 +352,7 @@ INSERT INTO `mob_skills` VALUES (320,64,'sweet_breath',4,0.0,15.0,2000,1500,4,0, INSERT INTO `mob_skills` VALUES (321,65,'needleshot',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0); INSERT INTO `mob_skills` VALUES (322,66,'1000_needles',1,0.0,10.0,2000,1500,4,0,0,0,0,0,0); INSERT INTO `mob_skills` VALUES (323,37,'wild_carrot',0,0.0,20.0,2000,2600,1,0,0,0,0,0,0); -INSERT INTO `mob_skills` VALUES (324,68,'photosynthesis',0,0.0,7.0,2000,1500,1,0,0,0,0,0,0); +INSERT INTO `mob_skills` VALUES (324,68,'photosynthesis_sabotender',0,0.0,7.0,2000,1500,1,0,0,0,0,0,0); INSERT INTO `mob_skills` VALUES (325,161,'random_kiss',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0); INSERT INTO `mob_skills` VALUES (326,164,'absorbing_kiss',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0); INSERT INTO `mob_skills` VALUES (327,165,'deep_kiss',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0); @@ -3380,7 +3380,7 @@ INSERT INTO `mob_skills` VALUES (3337,313,'lunar_bay',0,0.0,10.0,519,1500,4,0,0, -- INSERT INTO `mob_skills` VALUES (3349,3093,'dark_burst',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0); -- INSERT INTO `mob_skills` VALUES (3350,3094,'dark_flood',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0); INSERT INTO `mob_skills` VALUES (3351,46,'wild_oats',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0); -- BabbanMheillea --- INSERT INTO `mob_skills` VALUES (3352,3096,'photosynthesis',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0); +-- INSERT INTO `mob_skills` VALUES (3352,3096,'photosynthesis_mandragora',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0); INSERT INTO `mob_skills` VALUES (3353,1603,'petal_pirouette',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0); INSERT INTO `mob_skills` VALUES (3354,44,'head_butt',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0); INSERT INTO `mob_skills` VALUES (3355,325,'blow',0,0.0,7.0,2000,1500,4,0,0,0,0,0,0);