diff options
| -rw-r--r-- | Changelog-Trunk.txt | 5 | ||||
| -rw-r--r-- | src/map/clif.c | 1 | ||||
| -rw-r--r-- | src/map/skill.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 6f0260ee4..16a9b0c07 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -5,6 +5,11 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/02/20
+ * The Super Novice Explosion Spirits skill will now trigger when the last
+ sentence is said (not after the next sentence as it was currently) [Skotlex]
+ * Now the default delay of amotion is applied only for BF_WEAPON, non
+ NK_NO_DAMAGE skills (so stuff like Summon Spirit Sphere get the default
+ skill delay rather than ASPD) [Skotlex]
* Made the Char-SQL server send the GM listing when the map server
connects. [Skotlex]
* Play-dead and Basilica now block Gospel [Skotlex]
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
|