From 93523927791dc3e7f755f38b0c425e77b6d75314 Mon Sep 17 00:00:00 2001 From: skotlex Date: Tue, 21 Feb 2006 01:19:26 +0000 Subject: - Oh yeah, made Super Novice explosion spirits trigger when the last phrase is said, no need for extra junk. - Now the default delay of amotion is applied only for BF_WEAPON, non NK_NO_DAMAGE skills. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5352 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/clif.c | 1 - src/map/skill.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/map/clif.c b/src/map/clif.c index 0a4614c0a..e980570cf 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9121,7 +9121,6 @@ void clif_parse_GlobalMessage(int fd, struct map_session_data *sd) { // S 008c < case 2: if (strstr(message, msg_txt(506))) sd->state.snovice_flag++; - break; case 3: if (skillnotok(MO_EXPLOSIONSPIRITS,sd)) break; //Do not override the noskill mapflag. [Skotlex] diff --git a/src/map/skill.c b/src/map/skill.c index 7d528aa50..33fa365bc 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -8276,7 +8276,7 @@ int skill_delayfix( struct block_list *bl, int skill_id, int skill_lv, int time // instant cast attack skills depend on aspd as delay [celest] if (time == 0) { - if (skill_get_type(skill_id) == BF_WEAPON) + if (skill_get_type(skill_id) == BF_WEAPON && !(skill_get_nk(skill_id)&NK_NO_DAMAGE)) time = status_get_amotion(bl); //Use attack animation as default delay. else time = 300; // default delay, according to official servers -- cgit v1.2.3-70-g09d2