- Fixed the inf2 for BA_DISSONANCE

- Fixed SC_SWOO's opt3 value.
- Fixed allowing multiple recast of Dissonance/Ugly-Dance
- Fixed those annoying irc.c compile warnings.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5693 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog-Trunk.txt

@@ -4,13 +4,18 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.  EVERYTHING ELSE
 GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
 
-
+2006/03/21
-2006/03/18
+	* Fixed SC_SWOO's opt3 value. Small monsters should stay small for skill's
+	  duration now. [Skotlex]
+	* Fixed allowing multiple recast of Dissonance/Ugly-Dance [Skotlex]
+	* Fixed those annoying irc.c compile warnings. [Skotlex]
+2006/03/20
 	* Added monster_ai&16 setting for executing the hard ai on ALL mobs in maps
 	  with players instead of just mobs in the vecinity of players. [Skotlex]
 	* Cleaned up some guild functions. [LuzZza]
 	- Now guild leaving/explusion packets sends correctly.
 	- Fix to prevent creation alliance/opposition with same guilds.
+2006/03/19
 	* @stfu now allows negative intervals to be specified. [Skotlex]
 	* Added overflow check to the login-server when sending GM accounts to
 	  char. [Skotlex]

db/Changelog.txt

@@ -27,6 +27,7 @@
 =========================
 
 03/21
+	* Fixed the inf2 for BA_DISSONANCE to be dance-skill. [Skotlex]
 	* Myst Case Card will drop GB even if the card combo's on [Lupus]
 03/20
 	* Fixed splash area of Ganbantein [Skotlex]

db/skill_db.txt

@@ -336,7 +336,7 @@
 //314,0,0,0,0,0,0,1,1,no,0,64,0,misc,0	//BD_RAGNAROK#Ragnarok#
 315,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0	//BA_MUSICALLESSON#Music Lesson#
 316,9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0	//BA_MUSICALSTRIKE#Melody Strike#
-317,0,8,4,0,1,0,5,1,no,0,0,0,misc,0	//BA_DISSONANCE#Unchained Serenade#
+317,0,8,4,0,1,0,5,1,no,0,32,0,misc,0	//BA_DISSONANCE#Unchained Serenade#
 318,0,6,4,0,3,-1,5,1,no,0,0,0,misc,0	//BA_FROSTJOKE#Unbarring Octave#
 319,0,6,4,0,1,0,10,1,no,0,32,0,misc,0	//BA_WHISTLE#Perfect Tablature#
 320,0,6,4,0,1,0,10,1,no,0,32,0,misc,0	//BA_ASSASSINCROSS#Impressive Riff#

src/map/irc.c

@@ -197,7 +197,7 @@ void irc_parse_sub(int fd, char *incoming_string)
 	char *source_nick=NULL;
 	char *source_ident=NULL;
 	char *source_host=NULL;
-	char *state_mgr=NULL;
+//	char *state_mgr=NULL;
 	
 	memset(source,'\0',256);
 	memset(command,'\0',256);
@@ -208,7 +208,7 @@ void irc_parse_sub(int fd, char *incoming_string)
 	sscanf(incoming_string, ":%255s %255s %255s :%4095[^\n]", source, command, target, message);
 	if (source != NULL) {
 		if (strstr(source,"!") != NULL) {
-			sscanf(source,"%s!%s@$s",source_nick, source_ident, source_host);
+			sscanf(source,"%s!%s@%s",source_nick, source_ident, source_host);
 			//source_nick = strtok_r(source,"!",&state_mgr);
 			//source_ident = strtok_r(NULL,"@",&state_mgr);
 			//source_host = strtok_r(NULL,"%%",&state_mgr);
@@ -253,7 +253,7 @@ int send_to_parser(int fd, char *input,char key[2])
 	char format[4];
 	char *temp_string=NULL;
 	char *next_string=NULL;
-	char *state_mgr=NULL;
+//	char *state_mgr=NULL;
 	int total_loops=0;
 
 	//temp_string = strtok_r(input,key,&state_mgr);

src/map/status.c

@@ -439,11 +439,10 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int
 			)
 				return 0;
 
-			if (sc->data[SC_DANCING].timer != -1)
+			if (flag!=2 && sc->data[SC_DANCING].timer != -1)
 			{
 				if (skill_num != BD_ADAPTATION && skill_num != CG_LONGINGFREEDOM
-					&& skill_num != BA_MUSICALSTRIKE && skill_num != DC_THROWARROW
+					&& skill_num != BA_MUSICALSTRIKE && skill_num != DC_THROWARROW)
-					&& skill_num != BA_DISSONANCE && skill_num != DC_UGLYDANCE)	//[blackhole89] - these hit even (only, in fact) if you are dancing too
 					return 0;
 				if (sc->data[SC_DANCING].val1 == CG_HERMODE && skill_num == BD_ADAPTATION)
 					return 0;	//Can't amp out of Wand of Hermode :/ [Skotlex]
@@ -4549,6 +4548,7 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
 			break;
 		case SC_MAXOVERTHRUST:
 		case SC_OVERTHRUST:			/* オ?バ?スラスト */
+		case SC_SWOO:	//Why does it shares the same opt as Overthrust? Perhaps we'll never know...
 			sc->opt3 |= 2;
 			opt_flag = 0;
 			break;
@@ -4592,9 +4592,6 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
 			sc->opt3 |= 4096;
 			opt_flag = 0;
 			break;
-//		case SC_SWOO: // [marquis007]
-//			sc->opt3 |= 8192; //We haven't figured out this value yet...
-//			break;
 			
 		//OPTION
 		case SC_HIDING:
@@ -5119,6 +5116,8 @@ int status_change_end( struct block_list* bl , int type,int tid )
 			sc->opt3 &= ~1;
 			break;
 		case SC_OVERTHRUST:			/* オ?バ?スラスト */
+		case SC_MAXOVERTHRUST:
+		case SC_SWOO:
 			sc->opt3 &= ~2;
 			break;
 		case SC_ENERGYCOAT:			/* エナジ?コ?ト */