* Added bard/dancer songs and duets to the nodispell list. (bugreport:4411)

* Applied Ai4rei's patch for the skill WE_CALLPARTNER (bugreport:4437)
* Lots of updates to monster stats/drops, all fairly minor.
* Updated the price and weight of a handful of etc items.
* Removed drops for quest-spawned Satan Morroc. (bugreport:4425)
* Changed weight on novice consumable items to 0 (bugreport:4442)
* Updated Sage quest skill quest with the file curtosy of 5511.
* Fixed the Pink Crystal being named Blue Crystal in Flavius.
* Touched up the archer tutorial, and phantasmic arrow quests.
* Fixed Turbo Track records for 8 and 16 normal saving as expert. (bugreport:4433)
* Corrected the positions for the arug castle 04 exterior flags. (bugreport:4436)


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14409 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 196 insertions, 214 deletions

diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt
index 832a670ad..e443f99c1 100644
--- a/npc/quests/first_class/tu_archer.txt
+++ b/npc/quests/first_class/tu_archer.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Fix up by Jukka
 //===== Current Version: ===================================== 
-//= 1.7
+//= 1.8
 //===== Compatible With: ===================================== 
 //= eAthena SVN (Testet in Trunk 88xx)
 //===== Description: ========================================= 
@@ -18,6 +18,7 @@
 //= 1.5 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
 //= 1.6 Fixed infinate loop. (bugreport:2393) [L0ne_W0lf]
 //= 1.7 Added 10.3 dialog and moved Arpesto to hunter skill quest. [Kisuka]
+//= 1.8 Updated slightly, removed additional emotions from Reiden. [L0ne_W0lf]
 //============================================================ 
 
 
@@ -60,18 +61,9 @@ payon_in02,67,65,3	script	Bard Jet#tu	51,{
 		mes "up a joke~!";
 		emotion e_gg;
 		next;
-		if(Sex){
-			menu "A joke, eh?",-;
-			mes "["+ strcharinfo(0) +"]";
-			mes "What did...";
-			mes "the... Priest...";
-			mes "say to the Verit?";
-			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "'HEAL!'";
-			mes "Um... Get it?";
-			next;
-			//misceffect EF_TALK_FROSTJOKE ;
+		if (Sex == 1) {
+			select("A joke, eh?");
+			specialeffect2 EF_TALK_FROSTJOKE;
 			mes "[Jet]";
 			mes "Oh...";
 			mes "My...";
@@ -84,9 +76,8 @@ payon_in02,67,65,3	script	Bard Jet#tu	51,{
 			mes "talent for showmanship! You";
 			mes "just have to become a Bard!";
 		} else {
-			menu "Scream!",-;
-			next;
-			//misceffect  ;
+			select("Scream!");
+			specialeffect2 EF_TALK_SCREAM;
 			mes "[Jet]";
 			mes "W-Wow...";
 			mes "I don't know why, but that was truly amazing. You must have";
@@ -112,8 +103,8 @@ payon_in02,67,65,3	script	Bard Jet#tu	51,{
 		mes "Ooh...!";
 		mes "You're...!";
 		next;
-		//misceffect EF_TALK_FROSTJOKE ;
-		//ShowEffect "Bard Jet#tu" EF_TALK_FROSTJOKE 
+		specialeffect2 EF_TALK_FROSTJOKE;
+		//specialeffect EF_TALK_FROSTJOKE,"Bard Jet#tu";
 		emotion e_no1;
 		mes "[Jet]";
 		mes "Let's see...";
@@ -169,22 +160,21 @@ payon_in02,67,65,3	script	Bard Jet#tu	51,{
 //=================================================Sign====================================================
 pay_arche,127,154,4	script	Sign#arc	835,{
 	mes " ";
-	mes " Archer Job Change Office  --->  ";
-	mes " <---     Icarus  ";
+	mes " Archer Job Change Office ---> ";
+	mes " <--- Icarus ";
 	mes " ";
 	close;
 }
 
 //=================================================Master Kavaruk====================================================
 payon_in02,47,13,3	script	Master Kavaruk	55,{
-
 	mes "[Master Kavaruk]";
 	mes "Hello, young one.";
 	mes "I am Master Kavaruk";
 	mes "of the Icarus Archer Guild.";
 	mes "I bid you welcome.";
 	next;
-	switch(select("Ask about 'Icarus.':Ask about recent news.:Talk about Archers.")){
+	switch(select("Ask about 'Icarus.':Ask about recent news.:Talk about Archers.")) {
 	case 1:
 		mes "[Master Kavaruk]";
 		mes "Have you ever";
@@ -277,8 +267,7 @@ payon_in02,47,13,3	script	Master Kavaruk	55,{
 				mes "Hmmm...";
 				mes "..........";
 				next;
-				menu "Is something the matter?",-;
-
+				select("Is something the matter?");
 				mes "[Master Kavaruk]";
 				mes "Actually, we have a problem.";
 				mes "The position of master seems to have a lot of power, but I always need to remain here. I don't have the luxury of being able to leave my post.";
@@ -291,7 +280,8 @@ payon_in02,47,13,3	script	Master Kavaruk	55,{
 				mes "He has been sending me letters containing detailed information, but all of a sudden, I've lost contact with him. I'm concerned over what may have happened.";
 				next;
 				mes "[Master Kavaruk]";
-				mes "Would you please go find ^3131FFArthail of the Wind^000000 for me? Although he doesn't like people, I've ordered for him to wander within the crowds to gather information.";
+				mes "Would you please go find";
+				mes "^3131FFArthail of the Wind^000000 for me? Although he doesn't like people, I've ordered for him to wander within the crowds to gather information.";
 				next;
 				mes "[Master Kavaruk]";
 				mes "Please find out if he is all right and help him with whatever he";
@@ -313,7 +303,6 @@ payon_in02,47,13,3	script	Master Kavaruk	55,{
 				set tu_archer02, 10;
 				getexp 2000,1000;
 				close;
-
 			}
 		}
 		mes "I don't know...";
@@ -383,7 +372,7 @@ payon_in02,47,13,3	script	Master Kavaruk	55,{
 				mes "Icarus will always welcome";
 				mes "you with open arms. If you";
 				mes "ever change your mind, feel";
-				mes "free to come back."; 
+				mes "free to come back.";
 				close;
 				break;
 			}
@@ -401,7 +390,7 @@ payon_in02,47,13,3	script	Master Kavaruk	55,{
 			next;
 			mes "[Master Kavaruk]";
 			if(Class == Job_Archer || Class == Job_Archer_High || Class == Job_Baby_Archer){
-				mes "Now it is time to experience the principles you've just learned firsthand. Go speak to ^3131FFRaiden Karus^000000, who is just outside of this building, and he'll tell you about the different skills.";
+				mes "Now it is time to experience the principles you've just learned firsthand. Go speak to ^3131FFReidin Corse^000000, who is just outside of this building, and he'll tell you about the different skills.";
 				set tu_archer01, 4;
 			} else {
 				mes "Still, there's no need for you to do any field training since only Archers can actually participate";
@@ -410,7 +399,7 @@ payon_in02,47,13,3	script	Master Kavaruk	55,{
 			close;
 
 		} else if(tu_archer01 == 4){
-			mes "Raiden Karus is just outside of this building. Didn't you see him on your way in?";
+			mes "Reidin Corse is just outside of this building. Didn't you see him on your way in?";
 			close;
 
 		}
@@ -421,10 +410,9 @@ payon_in02,47,13,3	script	Master Kavaruk	55,{
 	close;
 }
 
-//=================================================Raiden Karus====================================================
-pay_arche,103,165,5	script	Raiden Karus#tu	832,{
-
-	mes "[Raiden Karus]";
+//=================================================Reidin Corse====================================================
+pay_arche,103,165,5	script	Reidin Corse#tu	832,{
+	mes "[Reidin Corse]";
 	if(MaxWeight - Weight < 2000){
 		mes "Hey, you're carrying an";
 		mes "awful lot of stuff. You ought";
@@ -438,9 +426,9 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 			mes "Can I help you";
 			mes "with something?";
 			next;
-			switch(select("Tell me about skills.:Er, not really...")){
+			switch(select("Tell me about skills.:Er, not really...")) {
 			case 1:
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Huh. So Master";
 				mes "Kavaruk told you";
 				mes "to come to me, eh?";
@@ -449,7 +437,7 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 				next;
 				break;
 			case 2:
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Huh...?";
 				mes "Alright. You sure";
 				mes "you've got nothing";
@@ -458,18 +446,18 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 				close;
 				break;
 			}
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "Fine. I'm an incredibly";
 			mes "busy guy, but I'll make time for you. I'll teach you what I know about Archer skills... On one condition!";
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "From here on out, you gotta";
 			mes "call me ^3131FFChief^000000, got it? Stick with me and you'll become the second best archer in the world! How";
 			mes "about it, kid?";
 			next;
-			switch(select("You got it, Chief!", "Ugh, no thanks~!")){
+			switch(select("You got it, Chief!:Ugh, no thanks~!")) {
 			case 1:
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Ho ho!";
 				mes "That's the way to go!";
 				mes "Good good~ Call me Chief";
@@ -477,12 +465,12 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 				next;
 				break;
 			case 2:
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Huh? What kind of attitude";
 				mes "is that? Ah, I get it. You're not mature enough to recognize greatness when it's right";
 				mes "before you.";
 				next;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Don't worry...";
 				mes "When you come crawlin'";
 				mes "back, I'll reconsider";
@@ -490,14 +478,14 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 				close;
 				break;
 			}
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "Let's see...";
 			mes "How much do you know?";
 			mes "Mmmmmmmmmm...";
 			next;
-			mes "^3355FFRaiden Karus narrows his experienced eyes and sizes you up.^000000";
+			mes "^3355FFReidin Corse narrows his experienced eyes and sizes you up.^000000";
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			if(JobLevel > 39){
 				mes "Hey! You're ready to change jobs, aren't you? Don't waste time here and just get a new job already! Eh, or you can ask Master Kavaruk for something to do.";
 				close;
@@ -506,7 +494,7 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 				mes "up. Okay? Good.";
 				next;
 				set tu_archer01, 5;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Okay, I'm ready to begin the lessons! Come back over here once you've got your bow and arrows and everything else ready, got it?";
 				close;
 			} else {
@@ -515,7 +503,7 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 				mes "a little experienced, there's still room for you to learn. So try and keep up, got it?";
 				next;
 				set tu_archer01, 5;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Well, I'm ready to teach whenever you're ready to learn. Come back once your bow and arrows and everything else is ready, alright?";
 				close;
 			}
@@ -523,33 +511,32 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 			mes "You ready? I think it's fair to remind you that I won't tolerate any complaining! Just do what";
 			mes "I say and you'll be the second best Archer in the world! After me, of course~";
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "If you don't like it, you can just quit! No reason to stick around";
 			mes "if you can't keep up with the Chief, anyway.";
 			next;
-			switch(select("Please teach me... Chief!:I want to quit.")){
+			switch(select("Please teach me... Chief!:I want to quit.")) {
 			case 1:
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "That's what I'm talkin' about! Yeah! Just trust me and you'll learn almost everything about Archer skills! Let's get started!";
 				next;
-				menu "Yes, Chief!",-;
-
+				select("Yes, Chief!");
 				emotion e_ok;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Great...!";
 				mes "I like your style!";
 				next;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Now, open your Skill Window (Alt+S). You oughta be able to see two skills: ^FF0000Owl's Eye^000000 and ^FF0000Double Strafe^000000. First, I'll talk about Owl's Eye.";
 				next;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "We Archers need to be able to preceive the movements of our targets from far away. Now, even during the night, nothing can escape the eyes of an owl.";
 				next;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "So we gotta train our vision so that we see the way owls do. Now";
 				mes "if you can't aim at your targets, you'd be horrible at archery, right? You gotta have Accuracy!";
 				next;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				set @skill_owl, getskilllv("AC_OWL");
 				if(@skill_owl < 3){
 					set tu_archer01, 6;
@@ -557,14 +544,14 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 					mes "is to learn ^3131FFLevel 3 Owl's Eye^000000!";
 					mes "From Prontera, if you travel south, south and then west, you can fight Condors for your training.";
 					next;
-					mes "[Raiden Karus]";
+					mes "[Reidin Corse]";
 					mes "You can head somewhere";
 					mes "else if you want, but if you don't know any training areas, then";
 					mes "just follow my great advice.";
 					next;
-					switch(select("I'll follow your advice, Chief!:I'll hunt somewhere else...")){
+					switch(select("I'll follow your advice, Chief!:I'll hunt somewhere else...")) {
 					case 1:
-						mes "[Raiden Karus]";
+						mes "[Reidin Corse]";
 						mes "I'll send you to";
 						mes "Prontera for now,";
 						mes "so don't forget the";
@@ -572,39 +559,39 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 						mes "Travel ^3131FFsouth^000000, ^3131FFsouth^000000,";
 						mes "and then ^3131FFwest^000000.";
 						next;
-						switch(select("Leave right away~", "W-wait, let me get ready!")){
-							case 1:
-								mes "[Raiden Karus]";
-								mes "When you struggle";
-								mes "through the hardships";
-								mes "of training, just think";
-								mes "about trying to become as";
-								mes "good as the greatest Archer";
-								mes "ever: me.";
-								emotion e_dots;
-								next;
-								mes "[Raiden Karus]";
-								mes "Okay...!";
-								mes "Off you go!";
-								mes "To Prontera!";
-								close2;
-								warp "prontera",116,72;
-								end;
-								break;
-							case 2:
-								mes "[Raiden Karus]";
-								mes "Hm...?";
-								mes "What do you possibly";
-								mes "need to prepare? Alright,";
-								mes "do whatever it is you";
-								mes "need to do...";
-								close;
-								break;
+						switch(select("Leave right away~:W-wait, let me get ready!")) {
+						case 1:
+							mes "[Reidin Corse]";
+							mes "When you struggle";
+							mes "through the hardships";
+							mes "of training, just think";
+							mes "about trying to become as";
+							mes "good as the greatest Archer";
+							mes "ever: me.";
+							emotion e_dots;
+							next;
+							mes "[Reidin Corse]";
+							mes "Okay...!";
+							mes "Off you go!";
+							mes "To Prontera!";
+							close2;
+							warp "prontera",116,72;
+							end;
+							break;
+						case 2:
+							mes "[Reidin Corse]";
+							mes "Hm...?";
+							mes "What do you possibly";
+							mes "need to prepare? Alright,";
+							mes "do whatever it is you";
+							mes "need to do...";
+							close;
+							break;
 						}
 						break;
 					case 2:
 						emotion e_an;
-						mes "[Raiden Karus]";
+						mes "[Reidin Corse]";
 						mes "Say what...?";
 						mes "Alright, then.";
 						mes "But the next time";
@@ -623,7 +610,7 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 				}
 				break;
 			case 2:
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Huh. Okay.";
 				mes "And here I was";
 				mes "getting ready to";
@@ -641,20 +628,20 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 				mes "waiting for a while!";
 				next;
 				emotion e_gasp;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Ah, but your eyes look a lot sharper than they used to be.";
 				mes "Here, this is a small, special reward for you.";
-				//misceffect EF_WIND ;
+				specialeffect2 EF_WIND;
 				set tu_archer01, 7;
 				getexp 500,0;
 				next;
 				emotion e_pif;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Not bad, but you really should master Owl's Eye. That means";
 				mes "you need to learn it all the way";
 				mes "up to Level 10!";
 				next;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Now, I guess I'll";
 				mes "talk about a different";
 				mes "skill in my next lecture, kay?";
@@ -677,19 +664,19 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 			mes "able to see the Vulture's Eye";
 			mes "skill in the list too.";
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "Now when you think";
 			mes "about vultures, what";
 			mes "exactly comes to mind?";
 			next;
-			switch(select("Sharp, precise eyes.", "You, Chief.")){
+			switch(select("Sharp, precise eyes.:You, Chief.")) {
 			case 1:
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Exactly!";
 				break;
 			case 2:
 				emotion e_lv2;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Hahahaha!";
 				mes "Well, I am famous";
 				mes "for my incredible";
@@ -698,25 +685,25 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 				break;
 			}
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "Vultures circle the sky, find a target on the ground, and then very swiftly swoop down and ensnare their prey in their claws.";
 			next;
 			emotion e_lv;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "No doubt about it.";
 			mes "Vultures are awesome!";
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "The ^3131FFVulture's Eye^000000 skill allows";
 			mes "you to train your vision to be like a vulture's. You'll increase your Attack Accuracy and can target enemies from further away.";
 			next;
 			emotion e_no;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "I know that you can attack";
 			mes "from a distance now, but don't";
 			mes "be satisfied with just your current attack range. Learn Vulture's Eye so you can attack from even further distances.";
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "Now for your";
 			mes "second assignment!";
 			mes "Go hunt Mandagora!";
@@ -730,7 +717,7 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 				mes "Alright, Mandagora usually live around Mt. Mjolnir. I can send you to Prontera, so just travel north, then east from there to find";
 				mes "some of them.";
 				next;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Remember, the most";
 				mes "important thing is to level the Vulture's Eye skill and test the distance of your attack range.";
 				if(MaxWeight - Weight < 1000){
@@ -740,19 +727,19 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 					next;
 				} else {
 					next;
-					mes "[Raiden Karus]";
+					mes "[Reidin Corse]";
 					mes "Here's a little something to encourage you. Since Mandagora are Earth property monsters, these Fire Arrows will work really well.";
 					set tu_archer01, 8;
 					getitem 1752, 300;
 					next;
 				}
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Alright~";
 				mes "Ready to go?";
 				next;
-				switch(select("Let's go!", "W-wait a minute!")){
-				case 1: 
-					mes "[Raiden Karus]";
+				switch(select("Let's go!:W-wait a minute!")) {
+				case 1:
+					mes "[Reidin Corse]";
 					mes "Alright...!";
 					mes "Get a move on!";
 					close2;
@@ -760,7 +747,7 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 					end;
 					break;
 				case 2:
-					mes "[Raiden Karus]";
+					mes "[Reidin Corse]";
 					mes "You still need";
 					mes "to get ready?";
 					mes "Hurry it up!";
@@ -772,7 +759,7 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 				mes "Wait a minute...";
 				emotion e_what;
 				next;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "You already";
 				mes "learned Vulture's Eye!";
 				mes "Why did I spend so much time explaining about it? Well, I guess we're ready to move on to the next lesson...";
@@ -785,14 +772,14 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 			if(@eagle < 3){
 				mes "Mandagora lives in the area north and east of Prontera. Learn up to Level 3 Vulture's Eye and get acquainted with your attack range.";
 				next;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Okay...";
 				mes "Are you";
 				mes "ready to go?";
 				next;
-				switch(select("Go.", "Wait a moment.")){
-				case 1: 
-					mes "[Raiden Karus]";
+				switch(select("Go.:Wait a moment.")) {
+				case 1:
+					mes "[Reidin Corse]";
 					mes "Alright...!";
 					mes "Get a move on!";
 					close2;
@@ -800,7 +787,7 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 					end;
 					break;
 				case 2:
-					mes "[Raiden Karus]";
+					mes "[Reidin Corse]";
 					mes "You still need";
 					mes "to get ready?";
 					mes "Hurry it up!";
@@ -821,11 +808,11 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 			mes "You know, Owl's Eye";
 			mes "and Vulture's Eye.";
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "Even though you may not be doing anything, Passive Skills are always in effect. Now, it's time for me to teach you about an Active Skill";
 			mes "for Archers. Ready?";
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "Today I'll tell";
 			mes "you all about";
 			mes "^3131FFDouble Strafe^000000!";
@@ -839,23 +826,23 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 				mes "I already know";
 				mes "about Double Strafe.";
 				next;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "...";
 				mes "......";
 				next;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "^333333*Sigh*^000000";
 				mes "Next lesson...";
 				set tu_archer01, 10;
 				close;
 			} else {
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Just like its name, Double Strafe allows you to attack enemies with your arrows twice in a row! Booyah~";
 				next;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "As Double Strafe's level rises, its attack strength also increases. If you master this skill, you can do a great amount of damage to your enemies!";
 				next;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Hold your bow and arrow";
 				mes "like this, concentrate, aim,";
 				mes "then fire twice with all your";
@@ -863,16 +850,16 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 				mes "enough and you'll get used to it!";
 				next;
 				if(@eagle == 0){
-					//misceffect EF_WIND;
+					specialeffect2 EF_WIND;
 					set tu_archer01, 10;
 					getexp 0,500;
 				}
 				emotion e_no1;
 				next;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Now, there's another skill known as ^FF0000Arrow Shower^000000. Where Double Strafe uses 2 Arrows, Arrow Shower fires a bunch of arrows at once.";
 				next;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Not even I can handle";
 				mes "Arrow Shower all that well since it's really hard. Still, maybe if you trained more at it, you'd manage to pull it off?";
 				emotion e_heh;
@@ -882,19 +869,19 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 			mes "Now, I've taught you a lot of stuff and I wanna make sure you retain all of it. That's why I want you to take this midterm. Your mission: ^FF0000Attack the Hydras^000000!";
 			emotion e_no1;
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "There's a ship that";
 			mes "leads to Byalan Island in Izlude, Prontera's satellite city. Ride that ship to Byalan Island.";
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "In the center of that island is the entrance to a dungeon where a lot of Hydras live. Remember that it's a water dungeon, and that ^3131FFWater resists Fire^000000, ^3131FFbut is weak against Wind^000000.";
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "Now go and bring ^3131FF10 Tentacles^000000";
 			mes "from hunting Hydra and ^3131FF1 Crystal Blue^000000, which you can get from hunting the Mushrooms there.";
 			mes "Bring all of that and you pass~";
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "It's easier to find Izlude if you pass by Prontera, so head towards the fields near Prontera. Alright, off you go, " + strcharinfo(0) + "~";
 			set tu_archer01, 11;
 			close;
@@ -909,13 +896,13 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 					mes "Let's see now...";
 					next;
 					emotion e_no1;
-					mes "[Raiden Karus]";
+					mes "[Reidin Corse]";
 					mes "Good! You pass.";
 					mes "Don't forget that you gotta keep training and improve your skills. Before you know it, you'll be an expert almost as good as me!";
-					//misceffect EF_WIND;
+					specialeffect2 EF_WIND;
 					set tu_archer01, 12;
 					getexp 1000,1000;
-					getitem 1707, 1;
+					getitem 1707,1; //Great_Bow
 					close;
 				}
 			} else {
@@ -929,21 +916,21 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 			mes "Alright, now there's only";
 			mes "one more skill you need to know about. Personally, I think this one is crucial for every Archer...";
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "Open your Skill Window.";
 			mes "Make sure that you learn";
 			mes "^FF0000Increase Concentration^000000.";
 			mes "Now, how can I describe";
 			mes "how to do it?";
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "I guess that first, you gotta quiet your mind and enter a state of complete concentration. Steadily draw your bowstring back. If there's even a millisecond of imbalance, you'll miss.";
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "We use Increase Concentration";
 			mes "to keep ourselves calm and focused to ^3131FFmaximize certain abilities and stats^000000. This skill enhances our performance as Archers immensely!";
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "You might not be able";
 			mes "to see it now, but as you become more skilled, you'll eventually recognize all the benefits of this skill.";
 			set tu_archer01, 13;
@@ -955,29 +942,29 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 			mes "done with all of your lessons.";
 			emotion e_pif;
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "Ah, but it's not time for";
 			mes "you to relax yet! Since I've given you a midterm, it's only fitting that I also give you a final!";
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "Surprised, huh?";
 			mes "Well, this test is a little harder, but I'll help you out so there's";
 			mes "no need for you to fret.";
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "Now, go to Mt. Mjolnir and hunt Floras. Your test will be to bring back ^3131FF5 Maneater Blossoms^000000 and";
 			mes "^3131FF20 Stems^000000.";
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "I know it's a little dangerous,";
 			mes "but I've got a pal who'll be there to help you. Of course, she's still in training, but...";
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "Oh...";
 			mes "And one last thing.";
 			mes "Take some of these.";
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			if(MaxWeight - Weight < 2100){
 				mes "H-hey!";
 				mes "Why are you carrying";
@@ -986,10 +973,10 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 			} else {
 				mes "This stuff is just a little something to encourage you, so don't take it the wrong way! Now hurry up, get what I asked for,";
 				mes "and come back!";
-				set tu_archer01, 14;
-				getitem 601, 10; 
-				getitem 501, 10;
-				getitem 602, 1;
+				set tu_archer01,14;
+				getitem 601,10; //Wing_Of_Fly
+				getitem 501,10; //Red_Potion
+				getitem 602,1; //Wing_Of_Butterfly
 				close;
 			}
 		} else if((tu_archer01 == 14) || (tu_archer01 == 15)){
@@ -1000,30 +987,30 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 				mes "now! Yeap, I can see it";
 				mes "in your eyes.";
 				next;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Right, did you get a chance to meet my Acolyte pal, Mafra? She's pretty shy, but I hope you two got along.";
 				next;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "I'm happy to tell";
 				mes "you that you've passed";
 				mes "my final exam! Here, take";
 				mes "this little reward!";
-				//misceffect EF_WIND ;
-				set tu_archer01, 16;
+				specialeffect2 EF_WIND;
+				set tu_archer01,16;
 				getexp 3000,3000;
-				getitem 1770, 500;
+				getitem 1770,500; //Iron_Arrow
 				next;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Well, it's like you're a full fledged Archer now. Honestly,";
 				mes "I've got nothing more to teach you. Well, about archery, anyway.";
 				emotion e_heh;
 				next;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Well, if you talk to him, Master Kavaruk might have something for you to do. He happens to have me running around to doing errands";
 				mes "for him too. That creep!";
 				emotion e_pif;
 				next;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "Well, "+ strcharinfo(0) +",";
 				mes "It'd make me really happy if you get to the point where you develop a true love for the art of archery. I'll see you sometime, okay?";
 				emotion e_no1;
@@ -1035,13 +1022,13 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 				mes "^3131FF5 Maneater Blossoms^000000";
 				mes "and ^3131FF20 Stems^000000.";
 				next;
-				mes "[Raiden Karus]";
+				mes "[Reidin Corse]";
 				mes "From Prontera, you'd get to Mt. Mjolnir by traveling ^3131FFnorth^000000, ^3131FFnorth^000000 and then ^3131FFeast^000000. But if you want,";
 				mes "I can just send you there.";
 				next;
-				switch(select("Go!:W-Wait!")){
+				switch(select("Go!:W-Wait!")) {
 				case 1:
-					mes "[Raiden Karus]";
+					mes "[Reidin Corse]";
 					mes "Alright!";
 					mes "Oh, and if you get";
 					mes "the chance, give a hello to my Acolyte pal over there for me~";
@@ -1051,7 +1038,7 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 					end;
 					break;
 				case 2:
-					mes "[Raiden Karus]";
+					mes "[Reidin Corse]";
 					mes "Huh?";
 					mes "Um, sure. But";
 					mes "there's no reason to";
@@ -1066,11 +1053,11 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 			mes "There's so much lush greenery";
 			mes "and the birds are always singing. Payon really is peaceful.";
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "Of course, I've got friends here that I can trust with my life. We always argue, but we all want what's best for each other.";
 			emotion e_pif;
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "Wouldn't you";
 			mes "agree that it's";
 			mes "wonderful to have";
@@ -1080,83 +1067,70 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 			mes "I really like this town.";
 			mes "Everything is green and birds singing all around.. such a peaceful place Payon is.";
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "I feel so happy laying in the grass and looking up at the sky.";
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "It might also be because I have my trustable friends here with me. Haha.";
 			mes "We always argue, but we care for each other deep down inside.";
 			emotion e_pif;
 			next;
-			mes "[Raiden Karus]";
+			mes "[Reidin Corse]";
 			mes "..'friend' is a wonderful word. Don't you agree?";
 			close;
 		}
 	}
-	mes "Allow me to introduce myself. I'm the Archer of all Archers, ^3131FFRaiden Karus^000000, Master of the Icarus Guild!";
+	mes "Allow me to introduce myself. I'm the Archer of all Archers, ^3131FFReidin Corse^000000, Master of the Icarus Guild!";
 	next;
 	emotion e_no1;
-	mes "[Raiden Karus]";
+	mes "[Reidin Corse]";
 	mes "Right now, we're having a special event! The application fee for the Icarus Guild has been slashed by 50%! Join now and there'll be no annual fees!";
 	next;
 	emotion e_lv;
-	mes "[Raiden Karus]";
+	mes "[Reidin Corse]";
 	mes "During our special event, we'll have no job class restrictions!";
 	mes "As an added bonus, all new male members will be introduced to beautiful Dancer girls!";
 	next;
 	emotion e_heh;
-	mes "[Raiden Karus]";
+	mes "[Reidin Corse]";
 	mes "And new female members will have the special opportunity to go out on a date with me! Don't miss out!";
 	next;
 	emotion e_cash;
-	mes "[Raiden Karus]";
+	mes "[Reidin Corse]";
 	mes "Join right now";
 	mes "for a one time fee of only ^3131FF1,000,000, zeny^000000! Hurry and join the Icarus Guild while";
 	mes "this offer still lasts!";
 	next;
-	emotion e_pif;
+	emotion e_pif,"Arpesto";
 	mes "[Arpesto]";
-	mes "Raiden...";
+	mes "Reiden...";
 	mes "Stop messing around.";
 	mes "Hey there, kid. The real";
 	mes "master of the Icarus Guild";
 	mes "is in that building.";
 	next;
 	emotion e_omg;
-	mes "[Raiden Karus]";
+	mes "[Reidin Corse]";
 	mes "Arpesto...!";
 	mes "Why'd you...?!";
 	next;
 	emotion e_ag;
-	mes "[Raiden Karus]";
+	mes "[Reidin Corse]";
 	mes "^333333*Sigh*^000000";
 	mes "You got me, you got me.";
 	mes "There's no application fee.";
 	mes "But I'll still date all of";
 	mes "those cute girls...";
 	close;
-
-	OnKik:
-		emotion 29;
-	OnSwt:
-		emotion 4;
-	OnIc:
-		emotion 5;
-	OnOmg:
-		emotion 23;
-	OnThink:
-		emotion 9;
-	OnHng:
-		emotion 32;
 }
 
 //=================================================Seisner====================================================
 pay_arche,84,139,3	script	Seisner	727,{
-	//misceffect EF_HIT2;
+	specialeffect EF_HIT2,"#Target";
 	mes "[Seisner]";
 	mes "Aaaah!";
 	mes "Double Strafe!";
-	//misceffect EF_HIT2;
+	specialeffect EF_HIT2,"#Target";
 	next;
 	mes "[Seisner]";
 	mes "I did it!";
@@ -1176,8 +1150,8 @@ pay_arche,84,139,3	script	Seisner	727,{
 		next;
 		mes "[Seisner]";
 		mes "So Master Kavaruk";
-		mes "wants me to teach";
-		mes "you about Archers and Archery? Alright, what would you like to know more about?";
+		mes "wants me to teach you";
+		mes "about Archers and Archery? Alright, what would you like to know more about?";
 		next;
 		while(1){
 			switch(select("About Archers.:Stats for Archers:End Conversation.")){
@@ -1212,10 +1186,10 @@ pay_arche,84,139,3	script	Seisner	727,{
 				mes "[Seisner]";
 				mes "So you want to";
 				mes "know more about Stats";
-				mes "and how they affect Archer abilities? I'll do my best to explain."; 
+				mes "and how they affect Archer abilities? I'll do my best to explain.";
 				next;
-				while(1){
-					switch(select("STR", "^3131FFAGI^000000", "VIT", "^FF9900INT^000000", "^FF3131DEX^000000", "LUK", "End Conversation.")){
+				while(1) {
+					switch(select("STR:^3131FFAGI^000000:VIT:^FF9900INT^000000:^FF3131DEX^000000:LUK:End Conversation.")) {
 					case 1:
 						mes "[Seisner]";
 						mes "STR typically increases the damage of attacks. However, Archer class characters use weapons that rely on ^FF3131DEX^000000 to increase their damage.";
@@ -1340,7 +1314,7 @@ pay_arche,84,139,3	script	Seisner	727,{
 		mes "[Seisner]";
 		mes "If you feel comfortable enough with the knowledge I've taught you, you should go back to Master Kavaruk. But if you still have questions, you can always come and ask me.";
 		close2;
-		//misceffect EF_WIND ;
+		specialeffect2 EF_WIND;
 		set tu_archer01, 3;
 		if(JobLevel == 1){
 			getexp 0,30;
@@ -1366,12 +1340,12 @@ mjolnir_11,27,223,3	script	Acolyte#tu	95,{
 		if(gettime(3) >= 18 && gettime(3) < 22){
 			mes "H-hello!";
 			mes "Umm, umm...";
-			mes "Are you R-Raiden Karus's";
+			mes "Are you R-Reidin Corse's";
 			mes "friend t-too?";
 			next;
 			mes "[Acolyte]";
 			mes "M-my name is Mafra.";
-			mes "Ever since he saved my life, Raiden has a-always been a good f-friend to me. He's such a great Archer";
+			mes "Ever since he saved my life, Reidin has a-always been a good f-friend to me. He's such a great Archer";
 			mes "and a really nice person!";
 			next;
 			mes "[Acolyte]";
@@ -1386,7 +1360,7 @@ mjolnir_11,27,223,3	script	Acolyte#tu	95,{
 			mes "Let's h-help each other train!";
 			mes "Um, is that okay?";
 			next;
-			switch(select("Sure.:No thanks.:Raiden Karus is mine!")){
+			switch(select("Sure.:No thanks.:Reidin Corse is mine!")) {
 			case 1:
 				mes "[Acolyte]";
 				mes "Wow!";
@@ -1441,7 +1415,7 @@ mjolnir_11,27,223,3	script	Acolyte#tu	95,{
 			mes "^666666Zzzzz...^000000";
 			mes "Wh-wha...?";
 			mes "Who are you?";
-			//misceffect EF_SLEEPATTACK;
+			specialeffect EF_SLEEPATTACK;
 			next;
 			mes "[Acolyte]";
 			mes "Wait, I know...";
@@ -1481,10 +1455,10 @@ mjolnir_11,27,223,3	script	Acolyte#tu	95,{
 			mes "^666666Zzzzz...^000000";
 			mes "Wh-wha...?";
 			mes "Who are you?";
-			//misceffect EF_SLEEPATTACK;
+			specialeffect EF_SLEEPATTACK;
 			next;
 			mes "[Acolyte]";
-			mes "Raiden Karus?";
+			mes "Reidin Corse?";
 			mes "I can't believe";
 			mes "I feel asleep fo--";
 			mes "^666666Zzzzzzz...^000000";
@@ -1557,7 +1531,7 @@ mjolnir_11,27,223,3	script	Acolyte#tu	95,{
 	mes "traveling make";
 	mes "me sooo sleepy...?";
 	mes "^666666Zzzzzzzz...^000000";
-	//misceffect EF_SLEEPATTACK ;
+	specialeffect EF_SLEEPATTACK;
 	close;
 }
 
@@ -1580,7 +1554,7 @@ pay_arche,130,113,3	script	Alchemist Guildmember#tu	740,{
 			mes "each Stem for ^3131FF30 Zeny^000000 and each";
 			mes "Maneater Blossom for ^3131FF130 Zeny^000000.";
 			next;
-			switch(select("Sell all Stems and Maneater Blossoms.:Don't sell anything.")){
+			switch(select("Sell all Stems and Maneater Blossoms:Don't sell anything.")) {
 			case 1:
 				mes "[Alchemist Guildmember]";
 				mes "Thank you very much!";
@@ -1655,7 +1629,7 @@ prontera,126,335,5	script	Arthail	51,{
 		mes "I have no songs to share.";
 		if(tu_archer02 == 2) {
 			next;
-			menu "Master Kavaruk told me to find you!",-;
+			select("Master Kavaruk told me to find you!");
 			mes "[Arthail]";
 			mes "Really now?";
 			mes "I suppose it";
@@ -1929,14 +1903,16 @@ prt_castle,76,165,6	script	Minister#tu	55,{
 
 //=================================================Range NPC====================================================
 prt_castle,94,150,4	script	#sound_tu	139,10,10,{
-OnTouch:
-	if(tu_archer02 != 6) end;
-	mes "[Minister]";
-	mes "Contact the";
-	mes "Prontera Church.";
-	mes "Hurry, this is urgent!";
-	set tu_archer02, 7;
-	close;
+OnTouch_:
+	if(tu_archer02 != 6) {
+		mes "[Minister]";
+		mes "Contact the";
+		mes "Prontera Church.";
+		mes "Hurry, this is urgent!";
+		set tu_archer02, 7;
+		close;
+	}
+	end;
 }
 
 //=================================================Bishop Maugins====================================================
@@ -1944,12 +1920,17 @@ monk_in,19,43,1	script	Bishop Maugins	60,{
 	mes "[Bishop Maugins]";
 	if(tu_archer02 == 7){
 		mes "Greetings.";
-		mes "I doubt that you're here to change to the Monk job, but may I help you with something? Perhaps you're here for a confession?";
+		mes "I doubt that you're here to change to the Monk job, but may I help you with something? Perhaps you're";
+		mes "here for a confession?";
 		next;
 		mes "[Bishop Maugins]";
-		mes "Hm? Work related to the Palace? Yes, I'm in charge of that area. So how may I help you?";
+		mes "Hm? Work related to";
+		mes "the Palace? Yes, I'm in";
+		mes "charge of that area. So";
+		mes "how may I help you?";
 		next;
-		if(select("Has something happened to the Kingdom?:Nothing.")==1){
+		switch(select("Has something happened to the Kingdom?:Nothing.")) {
+		case 1:
 			mes "[Bishop Maugins]";
 			mes "...!!";
 			next;
@@ -1963,6 +1944,7 @@ monk_in,19,43,1	script	Bishop Maugins	60,{
 			mes "The king and I regularly write to each other, but I haven't heard of anything in particular. Please don't worry yourself.";
 			next;
 			set tu_archer02, 8;
+			break;
 		}
 		mes "[Bishop Maugins]";
 		mes "Good luck on";