diff options
| -rw-r--r-- | db/pre-re/skill_db.conf | 9 | ||||
| -rw-r--r-- | db/re/skill_db.conf | 7 | ||||
| -rw-r--r-- | src/map/skill.c | 4 |
3 files changed, 7 insertions, 13 deletions
diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf index 351a63bda..f3e3bfb4a 100644 --- a/db/pre-re/skill_db.conf +++ b/db/pre-re/skill_db.conf @@ -115,7 +115,7 @@ SkillData1: Skill Data/Duration (in ms) (int, defaults to 0) (can be grouped by Levels) SkillData2: Skill Data/Duration (in ms) (int, defaults to 0) (can be grouped by Levels) CoolDown: Skill Cooldown (in ms) (int, defaults to 0) (can be grouped by Levels) - + CastTimeOptions: { IgnoreDex: true/false (boolean, defaults to false) IgnoreStatusEffect: true/false (boolean, defaults to false) @@ -386,9 +386,9 @@ skill_db: ( } SplashRange: 2 KnockBackTiles: 2 - SkillData1: 2000 SkillData2: 10000 - CoolDown: 2000 + AfterCastActDelay: 2000 + CoolDown: 0 Requirements: { HPCost: { Lv1: 20 @@ -35238,8 +35238,7 @@ skill_db: ( } SplashRange: 2 KnockBackTiles: 2 - AfterCastWalkDelay: 2000 - SkillData1: 2000 + AfterCastActDelay: 2000 SkillData2: 10000 CoolDown: 0 Requirements: { diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf index 9f5ce6439..e1f2098cd 100644 --- a/db/re/skill_db.conf +++ b/db/re/skill_db.conf @@ -389,7 +389,7 @@ skill_db: ( SplashRange: 2 KnockBackTiles: 2 AfterCastActDelay: 2000 - SkillData1: 2000 + CoolDown: 2000 SkillData2: 10000 FixedCastTime: 0 Requirements: { @@ -36193,9 +36193,8 @@ skill_db: ( } SplashRange: 2 KnockBackTiles: 2 - AfterCastActDelay: 1500 - AfterCastWalkDelay: 2000 - SkillData1: 2000 + AfterCastActDelay: 2000 + CoolDown: 2000 SkillData2: 10000 FixedCastTime: 0 Requirements: { diff --git a/src/map/skill.c b/src/map/skill.c index ad27ef0e3..4e433b3fb 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -6530,10 +6530,6 @@ static int skill_castend_nodamage_id(struct block_list *src, struct block_list * clif->skill_nodamage (src,src,skill_id,skill_lv,1); // Initiate 10% of your damage becomes fire element. sc_start4(src,src,SC_SUB_WEAPONPROPERTY,100,3,20,0,0,skill->get_time2(skill_id, skill_lv)); - if( sd ) - skill->blockpc_start(sd, skill_id, skill->get_time(skill_id, skill_lv)); - else if( bl->type == BL_MER ) - skill->blockmerc_start(BL_UCAST(BL_MER, bl), skill_id, skill->get_time(skill_id, skill_lv)); break; case TK_JUMPKICK: |