From 66b348c54784c2fc4f4eef70785c5c1743c49b38 Mon Sep 17 00:00:00 2001 From: Aleos Date: Wed, 2 Nov 2022 13:01:19 -0400 Subject: [PATCH] Fixes NPC_COMET duration (#7388) * Fixes #7355. * Follow up to 2993c0b. * Resolves an issue with the duration of Burning overlapping with the duration of NPC_COMET. Thanks to @sonniez and @OptimusM! --- db/re/skill_db.yml | 2 +- src/map/skill.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/db/re/skill_db.yml b/db/re/skill_db.yml index 92fadc9fb3..fdefb50c4c 100644 --- a/db/re/skill_db.yml +++ b/db/re/skill_db.yml @@ -17022,7 +17022,7 @@ Body: Range: 11 Hit: Multi_Hit HitCount: -20 - Duration1: 18000 + Duration2: 18000 SplashArea: 9 Knockback: 2 CastCancel: true diff --git a/src/map/skill.cpp b/src/map/skill.cpp index ff6bf22f0d..dfb4e1ab33 100755 --- a/src/map/skill.cpp +++ b/src/map/skill.cpp @@ -1800,7 +1800,7 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1 sc_start(src, bl, SC_MAGIC_POISON, 100, skill_lv, 20000); break; case NPC_COMET: - sc_start4(src,bl,SC_BURNING,100,skill_lv,1000,src->id,0,skill_get_time(skill_id,skill_lv)); + sc_start4(src,bl,SC_BURNING,100,skill_lv,1000,src->id,0,skill_get_time2(skill_id,skill_lv)); break; case NPC_JACKFROST: sc_start(src,bl,SC_FREEZE,200,skill_lv,skill_get_time(skill_id,skill_lv));