diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-02-21 01:19:26 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-02-21 01:19:26 +0000 |
| commit | 93523927791dc3e7f755f38b0c425e77b6d75314 (patch) | |
| tree | 81c62550b854b561668b0f2d44f5b598f6fe6325 /src/map | |
| parent | abf5a30aae55b878ca9352d00853d2ca62408283 (diff) | |
| download | hercules-93523927791dc3e7f755f38b0c425e77b6d75314.tar.gz hercules-93523927791dc3e7f755f38b0c425e77b6d75314.tar.bz2 hercules-93523927791dc3e7f755f38b0c425e77b6d75314.tar.xz hercules-93523927791dc3e7f755f38b0c425e77b6d75314.zip | |
- 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
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/clif.c | 1 | ||||
| -rw-r--r-- | src/map/skill.c | 2 |
2 files changed, 1 insertions, 2 deletions
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
|