* Corrected and optimized 12 guide NPCs (/guides/)

* Fixed a small typo in Warlock quest, bugreport:6164 (jobs\3-1\warlock.txt)
* Fixed a couple of job constant typos in "Nameless Island Quests" (quests\quests_nameless.txt)
* Removed non-RE changelogs from RE scripts

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

1 files changed, 28 insertions, 79 deletions

diff --git a/npc/guides/guides_juno.txt b/npc/guides/guides_juno.txt
index 652b218af..dc8d41812 100644
--- a/npc/guides/guides_juno.txt
+++ b/npc/guides/guides_juno.txt
@@ -3,20 +3,21 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
-//= rAthena  SVN
+//= rAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
-//= Guides for the city of Juno
+//= Guides for the city of Juno.
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Renewal guide.
+//= 1.1 Fixed and optimized. [Euphy]
 //============================================================ 
 
 yuno,59,212,4	script	Juno Guide#yuno01::GuideJuno	700,{
 	mes "[Juno Guide]";
 	mes "A place that takes the vision of the future, and gives it form in the present. Welcome to";
-	mes "the city of ^8B4513Juno^00000!";
+	mes "the city of ^8B4513Juno^000000!";
 	next;
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove marks from Mini-Map:Cancel")) {
@@ -25,119 +26,67 @@ yuno,59,212,4	script	Juno Guide#yuno01::GuideJuno	700,{
 			while (.@loop) {
 				switch(select("[ Tool Shop ]:[ Forge ]:[ Airport ]:[ Government Building ]:[ Street of Book Stores ]:[ Inn & Pub ]:[ Sage Castle ]:[ Monster Academy ]:[ Library of the Republic ]:[ Weapon & Armor Shop ]:[ Juphero Plaze ]:[ Monster Museum ]:[ Schweicherbil Magic Academy ]:Previous Menu")) {
 				case 1:
-					mes "[Juno Guide]";
-					mes "I will mark the location";
-					mes "of the ^FF0000Tool Shop^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^FF0000Tool Shop";
 					viewpoint 1,194,140,0,0xFF0000;
 					next;
 					break;
 				case 2:
-					mes "[Juno Guide]";
-					mes "I will mark the location";
-					mes "of the ^FF4500Forge^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^FF4500Forge";
 					viewpoint 1,120,137,1,0xFF4500;
 					next;
 					break;
 				case 3:
-					mes "[Juno Guide]";
-					mes "I will mark the location";
-					mes "of the ^DAA520Airport^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^DAA520Airport";
 					viewpoint 1,16,261,2,0xDAA520;
 					next;
 					break;
 				case 4:
-					mes "[Juno Guide]";
-					mes "I will mark the location";
-					mes "of the ^008000Government Building^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^008000Government Building";
 					viewpoint 1,157,317,3,0x008000;
 					next;
 					break;
 				case 5:
-					mes "[Juno Guide]";
-					mes "I will mark the location";
-					mes "of the ^0000FFStreet of Book Stores^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^0000FFStreet of Book Stores";
 					viewpoint 1,172,100,4,0x0000FF;
 					next;
 					break;
 				case 6:
-					mes "[Juno Guide]";
-					mes "I will mark the location";
-					mes "of the ^000080Inn & Pub^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^000080Inn & Pub";
 					viewpoint 1,51,105,5,0x000080;
 					next;
 					break;
 				case 7:
-					mes "[Juno Guide]";
-					mes "I will mark the location";
-					mes "of the ^800080Sage Castle^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^800080Sage Castle";
 					viewpoint 1,90,318,6,0x800080;
 					next;
 					break;
 				case 8:
-					mes "[Juno Guide]";
-					mes "I will mark the location";
-					mes "of the ^834683Monster Academy^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^834683Monster Academy";
 					viewpoint 1,95,184,7,0x834683;
 					next;
 					break;
 				case 9:
-					mes "[Juno Guide]";
-					mes "I will mark the location";
-					mes "of the ^4B0082Juno Library^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^4B0082Juno Library";
 					viewpoint 1,338,203,8,0x4B0082;
 					next;
 					break;
 				case 10:
-					mes "[Juno Guide]";
-					mes "I will mark the location";
-					mes "of the ^008080Weapon & Armor Shop^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^008080Weapon & Armor Shop";
 					viewpoint 1,120,137,9,0x008080;
 					next;
 					break;
 				case 11:
-					mes "[Juno Guide]";
-					mes "I will mark the location";
-					mes "of the ^FF1493Juphero Plaza^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^FF1493Juphero Plaza";
 					viewpoint 1,115,157,10,0xFF1493;
 					next;
 					break;
 				case 12:
-					mes "[Juno Guide]";
-					mes "I will mark the location";
-					mes "of the ^DA70D6Monster Museum^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^DA70D6Monster Museum";
 					viewpoint 1,278,290,11,0xDA70D6;
 					next;
 					break;
 				case 13:
-					mes "[Juno Guide]";
-					mes "I will mark the location";
-					mes "of the ^CD1039Schweicherbil Magic Academy^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^CD1039Schweicherbil Magic Academy";
 					viewpoint 1,323,280,12,0xCD1039;
 					next;
 					break;
@@ -152,22 +101,14 @@ yuno,59,212,4	script	Juno Guide#yuno01::GuideJuno	700,{
 			while (.@loop) {
 				switch(select("[ Kafra Employees ]:[ Eden Teleport Officer ]:Previous Menu")) {
 				case 1:
-					mes "[Juno Guide]";
-					mes "I will mark the location";
-					mes "of the ^FA8072Kafra Employees^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^FA8072Kafra Employees";
 					viewpoint 1,152,187,13,0xFA8072;
 					viewpoint 1,277,221,14,0xFA8072;
 					viewpoint 1,327,108,15,0xFA8072;
 					next;
 					break;
 				case 2:
-					mes "[Juno Guide]";
-					mes "I will mark the location";
-					mes "of the ^803232Eden Teleport Officer^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark,"^803232Eden Teleport Officer";
 					viewpoint 1,144,189,16,0x803232;
 					next;
 					break;
@@ -206,6 +147,14 @@ yuno,59,212,4	script	Juno Guide#yuno01::GuideJuno	700,{
 			close;
 		}
 	}
+	end;
+L_Mark:
+	mes "[Juno Guide]";
+	mes "I will mark the location";
+	mes "of the "+getarg(0)+"^000000";
+	mes "on your mini-map.";
+	mes "Would you like to check any other locations?";
+	return;
 }
 
 yuno,153,47,4	duplicate(GuideJuno)	Juno Guide#yuno02	700