- Updated 1st class platinum skill NPC's.

- Fixed [bugreport:5606] .

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

1 files changed, 215 insertions, 221 deletions

diff --git a/npc/quests/skills/swordman_skills.txt b/npc/quests/skills/swordman_skills.txt
index 6cbdccfbe..c45dceae6 100644
--- a/npc/quests/skills/swordman_skills.txt
+++ b/npc/quests/skills/swordman_skills.txt
@@ -3,56 +3,59 @@
 //===== By: ==================================================
 //= kobra_k88
 //===== Current Version: =====================================
-//= 1.6
+//= 1.7
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
 //= Quests for skills: Fatal Blow, Mobile HP Recovery,
 //  Auto-Berserk
 //===== Additional Comments: =================================
 //= 1.6 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
+//= 1.7 Updated to latest available official file. [Masao]
 //============================================================
 
-izlude_in,175,130,2	script	Knight De Thomas#qsk_sm	98,{
-	if (BaseClass == Job_Swordman) {
-		if (SWORD_SK < 1 && getskilllv("SM_MOVINGRECOVERY") == 0) {
-			mes "[De Thomas]";
-			mes "Oh, no! You must have been hurt! Are you ok?";
-			mes "You must have fought hard to get such serious injuries..";
-			mes "Being a swordsman must come with a lot of responsibility and sacrifice.";
-			next;
+izlude_in,175,130,2	script	Knight De Thomas	98,4,4,{
+	if ((BaseJob == Job_Swordman) && (sm_movingrecovery_x < 1)) {
+		mes "[De Thomas]";
+		mes "Oh, no! You must have been hurt! Are you ok?";
+		mes "You must have fought hard to get such serious injuries..";
+		mes "Being a swordsman must come with a lot of responsibility and sacrifice.";
+		next;
+		mes "[De Thomas]";
+		if (Sex == 0) {
+			mes "For these swordsmen and knights, there is a wonderful skill.";
+		}
+		else {
+			mes "For these swordswomen and knights, there is a wonderful skill young lady.";
+		}
+		mes "I present to you - HP Recovery While Moving!";
+		mes "Body moving is a splendid skill";
+		mes "that allows you to regain strength(HP)";
+		mes "while you are moving!";
+		next;
+		mes "[De Thomas]";
+		mes "It is currently under development";
+		mes "so it may not recover that much,";
+		mes "but it will help a little.";
+		mes "What do you think? Would you like to learn this skill?";
+		next;
+		switch (select("What a nice skill! I want to learn it!:No, thank you.")) {
+		case 1:
 			mes "[De Thomas]";
-			if (Sex == 0)
-				mes "For these swordsmen and knights, there is a wonderful skill.";
-			else
-				mes "For these swordswomen and knights, there is a wonderful skill young lady.";
-			mes "I present to you - HP Recovery While Moving!";
-			mes "Body moving is a splendid skill";
-			mes "that allows you to regain strength(HP)";
-			mes "while you are moving!";
+			mes "Very well. I will tell you what you need to learn this skill.";
+			mes "First, your job level must be higher than ^00880035^000000.";
+			mes "You will also need ^008800200 empty bottles^000000.";
+			mes "Why? Because it is proof that you fought fiercely to have used that many potions.";
 			next;
 			mes "[De Thomas]";
-			mes "It is currently under development";
-			mes "so it may not recover that much,";
-			mes "but it will help a little.";
-			mes "What do you think? Would you like to learn this skill?";
+			mes "Also, the armor you used in battle.";
+			mes "This is also proof of an experienced fighter.";
+			mes "For the armor... your armor is perfect!";
+			mes "Bring your armor!";
+			mes "Last but not least... bring me one ^008800Moth Wing^000000.";
 			next;
-			if (select("What a nice skill! I want to learn it!:No, thank you.") == 1) {
-				mes "[De Thomas]";
-				mes "Very well. I will tell you what you need to learn this skill.";
-				mes "First, your job level must be higher than ^00880035^000000.";
-				mes "You will also need ^008800200 empty bottles^000000.";
-				mes "Why? Because it is proof that you fought fiercely to have used that many potions.";
-				next;
-				mes "[De Thomas]";
-				mes "Also, the armor you used in battle.";
-				mes "This is also proof of an experienced fighter.";
-				mes "For the armor... your armor is perfect!";
-				mes "Bring your armor!";
-				mes "Last but not least... bring me one ^008800Moth Wing^000000.";
-				next;
-				select("Eh? You need that, too?");
+			switch (select("Eh? You need that, too?")) {
+			case 1:
 				mes "[De Thomas]";
 				mes "Not really.. I don't really NEED it.";
 				mes "It's just that my niece has gotten a bug hunting as a holiday task during the summer vacation.";
@@ -63,96 +66,94 @@ izlude_in,175,130,2	script	Knight De Thomas#qsk_sm	98,{
 				mes "Don't you think it is pitiful that I have to stay in once place everyday, not being able to go outside?";
 				mes "Please, find me one...*sniffsniff*";
 				mes "If you don't...";
-				set SWORD_SK,1;
+				set sm_movingrecovery_x,1;
 				mes "You won't get anything! Muahahaha.";
 				close;
-			}
-			mes "[De Thomas]";
-			mes "...";
-			close;
-		}
-		else if (SWORD_SK == 1 && getskilllv("SM_MOVINGRECOVERY") == 0) {
-			mes "[De Thomas]";
-			mes "Welcome back...";
-			mes "are you ready to learn Body Movin'?";
-			next;
-			switch(select("Yes.:No, I'm not ready yet.")) {
-			case 1:
-				if (JobLevel > 34 && countitem(713) > 199 && countitem(1058) > 0) {
-					mes "[De Thomas]";
-					mes "Let's see.....";
-					next;
-					mes "[De Thomas]";
-					mes "Ok! I shall now teach you...";
-					mes "..The Body Movin' skill!";
-					next;
-					delitem 713,200; //Empty_Bottle
-					delitem 1058,1; //Wing_Of_Moth
-					skill "SM_MOVINGRECOVERY",1,0;
-					set SWORD_SK,0;
-					mes "[De Thomas]";
-					mes "There you go!";
-					mes "Try it yourself.";
-					mes "But don't overdo it.";
-					next;
-					mes "[De Thomas]";
-					mes "Oh yeah, I won't be needing your";
-					mes "armor so you can keep it.";
-					mes "..Good luck now!";
-					close;
-				}
-				else if (JobLevel < 35) {
-					mes "[De Thomas]";
-					mes "Wait a second your Job level isn't above ^00880035^000000!";
-					mes "Come back when it is.";
-					close;
-				}
-				else if (countitem(713) < 200 || countitem(1058) < 1) {
-					mes "[De Thomas]";
-					mes "You do not have all the items I asked for.";
-					next;
-					mes "[De Thomas]";
-					mes "Remember I need, ^008800200 empty bottles^000000, your armor, and a ^008800Moth Wing^000000. Come back when you have it all.";
-					close;
-				}
-				else {
-					mes "[De Thomas]";
-					mes "You do not have all the items I asked for.";
-					next;
-					mes "[De Thomas]";
-					mes "Remember I need, ^008800200 empty bottles^000000, your armor, and a ^008800Moth Wing^000000. Come back when you have it all.";
-					close;
-				}
 			case 2:
 				mes "[De Thomas]";
-				mes "Is that so?";
-				mes "Then come when you are prepared.";
+				mes "...";
 				close;
 			}
 		}
-		else {
-			mes "[De Thomas]";
-			mes "Oh, it's you?";
-			mes "Long time no see!";
-			mes "You seem healthier than before.";
-			mes "Hahahaha!";
-			mes "Take care! See you again!";
-			close;
-		}
 	}
-	else {
+	else if ((BaseJob == Job_Swordman) && (sm_movingrecovery_x > 1)) {
 		mes "[De Thomas]";
-		mes "My name is De Thomas Carlos.";
-		mes "Knight of Prontera's 3rd Calvary.";
-		mes "I have a certain duty these days.";
-		mes "Ehem! Need I say more.";
+		mes "Oh, it's you?";
+		mes "Long time no see!";
+		mes "You seem healthier than before.";
+		mes "Hahahaha!";
+		mes "Take care! See you again!";
 		close;
 	}
+	else if ((BaseJob == Job_Swordman) && (sm_movingrecovery_x == 1)) {
+		mes "[De Thomas]";
+		mes "Welcome back...";
+		mes "are you ready to learn Body Movin'?";
+		next;
+		switch (select("Yes.:No, I'm not ready yet.")) {
+		case 1:
+			if ((JobLevel > 34) && (countitem(713) > 199) && (countitem(1058) > 0)) {
+				mes "[De Thomas]";
+				mes "Let's see.....";
+				next;
+				mes "[De Thomas]";
+				mes "Ok! I shall now teach you...";
+				mes "..The Body Movin' skill!";
+				next;
+				delitem 713,200; //Empty_Bottle
+				delitem 1058,1; //Wing_Of_Moth
+				skill "SM_MOVINGRECOVERY",1,0;
+				set sm_movingrecovery_x,2;
+				mes "[De Thomas]";
+				mes "There you go!";
+				mes "Try it yourself.";
+				mes "But don't overdo it.";
+				next;
+				mes "[De Thomas]";
+				mes "Oh yeah, I won't be needing your";
+				mes "armor so you can keep it.";
+				mes "..Good luck now!";
+				close;
+			}
+			else if (JobLevel < 35) {
+				mes "[De Thomas]";
+				mes "Wait a second your Job level isn't above ^00880035^000000!";
+				mes "Come back when it is.";
+				close;
+			}
+			else if ((countitem(713) < 200) || (countitem(1058) < 1)) {
+				mes "[De Thomas]";
+				mes "You do not have all the items I asked for.";
+				next;
+				mes "[De Thomas]";
+				mes "Remember I need, ^008800200 empty bottles^000000, your armor, and a ^008800Moth Wing^000000. Come back when you have it all.";
+				close;
+			}
+			mes "[De Thomas]";
+			mes "You do not have all the items I asked for.";
+			next;
+			mes "[De Thomas]";
+			mes "Remember I need, ^008800200 empty bottles^000000, your armor, and a ^008800Moth Wing^000000. Come back when you have it all.";
+			close;
+		case 2:
+			mes "[De Thomas]";
+			mes "Is that so?";
+			mes "Then come when you are prepared.";
+			close;
+		}
+	}
+	mes "[De Thomas]";
+	mes "My name is De Thomas Carlos.";
+	mes "Knight of Prontera's 3rd Calvary.";
+	mes "I have a certain duty these days.";
+	mes "Ehem! Need I say more.";
+	close;
 }
 
-prt_in,75,88,5	script	Leon Von Frich#qsk_sm	85,3,3,{
-	if ((BaseJob == Job_Swordman && JobLevel >= 25) || BaseJob == Job_Knight || BaseJob == Job_Crusader) {
-		if (getskilllv("SM_FATALBLOW") == 1) {
+prt_in,75,88,5	script	Leon Von Frich	85,3,3,{
+
+	if ((BaseJob == Job_Swordman) && (JobLevel >= 25)) {
+		if (sm_fatalblow_x == 1) {
 			mes "[Leon]";
 			mes "Eh?";
 			mes "I was wondering who that was!";
@@ -161,13 +162,13 @@ prt_in,75,88,5	script	Leon Von Frich#qsk_sm	85,3,3,{
 			mes "Be careful! Hahaha!";
 			close;
 		}
-		else if (countitem(1752) > 9 && countitem(1751) > 9 && countitem(532) > 0 && countitem(962) > 29 && countitem(526) > 4) {
+		else if ((countitem(1752) > 9) && (countitem(1751) > 9) && (countitem(532) > 0) && (countitem(962) > 29) && (countitem(526) > 4) && (BaseJob == Job_Swordman) && (JobLevel >= 25)) {
 			mes "[Leon]";
 			mes "Ooh! You are more than ready";
 			mes "to learn Fatal Blow!";
 			mes "So how about it? Would you like to learn?";
 			next;
-			switch(select("Yes!:No, I don't want to.:But, what is Fatal Blow?")) {
+			switch (select("Yes!:No, I don't want to.:But, what is Fatal Blow?")) {
 			case 1:
 				mes "[Leon]";
 				mes "OK, lets begin!";
@@ -178,6 +179,7 @@ prt_in,75,88,5	script	Leon Von Frich#qsk_sm	85,3,3,{
 				delitem 962,30; //Tentacle
 				delitem 526,5; //Royal_Jelly
 				skill "SM_FATALBLOW",1,0;
+				set sm_fatalblow_x,1;
 				mes "[Leon]";
 				mes "Success!";
 				mes "Go use your new skill to its full potential.";
@@ -209,7 +211,7 @@ prt_in,75,88,5	script	Leon Von Frich#qsk_sm	85,3,3,{
 			mes "[Leon]";
 			mes "Wow, seeing your arm, you must enjoy using bash?";
 			next;
-			select("Eh, I.. just...");
+			menu "Eh, I.. just...",-;
 			mes "[Leon]";
 			if (Sex == 0) {
 				mes "No need to be surprised.";
@@ -225,17 +227,15 @@ prt_in,75,88,5	script	Leon Von Frich#qsk_sm	85,3,3,{
 			mes "[Leon]";
 			mes "Yes, I would like to give a present to an awesome swordsman like you.";
 			next;
-			switch(select("What present?:It's ok.")) {
+			switch (select("What present?:It's ok.")) {
 			case 1:
 				mes "[Leon]";
 				mes "Haha nothing special, but a skill to attack the vital point!";
 				next;
-				break;
 			case 2:
 				mes "[Leon]";
 				mes "...Haha nothing special, just a skill that aims at the vital spot!";
 				next;
-				break;
 			}
 			mes "[Leon]";
 			mes "It's a skill I developed recently.";
@@ -255,7 +255,7 @@ prt_in,75,88,5	script	Leon Von Frich#qsk_sm	85,3,3,{
 			mes "and finally, I developed this wonderful new skill!";
 			mes "Would you like to learn this skill?";
 			next;
-			switch(select("Yes.:No.:Do you have any advice on how to eat sushi?")) {
+			switch (select("Yes.:No.:Do you have any advice on how to eat sushi?")) {
 			case 1:
 				mes "[Leon]";
 				mes "Ok. I'll tell you the requirements.";
@@ -292,16 +292,13 @@ prt_in,75,88,5	script	Leon Von Frich#qsk_sm	85,3,3,{
 				close;
 			}
 		}
-		close;
-	}
-	else {
-		mes "[Leon]";
-		mes "Oh, no! I have nothing to offer you!";
-		mes "I can't say nice and fun things to anyone";
-		mes "other than swordsmen!";
-		mes "See you in a better world!";
-		close;
 	}
+	mes "[Leon]";
+	mes "Oh, no! I have nothing to offer you!";
+	mes "I can't say nice and fun things to anyone";
+	mes "other than swordsmen!";
+	mes "See you in a better world!";
+	close;
 
 OnTouch:
 	mes "[Leon]";
@@ -310,9 +307,9 @@ OnTouch:
 	close;
 }
 
-prt_in,94,57,3	script	Juan#qsk_sm	85,{
-	if (BaseClass == Job_Swordman) {
-		if (getskilllv("SM_AUTOBERSERK") == 1) {
+prt_in,94,57,3	script	Juan	85,4,4,{
+	if (BaseJob == Job_Swordman) {
+		if (sm_autoberserk_x == 1) {
 			mes "[Juan]";
 			mes "Mmm? Long time no see!";
 			mes "How are you?";
@@ -321,7 +318,7 @@ prt_in,94,57,3	script	Juan#qsk_sm	85,{
 			mes "You can do it.";
 			close;
 		}
-		else if (BaseJob == Job_Swordman && JobLevel < 10) {
+		else if ((BaseJob == Job_Swordman) && (JobLevel < 10)) {
 			mes "[?]";
 			mes "What are you?";
 			mes "Eh, still a beginner.";
@@ -329,91 +326,90 @@ prt_in,94,57,3	script	Juan#qsk_sm	85,{
 			mes "before coming back.";
 			close;
 		}
-		else if (BaseJob == Job_Swordman && JobLevel > 10 && JobLevel < 30) {
+		else if ((BaseJob == Job_Swordman) && ((JobLevel > 10) && (JobLevel < 30))) {
 			mes "[Juan]";
 			mes "Oh, nice to meet you.";
 			mes "You can be on your way. (smiley~)";
 			close;
 		}
-		else if (countitem(924) > 34 && countitem(958) > 9 && countitem(957) > 9 && countitem(518) > 9) {
-			if ((BaseJob == Job_Swordman && JobLevel >= 30) || BaseJob == Job_Knight || BaseJob == Job_Crusader) {
+		else if ((countitem(924) > 34) && (countitem(958) > 9) && (countitem(957) > 9) && (countitem(518) > 9) && (BaseJob == Job_Swordman) && (JobLevel >= 30)) {
+			mes "[Juan]";
+			mes "Ooh. Young swordsman!";
+			mes "You are ready to learn the";
+			mes "newest skill, Auto Berserk?!";
+			next;
+			switch (select("Hoho, I would like to learn it now.:What is that?")) {
+			case 1:
+				mes "[Juan]";
+				mes "Ok. Then..";
+				next;
+				delitem 924,35; //Powder_Of_Butterfly
+				delitem 958,10; //Horrendous_Mouth
+				delitem 957,10; //Decayed_Nail
+				delitem 518,10; //Honey
+				skill "SM_AUTOBERSERK",1,0;
+				set sm_autoberserk_x,1;
 				mes "[Juan]";
-				mes "Ooh. Young swordsman!";
-				mes "You are ready to learn the";
-				mes "newest skill, Auto Berserk?!";
+				mes "You have just become a swordsman";
+				mes "that can use Auto Berserk.";
+				mes "You can go about ";
+				mes "and achieve great things!";
 				next;
-				switch(select("Hoho, I would like to learn it now.:What is that?")) {
-				case 1:
-					mes "[Juan]";
-					mes "Ok. Then..";
-					next;
-					delitem 924,35; //Powder_Of_Butterfly
-					delitem 958,10; //Horrendous_Mouth
-					delitem 957,10; //Decayed_Nail
-					delitem 518,10; //Honey
-					skill "SM_AUTOBERSERK",1,0;
-					mes "[Juan]";
-					mes "You have just become a swordsman";
-					mes "that can use Auto Berserk.";
-					mes "You can go about ";
-					mes "and achieve great things!";
-					next;
-					mes "[Juan]";
-					mes "Good luck!";
-					next;
-					mes "[Juan]";
-					mes "....................................oh yeah.";
-					mes "I forgot to say something.";
-					mes "There are some things you must keep in mind.";
-					next;
-					mes "[Juan]";
-					mes "Once you regain health,";
-					mes "this skill will subside.";
-					mes "Also, there isn't really a time limit";
-					mes "but it can still disappear when";
-					mes "it is attacked with a skill that can";
-					mes "nullify provoke.";
-					next;
-					mes "[Juan]";
-					mes "If you don't remember these characteristics,";
-					mes "you may run into some problems on the battlefield";
-					mes "when the skill disappears all of a sudden.";
-					next;
-					mes "[Juan]";
-					mes "Then... bye for real~";
-					close;
-				case 2:
-					mes "[Juan]";
-					mes "Auto Berserk?";
-					mes "It's a skill crucial on the battlefield.";
-					mes "When your health is in red,";
-					mes "your hidden potential provokes yourself";
-					mes "to help you in battle.";
-					next;
-					mes "[Juan]";
-					mes "It is perfect for those that";
-					mes "fight on the battlefield like fire!";
-					mes "With your ability, you can learn";
-					mes "this skill right now.";
-					mes "Then, I shall tell you the necessary materials.";
-					next;
-					mes "[Juan]";
-					mes "You need 35 Powder of Butterfly.";
-					mes "The energy from the magnificent";
-					mes "wings of a butterfly will";
-					mes "help you gather your strength!";
-					mes "And 10 Horrendous Mouth.";
-					mes "10 Decayed Nail.";
-					mes "and last but not least...";
-					mes "10 Honey!";
-					next;
-					mes "[Juan]";
-					mes "Did you get all that down?";
-					mes "As always, please come back";
-					mes "when you are ready.";
-					mes "I look forward to seeing you again.";
-					close;
-				}
+				mes "[Juan]";
+				mes "Good luck!";
+				next;
+				mes "[Juan]";
+				mes "....................................oh yeah.";
+				mes "I forgot to say something.";
+				mes "There are some things you must keep in mind.";
+				next;
+				mes "[Juan]";
+				mes "Once you regain health,";
+				mes "this skill will subside.";
+				mes "Also, there isn't really a time limit";
+				mes "but it can still disappear when";
+				mes "it is attacked with a skill that can";
+				mes "nullify provoke.";
+				next;
+				mes "[Juan]";
+				mes "If you don't remember these characteristics,";
+				mes "you may run into some problems on the battlefield";
+				mes "when the skill disappears all of a sudden.";
+				next;
+				mes "[Juan]";
+				mes "Then... bye for real~";
+				close;
+			case 2:
+				mes "[Juan]";
+				mes "Auto Berserk?";
+				mes "It's a skill crucial on the battlefield.";
+				mes "When your health is in red,";
+				mes "your hidden potential provokes yourself";
+				mes "to help you in battle.";
+				next;
+				mes "[Juan]";
+				mes "It is perfect for those that";
+				mes "fight on the battlefield like fire!";
+				mes "With your ability, you can learn";
+				mes "this skill right now.";
+				mes "Then, I shall tell you the necessary materials.";
+				next;
+				mes "[Juan]";
+				mes "You need 35 Powder of Butterfly.";
+				mes "The energy from the magnificent";
+				mes "wings of a butterfly will";
+				mes "help you gather your strength!";
+				mes "And 10 Horrendous Mouth.";
+				mes "10 Decayed Nail.";
+				mes "and last but not least...";
+				mes "10 Honey!";
+				next;
+				mes "[Juan]";
+				mes "Did you get all that down?";
+				mes "As always, please come back";
+				mes "when you are ready.";
+				mes "I look forward to seeing you again.";
+				close;
 			}
 		}
 		mes "[Juan]";
@@ -429,7 +425,7 @@ prt_in,94,57,3	script	Juan#qsk_sm	85,{
 		mes "Of course you could always use the";
 		mes "skill we developed to overcome these limits.";
 		next;
-		switch(select("Eh! What are you talking about?:Haha, there can't be such a thing.:Keuuuuuuuh!")) {
+		switch (select("Eh! What are you talking about?:Haha, there can't be such a thing.:Keuuuuuuuh!")) {
 		case 1:
 			mes "[Juan]";
 			mes "The skill is called Berserk.";
@@ -474,14 +470,12 @@ prt_in,94,57,3	script	Juan#qsk_sm	85,{
 			close;
 		}
 	}
-	else {
-		mes "[Juan]";
-		mes "Are you enjoying your trip?";
-		mes "I hope you have nice days ahead of you.";
-		mes "Ah, I am just a kind knight Juan.";
-		mes "Don't worry about me too much. Hahaha...";
-		close;
-	}
+	mes "[Juan]";
+	mes "Are you enjoying your trip?";
+	mes "I hope you have nice days ahead of you.";
+	mes "Ah, I am just a kind knight Juan.";
+	mes "Don't worry about me too much. Hahaha...";
+	close;
 }
 
 //============================================================