* Condensed the documentation on the "Import" folder, it should be more reader-friendly now (conf\readme.txt)

* Deleted doc\pccommand_list.txt, it's outdated and its contents are already (better) explained in doc\script_commands.txt
* Other misc cleaning...

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

6 files changed, 154 insertions, 208 deletions

diff --git a/npc/pre-re/merchants/socket_enchant.txt b/npc/pre-re/merchants/socket_enchant.txt
index 63499c429..836644a5f 100644
--- a/npc/pre-re/merchants/socket_enchant.txt
+++ b/npc/pre-re/merchants/socket_enchant.txt
@@ -36,7 +36,7 @@
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
 		mes "- Please try again -";
-		mes "- after you loose some weight. -";
+		mes "- after you lose some weight. -";
 		close;
 	}
 	mes "[Seiyablem]";
diff --git a/npc/pre-re/merchants/socket_enchant2.txt b/npc/pre-re/merchants/socket_enchant2.txt
index aa92f4d22..a66ab30d8 100644
--- a/npc/pre-re/merchants/socket_enchant2.txt
+++ b/npc/pre-re/merchants/socket_enchant2.txt
@@ -17,11 +17,11 @@
 -	script	Leablem#dummy::SocketEnchant2	-1,{
 	if (checkweight(1201,1) == 0)
 	{
-		mes "- Wait a seconds !! -";
-		mes "- You have carried too many items -";
-		mes "- so, you can't get more items. -";
-		mes "- Make your weight as low -";
-		mes "- after then try it again. -";
+		mes "- Wait a minute !! -";
+		mes "- Currently you're carrying -";
+		mes "- too many items with you. -";
+		mes "- Please try again -";
+		mes "- after you lose some weight. -";
 		close;
 	}
 	mes "[Leablem]";
diff --git a/npc/pre-re/quests/quests_rachel.txt b/npc/pre-re/quests/quests_rachel.txt
index 1a86aa3df..5687f4e8d 100644
--- a/npc/pre-re/quests/quests_rachel.txt
+++ b/npc/pre-re/quests/quests_rachel.txt
@@ -300,7 +300,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		close;
 	}
 
-
 	else if (lost_boy == 8) {
 		mes "[Vincent]";
 		mes "The gem is very special...";
@@ -340,7 +339,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		close;
 	}
 
-
 	else if (lost_boy == 9) {
 		mes "[Vincent]";
 		mes "You came back!";
@@ -6990,13 +6988,11 @@ ra_temin,134,134,3	duplicate(raofficeguard)	Pope's Office Guard#2ra	926
 
 ra_temin,134,131,0	script	gyoin1#rachel	45,1,1,{
 OnTouch:
-	if (ra_tem_q == 16) {
+	if (ra_tem_q == 16)
 		warp "ra_temin",276,239;
-	}
 	else if ((ra_tem_q > 16) || (MISC_QUEST & 8192)){
-		if ((aru_em == 15) || (aru_em == 21)) {
+		if ((aru_em == 15) || (aru_em == 21))
 			warp "ra_temin",276,239;
-		}
 		else {
 			mes "[Pope's Office Guard]";
 			mes "I'm sorry, but the pope";
@@ -7281,7 +7277,6 @@ OnTouch:
 		warp "ra_temin",300,153;
 		end;
 	}
-
 	end;
 
 }
@@ -7532,73 +7527,73 @@ OnTouch:
 }
 
 que_san04,119,203,0	script	imir3#rachel	-1,7,7,{
-	OnTouch:
-		if (ra_tem_q == 21) {
-			mes "^3355FFNo wonder this object";
-			mes "in the water seems so";
-			mes "familiar: it's a Ymir's";
-			mes "Heart Piece! In fact, there's";
-			mes "dozens of them just lying here.^000000";
-			next;
-			mes "^3355FFWhy would so many of these";
-			mes "powerful artifacts be here";
-			mes "in the Holy Ground? Perhaps";
-			mes "this is the secret that the";
-			mes "priests are trying to keep.^000000";
-			next;
-			hideoffnpc "High Priestess Niren#r2";
-			cutin "ra_gwoman",2;
-			mes "[High Priestess Niren]";
-			mes "How dare you intrude";
-			mes "the Holy Ground! Identify";
-			mes "yourself! I'll have you tried!";
-			next;
-			cutin "ra_gwoman2",2;
-			mes "[High Priestess Niren]";
-			mes "O-oh! It's you, the";
-			mes "adventurer recommended";
-			mes "by Bekento. Hm. I apologize";
-			mes "for snapping at you like";
-			mes "that. Didn't you know that";
-			mes "no one's allowed here?";
-			next;
-			cutin "ra_gwoman",2;
-			mes "[High Priestess Niren]";
-			mes "Hmm. Well, you Rune-Midgarts";
-			mes "adventurers are famous for your";
-			mes "skills and abilities, but this";
-			mes "was not expected. I mean, we";
-			mes "made sure this place was";
-			mes "absolutely secure.";
-			next;
-			cutin "ra_gwoman2",2;
-			mes "[High Priestess Niren]";
-			mes "What's done is done...";
-			mes "I warned Bekento that he";
-			mes "might cause trouble for you,";
-			mes "but it seems that you've";
-			mes "caused trouble for him.";
-			next;
-			mes "[High Priestess Niren]";
-			mes "Understand this:";
-			mes "most intruders are";
-			mes "severely punished, but";
-			mes "because of my friendship";
-			mes "with Bekento, I'm letting";
-			mes "you off easy. Remember that.";
-			next;
-			sc_start SC_Blind,600000,0;
-			mes "^3355FFNiren began to chant";
-			mes "in a low voice, and your";
-			mes "eyelids grow heavier as you";
-			mes "grow drowsier and sleepier...^000000";
-			set ra_tem_q,22;
-			close2;
-			hideonnpc "High Priestess Niren#r2";
-			warp "rachel",163,152;
-			end;
-		}
+OnTouch:
+	if (ra_tem_q == 21) {
+		mes "^3355FFNo wonder this object";
+		mes "in the water seems so";
+		mes "familiar: it's a Ymir's";
+		mes "Heart Piece! In fact, there's";
+		mes "dozens of them just lying here.^000000";
+		next;
+		mes "^3355FFWhy would so many of these";
+		mes "powerful artifacts be here";
+		mes "in the Holy Ground? Perhaps";
+		mes "this is the secret that the";
+		mes "priests are trying to keep.^000000";
+		next;
+		hideoffnpc "High Priestess Niren#r2";
+		cutin "ra_gwoman",2;
+		mes "[High Priestess Niren]";
+		mes "How dare you intrude";
+		mes "the Holy Ground! Identify";
+		mes "yourself! I'll have you tried!";
+		next;
+		cutin "ra_gwoman2",2;
+		mes "[High Priestess Niren]";
+		mes "O-oh! It's you, the";
+		mes "adventurer recommended";
+		mes "by Bekento. Hm. I apologize";
+		mes "for snapping at you like";
+		mes "that. Didn't you know that";
+		mes "no one's allowed here?";
+		next;
+		cutin "ra_gwoman",2;
+		mes "[High Priestess Niren]";
+		mes "Hmm. Well, you Rune-Midgarts";
+		mes "adventurers are famous for your";
+		mes "skills and abilities, but this";
+		mes "was not expected. I mean, we";
+		mes "made sure this place was";
+		mes "absolutely secure.";
+		next;
+		cutin "ra_gwoman2",2;
+		mes "[High Priestess Niren]";
+		mes "What's done is done...";
+		mes "I warned Bekento that he";
+		mes "might cause trouble for you,";
+		mes "but it seems that you've";
+		mes "caused trouble for him.";
+		next;
+		mes "[High Priestess Niren]";
+		mes "Understand this:";
+		mes "most intruders are";
+		mes "severely punished, but";
+		mes "because of my friendship";
+		mes "with Bekento, I'm letting";
+		mes "you off easy. Remember that.";
+		next;
+		sc_start SC_Blind,600000,0;
+		mes "^3355FFNiren began to chant";
+		mes "in a low voice, and your";
+		mes "eyelids grow heavier as you";
+		mes "grow drowsier and sleepier...^000000";
+		set ra_tem_q,22;
+		close2;
+		hideonnpc "High Priestess Niren#r2";
+		warp "rachel",163,152;
 		end;
+	}
+	end;
 }
 
 que_san04,122,200,4	script	High Priestess Niren#r2	915,{
@@ -7634,13 +7629,12 @@ OnTouch:
 		set ra_tem_q,23;
 		close;
 	}
-
 	end;
 }
 
-//rachel,142,167,5	script	Seeking Follower#rachel	917,6,6,{
 rachel,142,167,5	script	Seeking Follower#rachel	916,6,6,{
 	if ((lost_boy == 13) && (ra_tem_q == 20)) {
+		L_Mes:
 		mes "[Arunafeltz Follower]";
 		mes "Excuse me, but";
 		mes "are you "+strcharinfo(0)+"?";
@@ -7661,7 +7655,6 @@ rachel,142,167,5	script	Seeking Follower#rachel	916,6,6,{
 		mes "right room of the temple.";
 		close;
 	}
-
 	else {
 		mes "[Arunafeltz Follower]";
 		mes "May Freya bless you";
@@ -7670,28 +7663,8 @@ rachel,142,167,5	script	Seeking Follower#rachel	916,6,6,{
 	}
 
 OnTouch:
-	if ((lost_boy == 13) && (ra_tem_q == 20)) {
-		mes "[Arunafeltz Follower]";
-		mes "Excuse me, but";
-		mes "are you "+strcharinfo(0)+"?";
-		next;
-		select("Yes.");
-		mes "[Arunafeltz Follower]";
-		mes "High Priest Zhed";
-		mes "would like to see";
-		mes "you right away, "+strcharinfo(0)+".";
-		next;
-		select("May ask why?");
-		mes "[Arunafeltz Follower]";
-		mes "Well, I actually have no";
-		mes "idea. I'm only supposed to";
-		mes "inform you that he's looking";
-		mes "for you. Please visit High";
-		mes "Priest Zhed in the second";
-		mes "right room of the temple.";
-		close;
-	}
-
+	if ((lost_boy == 13) && (ra_tem_q == 20)) goto L_Mes;
+	end;
 }
 
 // End of Donation Lottery/High Priest quest
diff --git a/npc/re/merchants/socket_enchant.txt b/npc/re/merchants/socket_enchant.txt
index 63499c429..836644a5f 100644
--- a/npc/re/merchants/socket_enchant.txt
+++ b/npc/re/merchants/socket_enchant.txt
@@ -36,7 +36,7 @@
 		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
 		mes "- Please try again -";
-		mes "- after you loose some weight. -";
+		mes "- after you lose some weight. -";
 		close;
 	}
 	mes "[Seiyablem]";
diff --git a/npc/re/merchants/socket_enchant2.txt b/npc/re/merchants/socket_enchant2.txt
index aa92f4d22..a66ab30d8 100644
--- a/npc/re/merchants/socket_enchant2.txt
+++ b/npc/re/merchants/socket_enchant2.txt
@@ -17,11 +17,11 @@
 -	script	Leablem#dummy::SocketEnchant2	-1,{
 	if (checkweight(1201,1) == 0)
 	{
-		mes "- Wait a seconds !! -";
-		mes "- You have carried too many items -";
-		mes "- so, you can't get more items. -";
-		mes "- Make your weight as low -";
-		mes "- after then try it again. -";
+		mes "- Wait a minute !! -";
+		mes "- Currently you're carrying -";
+		mes "- too many items with you. -";
+		mes "- Please try again -";
+		mes "- after you lose some weight. -";
 		close;
 	}
 	mes "[Leablem]";
diff --git a/npc/re/quests/quests_rachel.txt b/npc/re/quests/quests_rachel.txt
index 1a86aa3df..5687f4e8d 100644
--- a/npc/re/quests/quests_rachel.txt
+++ b/npc/re/quests/quests_rachel.txt
@@ -300,7 +300,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		close;
 	}
 
-
 	else if (lost_boy == 8) {
 		mes "[Vincent]";
 		mes "The gem is very special...";
@@ -340,7 +339,6 @@ ra_in01,384,246,3	script	Vincent#ra_in01	47,{
 		close;
 	}
 
-
 	else if (lost_boy == 9) {
 		mes "[Vincent]";
 		mes "You came back!";
@@ -6990,13 +6988,11 @@ ra_temin,134,134,3	duplicate(raofficeguard)	Pope's Office Guard#2ra	926
 
 ra_temin,134,131,0	script	gyoin1#rachel	45,1,1,{
 OnTouch:
-	if (ra_tem_q == 16) {
+	if (ra_tem_q == 16)
 		warp "ra_temin",276,239;
-	}
 	else if ((ra_tem_q > 16) || (MISC_QUEST & 8192)){
-		if ((aru_em == 15) || (aru_em == 21)) {
+		if ((aru_em == 15) || (aru_em == 21))
 			warp "ra_temin",276,239;
-		}
 		else {
 			mes "[Pope's Office Guard]";
 			mes "I'm sorry, but the pope";
@@ -7281,7 +7277,6 @@ OnTouch:
 		warp "ra_temin",300,153;
 		end;
 	}
-
 	end;
 
 }
@@ -7532,73 +7527,73 @@ OnTouch:
 }
 
 que_san04,119,203,0	script	imir3#rachel	-1,7,7,{
-	OnTouch:
-		if (ra_tem_q == 21) {
-			mes "^3355FFNo wonder this object";
-			mes "in the water seems so";
-			mes "familiar: it's a Ymir's";
-			mes "Heart Piece! In fact, there's";
-			mes "dozens of them just lying here.^000000";
-			next;
-			mes "^3355FFWhy would so many of these";
-			mes "powerful artifacts be here";
-			mes "in the Holy Ground? Perhaps";
-			mes "this is the secret that the";
-			mes "priests are trying to keep.^000000";
-			next;
-			hideoffnpc "High Priestess Niren#r2";
-			cutin "ra_gwoman",2;
-			mes "[High Priestess Niren]";
-			mes "How dare you intrude";
-			mes "the Holy Ground! Identify";
-			mes "yourself! I'll have you tried!";
-			next;
-			cutin "ra_gwoman2",2;
-			mes "[High Priestess Niren]";
-			mes "O-oh! It's you, the";
-			mes "adventurer recommended";
-			mes "by Bekento. Hm. I apologize";
-			mes "for snapping at you like";
-			mes "that. Didn't you know that";
-			mes "no one's allowed here?";
-			next;
-			cutin "ra_gwoman",2;
-			mes "[High Priestess Niren]";
-			mes "Hmm. Well, you Rune-Midgarts";
-			mes "adventurers are famous for your";
-			mes "skills and abilities, but this";
-			mes "was not expected. I mean, we";
-			mes "made sure this place was";
-			mes "absolutely secure.";
-			next;
-			cutin "ra_gwoman2",2;
-			mes "[High Priestess Niren]";
-			mes "What's done is done...";
-			mes "I warned Bekento that he";
-			mes "might cause trouble for you,";
-			mes "but it seems that you've";
-			mes "caused trouble for him.";
-			next;
-			mes "[High Priestess Niren]";
-			mes "Understand this:";
-			mes "most intruders are";
-			mes "severely punished, but";
-			mes "because of my friendship";
-			mes "with Bekento, I'm letting";
-			mes "you off easy. Remember that.";
-			next;
-			sc_start SC_Blind,600000,0;
-			mes "^3355FFNiren began to chant";
-			mes "in a low voice, and your";
-			mes "eyelids grow heavier as you";
-			mes "grow drowsier and sleepier...^000000";
-			set ra_tem_q,22;
-			close2;
-			hideonnpc "High Priestess Niren#r2";
-			warp "rachel",163,152;
-			end;
-		}
+OnTouch:
+	if (ra_tem_q == 21) {
+		mes "^3355FFNo wonder this object";
+		mes "in the water seems so";
+		mes "familiar: it's a Ymir's";
+		mes "Heart Piece! In fact, there's";
+		mes "dozens of them just lying here.^000000";
+		next;
+		mes "^3355FFWhy would so many of these";
+		mes "powerful artifacts be here";
+		mes "in the Holy Ground? Perhaps";
+		mes "this is the secret that the";
+		mes "priests are trying to keep.^000000";
+		next;
+		hideoffnpc "High Priestess Niren#r2";
+		cutin "ra_gwoman",2;
+		mes "[High Priestess Niren]";
+		mes "How dare you intrude";
+		mes "the Holy Ground! Identify";
+		mes "yourself! I'll have you tried!";
+		next;
+		cutin "ra_gwoman2",2;
+		mes "[High Priestess Niren]";
+		mes "O-oh! It's you, the";
+		mes "adventurer recommended";
+		mes "by Bekento. Hm. I apologize";
+		mes "for snapping at you like";
+		mes "that. Didn't you know that";
+		mes "no one's allowed here?";
+		next;
+		cutin "ra_gwoman",2;
+		mes "[High Priestess Niren]";
+		mes "Hmm. Well, you Rune-Midgarts";
+		mes "adventurers are famous for your";
+		mes "skills and abilities, but this";
+		mes "was not expected. I mean, we";
+		mes "made sure this place was";
+		mes "absolutely secure.";
+		next;
+		cutin "ra_gwoman2",2;
+		mes "[High Priestess Niren]";
+		mes "What's done is done...";
+		mes "I warned Bekento that he";
+		mes "might cause trouble for you,";
+		mes "but it seems that you've";
+		mes "caused trouble for him.";
+		next;
+		mes "[High Priestess Niren]";
+		mes "Understand this:";
+		mes "most intruders are";
+		mes "severely punished, but";
+		mes "because of my friendship";
+		mes "with Bekento, I'm letting";
+		mes "you off easy. Remember that.";
+		next;
+		sc_start SC_Blind,600000,0;
+		mes "^3355FFNiren began to chant";
+		mes "in a low voice, and your";
+		mes "eyelids grow heavier as you";
+		mes "grow drowsier and sleepier...^000000";
+		set ra_tem_q,22;
+		close2;
+		hideonnpc "High Priestess Niren#r2";
+		warp "rachel",163,152;
 		end;
+	}
+	end;
 }
 
 que_san04,122,200,4	script	High Priestess Niren#r2	915,{
@@ -7634,13 +7629,12 @@ OnTouch:
 		set ra_tem_q,23;
 		close;
 	}
-
 	end;
 }
 
-//rachel,142,167,5	script	Seeking Follower#rachel	917,6,6,{
 rachel,142,167,5	script	Seeking Follower#rachel	916,6,6,{
 	if ((lost_boy == 13) && (ra_tem_q == 20)) {
+		L_Mes:
 		mes "[Arunafeltz Follower]";
 		mes "Excuse me, but";
 		mes "are you "+strcharinfo(0)+"?";
@@ -7661,7 +7655,6 @@ rachel,142,167,5	script	Seeking Follower#rachel	916,6,6,{
 		mes "right room of the temple.";
 		close;
 	}
-
 	else {
 		mes "[Arunafeltz Follower]";
 		mes "May Freya bless you";
@@ -7670,28 +7663,8 @@ rachel,142,167,5	script	Seeking Follower#rachel	916,6,6,{
 	}
 
 OnTouch:
-	if ((lost_boy == 13) && (ra_tem_q == 20)) {
-		mes "[Arunafeltz Follower]";
-		mes "Excuse me, but";
-		mes "are you "+strcharinfo(0)+"?";
-		next;
-		select("Yes.");
-		mes "[Arunafeltz Follower]";
-		mes "High Priest Zhed";
-		mes "would like to see";
-		mes "you right away, "+strcharinfo(0)+".";
-		next;
-		select("May ask why?");
-		mes "[Arunafeltz Follower]";
-		mes "Well, I actually have no";
-		mes "idea. I'm only supposed to";
-		mes "inform you that he's looking";
-		mes "for you. Please visit High";
-		mes "Priest Zhed in the second";
-		mes "right room of the temple.";
-		close;
-	}
-
+	if ((lost_boy == 13) && (ra_tem_q == 20)) goto L_Mes;
+	end;
 }
 
 // End of Donation Lottery/High Priest quest