- 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://svn.code.sf.net/p/rathena/svn/trunk@5352 54d463be-8e91-2dee-dedb-b68131a5f0ec

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]

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]

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