소스 검색

Merge branch 'master' of github.com:rathena/rathena

lighta 11 년 전
부모
커밋
48919f06e3

+ 16 - 16
db/quest_db.txt

@@ -1111,7 +1111,7 @@
 7364,0,0,0,0,0,0,0,"Deliver Holy Item to Middle-aged Man"
 7364,0,0,0,0,0,0,0,"Deliver Holy Item to Middle-aged Man"
 7365,0,0,0,0,0,0,0,"Better than My Old Button-2"
 7365,0,0,0,0,0,0,0,"Better than My Old Button-2"
 7366,0,0,0,0,0,0,0,"Traditional Spiritual Protection and Impudent Girl-1"
 7366,0,0,0,0,0,0,0,"Traditional Spiritual Protection and Impudent Girl-1"
-7367,0,0,0,0,0,0,0,"Traditional Spiritual Protection and Impudent Girl-2"
+7367,900,0,0,0,0,0,0,"Traditional Spiritual Protection and Impudent Girl-2"
 7368,0,0,0,0,0,0,0,"Deliver Spiritual Protection-Pedro"
 7368,0,0,0,0,0,0,0,"Deliver Spiritual Protection-Pedro"
 7369,0,0,0,0,0,0,0,"Deliver Spiritual Protection-Nardo"
 7369,0,0,0,0,0,0,0,"Deliver Spiritual Protection-Nardo"
 7370,0,0,0,0,0,0,0,"Deliver Spiritual Protection-Pandoi"
 7370,0,0,0,0,0,0,0,"Deliver Spiritual Protection-Pandoi"
@@ -1119,13 +1119,13 @@
 7372,0,0,0,0,0,0,0,"Deliver Spiritual Protection-Talah"
 7372,0,0,0,0,0,0,0,"Deliver Spiritual Protection-Talah"
 7373,0,0,0,0,0,0,0,"Deliver Spiritual Protection-Romel"
 7373,0,0,0,0,0,0,0,"Deliver Spiritual Protection-Romel"
 7374,0,0,0,0,0,0,0,"Love and Spiritual Protection for All"
 7374,0,0,0,0,0,0,0,"Love and Spiritual Protection for All"
-7375,0,0,0,0,0,0,0,"Love and Spiritual Protection Continues"
+7375,86400,0,0,0,0,0,0,"Love and Spiritual Protection Continues"
 7376,0,0,0,0,0,0,0,"Old Man and Cast-Iron Caldron-1"
 7376,0,0,0,0,0,0,0,"Old Man and Cast-Iron Caldron-1"
 7377,0,0,0,0,0,0,0,"Old Man and Cast-Iron Caldron-2"
 7377,0,0,0,0,0,0,0,"Old Man and Cast-Iron Caldron-2"
-7378,0,0,0,0,0,0,0,"Old Man and Cast-Iron Caldron-Regular Trades"
+7378,86400,0,0,0,0,0,0,"Old Man and Cast-Iron Caldron-Regular Trades"
 7379,0,0,0,0,0,0,0,"Peace Preacher"
 7379,0,0,0,0,0,0,0,"Peace Preacher"
 7380,0,0,0,0,0,0,0,"To Smith a Traditional Spiritual Protection"
 7380,0,0,0,0,0,0,0,"To Smith a Traditional Spiritual Protection"
-7381,0,0,0,0,0,0,0,"High Demand on Spiritual Protection Material"
+7381,86400,0,0,0,0,0,0,"High Demand on Spiritual Protection Material"
 7382,0,0,0,0,0,0,0,"Deliver to Pedro"
 7382,0,0,0,0,0,0,0,"Deliver to Pedro"
 7383,0,0,0,0,0,0,0,"Deliver to Nardo"
 7383,0,0,0,0,0,0,0,"Deliver to Nardo"
 7384,0,0,0,0,0,0,0,"Deliver to Pandoi"
 7384,0,0,0,0,0,0,0,"Deliver to Pandoi"
@@ -1134,27 +1134,27 @@
 7387,0,0,0,0,0,0,0,"Deliver to Romel"
 7387,0,0,0,0,0,0,0,"Deliver to Romel"
 7388,0,0,0,0,0,0,0,"Maries's Child"
 7388,0,0,0,0,0,0,0,"Maries's Child"
 7389,0,0,0,0,0,0,0,"Give the Shirt to Maries's Child"
 7389,0,0,0,0,0,0,0,"Give the Shirt to Maries's Child"
-7390,0,0,0,0,0,0,0,"Worried about Maries's Child"
+7390,86400,0,0,0,0,0,0,"Worried about Maries's Child"
 7391,0,0,0,0,0,0,0,"Jejeling and Jejellopy"
 7391,0,0,0,0,0,0,0,"Jejeling and Jejellopy"
-7392,0,0,0,0,0,0,0,"Collect Jejellopy Regularly"
-7393,0,0,0,0,0,0,0,"Shiny Silver Blade"
-7394,0,0,0,0,0,0,0,"Shiny Tomorrow"
-7395,0,0,0,0,0,0,0,"Ghost on the Perry Ship"
-7396,0,0,0,0,0,0,0,"Angry Soul on Perry Ship"
+7392,86400,0,0,0,0,0,0,"Collect Jejellopy Regularly"
+7393,0,2314,10,2311,10,0,0,"Shiny Silver Blade"
+7394,86400,0,0,0,0,0,0,"Shiny Tomorrow"
+7395,0,0,0,0,0,0,0,"Ghost on the Ferry Ship"
+7396,0,0,0,0,0,0,0,"Angry Soul on Ferry Ship"
 7397,0,0,0,0,0,0,0,"Mumbaki Phong's Advice"
 7397,0,0,0,0,0,0,0,"Mumbaki Phong's Advice"
 7398,0,0,0,0,0,0,0,"Offering Bouquet Recommended by Mumbaki"
 7398,0,0,0,0,0,0,0,"Offering Bouquet Recommended by Mumbaki"
 7399,0,0,0,0,0,0,0,"Soul Diwata's Story"
 7399,0,0,0,0,0,0,0,"Soul Diwata's Story"
 7400,0,0,0,0,0,0,0,"Mumbaki of Port Malaya"
 7400,0,0,0,0,0,0,0,"Mumbaki of Port Malaya"
-7401,0,0,0,0,0,0,0,"All Aboard for Perry Sailing"
+7401,86400,0,0,0,0,0,0,"All Aboard for Perry Sailing"
 7402,0,0,0,0,0,0,0,"Bouquet for Diwata"
 7402,0,0,0,0,0,0,0,"Bouquet for Diwata"
 7403,0,0,0,0,0,0,0,"Stabilized Perry"
 7403,0,0,0,0,0,0,0,"Stabilized Perry"
-7404,0,0,0,0,0,0,0,"Get Rid of Jejeling"
-7405,0,0,0,0,0,0,0,"Get Rid of Jejeling - Same Time Tomorrow"
+7404,0,2316,20,0,0,0,0,"Get Rid of Jejeling"
+7405,86400,0,0,0,0,0,0,"Get Rid of Jejeling - Same Time Tomorrow"
 7406,0,0,0,0,0,0,0,"Agree to Collecting Bones!"
 7406,0,0,0,0,0,0,0,"Agree to Collecting Bones!"
 7407,0,0,0,0,0,0,0,"Purified Bone"
 7407,0,0,0,0,0,0,0,"Purified Bone"
-7408,0,0,0,0,0,0,0,"Agree to Come Back Tomorrow?"
-7409,0,0,0,0,0,0,0,"Cannot Meet Eyes with Him!"
-7410,0,0,0,0,0,0,0,"Teach Another Lesson Tomorrow!"
+7408,86400,0,0,0,0,0,0,"Agree to Come Back Tomorrow?"
+7409,0,2309,10,0,0,0,0,"Cannot Meet Eyes with Him!"
+7410,86400,0,0,0,0,0,0,"Teach Another Lesson Tomorrow!"
 
 
 // Eclage
 // Eclage
 7411,0,0,0,0,0,0,0,"The traveler, Fome's story"
 7411,0,0,0,0,0,0,0,"The traveler, Fome's story"

+ 41 - 88
npc/re/guides/guides_alberta.txt

@@ -3,14 +3,15 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
-//= rAthena  SVN
+//= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
 //= [Official Conversion]
 //= [Official Conversion]
 //= Guides for the city of Alberta
 //= Guides for the city of Alberta
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Renewal guides.
 //= 1.0 First version, Renewal guides.
+//= 1.1 Navigation system update. [Euphy]
 //============================================================ 
 //============================================================ 
 
 
 alberta,23,238,4	script	Guide#01alberta::AlbertaGuide	105,{
 alberta,23,238,4	script	Guide#01alberta::AlbertaGuide	105,{
@@ -19,7 +20,9 @@ alberta,23,238,4	script	Guide#01alberta::AlbertaGuide	105,{
 	mes "Welcome to ^8B4513Alberta^000000,";
 	mes "Welcome to ^8B4513Alberta^000000,";
 	mes "the Port City.";
 	mes "the Port City.";
 	mes "Do you need help navigating the city?";
 	mes "Do you need help navigating the city?";
+	F_Navi("[Alberta Guide]");
 	next;
 	next;
+	set .@str$,"Would you like to check any other locations?";
 	while (1) {
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:[ Destination Ports ]:Remove Marks from Mini-Map:Cancel")) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:[ Destination Ports ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
 		case 1:
@@ -29,54 +32,54 @@ alberta,23,238,4	script	Guide#01alberta::AlbertaGuide	105,{
 				case 1:
 				case 1:
 					mes "[Alberta Guide]";
 					mes "[Alberta Guide]";
 					mes "Let me mark the location of the";
 					mes "Let me mark the location of the";
-					mes "the ^0000FFTool Shop^000000";
+					mes "the "+F_Navi("Tool Shop","alberta,98,154","^0000FF");
 					mes "on your mini-map.";
 					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,98,154,0,0x0A82FF;
 					viewpoint 1,98,154,0,0x0A82FF;
 					next;
 					next;
 					break;
 					break;
 				case 2:
 				case 2:
 					mes "[Alberta Guide]";
 					mes "[Alberta Guide]";
-					mes "The ^B9062FForge^000000 is currently";
+					mes "The "+F_Navi("Forge","alberta,35,41","^B9062F")+" is currently";
 					mes "located inside the Merchant Guild building.";
 					mes "located inside the Merchant Guild building.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,35,41,1,0xFF0000;
 					viewpoint 1,35,41,1,0xFF0000;
 					next;
 					next;
 					break;
 					break;
 				case 3:
 				case 3:
 					mes "[Alberta Guide]";
 					mes "[Alberta Guide]";
 					mes "Let me mark the location of the";
 					mes "Let me mark the location of the";
-					mes "the ^FF5400Weapon & Armor Shop^000000";
+					mes "the "+F_Navi("Weapon & Armor Shop","alberta,117,37","^FF5400");
 					mes "on your mini-map.";
 					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,117,37,2,0xFFB400;
 					viewpoint 1,117,37,2,0xFFB400;
 					next;
 					next;
 					break;
 					break;
 				case 4:
 				case 4:
 					mes "[Alberta Guide]";
 					mes "[Alberta Guide]";
 					mes "Let me mark the location of the";
 					mes "Let me mark the location of the";
-					mes "the ^006400Inn^000000";
+					mes "the "+F_Navi("Inn","alberta,65,233","^006400");
 					mes "on your mini-map.";
 					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,65,233,3,0xAAFF00;
 					viewpoint 1,65,233,3,0xAAFF00;
 					next;
 					next;
 					break;
 					break;
 				case 5:
 				case 5:
 					mes "[Alberta Guide]";
 					mes "[Alberta Guide]";
 					mes "Let me mark the location of the";
 					mes "Let me mark the location of the";
-					mes "the ^7F3300Beauty Salon^000000";
+					mes "the "+F_Navi("Beauty Salon","alberta,48,145","^7F3300");
 					mes "on your mini-map.";
 					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,48,145,4,0xD2691E;
 					viewpoint 1,48,145,4,0xD2691E;
 					next;
 					next;
 					break;
 					break;
 				case 6:
 				case 6:
 					mes "[Alberta Guide]";
 					mes "[Alberta Guide]";
-					mes "The Merchant Guild is where";
-					mes "you can change your job to ^800080Merchant.";
+					mes "The "+F_Navi("Merchant Guild","alberta,33,41")+" is where";
+					mes "you can change your job to ^800080Merchant^000000.";
 					mes "Let me mark its location";
 					mes "Let me mark its location";
 					mes "on your mini-map.";
 					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,33,41,5,0xDA70D6;
 					viewpoint 1,33,41,5,0xDA70D6;
 					next;
 					next;
 					break;
 					break;
@@ -92,10 +95,10 @@ alberta,23,238,4	script	Guide#01alberta::AlbertaGuide	105,{
 				switch(select("[ Eden Teleport Officer ]:[ Kafra Employee ]:[ Cool Event Employee ]:[ Bullet Merchant ]:[ Cooking Ingredient Merchant ]:Previous Menu")) {
 				switch(select("[ Eden Teleport Officer ]:[ Kafra Employee ]:[ Cool Event Employee ]:[ Bullet Merchant ]:[ Cooking Ingredient Merchant ]:Previous Menu")) {
 				case 1:
 				case 1:
 					mes "[Alberta Guide]";
 					mes "[Alberta Guide]";
-					mes "^B9062FEden Teleport Officers^000000 are located in south Alberta";
-					mes "and inside the Merchant Guild building.";
+					mes "^B9062FEden Teleport Officers^000000 are located in "+F_Navi("south Alberta","alberta,121,68");
+					mes "and inside the "+F_Navi("Merchant Guild","alberta,33,41")+" building.";
 					mes "Let me mark their locations on your mini-map.";
 					mes "Let me mark their locations on your mini-map.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,33,41,6,0xFF0000;
 					viewpoint 1,33,41,6,0xFF0000;
 					viewpoint 1,121,68,7,0xFF0000;
 					viewpoint 1,121,68,7,0xFF0000;
 					next;
 					next;
@@ -105,7 +108,7 @@ alberta,23,238,4	script	Guide#01alberta::AlbertaGuide	105,{
 					mes "Let me mark the location of the";
 					mes "Let me mark the location of the";
 					mes "^0000FFKafra Employees^000000";
 					mes "^0000FFKafra Employees^000000";
 					mes "on your mini-map.";
 					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,33,41,8,0x0A82FF;
 					viewpoint 1,33,41,8,0x0A82FF;
 					viewpoint 1,113,60,9,0x0A82FF;
 					viewpoint 1,113,60,9,0x0A82FF;
 					next;
 					next;
@@ -113,8 +116,8 @@ alberta,23,238,4	script	Guide#01alberta::AlbertaGuide	105,{
 				case 3:
 				case 3:
 					mes "[Alberta Guide]";
 					mes "[Alberta Guide]";
 					mes "When you win event items,";
 					mes "When you win event items,";
-					mes "you can claim them through the ^FF5400Cool Event Employee^000000.";
-					mes "Would you like to check any other locations?";
+					mes "you can claim them through the "+F_Navi("Cool Event Employee","alberta,148,57","^FF5400")+".";
+					mes .@str$;
 					viewpoint 1,148,57,10,0xFFB400;
 					viewpoint 1,148,57,10,0xFFB400;
 					next;
 					next;
 					break;
 					break;
@@ -122,17 +125,17 @@ alberta,23,238,4	script	Guide#01alberta::AlbertaGuide	105,{
 					mes "[Alberta Guide]";
 					mes "[Alberta Guide]";
 					mes "The ^7F3300Bullet Merchants^000000 for ^7F3300Gunslingers^000000";
 					mes "The ^7F3300Bullet Merchants^000000 for ^7F3300Gunslingers^000000";
 					mes "are located";
 					mes "are located";
-					mes "near the center of the city.";
-					mes "Would you like to check any other locations?";
+					mes "near the "+F_Navi("center of the city","alberta,117,158")+".";
+					mes .@str$;
 					viewpoint 1,117,158,11,0xD2691E;
 					viewpoint 1,117,158,11,0xD2691E;
 					next;
 					next;
 					break;
 					break;
 				case 5:
 				case 5:
 					mes "[Alberta Guide]";
 					mes "[Alberta Guide]";
-					mes "The ^006400Chef Assistant^000000 in Alberta";
+					mes "The "+F_Navi("Chef Assistant","alberta,167,135","^006400")+" in Alberta";
 					mes "has many regular customers,";
 					mes "has many regular customers,";
 					mes "especially for his ^006400Delicious Fishes^000000.";
 					mes "especially for his ^006400Delicious Fishes^000000.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,167,135,12,0xAAFF00;
 					viewpoint 1,167,135,12,0xAAFF00;
 					next;
 					next;
 					break;
 					break;
@@ -145,77 +148,32 @@ alberta,23,238,4	script	Guide#01alberta::AlbertaGuide	105,{
 		case 3:
 		case 3:
 			set .@loop,1;
 			set .@loop,1;
 			while (.@loop) {
 			while (.@loop) {
-				switch(select("[ Port - Northern Dock ]:[ Port - Brasilis ]:[ Port - Amatsu ]:[ Port - Kunlun ]:[ Port - Moscovia ]:[ Port - Louyang ]:[ Port - Ayothaya ]:Previous Menu")) {
+				switch(select("[ Port - Northern Dock ]:[ Port - Central Dock ]:[ Port - Southern Dock ]:Previous Menu")) {
 				case 1:
 				case 1:
 					mes "[Alberta Guide]";
 					mes "[Alberta Guide]";
-					mes "You can use";
-					mes "the ^B9062FNorthern Dock^000000";
-					mes "to go to the ^B9062FSunken Ship^000000 or ^B9062FIzlude Marina^000000.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,192,151,13,0xFF0000;
+					mes "You can use the "+F_Navi("Northern Dock","alberta,192,196");
+					mes "to go to ^0000FFPort Malaya^000000 or ^0000FFDewata^000000.";
+					mes .@str$;
+					viewpoint 1,192,196,13,0xFF0000;
 					next;
 					next;
 					break;
 					break;
 				case 2:
 				case 2:
 					mes "[Alberta Guide]";
 					mes "[Alberta Guide]";
-					mes "Please talk to the ^800080Crewman^000000 at the Alberta Port";
-					mes "if you'd like to visit ^800080Brasilis^000000,";
-					mes "the City of Passion.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,246,82,14,0xDA70D6;
+					mes "You can use the "+F_Navi("Central Dock","alberta,192,151");
+					mes "to go to the ^B9062FSunken Ship^000000 or ^B9062FIzlude Marina^000000.";
+					mes .@str$;
+					viewpoint 1,192,151,14,0xFF0000;
 					next;
 					next;
 					break;
 					break;
 				case 3:
 				case 3:
 					mes "[Alberta Guide]";
 					mes "[Alberta Guide]";
-					mes "Please talk to the";
-					mes "the ^0000FFSea Captain^000000 at the Alberta Port";
-					mes "if you'd like to enjoy viewing cherry blossoms";
-					mes "in ^0000FFAmatsu^000000.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,246,74,15,0x0A82FF;
+					mes "You can use the "+F_Navi("Southern Dock","alberta,245,86");
+					mes "to go to ^0000FFTurtle Island^000000, ^0000FFBrasilis^000000, ^0000FFAmatsu^000000, ^0000FFKunlun^000000, ^0000FFMoscovia^000000, ^0000FFLouyang^000000, or ^0000FFAyothaya^000000.";
+					mes .@str$;
+					viewpoint 1,245,86,15,0xFF0000;
 					next;
 					next;
 					break;
 					break;
 				case 4:
 				case 4:
-					mes "[Alberta Guide]";
-					mes "Please talk to the";
-					mes "^B9062FKunlun Envoy^000000 at the Alberta Port";
-					mes "if you'd like to experience the exotic atmosphere of ^B9062FKunlun^000000.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,246,62,16,0xFF0000;
-					next;
-					break;
-				case 5:
-					mes "[Alberta Guide]";
-					mes "Please talk to the";
-					mes "^FF5400Moscovia P.R. Officer^000000 at the Alberta Port";
-					mes "if you'd like to move to";
-					mes "^FF5400Moscovia^000000,";
-					mes "the Eden on the ocean.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,246,51,17,0xFFB400;
-					next;
-					break;
-				case 6:
-					mes "[Alberta Guide]";
-					mes "Please talk to the";
-					mes "^7F3300Girl^000000 at the Alberta Port";
-					mes "if you'd like to move to the historical city,";
-					mes "^7F3300Louyang^000000.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,246,40,18,0xD2691E;
-					next;
-					break;
-				case 7:
-					mes "[Alberta Guide]";
-					mes "Please talk to";
-					mes "^800080Aibakthing^000000 at the Alberta Port";
-					mes "if you'd like to move to";
-					mes "^800080Ayothaya^000000,";
-					mes "the religious city.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,246,29,19,0xDA70D6;
-					next;
-					break;
-				case 8:
 					set .@loop,0;
 					set .@loop,0;
 					break;
 					break;
 				}
 				}
@@ -241,10 +199,6 @@ alberta,23,238,4	script	Guide#01alberta::AlbertaGuide	105,{
 			viewpoint 2,1,1,13,0xFFFF00;
 			viewpoint 2,1,1,13,0xFFFF00;
 			viewpoint 2,1,1,14,0xFFFF00;
 			viewpoint 2,1,1,14,0xFFFF00;
 			viewpoint 2,1,1,15,0xFFFF00;
 			viewpoint 2,1,1,15,0xFFFF00;
-			viewpoint 2,1,1,16,0xFFFF00;
-			viewpoint 2,1,1,17,0xFFFF00;
-			viewpoint 2,1,1,18,0xFFFF00;
-			viewpoint 2,1,1,19,0xFFFF00;
 			next;
 			next;
 			break;
 			break;
 		case 5:
 		case 5:
@@ -256,6 +210,5 @@ alberta,23,238,4	script	Guide#01alberta::AlbertaGuide	105,{
 		}
 		}
 	}
 	}
 }
 }
-
 alberta,120,60,3	duplicate(AlbertaGuide)	Guide#02alberta	105
 alberta,120,60,3	duplicate(AlbertaGuide)	Guide#02alberta	105
 alberta,184,143,4	duplicate(AlbertaGuide)	Guide#03alberta	105
 alberta,184,143,4	duplicate(AlbertaGuide)	Guide#03alberta	105

+ 33 - 44
npc/re/guides/guides_aldebaran.txt

@@ -3,14 +3,16 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
-//= rAthena  SVN
+//= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
 //= [Official Conversion]
 //= [Official Conversion]
-//= Guides for the city of Al De baran
+//= Guides for the city of Al De Baran.
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Renewal guide.
 //= 1.0 First version, Renewal guide.
+//= 1.1 Navigation system update. [Euphy]
+//=     Optimized.
 //============================================================ 
 //============================================================ 
 
 
 aldebaran,139,63,4	script	Guide#01aldebaran::GuideAldearan	105,{
 aldebaran,139,63,4	script	Guide#01aldebaran::GuideAldearan	105,{
@@ -19,7 +21,9 @@ aldebaran,139,63,4	script	Guide#01aldebaran::GuideAldearan	105,{
 	mes "Welcome to ^8B4513Al De Baran^000000,";
 	mes "Welcome to ^8B4513Al De Baran^000000,";
 	mes "the Border City.";
 	mes "the Border City.";
 	mes "Do you need help navigating the city?";
 	mes "Do you need help navigating the city?";
+	F_Navi("[Al De Baran Guide]");
 	next;
 	next;
+	set .@str$,"Would you like to check any other locations?";
 	while (1) {
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
 		case 1:
@@ -27,55 +31,43 @@ aldebaran,139,63,4	script	Guide#01aldebaran::GuideAldearan	105,{
 			while (.@loop) {
 			while (.@loop) {
 				switch(select("[ Kafra Headquarters ]:[ Alchemist Guild ]:[ Clock Tower ]:[ Inn & Tool Shop ]:[ Repair & Buy Equipment ]:[ Tavern ]:Previous Menu")) {
 				switch(select("[ Kafra Headquarters ]:[ Alchemist Guild ]:[ Clock Tower ]:[ Inn & Tool Shop ]:[ Repair & Buy Equipment ]:[ Tavern ]:Previous Menu")) {
 				case 1:
 				case 1:
-					mes "[Al De Baran Guide]";
-					mes "Let me mark the location of the";
-					mes "^B9062FKafra Headquarters^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark, F_Navi("Kafra Headquarters","aldebaran,61,229","^B9062F");
+					mes .@str$;
 					viewpoint 1,61,229,0,0xFF0000;
 					viewpoint 1,61,229,0,0xFF0000;
 					next;
 					next;
 					break;
 					break;
 				case 2:
 				case 2:
-					mes "[Al De Baran Guide]";
-					mes "Let me mark the location of the";
-					mes "the ^0000FFAlchemist Guild^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark, F_Navi("Alchemist Guild","aldebaran,60,60","^0000FF");
+					mes .@str$;
 					viewpoint 1,60,60,1,0x0A82FF;
 					viewpoint 1,60,60,1,0x0A82FF;
 					next;
 					next;
 					break;
 					break;
 				case 3:
 				case 3:
-					mes "[Al De Baran Guide]";
-					mes "Let me mark the location of the";
-					mes "the ^FF5400Clock Tower^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark, F_Navi("Clock Tower","aldebaran,139,133","^FF5400");
+					mes .@str$;
 					viewpoint 1,139,133,2,0xFFB400;
 					viewpoint 1,139,133,2,0xFFB400;
 					next;
 					next;
 					break;
 					break;
 				case 4:
 				case 4:
 					mes "[Al De Baran Guide]";
 					mes "[Al De Baran Guide]";
 					mes "Let me mark the location of the";
 					mes "Let me mark the location of the";
-					mes "the ^006400Inn^000000 and";
-					mes "the ^006400Tool Shop^000000 building";
+					mes F_Navi("Inn & Tool Shop","aldebaran,197,70","^006400")+" building";
 					mes "on your mini-map.";
 					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,197,70,3,0xAAFF00;
 					viewpoint 1,197,70,3,0xAAFF00;
 					next;
 					next;
 					break;
 					break;
 				case 5:
 				case 5:
 					mes "[Al De Baran Guide]";
 					mes "[Al De Baran Guide]";
-					mes "If you'd like to ^7F3300Buy or Repair Equipment^000000,";
+					mes "If you'd like to ";
+					mes F_Navi("Buy or Repair Equipment","aldebaran,197,70","^7F3300")+",";
 					mes "then this is the place you'll want to visit.";
 					mes "then this is the place you'll want to visit.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,72,197,4,0xD2691E;
 					viewpoint 1,72,197,4,0xD2691E;
 					next;
 					next;
 					break;
 					break;
 				case 6:
 				case 6:
-					mes "[Al De Baran Guide]";
-					mes "Let me mark the location of the";
-					mes "the ^800080Tavern^000000";
-					mes "on your mini-map.";
+					callsub L_Mark, F_Navi("Tavern","aldebaran,231,106","^800080");
 					viewpoint 1,231,106,5,0xDA70D6;
 					viewpoint 1,231,106,5,0xDA70D6;
 					next;
 					next;
 					break;
 					break;
@@ -90,38 +82,29 @@ aldebaran,139,63,4	script	Guide#01aldebaran::GuideAldearan	105,{
 			while (.@loop) {
 			while (.@loop) {
 				switch(select("[ Eden Teleport Officer ]:[ Kafra Employee ]:[ Mr. Claus ]:[ Chef Assistant ]:Previous Menu")) {
 				switch(select("[ Eden Teleport Officer ]:[ Kafra Employee ]:[ Mr. Claus ]:[ Chef Assistant ]:Previous Menu")) {
 				case 1:
 				case 1:
-					mes "[Al De Baran Guide]";
-					mes "Let me mark the location of the";
-					mes "^B9062FEden Teleport Officer^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark, F_Navi("Eden Teleport Officer","aldebaran,133,119","^B9062F");
+					mes .@str$;
 					viewpoint 1,133,119,6,0xFF0000;
 					viewpoint 1,133,119,6,0xFF0000;
 					next;
 					next;
 					break;
 					break;
 				case 2:
 				case 2:
-					mes "[Al De Baran Guide]";
-					mes "Let me mark the location of the";
-					mes "^0000FFKafra Employee^000000";
-					mes "on your mini-map.";
+					callsub L_Mark, "^0000FFKafra Employee^000000";
 					viewpoint 1,143,119,7,0x0A82FF;
 					viewpoint 1,143,119,7,0x0A82FF;
 					next;
 					next;
 					break;
 					break;
 				case 3:
 				case 3:
 					mes "[Al De Baran Guide]";
 					mes "[Al De Baran Guide]";
 					mes "Mr. Claus can teleport";
 					mes "Mr. Claus can teleport";
-					mes "you to ^006400Lutie^000000.";
+					mes "you to "+F_Navi("Lutie","aldebaran,168,168","^006400")+".";
 					mes "Let me mark his location";
 					mes "Let me mark his location";
 					mes "on your mini-map.";
 					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,168,168,8,0xAAFF00;
 					viewpoint 1,168,168,8,0xAAFF00;
 					next;
 					next;
 					break;
 					break;
 				case 4:
 				case 4:
-					mes "[Al De Baran Guide]";
-					mes "Let me mark the location of the";
-					mes "^7F3300Chef Assistant^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark, F_Navi("Chef Assistant","aldebaran,165,107","^7F3300");
+					mes .@str$;
 					viewpoint 1,165,107,9,0xD2691E;
 					viewpoint 1,165,107,9,0xD2691E;
 					next;
 					next;
 					break;
 					break;
@@ -156,8 +139,14 @@ aldebaran,139,63,4	script	Guide#01aldebaran::GuideAldearan	105,{
 			end;
 			end;
 		}
 		}
 	}
 	}
+	end;
+L_Mark:
+	mes "[Al De Baran Guide]";
+	mes "Let me mark the location of the";
+	mes getarg(0);
+	mes "on your mini-map.";
+	return;
 }
 }
-
 aldebaran,243,143,2	duplicate(GuideAldearan)	Guide#02aldebaran	105
 aldebaran,243,143,2	duplicate(GuideAldearan)	Guide#02aldebaran	105
 aldebaran,135,243,4	duplicate(GuideAldearan)	Guide#03aldebaran	105
 aldebaran,135,243,4	duplicate(GuideAldearan)	Guide#03aldebaran	105
 aldebaran,36,135,6	duplicate(GuideAldearan)	Guide#04aldebaran	105
 aldebaran,36,135,6	duplicate(GuideAldearan)	Guide#04aldebaran	105

+ 12 - 10
npc/re/guides/guides_amatsu.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Renewal guide.
 //= 1.0 First version, Renewal guide.
 //= 1.1 Optimized. [Euphy]
 //= 1.1 Optimized. [Euphy]
+//= 1.2 Navigation system update. [Euphy]
 //============================================================ 
 //============================================================ 
 
 
 amatsu,202,91,3	script	Amatsu Guide#amatsu	758,{
 amatsu,202,91,3	script	Amatsu Guide#amatsu	758,{
@@ -27,39 +28,40 @@ amatsu,202,91,3	script	Amatsu Guide#amatsu	758,{
 	mes "as Miss Amatsu.";
 	mes "as Miss Amatsu.";
 	mes "Please tell me";
 	mes "Please tell me";
 	mes "if you want to know something.";
 	mes "if you want to know something.";
+	F_Navi("[Amachang]");
 	while (1) {
 	while (1) {
 		next;
 		next;
 		switch(select("[ Kafra Employee ]:[ Bar ]:[ Weapon Dealer ]:[ Tool Dealer ]:[ Amatsu Palace ]:[ Chef Assistant ]:[ Ninja Guild Building ]:[ Sea Captain ]:Remove Marks from Mini-Map:Cancel")) {
 		switch(select("[ Kafra Employee ]:[ Bar ]:[ Weapon Dealer ]:[ Tool Dealer ]:[ Amatsu Palace ]:[ Chef Assistant ]:[ Ninja Guild Building ]:[ Sea Captain ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
 		case 1:
-			callsub L_Mark,"^0000FFKafra Employee";
+			callsub L_Mark, "^0000FFKafra Employee^000000";
 			viewpoint 1,102,149,0,0x0A82FF;
 			viewpoint 1,102,149,0,0x0A82FF;
 			break;
 			break;
 		case 2:
 		case 2:
-			callsub L_Mark,"^006400Bar";
+			callsub L_Mark, F_Navi("Bar","amatsu,215,116","^006400");
 			viewpoint 1,215,116,1,0xAAFF00;
 			viewpoint 1,215,116,1,0xAAFF00;
 			break;
 			break;
 		case 3:
 		case 3:
-			callsub L_Mark,"^008080Weapon Dealer";
+			callsub L_Mark, F_Navi("Weapon Dealer","amatsu,129,117","^008080");
 			viewpoint 1,129,117,2,0x008080;
 			viewpoint 1,129,117,2,0x008080;
 			break;
 			break;
 		case 4:
 		case 4:
-			callsub L_Mark,"^FF1493Tool Dealer";
+			callsub L_Mark, F_Navi("Tool Dealer","amatsu,97,117","^FF1493");
 			viewpoint 1,97,117,3,0xFF1493;
 			viewpoint 1,97,117,3,0xFF1493;
 			break;
 			break;
 		case 5:
 		case 5:
-			callsub L_Mark,"^8B4513Amatsu Palace";
+			callsub L_Mark, F_Navi("Amatsu Palace","amatsu,87,235","^8B4513");
 			viewpoint 1,87,235,4,0x8B4513;
 			viewpoint 1,87,235,4,0x8B4513;
 			break;
 			break;
 		case 6:
 		case 6:
-			callsub L_Mark,"^8A2BE2Chef Assistant";
+			callsub L_Mark, F_Navi("Chef Assistant","amatsu,206,150","^8A2BE2");
 			viewpoint 1,206,150,5,0x8A2BE2;
 			viewpoint 1,206,150,5,0x8A2BE2;
 			break;
 			break;
 		case 7:
 		case 7:
-			callsub L_Mark,"^4B0082Ninja Guild Building";
+			callsub L_Mark, F_Navi("Ninja Guild Building","amatsu,148,137","^4B0082");
 			viewpoint 1,148,137,6,0x4B0082;
 			viewpoint 1,148,137,6,0x4B0082;
 			break;
 			break;
 		case 8:
 		case 8:
-			callsub L_Mark,"^00BFFFSea Captain";
+			callsub L_Mark, F_Navi("Sea Captain","amatsu,195,79","^00BFFF");
 			viewpoint 1,195,79,7,0x00BFFF;
 			viewpoint 1,195,79,7,0x00BFFF;
 			break;
 			break;
 		case 9:
 		case 9:
@@ -84,7 +86,7 @@ amatsu,202,91,3	script	Amatsu Guide#amatsu	758,{
 	end;
 	end;
 L_Mark:
 L_Mark:
 	mes "[Amachang]";
 	mes "[Amachang]";
-	mes "The "+getarg(0)+"^000000 is";
+	mes "The "+getarg(0)+" is";
 	mes "marked on your mini-map.";
 	mes "marked on your mini-map.";
 	mes "Is there anything else I can do for you?";
 	mes "Is there anything else I can do for you?";
 	return;
 	return;

+ 26 - 101
npc/re/guides/guides_ayothaya.txt

@@ -3,73 +3,79 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
-//= rAthena  SVN
+//= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
 //= [Official Conversion]
 //= [Official Conversion]
-//= Guide for the city of Ayothaya
+//= Guide for the city of Ayothaya.
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Renewal guide.
 //= 1.0 First version, Renewal guide.
 //= 1.1 Added missing case. [Joseph]
 //= 1.1 Added missing case. [Joseph]
+//= 1.2 Navigation system update. [Euphy]
 //============================================================ 
 //============================================================ 
 
 
 ayothaya,203,169,4	script	Ayothaya Guide Noi#01ay	839,{
 ayothaya,203,169,4	script	Ayothaya Guide Noi#01ay	839,{
-	mes "[Noi]";
+	if (strnpcinfo(0) == "Ayothaya Guide Noi#01ay")
+		set .@n$, "[Noi]";
+	else
+		set .@n$, "[Noa]";
+	mes .@n$;
 	mes "Hello~";
 	mes "Hello~";
 	mes "Welcome to ^8B4513Ayothaya^000000.";
 	mes "Welcome to ^8B4513Ayothaya^000000.";
 	mes "This town is linked to a river through the wild forest.";
 	mes "This town is linked to a river through the wild forest.";
 	mes "It's a really calm country.";
 	mes "It's a really calm country.";
 	mes "Take your time to look around.";
 	mes "Take your time to look around.";
+	F_Navi(.@n$);
 	while (1) {
 	while (1) {
 		next;
 		next;
 		switch(select("[ Weapon Shop ]:[ Tool Shop ]:[ Tavern ]:[ Shrine ]:[ Fishing Spot ]:[ Aibakthing ]:Remove Marks from Mini-Map:Cancel")) {
 		switch(select("[ Weapon Shop ]:[ Tool Shop ]:[ Tavern ]:[ Shrine ]:[ Fishing Spot ]:[ Aibakthing ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
 		case 1:
-			mes "[Noi]";
-			mes "The ^0000FFWeapon Shop^000000";
+			mes .@n$;
+			mes "The "+F_Navi("Weapon Shop","ayothaya,163,90","^0000FF");
 			mes "in Ayothaya has special weapons.";
 			mes "in Ayothaya has special weapons.";
 			mes "You can find great weapons there.";
 			mes "You can find great weapons there.";
 			mes "Is there anything else I can do for you?";
 			mes "Is there anything else I can do for you?";
 			viewpoint 1,163,90,0,0x0A82FF;
 			viewpoint 1,163,90,0,0x0A82FF;
 			break;
 			break;
 		case 2:
 		case 2:
-			mes "[Noi]";
-			mes "Our citizens purchase many products in the ^006400Tool Shop^000000.";
+			mes .@n$;
+			mes "Our citizens purchase many products in the "+F_Navi("Tool Shop","ayothaya,131,86","^006400")+".";
 			mes "Make sure you get all you need there.";
 			mes "Make sure you get all you need there.";
-			mes "Do you need anything else??";
+			mes "Do you need anything else?";
 			viewpoint 1,131,86,1,0xAAFF00;
 			viewpoint 1,131,86,1,0xAAFF00;
 			break;
 			break;
 		case 3:
 		case 3:
-			mes "[Noi]";
+			mes .@n$;
 			mes "Part of adventuring is collecting information.";
 			mes "Part of adventuring is collecting information.";
-			mes "The ^008080Tavern^000000 is crowded with lots of travelers where you can get useful information.";
+			mes "The "+F_Navi("Tavern","ayothaya,229,72","^008080")+" is crowded with lots of travelers where you can get useful information.";
 			mes "Is there anything else I can do for you?";
 			mes "Is there anything else I can do for you?";
 			viewpoint 1,229,72,2,0x008080;
 			viewpoint 1,229,72,2,0x008080;
 			break;
 			break;
 		case 4:
 		case 4:
-			mes "[Noi]";
-			mes "To calm your heart, go to the ^FF1493Shrine^000000 and say a prayer.";
+			mes .@n$;
+			mes "To calm your heart, go to the "+F_Navi("Shrine","ayothaya,208,280","^FF1493")+" and say a prayer.";
 			mes "Is there anything else I can do for you?";
 			mes "Is there anything else I can do for you?";
 			viewpoint 1,208,280,3,0xFF1493;
 			viewpoint 1,208,280,3,0xFF1493;
 			break;
 			break;
 		case 5:
 		case 5:
-			mes "[Noi]";
+			mes .@n$;
 			mes "Ayothaya is close to the beach, so most people enjoy fishing.";
 			mes "Ayothaya is close to the beach, so most people enjoy fishing.";
 			mes "They really love to fish.";
 			mes "They really love to fish.";
-			mes "Go ^8B4513fishing^000000 and try to grab a big fish.";
+			mes "Go "+F_Navi("fishing","ayothaya,255,99","^8B4513")+" and try to grab a big fish.";
 			mes "Is there anything else I can do for you?";
 			mes "Is there anything else I can do for you?";
 			viewpoint 1,255,99,4,0x8B4513;
 			viewpoint 1,255,99,4,0x8B4513;
 			break;
 			break;
 		case 6:
 		case 6:
-			mes "[Noi]";
+			mes .@n$;
 			mes "If you want to return home";
 			mes "If you want to return home";
-			mes "find ^00BFFFAibakthing^000000";
+			mes "find "+F_Navi("Aibakthing","ayothaya,151,68","^00BFFF");
 			mes "and ask him to send you back.";
 			mes "and ask him to send you back.";
 			mes "Is there anything else I can do for you?";
 			mes "Is there anything else I can do for you?";
 			viewpoint 1,151,68,5,0x00BFFF;
 			viewpoint 1,151,68,5,0x00BFFF;
 			break;
 			break;
 		case 7:
 		case 7:
-			mes "[Noi]";
+			mes .@n$;
 			mes "I'll remove all marks from your mini-map.";
 			mes "I'll remove all marks from your mini-map.";
 			mes "Do you need anything else??";
 			mes "Do you need anything else??";
 			viewpoint 2,1,1,0,0xFFFFFF;
 			viewpoint 2,1,1,0,0xFFFFFF;
@@ -80,91 +86,10 @@ ayothaya,203,169,4	script	Ayothaya Guide Noi#01ay	839,{
 			viewpoint 2,1,1,5,0xFFFFFF;
 			viewpoint 2,1,1,5,0xFFFFFF;
 			break;
 			break;
 		case 8:
 		case 8:
-			mes "[Noi]";
-			mes "Enjoy your trip~!";
-			close;
-		}
-	}
-}
-
-ayothaya,146,86,4	script	Ayothaya Guide Noa#01ay	839,{
-	mes "[Noa]";
-	mes "Hello~";
-	mes "Welcome to ^8B4513Ayothaya^000000.";
-	mes "This town is linked to a river through the wild forest.";
-	mes "It's a really calm country.";
-	mes "Take your time to look around.";
-	while (1) {
-		next;
-		switch(select("[ Kafra Employee ]:[ Weapon Shop ]:[ Tool Shop ]:[ Tavern ]:[ Shrine ]:[ Fishing Spot ]:[ Aibakthing ]:Remove Marks from Mini-Map:Cancel")) {
-		case 1:
-			mes "[Noa]";
-			mes "The ^0000FFKafra Employee^000000 is";
-			mes "marked on your mini-map.";
-			mes "Check your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,212,169,0,0x0A82FF;
-			break;
-		case 2:
-			mes "[Noa]";
-			mes "The ^0000FFWeapon Shop^000000";
-			mes "in Ayothaya has special weapons.";
-			mes "You can find great weapons there.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,163,90,1,0xAAFF00;
-			break;
-		case 3:
-			mes "[Noa]";
-			mes "Our citizens purchase many products in the ^006400Tool Shop^000000.";
-			mes "Make sure you get all you need there.";
-			mes "Do you need anything else??";
-			viewpoint 1,131,86,2,0x008080;
-			break;
-		case 4:
-			mes "[Noa]";
-			mes "Part of adventuring is collecting information.";
-			mes "The ^008080Tavern^000000 is crowded with lots of travelers where you can get useful information.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,229,72,3,0xFF1493;
-			break;
-		case 5:
-			mes "[Noa]";
-			mes "To calm your heart, go to the ^FF1493Shrine^000000 and say a prayer.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,208,280,4,0x8B4513;
-			break;
-		case 6:
-			mes "[Noa]";
-			mes "Ayothaya is close to the beach, so most people enjoy fishing.";
-			mes "They really love to fish.";
-			mes "Go ^8B4513fishing^000000 and try to grab a big fish.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,255,99,5,0x9400D3;
-			break;
-		case 7:
-			mes "[Noa]";
-			mes "If you want to return home";
-			mes "find ^00BFFFAibakthing^000000";
-			mes "and ask him to send you back.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 1,151,68,6,0x00BFFF;
-			break;
-		case 8:
-			mes "[Noa]";
-			mes "I'll remove all marks from your mini-map.";
-			mes "Do you need anything else??";
-			viewpoint 2,1,1,0,0xFFFFFF;
-			viewpoint 2,1,1,1,0xFFFFFF;
-			viewpoint 2,1,1,2,0xFFFFFF;
-			viewpoint 2,1,1,3,0xFFFFFF;
-			viewpoint 2,1,1,4,0xFFFFFF;
-			viewpoint 2,1,1,5,0xFFFFFF;
-			viewpoint 2,1,1,6,0xFFFFFF;
-			break;
-		case 9:
-			mes "[Noa]";
+			mes .@n$;
 			mes "Enjoy your trip~!";
 			mes "Enjoy your trip~!";
 			close;
 			close;
 		}
 		}
 	}
 	}
 }
 }
+ayothaya,146,86,4	duplicate(Ayothaya Guide Noi#01ay)	Ayothaya Guide Noa#02ay	839

+ 33 - 37
npc/re/guides/guides_brasilis.txt

@@ -3,79 +3,75 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
-//= rAthena  SVN
+//= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
 //= [Official Conversion]
 //= [Official Conversion]
-//= Guide for the city of Brasilis
+//= Guide for the city of Brasilis.
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First Version, Renewal guide.
 //= 1.0 First Version, Renewal guide.
 //= 1.1 Added a missing close.
 //= 1.1 Added a missing close.
+//= 1.2 Navigation system update. [Euphy]
 //============================================================ 
 //============================================================ 
 
 
 brasilis,219,97,3	script	Brasilis Guide	478,{
 brasilis,219,97,3	script	Brasilis Guide	478,{
 	mes "[Brasilis Guide]";
 	mes "[Brasilis Guide]";
 	mes "Welcome to ^8B4513Brasilis^000000, a country as passionate as the sun.";
 	mes "Welcome to ^8B4513Brasilis^000000, a country as passionate as the sun.";
 	mes "If you have any questions, please ask me.";
 	mes "If you have any questions, please ask me.";
+	F_Navi("[Brasilis Guide]");
 	next;
 	next;
-	mes "[Brasilis Guide]";
-	mes "Where can I guide you?";
-	while (1){
+	switch(select("Ask about locations:Remove Marks from Mini-Map:Cancel")) {
+	case 1:
+		mes "[Brasilis Guide]";
+		mes "Where can I guide you?";
 		next;
 		next;
-		switch(select("[ Hotel ]:[ Jungle Cable ]:[ Art Museum ]:[ Market ]:[ Verass Monument ]:Remove marks from Mini-Map:Cancel")) {
+		switch(select("[ Hotel ]:[ Jungle Cable ]:[ Art Museum ]:[ Market ]:[ Verass Monument ]")) {
 		case 1:
 		case 1:
 			mes "[Brasilis Guide]";
 			mes "[Brasilis Guide]";
-			mes "The Brasilis Hotel is located just above, ^FF3355+^000000.";
+			mes "The "+F_Navi("Brasilis Hotel","brasilis,274,151")+" is located just above, ^FF3355+^000000.";
 			mes "Is there anything else I can do for you?";
 			mes "Is there anything else I can do for you?";
 			viewpoint 1,274,151,2,0xFF3355;
 			viewpoint 1,274,151,2,0xFF3355;
-			next;
-			break;
+			close;
 		case 2:
 		case 2:
 			mes "[Brasilis Guide]";
 			mes "[Brasilis Guide]";
-			mes "Do you want to go through the rough jungle? You can take a Jungle Cable here ^CE6300+^000000.";
+			mes "Do you want to go through the rough jungle? You can take a ";
+			mes F_Navi("Jungle Cable","brasilis,308,335")+" here ^CE6300+^000000.";
 			mes "Is there anything else I can do for you?";
 			mes "Is there anything else I can do for you?";
 			viewpoint 1,308,335,3,0xCE6300;
 			viewpoint 1,308,335,3,0xCE6300;
-			next;
-			break;
+			close;
 		case 3:
 		case 3:
 			mes "[Brasilis Guide]";
 			mes "[Brasilis Guide]";
-			mes "The pride of Brasilis, the world scale Art Museum is at ^A5BAAD+^000000.";
+			mes "The pride of Brasilis, the world scale "+F_Navi("Art Museum","brasilis,137,167")+" is at ^A5BAAD+^000000.";
 			mes "Is there anything else I can do for you?";
 			mes "Is there anything else I can do for you?";
 			viewpoint 1,137,167,4,0x00FF00;
 			viewpoint 1,137,167,4,0x00FF00;
-			next;
-			break;
+			close;
 		case 4:
 		case 4:
 			mes "[Brasilis Guide]";
 			mes "[Brasilis Guide]";
-			mes "You can buy items for hunting at the Market here ^55FF33+^000000.";
+			mes "You can buy items for hunting at the "+F_Navi("Market","brasilis,254,248")+" here ^55FF33+^000000.";
 			mes "Is there anything else I can do for you?";
 			mes "Is there anything else I can do for you?";
 			viewpoint 1,254,248,5,0x55FF33;
 			viewpoint 1,254,248,5,0x55FF33;
-			next;
-			break;
+			close;
 		case 5:
 		case 5:
 			mes "[Brasilis Guide]";
 			mes "[Brasilis Guide]";
-			mes "The iconic monument of Brasilis, the Verass Monument stands at ^3355FF+^000000.";
+			mes "The iconic monument of Brasilis, the "+F_Navi("Verass Monument","brasilis,195,222")+" stands at ^3355FF+^000000.";
 			mes "Is there anything else I can do for you?";
 			mes "Is there anything else I can do for you?";
 			viewpoint 1,195,235,6,0x3355FF;
 			viewpoint 1,195,235,6,0x3355FF;
-			next;
-			break;
-		case 6:
-			mes "[Brasilis Guide]";
-			mes "I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 0,274,151,2,0x00FF00;
-			viewpoint 0,308,335,3,0x00FF00;
-			viewpoint 0,137,167,4,0x00FF00;
-			viewpoint 0,254,248,5,0x00FF00;
-			viewpoint 0,195,235,6,0x00FF00;
-			next;
-			break;
-		case 7:
-			mes "[Brasilis Guide]";
-			mes "Wandering on your own is always the best way to explore. Anyway, take care.";
 			close;
 			close;
 		}
 		}
+	case 2:
+		mes "[Brasilis Guide]";
+		mes "I'll remove all marks from your mini-map.";
+		mes "Is there anything else I can do for you?";
+		viewpoint 0,274,151,2,0x00FF00;
+		viewpoint 0,308,335,3,0x00FF00;
+		viewpoint 0,137,167,4,0x00FF00;
+		viewpoint 0,254,248,5,0x00FF00;
+		viewpoint 0,195,235,6,0x00FF00;
+		close;
+	case 3:
+		mes "[Brasilis Guide]";
+		mes "Wandering on your own is always the best way to explore. Anyway, take care.";
 		close;
 		close;
-		break;
 	}
 	}
 }
 }

+ 23 - 18
npc/re/guides/guides_comodo.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Renewal guide.
 //= 1.0 First version, Renewal guide.
 //= 1.1 Fixed and optimized. [Euphy]
 //= 1.1 Fixed and optimized. [Euphy]
+//= 1.2 Navigation system update. [Euphy]
 //============================================================ 
 //============================================================ 
 
 
 comodo,322,178,4	script	Comodo Guide#01comodo::GuideComodo	700,{
 comodo,322,178,4	script	Comodo Guide#01comodo::GuideComodo	700,{
@@ -19,6 +20,7 @@ comodo,322,178,4	script	Comodo Guide#01comodo::GuideComodo	700,{
 	mes "Welcome to ^8B4513Comodo^000000,";
 	mes "Welcome to ^8B4513Comodo^000000,";
 	mes "the Beach Town of the Rune-Midgarts Kingdom.";
 	mes "the Beach Town of the Rune-Midgarts Kingdom.";
 	mes "Do you need help navigating the town?";
 	mes "Do you need help navigating the town?";
+	F_Navi("[Comodo Guide]");
 	next;
 	next;
 	while (1) {
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel:About ^8B4513Comodo^000000")) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel:About ^8B4513Comodo^000000")) {
@@ -27,57 +29,61 @@ comodo,322,178,4	script	Comodo Guide#01comodo::GuideComodo	700,{
 			while (.@loop) {
 			while (.@loop) {
 				switch(select("[ Tavern ]:[ Casino ]:[ Weapon & Armor Shop ]:[ Tool Shop ]:[ Campsite ]:[ Souvenir Vendor ]:[ East Cave Mao ]:[ West Cave Karu ]:[ North Cave Ruanda ]:[ Hula Dance Stage ]:[ Kafra Co. Western Branch ]:Previous Menu")) {
 				switch(select("[ Tavern ]:[ Casino ]:[ Weapon & Armor Shop ]:[ Tool Shop ]:[ Campsite ]:[ Souvenir Vendor ]:[ East Cave Mao ]:[ West Cave Karu ]:[ North Cave Ruanda ]:[ Hula Dance Stage ]:[ Kafra Co. Western Branch ]:Previous Menu")) {
 				case 1:
 				case 1:
-					callsub L_Mark,"^FF0000Tavern";
+					callsub L_Mark, F_Navi("Tavern","comodo,161,315","^FF0000");
 					viewpoint 1,166,298,0,0xFF0000;
 					viewpoint 1,166,298,0,0xFF0000;
 					next;
 					next;
 					break;
 					break;
 				case 2:
 				case 2:
-					callsub L_Mark,"^FFA500Casino";
+					callsub L_Mark, F_Navi("Casino","comodo,140,111","^FFA500");
 					viewpoint 1,140,98,1,0xFFA500;
 					viewpoint 1,140,98,1,0xFFA500;
 					next;
 					next;
 					break;
 					break;
 				case 3:
 				case 3:
-					callsub L_Mark,"^FF4500Weapon & Armor Shop";
+					callsub L_Mark, F_Navi("Weapon & Armor Shop","comodo,266,74","^FF4500");
 					viewpoint 1,266,70,2,0xFF4500;
 					viewpoint 1,266,70,2,0xFF4500;
 					next;
 					next;
 					break;
 					break;
 				case 4:
 				case 4:
-					callsub L_Mark,"^B8860BTool Shop";
+					callsub L_Mark, F_Navi("Tool Shop","comodo,92,128","^B8860B");
 					viewpoint 1,86,128,3,0xB8860B;
 					viewpoint 1,86,128,3,0xB8860B;
 					next;
 					next;
 					break;
 					break;
 				case 5:
 				case 5:
-					callsub L_Mark,"^32CD32Campsite";
+					callsub L_Mark, F_Navi("Campsite","comodo,209,308","^32CD32");
 					viewpoint 1,210,308,4,0x32CD32;
 					viewpoint 1,210,308,4,0x32CD32;
 					next;
 					next;
 					break;
 					break;
 				case 6:
 				case 6:
-					callsub L_Mark,"^6B8E23Souvenir Vendor";
+					callsub L_Mark, F_Navi("Souvenir Vendor","comodo,293,125","^6B8E23");
 					viewpoint 1,298,124,5,0x6B8E23;
 					viewpoint 1,298,124,5,0x6B8E23;
 					next;
 					next;
 					break;
 					break;
 				case 7:
 				case 7:
-					callsub L_Mark,"^008B8BEast Cave Mao",1;
+					callsub L_Mark, F_Navi("East Cave Mao","comodo,333,175","^008B8B");
 					viewpoint 1,333,175,6,0x008B8B;
 					viewpoint 1,333,175,6,0x008B8B;
 					next;
 					next;
 					break;
 					break;
 				case 8:
 				case 8:
-					callsub L_Mark,"^1E90FFWest Cave Karu",1;
+					callsub L_Mark, F_Navi("West Cave Karu","comodo,24,214","^1E90FF");
 					viewpoint 1,24,214,7,0x1E90FF;
 					viewpoint 1,24,214,7,0x1E90FF;
 					next;
 					next;
 					break;
 					break;
 				case 9:
 				case 9:
-					callsub L_Mark,"^0000CDNorth Cave Ruanda",1;
+					callsub L_Mark, F_Navi("North Cave Ruanda","comodo,176,358","^0000CD");
 					viewpoint 1,176,358,8,0x0000CD;
 					viewpoint 1,176,358,8,0x0000CD;
 					next;
 					next;
 					break;
 					break;
 				case 10:
 				case 10:
-					callsub L_Mark,"^C71585Hula Dance Stage";
+					callsub L_Mark, F_Navi("Hula Dance Stage","comodo,188,168","^C71585");
 					viewpoint 1,188,168,9,0xC71585;
 					viewpoint 1,188,168,9,0xC71585;
 					next;
 					next;
 					break;
 					break;
 				case 11:
 				case 11:
-					callsub L_Mark,"^DB7093Kafra Corporation Western Branch";
+					mes "[Comodo Guide]";
+					mes "Let me mark the location of the";
+					mes F_Navi("Kafra Corporation Western Branch","comodo,131,195","^DB7093");
+					mes "on your mini-map.";
+					mes "Would you like to check any other locations?";
 					viewpoint 1,136,202,10,0xDB7093;
 					viewpoint 1,136,202,10,0xDB7093;
 					next;
 					next;
 					break;
 					break;
@@ -92,26 +98,26 @@ comodo,322,178,4	script	Comodo Guide#01comodo::GuideComodo	700,{
 			while (.@loop) {
 			while (.@loop) {
 				switch(select("[ Chief's House ]:[ Bor Robin ]:[ Kafra Employee ]:[ Roaming Bard ]:Previous Menu")) {
 				switch(select("[ Chief's House ]:[ Bor Robin ]:[ Kafra Employee ]:[ Roaming Bard ]:Previous Menu")) {
 				case 1:
 				case 1:
-					callsub L_Mark,"^6495EDChief's House";
+					callsub L_Mark, F_Navi("Chief's House","comodo,115,290","^6495ED");
 					viewpoint 1,114,294,11,0x6495ED;
 					viewpoint 1,114,294,11,0x6495ED;
 					next;
 					next;
 					break;
 					break;
 				case 2:
 				case 2:
 					mes "[Comodo Guide]";
 					mes "[Comodo Guide]";
-					mes "^228B22Bor Robin^000000";
+					mes F_Navi("Bor Robin","comodo,193,151","^228B22");
 					mes "helps adventurers to become ^228B22Dancers^000000.";
 					mes "helps adventurers to become ^228B22Dancers^000000.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,193,151,12,0x228B22;
 					viewpoint 1,193,151,12,0x228B22;
 					next;
 					next;
 					break;
 					break;
 				case 3:
 				case 3:
-					callsub L_Mark,"^1E90FFKafra Employee";
+					callsub L_Mark,"^1E90FFKafra Employee^000000";
 					viewpoint 1,195,149,13,0x1E90FF;
 					viewpoint 1,195,149,13,0x1E90FF;
 					next;
 					next;
 					break;
 					break;
 				case 4:
 				case 4:
 					mes "[Comodo Guide]";
 					mes "[Comodo Guide]";
-					mes "The ^DB7093Roaming Bard^000000";
+					mes "The "+F_Navi("Roaming Bard","comodo,211,155","^DB7093");
 					mes "helps adventurers to become ^DB7093Bards^000000.";
 					mes "helps adventurers to become ^DB7093Bards^000000.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,211,155,14,0xDB7093;
 					viewpoint 1,211,155,14,0xDB7093;
@@ -167,12 +173,11 @@ comodo,322,178,4	script	Comodo Guide#01comodo::GuideComodo	700,{
 L_Mark:
 L_Mark:
 	mes "[Comodo Guide]";
 	mes "[Comodo Guide]";
 	mes "Let me mark the location of";
 	mes "Let me mark the location of";
-	mes ((getarg(1,0))?"":"the ")+getarg(0)+"^000000";
+	mes "the "+getarg(0);
 	mes "on your mini-map.";
 	mes "on your mini-map.";
 	mes "Would you like to check any other locations?";
 	mes "Would you like to check any other locations?";
 	return;
 	return;
 }
 }
-
 comodo,181,347,4	duplicate(GuideComodo)	Comodo Guide#02comodo	700
 comodo,181,347,4	duplicate(GuideComodo)	Comodo Guide#02comodo	700
 comodo,197,149,3	duplicate(GuideComodo)	Comodo Guide#03comodo	700
 comodo,197,149,3	duplicate(GuideComodo)	Comodo Guide#03comodo	700
 comodo,37,219,4	duplicate(GuideComodo)	Comodo Guide#04comodo	700
 comodo,37,219,4	duplicate(GuideComodo)	Comodo Guide#04comodo	700

+ 49 - 56
npc/re/guides/guides_dewata.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= Muad_Dib
 //= Muad_Dib
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
@@ -11,6 +11,7 @@
 //= Guide for the city of Dewata.
 //= Guide for the city of Dewata.
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First version. [Lemongrass]
 //= 1.0 First version. [Lemongrass]
+//= 1.1 Navigation system update. [Euphy]
 //============================================================ 
 //============================================================ 
 
 
 dewata,202,106,4	script	Dewata Guide#dewata01	535,{
 dewata,202,106,4	script	Dewata Guide#dewata01	535,{
@@ -21,71 +22,63 @@ dewata,202,106,4	script	Dewata Guide#dewata01	535,{
 	next;
 	next;
 	mes "[Dewata Guide]";
 	mes "[Dewata Guide]";
 	mes "Where can I guide you?";
 	mes "Where can I guide you?";
+	F_Navi("[Dewata Guide]");
 	while (1) {
 	while (1) {
 		next;
 		next;
-		switch(select("[ Kafra Employee ]:[ Weapon Dealer ]:[ Armor Dealer ]:[ Tool Dealer ]:[ Krakatau Gatekeeper ]:[ Lodge Owner ]:[ Alberta Sailor ]:Remove marks from Mini-Map:Cancel")) {
-			case 1:
-				callsub L_Mark,"^0000FFKafra Employee";
-				viewpoint 1,202,184,0,0x000FFF;
-				break;
-
-			case 2:
-				callsub L_Mark,"^008080Armor Dealer";
-				viewpoint 1,218,163,1,0x008080;
-				break;
-
-			case 3:
-				callsub L_Mark,"^008080Weapon Dealer";
-				viewpoint 1,158,182,2,0x008080;
-				break;
-
-			case 4:
-				callsub L_Mark,"^FF1493Tool Dealer";
-				viewpoint 1,182,164,3,0xFF1493;
-				break;
-
-			case 5:
-				callsub L_Mark,"^FF1493Krakau Gatekeeper";
-				viewpoint 1,232,59,4,0xFF1493;
-				break;
-
-			case 6:
-				callsub L_Mark,"^8A2BE2Lodge Owner";
-				viewpoint 1,195,235,5,0x8A2BE2;
-				break;
-
-			case 7:
-				callsub L_Mark,"^00BFFFAlberta Sailor";
-				viewpoint 1,230,52,6,0x00BFFF;
-				break;
-
-			case 8:
-				mes "[Dewata Guide]";
-				mes "I'll remove all marks from your mini-map.";
-				mes "Is there anything else I can do for you?";
-				viewpoint 2,202,184,0,0xFFFFFF;
-				viewpoint 2,218,163,1,0xFFFFFF;
-				viewpoint 2,158,182,2,0xFFFFFF;
-				viewpoint 2,182,164,3,0xFFFFFF;
-				viewpoint 2,232,59,4,0xFFFFFF;
-				viewpoint 2,195,235,5,0xFFFFFF;
-				viewpoint 2,230,52,6,0xFFFFFF;
-				break;
-
-			case 9:
-				mes "[Dewata Guide]";
-				mes "Enjoy your trip!!";
-				close;
+		switch(select("[ Kafra Employee ]:[ Weapon Dealer ]:[ Armor Dealer ]:[ Tool Dealer ]:[ Restauranteur ]:[ Krakatau Gatekeeper ]:[ Alberta Sailor ]:Remove marks from Mini-Map:Cancel")) {
+		case 1:
+			callsub L_Mark, "^0000FFKafra Employee^000000";
+			viewpoint 1,202,184,0,0x000FFF;
+			break;
+		case 2:
+			callsub L_Mark, F_Navi("Weapon Dealer","dewata,218,164","^008080");
+			viewpoint 1,218,163,1,0x008080;
+			break;
+		case 3:
+			callsub L_Mark, F_Navi("Armor Dealer","dewata,158,182","^008080");
+			viewpoint 1,158,182,2,0x008080;
+			break;
+		case 4:
+			callsub L_Mark, F_Navi("Tool Dealer","dewata,182,164","^FF1493");
+			viewpoint 1,182,164,3,0xFF1493;
+			break;
+		case 5:
+			callsub L_Mark, F_Navi("Restauranteur","dewata,146,109","^FF1493");
+			viewpoint 1,146,109,4,0xFF1493;
+			break;
+		case 6:
+			callsub L_Mark, F_Navi("Krakau Gatekeeper","dewata,235,56","^8A2BE2");
+			viewpoint 1,235,56,5,0x8A2BE2;
+			break;
+		case 7:
+			callsub L_Mark, F_Navi("Alberta Sailor","dewata,229,49","^00BFFF");
+			viewpoint 1,229,49,6,0x00BFFF;
+			break;
+		case 8:
+			mes "[Dewata Guide]";
+			mes "I'll remove all marks from your mini-map.";
+			mes "Is there anything else I can do for you?";
+			viewpoint 2,202,184,0,0xFFFFFF;
+			viewpoint 2,218,163,1,0xFFFFFF;
+			viewpoint 2,158,182,2,0xFFFFFF;
+			viewpoint 2,182,164,3,0xFFFFFF;
+			viewpoint 2,232,59,4,0xFFFFFF;
+			viewpoint 2,195,235,5,0xFFFFFF;
+			viewpoint 2,230,52,6,0xFFFFFF;
+			break;
+		case 9:
+			mes "[Dewata Guide]";
+			mes "Enjoy your trip!!";
+			close;
 		}
 		}
 	}
 	}
 
 
 L_Mark:
 L_Mark:
 	mes "[Dewata Guide]";
 	mes "[Dewata Guide]";
-	mes "The "+getarg(0)+"^000000 is";
+	mes "The "+getarg(0)+" is";
 	mes "marked on your mini-map.";
 	mes "marked on your mini-map.";
 	mes "Check your mini-map.";
 	mes "Check your mini-map.";
 	mes "Is there anything else I can do for you?";
 	mes "Is there anything else I can do for you?";
 	return;
 	return;
 }
 }
-
 dewata,197,184,4	duplicate(Dewata Guide#dewata01)	Dewata Guide#dewata02	535
 dewata,197,184,4	duplicate(Dewata Guide#dewata01)	Dewata Guide#dewata02	535

+ 20 - 16
npc/re/guides/guides_dicastes.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= Muad_Dib
 //= Muad_Dib
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First version. [Joseph]
 //= 1.0 First version. [Joseph]
 //= 1.1 Fixed viewpoint syntax. [Euphy]
 //= 1.1 Fixed viewpoint syntax. [Euphy]
+//= 1.2 Navigation system update. [Euphy]
 //============================================================ 
 //============================================================ 
 
 
 dicastes01,181,191,5	script	Traveler Ichack#info	481,2,2,{
 dicastes01,181,191,5	script	Traveler Ichack#info	481,2,2,{
@@ -25,6 +26,7 @@ dicastes01,181,191,5	script	Traveler Ichack#info	481,2,2,{
 	mes "[Traveler Ichack]";
 	mes "[Traveler Ichack]";
 	mes "That's why I will provide a service to guide adventurers from Rune-Midgard.";
 	mes "That's why I will provide a service to guide adventurers from Rune-Midgard.";
 	mes "What would you like to know?";
 	mes "What would you like to know?";
+	F_Navi("[Traveler Ichack]");
 	next;
 	next;
 	switch(select("Dicastes Diel:Residential Area:Training Room:Factory:Pub:Cat Hand Caravan")) {
 	switch(select("Dicastes Diel:Residential Area:Training Room:Factory:Pub:Cat Hand Caravan")) {
 	case 1:
 	case 1:
@@ -33,9 +35,9 @@ dicastes01,181,191,5	script	Traveler Ichack#info	481,2,2,{
 		mes "It's said they discuss important things...";
 		mes "It's said they discuss important things...";
 		next;
 		next;
 		mes "[Traveler Ichack]";
 		mes "[Traveler Ichack]";
-		mes "Please make sure you signed in at the dior, otherwise you'll get in trouble.";
+		mes "Please make sure you signed in at the "+F_Navi("Diel","dicastes01,198,351")+", otherwise you'll get in trouble.";
 		mes "Go directly north from here and you can't miss it.";
 		mes "Go directly north from here and you can't miss it.";
-		viewpoint 1,351,198,0,0x00FF00;
+		viewpoint 1,198,351,0,0x00FF00;
 		close;
 		close;
 	case 2:
 	case 2:
 		mes "[Traveler Ichack]";
 		mes "[Traveler Ichack]";
@@ -46,39 +48,41 @@ dicastes01,181,191,5	script	Traveler Ichack#info	481,2,2,{
 		mes "You won't believe me until you see it! Go see it for yourself!";
 		mes "You won't believe me until you see it! Go see it for yourself!";
 		next;
 		next;
 		mes "[Traveler Ichack]";
 		mes "[Traveler Ichack]";
-		mes "The residential area is divided into 2 area's.";
-		mes "The lower residential area is around 7 o'clock and, the upper area is around 1 o'clock.";
-		viewpoint 1,283,280,1,0x01FF01;
-		viewpoint 1,106,136,2,0x0066FF;
+		mes "The residential area is divided into 2 areas.";
+		mes "The "+F_Navi("lower residential area","dicastes01,136,106")+" is around 7 o'clock, and the ";
+		mes F_Navi("upper area","dicastes01,280,283")+" is around 1 o'clock.";
+		viewpoint 1,280,283,1,0x01FF01;
+		viewpoint 1,136,106,2,0x0066FF;
 		close;
 		close;
 	case 3:
 	case 3:
 		mes "[Traveler Ichack]";
 		mes "[Traveler Ichack]";
-		mes "Because of the dangers here, we need better security..";
-		mes "Have you ever been to the training room? The training guards seem to never sleep!";
-		viewpoint 1,172,255,3,0xFFCCCC;
+		mes "Because of the dangers here, we need better security...";
+		mes "Have you ever been to the ";
+		mes F_Navi("training room","dicastes01,255,172")+"? The training guards seem to never sleep!";
+		viewpoint 1,255,172,3,0xFFCCCC;
 		close;
 		close;
 	case 4:
 	case 4:
 		mes "[Traveler Ichack]";
 		mes "[Traveler Ichack]";
 		mes "This is one of the most important reasons why they live here.";
 		mes "This is one of the most important reasons why they live here.";
-		mes "If you go to factory, you can see the recently refined Bradium.";
-		viewpoint 1,256,97,4,0x0066FF;
+		mes "If you go to the "+F_Navi("factory","dicastes01,97,256")+", you can see the recently refined Bradium.";
+		viewpoint 1,97,256,4,0x0066FF;
 		close;
 		close;
 	case 5:
 	case 5:
 		mes "[Traveler Ichack]";
 		mes "[Traveler Ichack]";
 		mes "Although I arrived here as the first adventurer, the owner of the pub was the first person here.";
 		mes "Although I arrived here as the first adventurer, the owner of the pub was the first person here.";
-		mes "Bumen Florine's pub is located underground in the lower residential area.";
+		mes F_Navi("Bumen Florine's pub","dicastes01,136,106")+" is located underground in the lower residential area.";
 		mes "He might have some valuable information for you.";
 		mes "He might have some valuable information for you.";
-		viewpoint 1,106,136,5,0xFF3300;
+		viewpoint 1,136,106,5,0xFF3300;
 		close;
 		close;
 	case 6:
 	case 6:
 		mes "[Traveler Ichack]";
 		mes "[Traveler Ichack]";
-		mes "The cats seems that don't have good relationship with sapha same as us.";
+		mes "The "+F_Navi("cats","dicastes01,199,39")+" don't seem to have a good relationship with the Sapha like we do.";
 		mes "Perhaps it's because trading is involved.";
 		mes "Perhaps it's because trading is involved.";
 		mes "Poor cats. They must be shivering from the cold out there.";
 		mes "Poor cats. They must be shivering from the cold out there.";
 		next;
 		next;
 		mes "[Traveler Ichack]";
 		mes "[Traveler Ichack]";
 		mes "You can find their caravan just outside the gates.";
 		mes "You can find their caravan just outside the gates.";
-		viewpoint 1,39,199,6,0x9933FF;
+		viewpoint 1,199,39,6,0x9933FF;
 		close;
 		close;
 	}
 	}
 OnTouch:
 OnTouch:

+ 24 - 24
npc/re/guides/guides_einbroch.txt

@@ -1,16 +1,17 @@
 //===== rAthena Script ======================================= 
 //===== rAthena Script ======================================= 
-//= Einbroch, and Einbech Guides
+//= Einbroch and Einbech Guides
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
-//= rAthena  SVN
+//= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
 //= [Official Conversion]
 //= [Official Conversion]
-//= Guides for the city of Einbroch, and Einbech
+//= Guides for the cities of Einbroch and Einbech.
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
+//= 1.0 First version, Renewal guides.
+//= 1.1 Navigation system update. [Euphy]
 //============================================================ 
 //============================================================ 
 
 
 einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
@@ -21,6 +22,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 	mes "the City of Steel.";
 	mes "the City of Steel.";
 	mes "Please ask me if you";
 	mes "Please ask me if you";
 	mes "have any questions.";
 	mes "have any questions.";
+	F_Navi("[Einbroch Guide]");
 	next;
 	next;
 	while (1) {
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
@@ -30,7 +32,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 				switch(select("[ Airport ]:[ Factory ]:[ Plaza ]:[ Hotel ]:[ Train Station ]:[ Weapon Shop ]:[ Laboratory ]:[ Monument ]:[ Blacksmith Guild ]:[ Gunslinger Guild ]:Previous Menu")) {
 				switch(select("[ Airport ]:[ Factory ]:[ Plaza ]:[ Hotel ]:[ Train Station ]:[ Weapon Shop ]:[ Laboratory ]:[ Monument ]:[ Blacksmith Guild ]:[ Gunslinger Guild ]:Previous Menu")) {
 				case 1:
 				case 1:
 					mes "[Einbroch Guide]";
 					mes "[Einbroch Guide]";
-					mes "The ^FF0000Airport^000000 is located";
+					mes "The "+F_Navi("Airport","einbroch,64,204","^FF0000")+" is located";
 					mes "in the northwestern part";
 					mes "in the northwestern part";
 					mes "of the city. There you can";
 					mes "of the city. There you can";
 					mes "see our city's pride and joy, the Airship. Remember that you must pay admission to board the Airship.";
 					mes "see our city's pride and joy, the Airship. Remember that you must pay admission to board the Airship.";
@@ -39,7 +41,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 					break;
 					break;
 				case 2:
 				case 2:
 					mes "[Einbroch Guide]";
 					mes "[Einbroch Guide]";
-					mes "The Factory, perhaps the";
+					mes "The "+F_Navi("Factory","einbroch,129,79")+", perhaps the";
 					mes "most important facility in";
 					mes "most important facility in";
 					mes "Einbroch, is located in the";
 					mes "Einbroch, is located in the";
 					mes "southern part of the city.";
 					mes "southern part of the city.";
@@ -48,7 +50,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 					break;
 					break;
 				case 3:
 				case 3:
 					mes "[Einbroch Guide]";
 					mes "[Einbroch Guide]";
-					mes "The Plaza, our biggest";
+					mes "The "+F_Navi("Plaza","einbroch,129,79")+", our biggest";
 					mes "shopping district, can be";
 					mes "shopping district, can be";
 					mes "found just east from the";
 					mes "found just east from the";
 					mes "center of Einbroch.";
 					mes "center of Einbroch.";
@@ -57,7 +59,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 					break;
 					break;
 				case 4:
 				case 4:
 					mes "[Einbroch Guide]";
 					mes "[Einbroch Guide]";
-					mes "The Hotel is east of";
+					mes "The "+F_Navi("Hotel","einbroch,254,199")+" is east of";
 					mes "the Plaza and offers top";
 					mes "the Plaza and offers top";
 					mes "caliber accomodations.";
 					mes "caliber accomodations.";
 					mes "There, you can enjoy your";
 					mes "There, you can enjoy your";
@@ -67,7 +69,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 					break;
 					break;
 				case 5:
 				case 5:
 					mes "[Einbroch Guide]";
 					mes "[Einbroch Guide]";
-					mes "The Train Station is";
+					mes "The "+F_Navi("Train Station","einbroch,232,272")+" is";
 					mes "located in the northeast";
 					mes "located in the northeast";
 					mes "part of Einbroch. Trains";
 					mes "part of Einbroch. Trains";
 					mes "running between here";
 					mes "running between here";
@@ -78,7 +80,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 					break;
 					break;
 				case 6:
 				case 6:
 					mes "[Einbroch Guide]";
 					mes "[Einbroch Guide]";
-					mes "The Weapon Shop is";
+					mes "The "+F_Navi("Weapon Shop","einbroch,216,211")+" is";
 					mes "located north from the";
 					mes "located north from the";
 					mes "Plaza. There you can";
 					mes "Plaza. There you can";
 					mes "purchase weapons for";
 					mes "purchase weapons for";
@@ -88,7 +90,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 					break;
 					break;
 				case 7:
 				case 7:
 					mes "[Einbroch Guide]";
 					mes "[Einbroch Guide]";
-					mes "The Laboratory is an";
+					mes "The "+F_Navi("Laboratory","einbroch,55,52")+" is an";
 					mes "annex of the Factory and";
 					mes "annex of the Factory and";
 					mes "is located in the southwest";
 					mes "is located in the southwest";
 					mes "sector of Einbroch.";
 					mes "sector of Einbroch.";
@@ -98,7 +100,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 				case 8:
 				case 8:
 					mes "[Einbroch Guide]";
 					mes "[Einbroch Guide]";
 					mes "I will mark the location";
 					mes "I will mark the location";
-					mes "of the ^808080Monument^000000";
+					mes "of the "+F_Navi("Monument","einbroch,178,173","^808080");
 					mes "on your mini-map.";
 					mes "on your mini-map.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,178,173,7,0x808080;
 					viewpoint 1,178,173,7,0x808080;
@@ -106,7 +108,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 					break;
 					break;
 				case 9:
 				case 9:
 					mes "[Einbroch Guide]";
 					mes "[Einbroch Guide]";
-					mes "The Blacksmith Guild is";
+					mes "The "+F_Navi("Blacksmith Guild","einbroch,255,110")+" is";
 					mes "located in the southeast";
 					mes "located in the southeast";
 					mes "part of Einbroch. You can";
 					mes "part of Einbroch. You can";
 					mes "upgrade your equipment";
 					mes "upgrade your equipment";
@@ -117,7 +119,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 				case 10:
 				case 10:
 					mes "[Einbroch Guide]";
 					mes "[Einbroch Guide]";
 					mes "I will mark the location";
 					mes "I will mark the location";
-					mes "of the ^008080Gunslinger Guild^000000";
+					mes "of the "+F_Navi("Gunslinger Guild","einbroch,130,197","^008080");
 					mes "on your mini-map.";
 					mes "on your mini-map.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,130,197,9,0x008080;
 					viewpoint 1,130,197,9,0x008080;
@@ -142,7 +144,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 					next;
 					next;
 					mes "[Einbroch Guide]";
 					mes "[Einbroch Guide]";
 					mes "I will mark the location";
 					mes "I will mark the location";
-					mes "of the ^FF1493Armsmith^000000";
+					mes "of the "+F_Navi("Armsmith","einbroch,255,110","^FF1493");
 					mes "on your mini-map.";
 					mes "on your mini-map.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
 					next;
 					next;
@@ -166,7 +168,7 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 					next;
 					next;
 					mes "[Einbroch Guide]";
 					mes "[Einbroch Guide]";
 					mes "I will mark the location";
 					mes "I will mark the location";
-					mes "of the ^CD1039Eden Teleport Officer^000000";
+					mes "of the "+F_Navi("Eden Teleport Officer","einbroch,130,197","^CD1039");
 					mes "on your mini-map.";
 					mes "on your mini-map.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
 					next;
 					next;
@@ -206,7 +208,6 @@ einbroch,72,202,4	script	Einbroch Guide#ein01::GuideEinbroch	852,{
 		}
 		}
 	}
 	}
 }
 }
-
 einbroch,155,43,4	duplicate(GuideEinbroch)	Einbroch Guide#ein02	852
 einbroch,155,43,4	duplicate(GuideEinbroch)	Einbroch Guide#ein02	852
 einbroch,162,317,4	duplicate(GuideEinbroch)	Einbroch Guide#ein03	852
 einbroch,162,317,4	duplicate(GuideEinbroch)	Einbroch Guide#ein03	852
 einbroch,252,320,3	duplicate(GuideEinbroch)	Einbroch Guide#ein04	852
 einbroch,252,320,3	duplicate(GuideEinbroch)	Einbroch Guide#ein04	852
@@ -219,12 +220,13 @@ einbech,67,37,4	script	Einbech Guide#einbech01::GuideEinbech	852,{
 	mes "here to assist tourists,";
 	mes "here to assist tourists,";
 	mes "so if you have any questions,";
 	mes "so if you have any questions,";
 	mes "please feel free to ask us.";
 	mes "please feel free to ask us.";
+	F_Navi("[Einbech Guide]");
 	next;
 	next;
 	while (1) {
 	while (1) {
 		switch(select("[ Tavern ]:[ Tool Shop ]:[ Train Station ]:[ Mine ]:[ Kafra Employee ]:Remove Marks from Mini-Map:Cancel")) {
 		switch(select("[ Tavern ]:[ Tool Shop ]:[ Train Station ]:[ Mine ]:[ Kafra Employee ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
 		case 1:
 			mes "[Einbech Guide]";
 			mes "[Einbech Guide]";
-			mes "The Tavern is located";
+			mes "The "+F_Navi("Tavern","einbech,157,106")+" is located";
 			mes "in the southern part of";
 			mes "in the southern part of";
 			mes "Einbech. It's a nice place";
 			mes "Einbech. It's a nice place";
 			mes "to relax after a long day.";
 			mes "to relax after a long day.";
@@ -233,8 +235,7 @@ einbech,67,37,4	script	Einbech Guide#einbech01::GuideEinbech	852,{
 			break;
 			break;
 		case 2:
 		case 2:
 			mes "[Einbech Guide]";
 			mes "[Einbech Guide]";
-			mes "You can find the Tool";
-			mes "Shop in the center of";
+			mes "You can find the "+F_Navi("Tool Shop","einbech,177,133")+" in the center of";
 			mes "Einbech. There, you can";
 			mes "Einbech. There, you can";
 			mes "purchase any tools you";
 			mes "purchase any tools you";
 			mes "might need for your travels.";
 			mes "might need for your travels.";
@@ -243,7 +244,7 @@ einbech,67,37,4	script	Einbech Guide#einbech01::GuideEinbech	852,{
 			break;
 			break;
 		case 3:
 		case 3:
 			mes "[Einbech Guide]";
 			mes "[Einbech Guide]";
-			mes "The Train Stations are";
+			mes "The "+F_Navi("Train Stations","einbech,39,215")+" are";
 			mes "located in the northwest";
 			mes "located in the northwest";
 			mes "and northeast parts of";
 			mes "and northeast parts of";
 			mes "Einbech. There, you can";
 			mes "Einbech. There, you can";
@@ -253,7 +254,7 @@ einbech,67,37,4	script	Einbech Guide#einbech01::GuideEinbech	852,{
 			break;
 			break;
 		case 4:
 		case 4:
 			mes "[Einbech Guide]";
 			mes "[Einbech Guide]";
-			mes "The Mine, which is";
+			mes "The "+F_Navi("Mine","einbech,137,248")+", which is";
 			mes "Einbech's major industry,";
 			mes "Einbech's major industry,";
 			mes "is located in the northern";
 			mes "is located in the northern";
 			mes "part of this town. It's where";
 			mes "part of this town. It's where";
@@ -290,5 +291,4 @@ einbech,67,37,4	script	Einbech Guide#einbech01::GuideEinbech	852,{
 		}
 		}
 	}
 	}
 }
 }
-
 einbech,48,214,4	duplicate(GuideEinbech)	Einbech Guide#einbech02	852
 einbech,48,214,4	duplicate(GuideEinbech)	Einbech Guide#einbech02	852

+ 17 - 14
npc/re/guides/guides_geffen.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Renewal guide.
 //= 1.0 First version, Renewal guide.
 //= 1.1 Fixed and optimized. [Euphy]
 //= 1.1 Fixed and optimized. [Euphy]
+//= 1.2 Navigation system update. [Euphy]
 //============================================================ 
 //============================================================ 
 
 
 geffen,203,116,4	script	Guide#01geffen::GuideGeffen	705,{
 geffen,203,116,4	script	Guide#01geffen::GuideGeffen	705,{
@@ -20,6 +21,7 @@ geffen,203,116,4	script	Guide#01geffen::GuideGeffen	705,{
 	mes "Welcome to ^8B4513Geffen^000000,";
 	mes "Welcome to ^8B4513Geffen^000000,";
 	mes "the City of Magic.";
 	mes "the City of Magic.";
 	mes "Do you need help navigating the city?";
 	mes "Do you need help navigating the city?";
+	F_Navi("[Geffen Guide]");
 	next;
 	next;
 	while (1) {
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
@@ -29,7 +31,7 @@ geffen,203,116,4	script	Guide#01geffen::GuideGeffen	705,{
 				switch(select("[ Magic Academy ]:[ Geffen Tower ]:[ Fountain ]:[ Tool Shop ]:[ Buy & Repair Equipment ]:[ Inn ]:[ Tavern ]:[ Christopher's Forge ]:Previous Menu")) {
 				switch(select("[ Magic Academy ]:[ Geffen Tower ]:[ Fountain ]:[ Tool Shop ]:[ Buy & Repair Equipment ]:[ Inn ]:[ Tavern ]:[ Christopher's Forge ]:Previous Menu")) {
 				case 1:
 				case 1:
 					mes "[Geffen Guide]";
 					mes "[Geffen Guide]";
-					mes "The ^B9062FMagic Academy^000000";
+					mes "The "+F_Navi("Magic Academy","geffen,61,180","^B9062F");
 					mes "handles all magic-related affairs,";
 					mes "handles all magic-related affairs,";
 					mes "including job changes.";
 					mes "including job changes.";
 					mes "Let me mark its location";
 					mes "Let me mark its location";
@@ -39,23 +41,24 @@ geffen,203,116,4	script	Guide#01geffen::GuideGeffen	705,{
 					next;
 					next;
 					break;
 					break;
 				case 2:
 				case 2:
-					callsub L_Mark,"^0000FFGeffen Tower";
+					callsub L_Mark, F_Navi("Geffen Tower","geffen,120,114","^0000FF");
 					viewpoint 1,120,114,1,0x0000FF;
 					viewpoint 1,120,114,1,0x0000FF;
 					next;
 					next;
 					break;
 					break;
 				case 3:
 				case 3:
-					callsub L_Mark,"^FF5400Fountain";
+					callsub L_Mark, F_Navi("Fountain","geffen,126,48","^FF5400");
 					viewpoint 1,126,48,2,0xFFB400;
 					viewpoint 1,126,48,2,0xFFB400;
 					next;
 					next;
 					break;
 					break;
 				case 4:
 				case 4:
-					callsub L_Mark,"^006400Tool Shop";
+					callsub L_Mark, F_Navi("Tool Shop","geffen,44,86","^006400");
 					viewpoint 1,44,86,3,0xAAFF00;
 					viewpoint 1,44,86,3,0xAAFF00;
 					next;
 					next;
 					break;
 					break;
 				case 5:
 				case 5:
 					mes "[Geffen Guide]";
 					mes "[Geffen Guide]";
-					mes "If you'd like to ^7F3300Buy or Repair Equipment^000000";
+					mes "If you'd like to ";
+					mes F_Navi("Buy or Repair Equipment","geffen,99,140","^7F3300");
 					mes "then this is the place you'll want to visit.";
 					mes "then this is the place you'll want to visit.";
 					mes "Let me mark its location";
 					mes "Let me mark its location";
 					mes "on your mini-map.";
 					mes "on your mini-map.";
@@ -64,18 +67,18 @@ geffen,203,116,4	script	Guide#01geffen::GuideGeffen	705,{
 					next;
 					next;
 					break;
 					break;
 				case 6:
 				case 6:
-					callsub L_Mark,"^800080Inn";
+					callsub L_Mark, F_Navi("Inn","geffen,172,174","^800080");
 					viewpoint 1,172,174,5,0xDA70D6;
 					viewpoint 1,172,174,5,0xDA70D6;
 					next;
 					next;
 					break;
 					break;
 				case 7:
 				case 7:
-					callsub L_Mark,"^B9062FTavern";
+					callsub L_Mark, F_Navi("Tavern","geffen,138,138","^B9062F");
 					viewpoint 1,138,138,6,0xFF0000;
 					viewpoint 1,138,138,6,0xFF0000;
 					next;
 					next;
 					break;
 					break;
 				case 8:
 				case 8:
 					mes "[Geffen Guide]";
 					mes "[Geffen Guide]";
-					mes "^0000FFChristopher's Forge^000000 is";
+					mes F_Navi("Christopher's Forge","geffen,182,59","^0000FF")+" is";
 					mes "where you can purchase";
 					mes "where you can purchase";
 					mes "Refining materials.";
 					mes "Refining materials.";
 					mes "It used to be the old Blacksmith Guild.";
 					mes "It used to be the old Blacksmith Guild.";
@@ -93,29 +96,29 @@ geffen,203,116,4	script	Guide#01geffen::GuideGeffen	705,{
 			while (.@loop) {
 			while (.@loop) {
 				switch(select("[ Eden Teleport Officer ]:[ Kafra Employee ]:[ Pet Groomer ]:[ Chef Assistant ]:[ Dimensional Arcanist Guide ]:Previous Menu")) {
 				switch(select("[ Eden Teleport Officer ]:[ Kafra Employee ]:[ Pet Groomer ]:[ Chef Assistant ]:[ Dimensional Arcanist Guide ]:Previous Menu")) {
 				case 1:
 				case 1:
-					callsub L_Mark,"^B9062FEden Teleport Officers";
+					callsub L_Mark, F_Navi("Eden Teleport Officers","geffen,132,66","^B9062F");
 					viewpoint 1,61,180,7,0xFF0000;
 					viewpoint 1,61,180,7,0xFF0000;
 					viewpoint 1,132,66,8,0xFF0000;
 					viewpoint 1,132,66,8,0xFF0000;
 					next;
 					next;
 					break;
 					break;
 				case 2:
 				case 2:
-					callsub L_Mark,"^FF5400Kafra Employees";
+					callsub L_Mark, "^FF5400Kafra Employees^000000";
 					viewpoint 1,203,123,10,0xFFB400;
 					viewpoint 1,203,123,10,0xFFB400;
 					viewpoint 1,120,62,11,0xFFB400;
 					viewpoint 1,120,62,11,0xFFB400;
 					next;
 					next;
 					break;
 					break;
 				case 3:
 				case 3:
-					callsub L_Mark,"^006400Pet Groomer";
+					callsub L_Mark, F_Navi("Pet Groomer","geffen,193,152","^006400");
 					viewpoint 1,193,152,12,0xAAFF00;
 					viewpoint 1,193,152,12,0xAAFF00;
 					next;
 					next;
 					break;
 					break;
 				case 4:
 				case 4:
-					callsub L_Mark,"^7F3300Chef Assistant";
+					callsub L_Mark, F_Navi("Chef Assistant","geffen,196,111","^7F3300");
 					viewpoint 1,196,111,13,0xD2691E;
 					viewpoint 1,196,111,13,0xD2691E;
 					next;
 					next;
 					break;
 					break;
 				case 5:
 				case 5:
-					callsub L_Mark,"^800080Dimensional Arcanist Guide";
+					callsub L_Mark, F_Navi("Dimensional Arcanist Guide","geffen,140,196","^800080");
 					viewpoint 1,140,196,14,0xDA70D6;
 					viewpoint 1,140,196,14,0xDA70D6;
 					next;
 					next;
 					break;
 					break;

+ 11 - 9
npc/re/guides/guides_gonryun.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Renewal guide.
 //= 1.0 First version, Renewal guide.
 //= 1.1 Optimized. [Euphy]
 //= 1.1 Optimized. [Euphy]
+//= 1.2 Navigation system update. [Euphy]
 //============================================================ 
 //============================================================ 
 
 
 gonryun,163,60,4	script	Kunlun Guide#01gonryun	780,{
 gonryun,163,60,4	script	Kunlun Guide#01gonryun	780,{
@@ -26,35 +27,36 @@ gonryun,163,60,4	script	Kunlun Guide#01gonryun	780,{
 	mes "I am responsible for helping you";
 	mes "I am responsible for helping you";
 	mes "with any questions you may have.";
 	mes "with any questions you may have.";
 	mes "Please feel free to ask me anything.";
 	mes "Please feel free to ask me anything.";
+	F_Navi("[He Yuen Zhe]");
 	while (1) {
 	while (1) {
 		next;
 		next;
 		switch(select("[ Kafra Employee ]:[ Chief's Residence ]:[ Tool Dealer ]:[ Weapon Dealer ]:[ Armor Dealer ]:[ Wine Maker ]:[ Kunlun Envoy ]:Remove Marks from Mini-Map:Cancel")) {
 		switch(select("[ Kafra Employee ]:[ Chief's Residence ]:[ Tool Dealer ]:[ Weapon Dealer ]:[ Armor Dealer ]:[ Wine Maker ]:[ Kunlun Envoy ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
 		case 1:
-			callsub L_Mark,"^0000FFKafra Employee";
+			callsub L_Mark, "^0000FFKafra Employee^000000";
 			viewpoint 1,159,122,0,0x0A82FF;
 			viewpoint 1,159,122,0,0x0A82FF;
 			break;
 			break;
 		case 2:
 		case 2:
-			callsub L_Mark,"^006400Chief's Residence";
+			callsub L_Mark, F_Navi("Chief's Residence","gonryun,110,131","^006400");
 			viewpoint 1,110,131,1,0xAAFF00;
 			viewpoint 1,110,131,1,0xAAFF00;
 			break;
 			break;
 		case 3:
 		case 3:
-			callsub L_Mark,"^D8BFD8Tool Dealer";
+			callsub L_Mark, F_Navi("Tool Dealer","gonryun,147,84","^D8BFD8");
 			viewpoint 1,147,84,2,0xD8BFD8;
 			viewpoint 1,147,84,2,0xD8BFD8;
 			break;
 			break;
 		case 4:
 		case 4:
-			callsub L_Mark,"^FF1493Weapon Dealer";
+			callsub L_Mark, F_Navi("Weapon Dealer","gonryun,174,101","^FF1493");
 			viewpoint 1,174,101,3,0xFF1493;
 			viewpoint 1,174,101,3,0xFF1493;
 			break;
 			break;
 		case 5:
 		case 5:
-			callsub L_Mark,"^8B4513Armor Dealer";
+			callsub L_Mark, F_Navi("Armor Dealer","gonryun,173,84","^8B4513");
 			viewpoint 1,173,84,4,0x8B4513;
 			viewpoint 1,173,84,4,0x8B4513;
 			break;
 			break;
 		case 6:
 		case 6:
-			callsub L_Mark,"^9400DWine Maker";
+			callsub L_Mark, F_Navi("Wine Maker","gonryun,213,115","^9400D3");
 			viewpoint 1,213,115,5,0x9400D3;
 			viewpoint 1,213,115,5,0x9400D3;
 			break;
 			break;
 		case 7:
 		case 7:
-			callsub L_Mark,"^00BFFFKunlun Envoy";
+			callsub L_Mark, F_Navi("Kunlun Envoy","gonryun,161,11","^00BFFF");
 			viewpoint 1,161,11,6,0x00BFFF;
 			viewpoint 1,161,11,6,0x00BFFF;
 			break;
 			break;
 		case 8:
 		case 8:
@@ -78,7 +80,7 @@ gonryun,163,60,4	script	Kunlun Guide#01gonryun	780,{
 	end;
 	end;
 L_Mark:
 L_Mark:
 	mes "[He Yuen Zhe]";
 	mes "[He Yuen Zhe]";
-	mes "The "+getarg(0)+"^000000 is";
+	mes "The "+getarg(0)+" is";
 	mes "marked on your mini-map.";
 	mes "marked on your mini-map.";
 	mes "Check your mini-map.";
 	mes "Check your mini-map.";
 	mes "Is there anything else I can do for you?";
 	mes "Is there anything else I can do for you?";

+ 29 - 25
npc/re/guides/guides_hugel.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Renewal guide.
 //= 1.0 First version, Renewal guide.
 //= 1.1 Optimized. [Euphy]
 //= 1.1 Optimized. [Euphy]
+//= 1.2 Navigation system update. [Euphy]
 //============================================================ 
 //============================================================ 
 
 
 hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
@@ -19,6 +20,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 	mes "Oh, hello~ you are one energetic adventurer.";
 	mes "Oh, hello~ you are one energetic adventurer.";
 	mes "Welcome to ^8B4513Hugel^000000. I am honored to guide you in this beautiful village.";
 	mes "Welcome to ^8B4513Hugel^000000. I am honored to guide you in this beautiful village.";
 	mes "If this is the first time for you to use the guide services, you should ask a lot of questions.";
 	mes "If this is the first time for you to use the guide services, you should ask a lot of questions.";
+	F_Navi("[Hugel Guide Granny]");
 	next;
 	next;
 	set .@str$,"Would you like to know more locations?";
 	set .@str$,"Would you like to know more locations?";
 	while (1) {
 	while (1) {
@@ -29,7 +31,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 				switch(select("[ Church ]:[ Inn ]:[ Pub ]:[ Airport ]:[ Weapon Shop ]:[ Tool Shop ]:[ Bingo Game Room ]:[ ^3131FFHunter Guild^000000 ]:[ Party Supplies Shop ]:[ ^3131FFShrine Expedition^000000 ]:Previous Menu")) {
 				switch(select("[ Church ]:[ Inn ]:[ Pub ]:[ Airport ]:[ Weapon Shop ]:[ Tool Shop ]:[ Bingo Game Room ]:[ ^3131FFHunter Guild^000000 ]:[ Party Supplies Shop ]:[ ^3131FFShrine Expedition^000000 ]:Previous Menu")) {
 				case 1:
 				case 1:
 					mes "[Hugel Guide Granny]";
 					mes "[Hugel Guide Granny]";
-					mes "Well, to me, this Church is rather like a place for old folks like me, you know...";
+					mes "Well, to me, this "+F_Navi("Church","hugel,159,113")+" is rather like a place for old folks like me, you know...";
 					mes .@str$;
 					mes .@str$;
 					viewpoint 1,159,113,0,0xFF0000;
 					viewpoint 1,159,113,0,0xFF0000;
 					next;
 					next;
@@ -37,14 +39,14 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 				case 2:
 				case 2:
 					mes "[Hugel Guide Granny]";
 					mes "[Hugel Guide Granny]";
 					mes "Pudding rather than praise.";
 					mes "Pudding rather than praise.";
-					mes "You'd better unpack your stuff first before you start looking around this village.";
+					mes "You'd better unpack your stuff at the "+F_Navi("Inn","hugel,101,77")+" first before you start looking around this village.";
 					mes .@str$;
 					mes .@str$;
 					viewpoint 1,101,77,1,0x8B4513;
 					viewpoint 1,101,77,1,0x8B4513;
 					next;
 					next;
 					break;
 					break;
 				case 3:
 				case 3:
 					mes "[Hugel Guide Granny]";
 					mes "[Hugel Guide Granny]";
-					mes "Yes, when you travel, you want to drop by a Pub and make new friends.";
+					mes "Yes, when you travel, you want to drop by a "+F_Navi("Pub","hugel,126,65")+" and make new friends.";
 					mes "Go east from here, then you will arrive at the pub.";
 					mes "Go east from here, then you will arrive at the pub.";
 					mes .@str$;
 					mes .@str$;
 					viewpoint 1,126,65,2,0xDAA520;
 					viewpoint 1,126,65,2,0xDAA520;
@@ -52,7 +54,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 					break;
 					break;
 				case 4:
 				case 4:
 					mes "[Hugel Guide Granny]";
 					mes "[Hugel Guide Granny]";
-					mes "A while ago, strangers came to the village and built that strange Airport kind of thing...";
+					mes "A while ago, strangers came to the village and built that strange "+F_Navi("Airport","hugel,178,146")+" kind of thing...";
 					mes "What do they call it? Airship?";
 					mes "What do they call it? Airship?";
 					mes .@str$;
 					mes .@str$;
 					viewpoint 1,178,146,3,0xD7567F;
 					viewpoint 1,178,146,3,0xD7567F;
@@ -60,7 +62,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 					break;
 					break;
 				case 5:
 				case 5:
 					mes "[Hugel Guide Granny]";
 					mes "[Hugel Guide Granny]";
-					mes "Well, we have a Weapon Shop in the center of the village.";
+					mes "Well, we have a "+F_Navi("Weapon Shop","hugel,88,167")+" in the center of the village.";
 					mes "But I don't know if there is any weapon that you find useful.";
 					mes "But I don't know if there is any weapon that you find useful.";
 					mes .@str$;
 					mes .@str$;
 					viewpoint 1,88,167,4,0xCD5C5C;
 					viewpoint 1,88,167,4,0xCD5C5C;
@@ -69,7 +71,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 				case 6:
 				case 6:
 					mes "[Hugel Guide Granny]";
 					mes "[Hugel Guide Granny]";
 					mes "Yes, I love Hugel brand Red Potions. I haven't tasted Red Potions from any other brands yet...hohoho. ";
 					mes "Yes, I love Hugel brand Red Potions. I haven't tasted Red Potions from any other brands yet...hohoho. ";
-					mes "The tool shop is located in the center of village.";
+					mes "The "+F_Navi("Tool Shop","hugel,92,163")+" is located in the center of village.";
 					mes .@str$;
 					mes .@str$;
 					viewpoint 1,92,163,5,0x000080;
 					viewpoint 1,92,163,5,0x000080;
 					next;
 					next;
@@ -77,7 +79,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 				case 7:
 				case 7:
 					mes "[Hugel Guide Granny]";
 					mes "[Hugel Guide Granny]";
 					mes "I will mark the location";
 					mes "I will mark the location";
-					mes "of the ^800080Bingo Game Room^000000";
+					mes "of the "+F_Navi("Bingo Game Room","hugel,58,206","^800080");
 					mes "on your mini-map.";
 					mes "on your mini-map.";
 					mes .@str$;
 					mes .@str$;
 					viewpoint 1,58,206,6,0x800080;
 					viewpoint 1,58,206,6,0x800080;
@@ -86,7 +88,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 				case 8:
 				case 8:
 					mes "[Hugel Guide Granny]";
 					mes "[Hugel Guide Granny]";
 					mes "Oh, are you an aspiring Hunter?";
 					mes "Oh, are you an aspiring Hunter?";
-					mes "Then head northeast following the beach, then you will find the Hunter Guild.";
+					mes "Then head northeast following the beach, then you will find the "+F_Navi("Hunter Guild","hugel,209,224")+".";
 					mes .@str$;
 					mes .@str$;
 					viewpoint 1,209,224,7,0xFF1493;
 					viewpoint 1,209,224,7,0xFF1493;
 					next;
 					next;
@@ -94,7 +96,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 				case 9:
 				case 9:
 					mes "[Hugel Guide Granny]";
 					mes "[Hugel Guide Granny]";
 					mes "I will mark the location";
 					mes "I will mark the location";
-					mes "of the ^483D8BParty Supplies Shop^000000";
+					mes "of the "+F_Navi("Party Supplies Shop","hugel,95,103","^483D8B");
 					mes "on your mini-map.";
 					mes "on your mini-map.";
 					mes .@str$;
 					mes .@str$;
 					viewpoint 1,95,103,8,0x483D8B;
 					viewpoint 1,95,103,8,0x483D8B;
@@ -102,7 +104,8 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 					break;
 					break;
 				case 10:
 				case 10:
 					mes "[Hugel Guide Granny]";
 					mes "[Hugel Guide Granny]";
-					mes "I heard that the Shrine Expedition is staying in a house at the west.";
+					mes "I heard that the ";
+					mes F_Navi("Shrine Expedition","hugel,52,95")+" is staying in a house at the west.";
 					mes "They have put some kind of sign in the middle of village, so I guess that they are hiring people for something...";
 					mes "They have put some kind of sign in the middle of village, so I guess that they are hiring people for something...";
 					mes "I wonder what they are doing in here... hmmm.";
 					mes "I wonder what they are doing in here... hmmm.";
 					mes .@str$;
 					mes .@str$;
@@ -170,7 +173,7 @@ hugel,98,56,3	script	Hugel Guide Granny#hugel	863,{
 }
 }
 
 
 hugel,187,172,6	script	Guide Rich King#hugel	414,{
 hugel,187,172,6	script	Guide Rich King#hugel	414,{
-	mes "[Guide Rich King]";
+	mes "[Rich King]";
 	mes "What business do you have";
 	mes "What business do you have";
 	mes "in this countryside village?";
 	mes "in this countryside village?";
 	next;
 	next;
@@ -178,6 +181,7 @@ hugel,187,172,6	script	Guide Rich King#hugel	414,{
 	mes "This is ^8B4513Hugel^000000";
 	mes "This is ^8B4513Hugel^000000";
 	mes "in the Schwaltzvalt Republic.";
 	mes "in the Schwaltzvalt Republic.";
 	mes "You are very honored to receive guidance from a great person like me.";
 	mes "You are very honored to receive guidance from a great person like me.";
+	F_Navi("[Rich King]");
 	next;
 	next;
 	while (1) {
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
@@ -186,52 +190,52 @@ hugel,187,172,6	script	Guide Rich King#hugel	414,{
 			while (.@loop) {
 			while (.@loop) {
 				switch(select("[ Church ]:[ Inn ]:[ Pub ]:[ Airport ]:[ Weapon Shop ]:[ Tool Shop ]:[ Bingo Game Room ]:[ Hunter Guild ]:[ Party Supplies Shop ]:[ Shrine Expedition ]:Previous Menu")) {
 				switch(select("[ Church ]:[ Inn ]:[ Pub ]:[ Airport ]:[ Weapon Shop ]:[ Tool Shop ]:[ Bingo Game Room ]:[ Hunter Guild ]:[ Party Supplies Shop ]:[ Shrine Expedition ]:Previous Menu")) {
 				case 1:
 				case 1:
-					callsub L_Mark,"^FF0000Church";
+					callsub L_Mark, F_Navi("Church","hugel,159,113","^FF0000");
 					viewpoint 1,159,113,0,0xFF0000;
 					viewpoint 1,159,113,0,0xFF0000;
 					next;
 					next;
 					break;
 					break;
 				case 2:
 				case 2:
-					callsub L_Mark,"^8B4513Inn";
+					callsub L_Mark, F_Navi("Inn","hugel,101,77","^8B4513");
 					viewpoint 1,101,77,1,0x8B4513;
 					viewpoint 1,101,77,1,0x8B4513;
 					next;
 					next;
 					break;
 					break;
 				case 3:
 				case 3:
-					callsub L_Mark,"^DAA520Pub";
+					callsub L_Mark, F_Navi("Pub","hugel,126,65","^DAA520");
 					viewpoint 1,126,65,2,0xDAA520;
 					viewpoint 1,126,65,2,0xDAA520;
 					next;
 					next;
 					break;
 					break;
 				case 4:
 				case 4:
-					callsub L_Mark,"^D7567FAirport";
+					callsub L_Mark, F_Navi("Airport","hugel,178,146","^D7567F");
 					viewpoint 1,178,146,3,0xD7567F;
 					viewpoint 1,178,146,3,0xD7567F;
 					next;
 					next;
 					break;
 					break;
 				case 5:
 				case 5:
-					callsub L_Mark,"^CD5C5CWeapon Shop";
+					callsub L_Mark, F_Navi("Weapon Shop","hugel,88,167","^CD5C5C");
 					viewpoint 1,88,167,4,0xCD5C5C;
 					viewpoint 1,88,167,4,0xCD5C5C;
 					next;
 					next;
 					break;
 					break;
 				case 6:
 				case 6:
-					callsub L_Mark,"^000080Tool Shop";
+					callsub L_Mark, F_Navi("Tool Shop","hugel,92,163","^000080");
 					viewpoint 1,92,163,5,0x000080;
 					viewpoint 1,92,163,5,0x000080;
 					next;
 					next;
 					break;
 					break;
 				case 7:
 				case 7:
-					callsub L_Mark,"^800080Bingo Game Room";
+					callsub L_Mark, F_Navi("Bingo Game Room","hugel,58,206","^800080");
 					viewpoint 1,58,206,6,0x800080;
 					viewpoint 1,58,206,6,0x800080;
 					next;
 					next;
 					break;
 					break;
 				case 8:
 				case 8:
-					callsub L_Mark,"^FF1493Hunter Guild";
+					callsub L_Mark, F_Navi("Hunter Guild","hugel,209,224","^FF1493");
 					viewpoint 1,209,224,7,0xFF1493;
 					viewpoint 1,209,224,7,0xFF1493;
 					next;
 					next;
 					break;
 					break;
 				case 9:
 				case 9:
-					callsub L_Mark,"^483D8BParty Supplies Shop";
+					callsub L_Mark, F_Navi("Party Supplies Shop","hugel,95,103","^483D8B");
 					viewpoint 1,95,103,8,0x483D8B;
 					viewpoint 1,95,103,8,0x483D8B;
 					next;
 					next;
 					break;
 					break;
 				case 10:
 				case 10:
-					callsub L_Mark,"^834683Shrine Expedition";
+					callsub L_Mark, F_Navi("Shrine Expedition","hugel,52,95","^834683");
 					viewpoint 1,52,95,9,0x834683;
 					viewpoint 1,52,95,9,0x834683;
 					next;
 					next;
 					break;
 					break;
@@ -246,12 +250,12 @@ hugel,187,172,6	script	Guide Rich King#hugel	414,{
 			while (.@loop) {
 			while (.@loop) {
 				switch(select("[ Monster Race Arena ]:[ Cool Event Corp. Staff ]:Previous Menu")) {
 				switch(select("[ Monster Race Arena ]:[ Cool Event Corp. Staff ]:Previous Menu")) {
 				case 1:
 				case 1:
-					callsub L_Mark,"^FF1493Monster Race Arena";
+					callsub L_Mark, "^FF1493Monster Race Arena^000000";
 					viewpoint 1,60,71,10,0xFF1493;
 					viewpoint 1,60,71,10,0xFF1493;
 					next;
 					next;
 					break;
 					break;
 				case 2:
 				case 2:
-					callsub L_Mark,"^DA70D6Cool Event Corp. Staff";
+					callsub L_Mark, "^DA70D6Cool Event Corp. Staff^000000";
 					viewpoint 1,88,168,11,0xDA70D6;
 					viewpoint 1,88,168,11,0xDA70D6;
 					next;
 					next;
 					break;
 					break;
@@ -290,7 +294,7 @@ hugel,187,172,6	script	Guide Rich King#hugel	414,{
 L_Mark:
 L_Mark:
 	mes "[Rich King]";
 	mes "[Rich King]";
 	mes "I will mark the location";
 	mes "I will mark the location";
-	mes "of the "+getarg(0)+"^000000.";
+	mes "of the "+getarg(0)+".";
 	mes "Do you want to know more locations?";
 	mes "Do you want to know more locations?";
 	mes "Are you going to keep bugging me and make me get upset?";
 	mes "Are you going to keep bugging me and make me get upset?";
 	return;
 	return;

+ 66 - 61
npc/re/guides/guides_izlude.txt

@@ -3,82 +3,81 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
 //= [Official Conversion]
 //= [Official Conversion]
-//= Guides for the city of Izlude
+//= Guides for the city of Izlude.
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Renewal guide.
 //= 1.0 First version, Renewal guide.
 //= 1.1 Updated to match the new Izlude Map. [Masao]
 //= 1.1 Updated to match the new Izlude Map. [Masao]
 //= 1.2 Added Renewal Izlude viewpoint coordinates.
 //= 1.2 Added Renewal Izlude viewpoint coordinates.
+//= 1.3 Navigation system update. [Euphy]
+//=     Optimized.
 //============================================================ 
 //============================================================ 
 
 
--	script	Guide#01izlude::GuideIzlude	-1,{
+izlude,129,175,4	script	Guide#01izlude::GuideIzlude	105,{
 	cutin "prt_soldier",2;
 	cutin "prt_soldier",2;
 	mes "[Izlude Guide]";
 	mes "[Izlude Guide]";
 	mes "Welcome to ^8B4513Izlude^000000,";
 	mes "Welcome to ^8B4513Izlude^000000,";
 	mes "Prontera's satellite town.";
 	mes "Prontera's satellite town.";
 	mes "Do you need help navigating the town?";
 	mes "Do you need help navigating the town?";
+	F_Navi("[Izlude Guide]");
 	next;
 	next;
 	while (1) {
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
 		case 1:
 			set .@loop,1;
 			set .@loop,1;
 			while (.@loop) {
 			while (.@loop) {
-				switch(select("[ Marina ]:[ Airport ]:[ Arena ]:[ Tool Shop ]:[ Weapon & Armor Shop ]:[ Swordsman Guild ]:[ Swordsman Association ]:Previous Menu")) {
+				switch(select("[ Kelitula Academy ]:[ Marina ]:[ International Airship ]:[ Arena ]:[ Kit Shop ]:[ Swordsman Guild ]:[ Enchant Association ]:[ Forge ]:Previous Menu")) {
 				case 1:
 				case 1:
 					mes "[Izlude Guide]";
 					mes "[Izlude Guide]";
-					mes "You can use the northeast ^B9062FMarina^000000";
+					mes "Novice adventurers should go to "+F_Navi("Kelitula Academy","iz_ac01,100,39")+" to receive more information and training!";
+					mes "Would you like to check any other locations?";
+					viewpoint 1,128,260,0,0xD2691E;
+					next;
+					break;
+				case 2:
+					mes "[Izlude Guide]";
+					mes "You can use the "+F_Navi("Marina","izlude_a,197,205","^B9062F");
 					mes "to go to ^8B4513Alberta^000000 or ^8B4513Byalan Island^000000.";
 					mes "to go to ^8B4513Alberta^000000 or ^8B4513Byalan Island^000000.";
 					mes "Beware of ^8B4513Izlude Dungeon^000000";
 					mes "Beware of ^8B4513Izlude Dungeon^000000";
 					mes "on Byalan Island since it is";
 					mes "on Byalan Island since it is";
 					mes "filled with dreadful monsters.";
 					mes "filled with dreadful monsters.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
-					viewpoint 1,197,205,0,0xFF0000;
+					viewpoint 1,197,205,1,0xFF0000;
 					next;
 					next;
 					break;
 					break;
-				case 2:
+				case 3:
 					mes "[Izlude Guide]";
 					mes "[Izlude Guide]";
-					mes "The ^0000FFInternational Airship^000000 to the southeast";
+					mes "The "+F_Navi("International Airship","izlude,202,75","^0000FF");
 					mes "goes to ^8B4513Juno^000000 and ^8B4513Rachel^000000.";
 					mes "goes to ^8B4513Juno^000000 and ^8B4513Rachel^000000.";
 					mes "Let me mark its location";
 					mes "Let me mark its location";
 					mes "on your mini-map.";
 					mes "on your mini-map.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
-					viewpoint 1,204,75,1,0x0A82FF;
+					viewpoint 1,210,73,2,0x0A82FF;
 					next;
 					next;
 					break;
 					break;
-				case 3:
+				case 4:
 					mes "[Izlude Guide]";
 					mes "[Izlude Guide]";
-					mes "The ^FF5400Arena^000000 at the north";
+					mes "The "+F_Navi("Arena","izlude,213,161","^FF5400");
 					mes "is a perfect place to";
 					mes "is a perfect place to";
 					mes "test your combat capabilities.";
 					mes "test your combat capabilities.";
 					mes "Let me mark its location";
 					mes "Let me mark its location";
 					mes "on your mini-map.";
 					mes "on your mini-map.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
-					viewpoint 1,128,255,2,0xFF5400;
-					next;
-					break;
-				case 4:
-					mes "[Izlude Guide]";
-					mes "Let me mark the location of the ^006400Tool Shop^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,160,125,3,0xAAFF00;
+					viewpoint 1,213,161,3,0xFF5400;
 					next;
 					next;
 					break;
 					break;
 				case 5:
 				case 5:
-					mes "[Izlude Guide]";
-					mes "Let me mark the location of the ^7F3300Weapon & Armor Shop^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,109,182,4,0xD2691E;
+					callsub L_Mark, F_Navi("Kit Shop","izlude,110,182","^006400");
+					viewpoint 1,108,179,4,0xAAFF00;
 					next;
 					next;
 					break;
 					break;
 				case 6:
 				case 6:
 					mes "[Izlude Guide]";
 					mes "[Izlude Guide]";
-					mes "The Swordsman Guild is where you can ^800080change your job to Swordsman.^000000";
+					mes "The "+F_Navi("Swordsman Guild","izlude,51,172")+" is where you can ^800080change your job to Swordsman.^000000";
 					mes "Let me mark its location";
 					mes "Let me mark its location";
 					mes "on your mini-map.";
 					mes "on your mini-map.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
@@ -86,14 +85,16 @@
 					next;
 					next;
 					break;
 					break;
 				case 7:
 				case 7:
-					mes "[Izlude Guide]";
-					mes "Let me mark the location of the ^B9062FSwordsman Association^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,212,161,6,0xFF0000;
+					callsub L_Mark, F_Navi("Enchant Association","izlude,97,125","^B9062F");
+					viewpoint 1,97,125,6,0xDA70D6;
 					next;
 					next;
 					break;
 					break;
 				case 8:
 				case 8:
+					callsub L_Mark, F_Navi("Forge","izlude,153,126");
+					viewpoint 1,153,126,7,0xAAFF00;
+					next;
+					break;
+				case 9:
 					set .@loop,0;
 					set .@loop,0;
 					break;
 					break;
 				}
 				}
@@ -102,55 +103,48 @@
 		case 2:
 		case 2:
 			set .@loop,1;
 			set .@loop,1;
 			while (.@loop) {
 			while (.@loop) {
-				switch(select("[ Eden Teleport Officer ]:[ Kafra Employee ]:[ Newlywed Helper ]:[ Bullet Merchant ]:[ Mercenary Guildsman ]:Previous Menu")) {
+				switch(select("[ Eden Teleport Officer ]:[ Kafra Employee ]:[ Hypnotist ]:[ Newlywed Helper ]:[ Mercenary Guildsman ]:[ Pet Groomer ]:Previous Menu")) {
 				case 1:
 				case 1:
 					mes "[Izlude Guide]";
 					mes "[Izlude Guide]";
-					mes "The ^0000FFEden Teleport Officer^000000";
+					mes "The "+F_Navi("Eden Teleport Officer","izlude,131,148","^0000FF");
 					mes "is currently staying inside";
 					mes "is currently staying inside";
 					mes "the Swordsman Guild building.";
 					mes "the Swordsman Guild building.";
 					mes "Let me mark his location on your mini-map.";
 					mes "Let me mark his location on your mini-map.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
-					viewpoint 1,131,148,7,0x0A82FF;
+					viewpoint 1,131,148,8,0x0A82FF;
 					next;
 					next;
 					break;
 					break;
 				case 2:
 				case 2:
-					mes "[Izlude Guide]";
-					mes "Let me mark the location of the";
-					mes "^FF5400Kafra Employee^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,128,148,8,0xFF5400;
+					callsub L_Mark, F_Navi("Kafra Employee","izlude,128,148","^FF5400"),1;
+					viewpoint 1,128,148,9,0xFF5400;
 					next;
 					next;
 					break;
 					break;
 				case 3:
 				case 3:
-					mes "[Izlude Guide]";
-					mes "If you'd like to go on a honeymoon to";
-					mes "^8B4513Jawaii^000000, the paradise of newlyweds,";
-					mes "please speak to the ^B9062FNewlywed Helper^000000.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,180,224,9,0xFF0000;
+					callsub L_Mark, F_Navi("Hypnotist","izlude,127,175"),1;
+					viewpoint 1,127,175,10,0x006400;
 					next;
 					next;
 					break;
 					break;
 				case 4:
 				case 4:
 					mes "[Izlude Guide]";
 					mes "[Izlude Guide]";
-					mes "The ^7F3300Bullet Merchants^000000 for ^7F3300Gunslingers^000000";
-					mes "is located to the east.";
-					mes "Let me mark his location";
-					mes "on your mini-map.";
+					mes "If you'd like to go on a honeymoon to";
+					mes "^8B4513Jawaii^000000, the paradise of newlyweds,";
+					mes "please speak to the ";
+					mes F_Navi("Newlywed Helper","izlude,180,224","^B9062F")+".";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
-					viewpoint 1,158,130,10,0xD2691E;
+					viewpoint 1,180,224,11,0xFF0000;
 					next;
 					next;
 					break;
 					break;
 				case 5:
 				case 5:
-					mes "[Izlude Guide]";
-					mes "Let me mark the location of ^0000FFFencer Mercenary Manager^000000 and";
-					mes "^0000FFMercenary Goods Merchant^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,56,169,11,0xDA70D6;
+					callsub L_Mark, F_Navi("Mercenary Guildsman","izlude,47,170","^0000FF");
+					viewpoint 1,47,170,12,0xDA70D6;
 					next;
 					next;
 					break;
 					break;
 				case 6:
 				case 6:
+					callsub L_Mark, F_Navi("Pet Groomer","izlude_in,72,98"),1;
+					viewpoint 1,108,179,13,0x006400;
+					next;
+					break;
+				case 7:
 					set .@loop,0;
 					set .@loop,0;
 					break;
 					break;
 				}
 				}
@@ -172,6 +166,8 @@
 			viewpoint 2,1,1,9,0xFFFF00;
 			viewpoint 2,1,1,9,0xFFFF00;
 			viewpoint 2,1,1,10,0xFFFF00;
 			viewpoint 2,1,1,10,0xFFFF00;
 			viewpoint 2,1,1,11,0xFFFF00;
 			viewpoint 2,1,1,11,0xFFFF00;
+			viewpoint 2,1,1,12,0xFFFF00;
+			viewpoint 2,1,1,13,0xFFFF00;
 			next;
 			next;
 			break;
 			break;
 		case 4:
 		case 4:
@@ -183,8 +179,17 @@
 			end;
 			end;
 		}
 		}
 	}
 	}
+	end;
+L_Mark:
+	mes "[Izlude Guide]";
+	if (getarg(1,0)) {
+		mes "Let me mark the location of the";
+		mes getarg(0);
+	} else
+		mes "Let me mark the location of the "+getarg(0);
+	mes "on your mini-map.";
+	mes "Would you like to check any other locations?";
+	return;
 }
 }
-
-izlude,129,175,4	duplicate(GuideIzlude)	Guide#02izlude	105
-izlude,133,113,4	duplicate(GuideIzlude)	Guide#03izlude	105
-izlude,120,206,4	duplicate(GuideIzlude)	Guide#04izlude	105
+izlude,133,113,4	duplicate(GuideIzlude)	Guide#02izlude	105
+//izlude,120,206,4	duplicate(GuideIzlude)	Guide#03izlude	105

+ 24 - 19
npc/re/guides/guides_juno.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
@@ -12,81 +12,87 @@
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Renewal guide.
 //= 1.0 First version, Renewal guide.
 //= 1.1 Fixed and optimized. [Euphy]
 //= 1.1 Fixed and optimized. [Euphy]
+//= 1.2 Navigation system update. [Euphy]
 //============================================================ 
 //============================================================ 
 
 
 yuno,59,212,4	script	Juno Guide#yuno01::GuideJuno	700,{
 yuno,59,212,4	script	Juno Guide#yuno01::GuideJuno	700,{
 	mes "[Juno Guide]";
 	mes "[Juno Guide]";
 	mes "A place that takes the vision of the future, and gives it form in the present. Welcome to";
 	mes "A place that takes the vision of the future, and gives it form in the present. Welcome to";
 	mes "the city of ^8B4513Juno^000000!";
 	mes "the city of ^8B4513Juno^000000!";
+	F_Navi("[Juno Guide]");
 	next;
 	next;
 	while (1) {
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove marks from Mini-Map:Cancel")) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove marks from Mini-Map:Cancel")) {
 		case 1:
 		case 1:
 			set .@loop,1;
 			set .@loop,1;
 			while (.@loop) {
 			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")) {
+				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 Plaza ]:[ Monster Museum ]:[ Schweicherbil Magic Academy ]:Previous Menu")) {
 				case 1:
 				case 1:
-					callsub L_Mark,"^FF0000Tool Shop";
+					callsub L_Mark, F_Navi("Tool Shop","yuno,194,140","^FF0000");
 					viewpoint 1,194,140,0,0xFF0000;
 					viewpoint 1,194,140,0,0xFF0000;
 					next;
 					next;
 					break;
 					break;
 				case 2:
 				case 2:
-					callsub L_Mark,"^FF4500Forge";
+					callsub L_Mark, F_Navi("Forge","yuno,120,137","^FF4500");
 					viewpoint 1,120,137,1,0xFF4500;
 					viewpoint 1,120,137,1,0xFF4500;
 					next;
 					next;
 					break;
 					break;
 				case 3:
 				case 3:
-					callsub L_Mark,"^DAA520Airport";
+					callsub L_Mark, F_Navi("Airport","yuno,16,261","^DAA520");
 					viewpoint 1,16,261,2,0xDAA520;
 					viewpoint 1,16,261,2,0xDAA520;
 					next;
 					next;
 					break;
 					break;
 				case 4:
 				case 4:
-					callsub L_Mark,"^008000Government Building";
+					callsub L_Mark, F_Navi("Government Building","yuno,157,317","^008000");
 					viewpoint 1,157,317,3,0x008000;
 					viewpoint 1,157,317,3,0x008000;
 					next;
 					next;
 					break;
 					break;
 				case 5:
 				case 5:
-					callsub L_Mark,"^0000FFStreet of Book Stores";
+					callsub L_Mark, F_Navi("Street of Book Stores","yuno,172,100","^0000FF");
 					viewpoint 1,172,100,4,0x0000FF;
 					viewpoint 1,172,100,4,0x0000FF;
 					next;
 					next;
 					break;
 					break;
 				case 6:
 				case 6:
-					callsub L_Mark,"^000080Inn & Pub";
+					callsub L_Mark, F_Navi("Inn & Pub","yuno,51,105","^000080");
 					viewpoint 1,51,105,5,0x000080;
 					viewpoint 1,51,105,5,0x000080;
 					next;
 					next;
 					break;
 					break;
 				case 7:
 				case 7:
-					callsub L_Mark,"^800080Sage Castle";
+					callsub L_Mark, F_Navi("Sage Castle","yuno,90,318","^800080");
 					viewpoint 1,90,318,6,0x800080;
 					viewpoint 1,90,318,6,0x800080;
 					next;
 					next;
 					break;
 					break;
 				case 8:
 				case 8:
-					callsub L_Mark,"^834683Monster Academy";
+					callsub L_Mark, F_Navi("Monster Academy","yuno,95,184","^834683");
 					viewpoint 1,95,184,7,0x834683;
 					viewpoint 1,95,184,7,0x834683;
 					next;
 					next;
 					break;
 					break;
 				case 9:
 				case 9:
-					callsub L_Mark,"^4B0082Juno Library";
+					callsub L_Mark, F_Navi("Juno Library","yuno,338,203","^4B0082");
 					viewpoint 1,338,203,8,0x4B0082;
 					viewpoint 1,338,203,8,0x4B0082;
 					next;
 					next;
 					break;
 					break;
 				case 10:
 				case 10:
-					callsub L_Mark,"^008080Weapon & Armor Shop";
+					callsub L_Mark, F_Navi("Weapon & Armor Shop","yuno,120,137","^008080");
 					viewpoint 1,120,137,9,0x008080;
 					viewpoint 1,120,137,9,0x008080;
 					next;
 					next;
 					break;
 					break;
 				case 11:
 				case 11:
-					callsub L_Mark,"^FF1493Juphero Plaza";
+					callsub L_Mark, F_Navi("Juphero Plaza","yuno,115,57","^FF1493");
 					viewpoint 1,115,157,10,0xFF1493;
 					viewpoint 1,115,157,10,0xFF1493;
 					next;
 					next;
 					break;
 					break;
 				case 12:
 				case 12:
-					callsub L_Mark,"^DA70D6Monster Museum";
+					callsub L_Mark, F_Navi("Monster Museum","yuno,278,290","^DA70D6");
 					viewpoint 1,278,290,11,0xDA70D6;
 					viewpoint 1,278,290,11,0xDA70D6;
 					next;
 					next;
 					break;
 					break;
 				case 13:
 				case 13:
-					callsub L_Mark,"^CD1039Schweicherbil Magic Academy";
+					mes "[Juno Guide]";
+					mes "I will mark the location of the";
+					mes F_Navi("Schweicherbil Magic Academy","yuno,323,280","^CD1039");
+					mes "on your mini-map.";
+					mes "Would you like to check any other locations?";
 					viewpoint 1,323,280,12,0xCD1039;
 					viewpoint 1,323,280,12,0xCD1039;
 					next;
 					next;
 					break;
 					break;
@@ -101,14 +107,14 @@ yuno,59,212,4	script	Juno Guide#yuno01::GuideJuno	700,{
 			while (.@loop) {
 			while (.@loop) {
 				switch(select("[ Kafra Employees ]:[ Eden Teleport Officer ]:Previous Menu")) {
 				switch(select("[ Kafra Employees ]:[ Eden Teleport Officer ]:Previous Menu")) {
 				case 1:
 				case 1:
-					callsub L_Mark,"^FA8072Kafra Employees";
+					callsub L_Mark, "^FA8072Kafra Employees^000000";
 					viewpoint 1,152,187,13,0xFA8072;
 					viewpoint 1,152,187,13,0xFA8072;
 					viewpoint 1,277,221,14,0xFA8072;
 					viewpoint 1,277,221,14,0xFA8072;
 					viewpoint 1,327,108,15,0xFA8072;
 					viewpoint 1,327,108,15,0xFA8072;
 					next;
 					next;
 					break;
 					break;
 				case 2:
 				case 2:
-					callsub L_Mark,"^803232Eden Teleport Officer";
+					callsub L_Mark, F_Navi("Eden Teleport Officer","yuno,144,189","^803232");
 					viewpoint 1,144,189,16,0x803232;
 					viewpoint 1,144,189,16,0x803232;
 					next;
 					next;
 					break;
 					break;
@@ -151,10 +157,9 @@ yuno,59,212,4	script	Juno Guide#yuno01::GuideJuno	700,{
 L_Mark:
 L_Mark:
 	mes "[Juno Guide]";
 	mes "[Juno Guide]";
 	mes "I will mark the location";
 	mes "I will mark the location";
-	mes "of the "+getarg(0)+"^000000";
+	mes "of the "+getarg(0);
 	mes "on your mini-map.";
 	mes "on your mini-map.";
 	mes "Would you like to check any other locations?";
 	mes "Would you like to check any other locations?";
 	return;
 	return;
 }
 }
-
 yuno,153,47,4	duplicate(GuideJuno)	Juno Guide#yuno02	700
 yuno,153,47,4	duplicate(GuideJuno)	Juno Guide#yuno02	700

+ 19 - 18
npc/re/guides/guides_lighthalzen.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Renewal guide.
 //= 1.0 First version, Renewal guide.
 //= 1.1 Optimized. [Euphy]
 //= 1.1 Optimized. [Euphy]
+//= 1.2 Navigation system update. [Euphy]
 //============================================================ 
 //============================================================ 
 
 
 lighthalzen,207,310,5	script	Lighthalzen Guide#lhz01::GuideLighthazlen	852,{
 lighthalzen,207,310,5	script	Lighthalzen Guide#lhz01::GuideLighthazlen	852,{
@@ -31,6 +32,7 @@ lighthalzen,207,310,5	script	Lighthalzen Guide#lhz01::GuideLighthazlen	852,{
 	mes "of ^8B4513Lighthalzen^000000. Now, please";
 	mes "of ^8B4513Lighthalzen^000000. Now, please";
 	mes "select the location that you'd";
 	mes "select the location that you'd";
 	mes "like to learn more about.";
 	mes "like to learn more about.";
+	F_Navi("[Lighthalzen Guide]");
 	next;
 	next;
 	while (1) {
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
@@ -39,52 +41,52 @@ lighthalzen,207,310,5	script	Lighthalzen Guide#lhz01::GuideLighthazlen	852,{
 			while (.@loop) {
 			while (.@loop) {
 				switch(select("[ Hotel ]:[ Bank ]:[ Airport ]:[ Weapon Shop ]:[ Department Store ]:[ Police Station ]:[ Jewelry Store ]:[ Cool Event Corp. ]:[ Somatology Laboratory ]:[ Alchemist Association ]:Previous Menu")) {
 				switch(select("[ Hotel ]:[ Bank ]:[ Airport ]:[ Weapon Shop ]:[ Department Store ]:[ Police Station ]:[ Jewelry Store ]:[ Cool Event Corp. ]:[ Somatology Laboratory ]:[ Alchemist Association ]:Previous Menu")) {
 				case 1:
 				case 1:
-					callsub L_Mark,"^FF0000Hotel";
+					callsub L_Mark, F_Navi("Hotel","lighthalzen,159,133","^FF0000");
 					viewpoint 1,160,217,0,0xFF0000;
 					viewpoint 1,160,217,0,0xFF0000;
 					next;
 					next;
 					break;
 					break;
 				case 2:
 				case 2:
-					callsub L_Mark,"^FF4500Bank";
+					callsub L_Mark, F_Navi("Bank","lighthalzen,203,257","^FF4500");
 					viewpoint 1,203,257,1,0xFF4500;
 					viewpoint 1,203,257,1,0xFF4500;
 					next;
 					next;
 					break;
 					break;
 				case 3:
 				case 3:
-					callsub L_Mark,"^DAA520Airport";
+					callsub L_Mark, F_Navi("Airport","lighthalzen,262,75","^DAA520");
 					viewpoint 1,262,75,2,0xDAA520;
 					viewpoint 1,262,75,2,0xDAA520;
 					next;
 					next;
 					break;
 					break;
 				case 4:
 				case 4:
-					callsub L_Mark,"^7B68EEWeapon Shop";
+					callsub L_Mark, F_Navi("Weapon Shop","lighthalzen,194,35","^7B68EE");
 					viewpoint 1,194,35,3,0x7B68EE;
 					viewpoint 1,194,35,3,0x7B68EE;
 					next;
 					next;
 					break;
 					break;
 				case 5:
 				case 5:
-					callsub L_Mark,"^B91A4DDepartment Store";
+					callsub L_Mark, F_Navi("Department Store","lighthalzen,199,164","^B91A4D");
 					viewpoint 1,202,106,4,0xB91A4D;
 					viewpoint 1,202,106,4,0xB91A4D;
 					next;
 					next;
 					break;
 					break;
 				case 6:
 				case 6:
-					callsub L_Mark,"^008000Police Station";
+					callsub L_Mark, F_Navi("Police Station","lighthalzen,234,276","^008000");
 					viewpoint 1,234,276,5,0x008000;
 					viewpoint 1,234,276,5,0x008000;
 					next;
 					next;
 					break;
 					break;
 				case 7:
 				case 7:
-					callsub L_Mark,"^0000FFJewelry Store";
+					callsub L_Mark, F_Navi("Jewelry Store","lighthalzen,96,110","^0000FF");
 					viewpoint 1,96,110,6,0x0000FF;
 					viewpoint 1,96,110,6,0x0000FF;
 					next;
 					next;
 					break;
 					break;
 				case 8:
 				case 8:
-					callsub L_Mark,"^000080Cool Event Corp.";
+					callsub L_Mark, F_Navi("Cool Event Corp.","lighthalzen,238,217","^000080");
 					viewpoint 1,238,217,7,0x000080;
 					viewpoint 1,238,217,7,0x000080;
 					next;
 					next;
 					break;
 					break;
 				case 9:
 				case 9:
-					callsub L_Mark,"^800080Somatology Laboratory";
+					callsub L_Mark, F_Navi("Somatology Laboratory","lighthalzen,101,243","^800080");
 					viewpoint 1,101,243,8,0x800080;
 					viewpoint 1,101,243,8,0x800080;
 					next;
 					next;
 					break;
 					break;
 				case 10:
 				case 10:
-					callsub L_Mark,"^0A9696Alchemist Association";
+					callsub L_Mark, F_Navi("Alchemist Association","lighthalzen,54,132","^0A9696");
 					viewpoint 1,54,132,9,0x0A9696;
 					viewpoint 1,54,132,9,0x0A9696;
 					next;
 					next;
 					break;
 					break;
@@ -105,7 +107,7 @@ lighthalzen,207,310,5	script	Lighthalzen Guide#lhz01::GuideLighthazlen	852,{
 					mes "on the 1st floor of the Weapon Shop.";
 					mes "on the 1st floor of the Weapon Shop.";
 					viewpoint 1,194,35,10,0x0A9696;
 					viewpoint 1,194,35,10,0x0A9696;
 					next;
 					next;
-					callsub L_Mark,"^0A9696Armsmith";
+					callsub L_Mark, "^0A9696Armsmith^000000";
 					next;
 					next;
 					break;
 					break;
 				case 2:
 				case 2:
@@ -116,22 +118,22 @@ lighthalzen,207,310,5	script	Lighthalzen Guide#lhz01::GuideLighthazlen	852,{
 					mes "of the Weapon Shop.";
 					mes "of the Weapon Shop.";
 					viewpoint 1,194,35,11,0x4B0082;
 					viewpoint 1,194,35,11,0x4B0082;
 					next;
 					next;
-					callsub L_Mark,"^4B0082Seiyablem",1;
+					callsub L_Mark, "^4B0082Seiyablem^000000",1;
 					next;
 					next;
 					break;
 					break;
 				case 3:
 				case 3:
-					callsub L_Mark,"^FF4500Pet Groomer";
+					callsub L_Mark, F_Navi("Pet Groomer","lighthalzen,222,191","^FF4500");
 					viewpoint 1,222,191,12,0xFF4500;
 					viewpoint 1,222,191,12,0xFF4500;
 					next;
 					next;
 					break;
 					break;
 				case 4:
 				case 4:
-					callsub L_Mark,"^008080Kafra Employees";
+					callsub L_Mark, "^008080Kafra Employees^000000";
 					viewpoint 1,164,99,13,0x008080;
 					viewpoint 1,164,99,13,0x008080;
 					viewpoint 1,164,99,14,0x008080;
 					viewpoint 1,164,99,14,0x008080;
 					next;
 					next;
 					break;
 					break;
 				case 5:
 				case 5:
-					callsub L_Mark,"^FF1493Cool Event Corp. Staff";
+					callsub L_Mark, F_Navi("Cool Event Corp. Staff","lighthalzen,94,247","^FF1493");
 					viewpoint 1,94,247,15,0xFF1493;
 					viewpoint 1,94,247,15,0xFF1493;
 					next;
 					next;
 					break;
 					break;
@@ -175,12 +177,11 @@ lighthalzen,207,310,5	script	Lighthalzen Guide#lhz01::GuideLighthazlen	852,{
 L_Mark:
 L_Mark:
 	mes "[Lighthalzen Guide]";
 	mes "[Lighthalzen Guide]";
 	mes "I will mark the location";
 	mes "I will mark the location";
-	mes "of "+((getarg(1,0))?"":"the ")+getarg(0)+"^000000";
+	mes "of "+((getarg(1,0))?"":"the ")+getarg(0);
 	mes "on your mini-map.";
 	mes "on your mini-map.";
 	mes "Would you like to check any other locations?";
 	mes "Would you like to check any other locations?";
 	return;
 	return;
 }
 }
-
 lighthalzen,220,310,3	duplicate(GuideLighthazlen)	Lighthalzen Guide#lhz02	852
 lighthalzen,220,310,3	duplicate(GuideLighthazlen)	Lighthalzen Guide#lhz02	852
 lighthalzen,154,100,5	duplicate(GuideLighthazlen)	Lighthalzen Guide#lhz03	852
 lighthalzen,154,100,5	duplicate(GuideLighthazlen)	Lighthalzen Guide#lhz03	852
 lighthalzen,307,224,3	duplicate(GuideLighthazlen)	Lighthalzen Guide#lhz04	852
 lighthalzen,307,224,3	duplicate(GuideLighthazlen)	Lighthalzen Guide#lhz04	852

+ 24 - 21
npc/re/guides/guides_louyang.txt

@@ -3,14 +3,15 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
-//= rAthena  SVN
+//= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
 //= [Official Conversion]
 //= [Official Conversion]
-//= Guide for the city of Louyang
+//= Guide for the city of Louyang.
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Renewal guide.
 //= 1.0 First version, Renewal guide.
+//= 1.1 Navigation system update. [Euphy]
 //============================================================ 
 //============================================================ 
 
 
 louyang,224,104,4	script	Louyang Guide#01louyang	818,{
 louyang,224,104,4	script	Louyang Guide#01louyang	818,{
@@ -26,86 +27,88 @@ louyang,224,104,4	script	Louyang Guide#01louyang	818,{
 	mes "[Representative]";
 	mes "[Representative]";
 	mes "^8B4513Louyang^000000 is famous for";
 	mes "^8B4513Louyang^000000 is famous for";
 	mes "its elaborate history, as well as specialties that are unique to this nation. Please take your time and enjoy your stay.";
 	mes "its elaborate history, as well as specialties that are unique to this nation. Please take your time and enjoy your stay.";
+	F_Navi("[Representative]");
+	set .@str$,"Is there anything else I can do for you?";
 	while (1) {
 	while (1) {
 		next;
 		next;
 		switch(select("[ Dragon Castle ]:[ Doctor's Office ]:[ City Hall ]:[ Weapon Shop ]:[ Tool Shop ]:[ Tavern ]:[ Observatory ]:[ Return to Alberta ]:Remove Marks from Mini-Map:Cancel")) {
 		switch(select("[ Dragon Castle ]:[ Doctor's Office ]:[ City Hall ]:[ Weapon Shop ]:[ Tool Shop ]:[ Tavern ]:[ Observatory ]:[ Return to Alberta ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
 		case 1:
 			mes "[Representative]";
 			mes "[Representative]";
-			mes "The Dragon Castle is located at ^0A82FF+^000000. It is where all the nobles reside, including our lord.";
+			mes "The "+F_Navi("Dragon Castle","louyang,218,253")+" is located at ^0A82FF+^000000. It is where all the nobles reside, including our lord.";
 			mes "Since you're an outsider, I guess it would be appropriate for you to visit our lord first.";
 			mes "Since you're an outsider, I guess it would be appropriate for you to visit our lord first.";
-			mes "Is there anything else I can do for you?";
+			mes .@str$;
 			viewpoint 1,218,253,0,0x0A82FF;
 			viewpoint 1,218,253,0,0x0A82FF;
 			break;
 			break;
 		case 2:
 		case 2:
 			mes "[Representative]";
 			mes "[Representative]";
-			mes "It's a famous ^AAFF00Doctor's Office^000000";
+			mes "It's a famous "+F_Navi("Doctor's Office","louyang,261,93","^AAFF00");
 			mes "according to rumor it can cure all diseases. But I'm not sure if it's true or not.";
 			mes "according to rumor it can cure all diseases. But I'm not sure if it's true or not.";
-			mes "Is there anything else I can do for you?";
+			mes .@str$;
 			viewpoint 1,261,93,1,0xAAFF00;
 			viewpoint 1,261,93,1,0xAAFF00;
 			break;
 			break;
 		case 3:
 		case 3:
 			mes "[Representative]";
 			mes "[Representative]";
-			mes "We have a City Hall where the federal government operates.";
+			mes "We have a "+F_Navi("City Hall","louyang,309,78")+" where the federal government operates.";
 			mes "It is located at ^008080+^000000.";
 			mes "It is located at ^008080+^000000.";
 			next;
 			next;
 			mes "[Representative]";
 			mes "[Representative]";
 			mes "If you have any problems,";
 			mes "If you have any problems,";
 			mes "you should talk with the";
 			mes "you should talk with the";
 			mes "employees there.";
 			mes "employees there.";
-			mes "Is there anything else I can do for you?";
+			mes .@str$;
 			viewpoint 1,309,78,2,0x20B2AA;
 			viewpoint 1,309,78,2,0x20B2AA;
 			break;
 			break;
 		case 4:
 		case 4:
 			mes "[Representative]";
 			mes "[Representative]";
-			mes "The Weapon Shop is located at ^55FF33+^000000.";
+			mes "The "+F_Navi("Weapon Shop","louyang,145,172")+" is located at ^55FF33+^000000.";
 			next;
 			next;
 			mes "[Representative]";
 			mes "[Representative]";
 			mes "You will see";
 			mes "You will see";
 			mes "marvelous weapons forged";
 			mes "marvelous weapons forged";
 			mes "by the well-experienced";
 			mes "by the well-experienced";
 			mes "Blacksmiths of Louyang.";
 			mes "Blacksmiths of Louyang.";
-			mes "Is there anything else I can do for you?";
+			mes .@str$;
 			viewpoint 1,145,172,3,0xFF1493;
 			viewpoint 1,145,172,3,0xFF1493;
 			break;
 			break;
 		case 5:
 		case 5:
 			mes "[Representative]";
 			mes "[Representative]";
-			mes "The Tool Shop is located at ^3355FF+^000000.";
+			mes "The "+F_Navi("Tool Shop","louyang,138,99")+" is located at ^3355FF+^000000.";
 			next;
 			next;
 			mes "[Representative]";
 			mes "[Representative]";
 			mes "Knowing your enemy";
 			mes "Knowing your enemy";
 			mes "is half the battle!";
 			mes "is half the battle!";
 			mes "It's also safer to prepare yourself than to be sorry later. Why don't you go check their supplies?";
 			mes "It's also safer to prepare yourself than to be sorry later. Why don't you go check their supplies?";
-			mes "Is there anything else I can do for you?";
+			mes .@str$;
 			viewpoint 1,138,99,4,0xFF0000;
 			viewpoint 1,138,99,4,0xFF0000;
 			break;
 			break;
 		case 6:
 		case 6:
 			mes "[Representative]";
 			mes "[Representative]";
-			mes "When you get tired during your trip, I suggest that you visit the Tavern. It's located at ^00FF00+^000000.";
+			mes "When you get tired during your trip, I suggest that you visit the "+F_Navi("Tavern","louyang,280,165")+". It's located at ^00FF00+^000000.";
 			next;
 			next;
-			mes "[Soldier]";
+			mes "[Representative]";
 			mes "The Tavern is a good place";
 			mes "The Tavern is a good place";
 			mes "to meet other tourists, as well as to hear of any news that may be helpful to know.";
 			mes "to meet other tourists, as well as to hear of any news that may be helpful to know.";
-			mes "Is there anything else I can do for you?";
+			mes .@str$;
 			viewpoint 1,280,165,5,0xDAA520;
 			viewpoint 1,280,165,5,0xDAA520;
 			break;
 			break;
 		case 7:
 		case 7:
 			mes "[Representative]";
 			mes "[Representative]";
-			mes "You won't get a better view of the world than you can at the Observatory.";
+			mes "You won't get a better view of the world than you can at the "+F_Navi("Observatory","louyang,136,245")+".";
 			mes "It's a must see here.";
 			mes "It's a must see here.";
-			mes "Is there anything else I can do for you?";
+			mes .@str$;
 			viewpoint 1,136,245,6,0xD8BFD8;
 			viewpoint 1,136,245,6,0xD8BFD8;
 			break;
 			break;
 		case 8:
 		case 8:
 			mes "[Representative]";
 			mes "[Representative]";
 			mes "If you want to return to Alberta,";
 			mes "If you want to return to Alberta,";
-			mes "find the ^00BFFFKGirl^000000 outside town on the docks.";
-			mes "Is there anything else I can do for you?";
+			mes "find the "+F_Navi("Girl","louyang,218,22","^00BFFF")+" outside town on the docks.";
+			mes .@str$;
 			viewpoint 1,218,22,7,0x00BFFF;
 			viewpoint 1,218,22,7,0x00BFFF;
 			break;
 			break;
 		case 9:
 		case 9:
 			mes "[Representative]";
 			mes "[Representative]";
 			mes "I'll remove all marks from your mini-map.";
 			mes "I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
+			mes .@str$;
 			viewpoint 2,1,1,0,0xFFFFFF;
 			viewpoint 2,1,1,0,0xFFFFFF;
 			viewpoint 2,1,1,1,0xFFFFFF;
 			viewpoint 2,1,1,1,0xFFFFFF;
 			viewpoint 2,1,1,2,0xFFFFFF;
 			viewpoint 2,1,1,2,0xFFFFFF;

+ 9 - 7
npc/re/guides/guides_lutie.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Renewal guide.
 //= 1.0 First version, Renewal guide.
 //= 1.1 Fixed and optimized. [Euphy]
 //= 1.1 Fixed and optimized. [Euphy]
+//= 1.2 Navigation system update. [Euphy]
 //============================================================ 
 //============================================================ 
 
 
 xmas,140,137,3	script	Lutie Guide#xmas	717,{
 xmas,140,137,3	script	Lutie Guide#xmas	717,{
@@ -19,31 +20,32 @@ xmas,140,137,3	script	Lutie Guide#xmas	717,{
 	mes "Welcome to ^8B4513Lutie^000000,";
 	mes "Welcome to ^8B4513Lutie^000000,";
 	mes "the Snow Village.";
 	mes "the Snow Village.";
 	mes "Do you need help navigating the village?";
 	mes "Do you need help navigating the village?";
+	F_Navi("[Lutie Guide]");
 	while (1) {
 	while (1) {
 		next;
 		next;
 		switch(select("[ Gift Shop ]:[ Church ]:[ Weapon & Armor Shop ]:[ Tool Shop ]:[ Santa's House ]:[ Toy Factory ]:Remove Marks from Mini-Map:Cancel")) {
 		switch(select("[ Gift Shop ]:[ Church ]:[ Weapon & Armor Shop ]:[ Tool Shop ]:[ Santa's House ]:[ Toy Factory ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
 		case 1:
-			callsub L_Mark,"^008080Gift Shop";
+			callsub L_Mark, F_Navi("Gift Shop","xmas,172,131","^008080");
 			viewpoint 1,172,131,2,0x008080;
 			viewpoint 1,172,131,2,0x008080;
 			break;
 			break;
 		case 2:
 		case 2:
-			callsub L_Mark,"^006400Church";
+			callsub L_Mark, F_Navi("Church","xmas,104,287","^006400");
 			viewpoint 1,104,287,1,0xAAFF00;
 			viewpoint 1,104,287,1,0xAAFF00;
 			break;
 			break;
 		case 3:
 		case 3:
-			callsub L_Mark,"^FF1493Weapon & Armor Shop";
+			callsub L_Mark, F_Navi("Weapon & Armor Shop","xmas,171,158","^FF1493");
 			viewpoint 1,171,158,3,0xFF1493;
 			viewpoint 1,171,158,3,0xFF1493;
 			break;
 			break;
 		case 4:
 		case 4:
-			callsub L_Mark,"^8B4513Tool Shop";
+			callsub L_Mark, F_Navi("Tool Shop","xmas,122,131","^8B4513");
 			viewpoint 1,122,131,4,0x8B4513;
 			viewpoint 1,122,131,4,0x8B4513;
 			break;
 			break;
 		case 5:
 		case 5:
-			callsub L_Mark,"^B9062FSanta's House",1;
+			callsub L_Mark, F_Navi("Santa's House","xmas,149,237","^B9062F"),1;
 			viewpoint 1,149,237,5,0x9400D3;
 			viewpoint 1,149,237,5,0x9400D3;
 			break;
 			break;
 		case 6:
 		case 6:
-			callsub L_Mark,"^9400D3Toy Factory";
+			callsub L_Mark, F_Navi("Toy Factory","xmas,143,312","^9400D3");
 			viewpoint 1,143,312,6,0xFF0000;
 			viewpoint 1,143,312,6,0xFF0000;
 			break;
 			break;
 		case 7:
 		case 7:

+ 18 - 16
npc/re/guides/guides_malaya.txt

@@ -3,56 +3,58 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= Euphy
 //= Euphy
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
 //= Guides for the city of Malaya.
 //= Guides for the city of Malaya.
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First version. [Euphy]
 //= 1.0 First version. [Euphy]
+//= 1.1 Navigation system update. [Euphy]
 //============================================================ 
 //============================================================ 
 
 
 malaya,71,72,4	script	Port Malaya Guide#01::GuideMalaya	579,{
 malaya,71,72,4	script	Port Malaya Guide#01::GuideMalaya	579,{
 	mes "[Port Malaya Guide]";
 	mes "[Port Malaya Guide]";
+	mes "Welcome to ^8B4513Port Malaya^000000, the Breathing Village.";
 	mes "Where cultures and legends come to life!";
 	mes "Where cultures and legends come to life!";
-	mes "At the Breathing Village, ^8B4513Port Malaya^000000, we welcome you.";
-	mes "I will show you around the village. Please ask me anything you want.";
+	mes "Do you need help navigating the village?";
+	F_Navi("[Port Malaya Guide]");
 	while(1) {
 	while(1) {
 		next;
 		next;
-		switch(select("Kafra Employee:Inn & Tavern:Weapon Store:Tool Shop:Hospital:Park:Harbor:Clear the mini map:Cancel")) {
+		switch(select("[ Kafra Employees ]:[ Inn & Tavern ]:[ Weapon & Armor Shop ]:[ Tool Shop ]:[ Hospital ]:[ Park ]:[ Harbor ]:Remove marks from Mini-Map:Cancel")) {
 		case 1:
 		case 1:
-			callsub L_Mark,"^0000FFKafra Employee";
+			callsub L_Mark, "^0000FFKafra Employees^000000",1;
 			viewpoint 1,71,79,0,0x0A82FF;
 			viewpoint 1,71,79,0,0x0A82FF;
 			viewpoint 1,234,204,1,0x0A82FF;
 			viewpoint 1,234,204,1,0x0A82FF;
 			break;
 			break;
 		case 2:
 		case 2:
-			callsub L_Mark,"^006400Inn & Tavern";
+			callsub L_Mark, F_Navi("Inn & Tavern","malaya,193,215","^006400");
 			viewpoint 1,193,215,2,0xAAFF00;
 			viewpoint 1,193,215,2,0xAAFF00;
 			break;
 			break;
 		case 3:
 		case 3:
-			callsub L_Mark,"^008080Weaponry Store";
+			callsub L_Mark, F_Navi("Weapon & Armor Shop","malaya,114,212","^008080");
 			viewpoint 1,114,212,3,0x4F543C;
 			viewpoint 1,114,212,3,0x4F543C;
 			break;
 			break;
 		case 4:
 		case 4:
-			callsub L_Mark,"^FF1493Tool Store";
+			callsub L_Mark, F_Navi("Tool Shop","malaya,297,167","^FF1493");
 			viewpoint 1,297,167,4,0xFF1493;
 			viewpoint 1,297,167,4,0xFF1493;
 			break;
 			break;
 		case 5:
 		case 5:
-			callsub L_Mark,"^8B4513Hospital";
+			callsub L_Mark, F_Navi("Hospital","malaya,50,75","^8B4513");
 			viewpoint 1,50,75,5,0x8B4513;
 			viewpoint 1,50,75,5,0x8B4513;
 			break;
 			break;
 		case 6:
 		case 6:
-			callsub L_Mark,"^8B4513Park";
+			callsub L_Mark, F_Navi("Park","malaya,280,371","^8B4513");
 			viewpoint 1,280,371,6,0x8B4513;
 			viewpoint 1,280,371,6,0x8B4513;
 			break;
 			break;
 		case 7:
 		case 7:
-			callsub L_Mark,"^8A2BE2Harbor";
+			callsub L_Mark, F_Navi("Harbor","malaya,276,55","^8A2BE2");
 			viewpoint 1,276,55,7,0x8A2BE2;
 			viewpoint 1,276,55,7,0x8A2BE2;
 			break;
 			break;
 		case 8:
 		case 8:
 			mes "[Port Malaya Guide]";
 			mes "[Port Malaya Guide]";
-			mes "Removing marks.";
-			mes "What else can I help you with?";
+			mes "I'll remove all marks from your mini-map.";
+			mes "Is there anything else I can do for you?";
 			viewpoint 2,1,1,0,0xFFFFFF;
 			viewpoint 2,1,1,0,0xFFFFFF;
 			viewpoint 2,1,1,1,0xFFFFFF;
 			viewpoint 2,1,1,1,0xFFFFFF;
 			viewpoint 2,1,1,2,0xFFFFFF;
 			viewpoint 2,1,1,2,0xFFFFFF;
@@ -71,10 +73,10 @@ malaya,71,72,4	script	Port Malaya Guide#01::GuideMalaya	579,{
 	end;
 	end;
 L_Mark:
 L_Mark:
 	mes "[Port Malaya Guide]";
 	mes "[Port Malaya Guide]";
-	mes "The "+getarg(0)+"^000000";
-	mes "location will be";
+	mes "The "+getarg(0)+" "+((getarg(1,0))?"are":"is");
 	mes "marked on your mini-map.";
 	mes "marked on your mini-map.";
-	mes "What else can I help you with?";
+	mes "Check your mini-map.";
+	mes "Is there anything else I can do for you?";
 	return;
 	return;
 }
 }
 malaya,250,83,6	duplicate(GuideMalaya)	Port Malaya Guide#02	579
 malaya,250,83,6	duplicate(GuideMalaya)	Port Malaya Guide#02	579

+ 22 - 17
npc/re/guides/guides_mora.txt

@@ -3,13 +3,14 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= Euphy
 //= Euphy
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
 //= Guides for the city of Mora.
 //= Guides for the city of Mora.
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First version. [Euphy]
 //= 1.0 First version. [Euphy]
+//= 1.1 Navigation system update. [Euphy]
 //============================================================ 
 //============================================================ 
 
 
 mora,25,158,5	script	Raffle Guide#north	516,{
 mora,25,158,5	script	Raffle Guide#north	516,{
@@ -17,32 +18,33 @@ mora,25,158,5	script	Raffle Guide#north	516,{
 	mes "Laoh~!";
 	mes "Laoh~!";
 	mes "Welcome to the Village of Mora.";
 	mes "Welcome to the Village of Mora.";
 	mes "I can tell you whatever you want to know about the village~!";
 	mes "I can tell you whatever you want to know about the village~!";
+	F_Navi("[Raffoh]");
 	next;
 	next;
 	switch(select("[ Inn ]:[ Residences ]:[ Stores ]:[ Warehouse ]:Remove markers from the mini-map:Quit")) {
 	switch(select("[ Inn ]:[ Residences ]:[ Stores ]:[ Warehouse ]:Remove markers from the mini-map:Quit")) {
 	case 1:
 	case 1:
 		mes "[Raffoh]";
 		mes "[Raffoh]";
 		mes "Laoh~!";
 		mes "Laoh~!";
-		mes "We have an inn but we can't make travelers sleep like Raffles...";
+		mes "We have an "+F_Navi("Inn","mora,44,138")+" but we can't make travelers sleep like Raffles...";
 		mes "Get some rest!";
 		mes "Get some rest!";
 		viewpoint 1,44,134,0,0x0A82FF;
 		viewpoint 1,44,134,0,0x0A82FF;
 		close;
 		close;
 	case 2:
 	case 2:
 		mes "[Raffoh]";
 		mes "[Raffoh]";
 		mes "Laoh~!";
 		mes "Laoh~!";
-		mes "This is where Raffles' houses are...";
+		mes F_Navi("This","mora,119,170")+" is where Raffles' houses are...";
 		mes "But keep the noise down because people are asleep~!";
 		mes "But keep the noise down because people are asleep~!";
 		viewpoint 1,119,170,1,0xAAFF00;
 		viewpoint 1,119,170,1,0xAAFF00;
 		close;
 		close;
 	case 3:
 	case 3:
 		mes "[Raffoh]";
 		mes "[Raffoh]";
 		mes "Laoh~!";
 		mes "Laoh~!";
-		mes "If you are looking for souvenirs, you can buy some in this district.";
+		mes "If you are looking for souvenirs, you can buy some in this "+F_Navi("district","mora,112,110")+".";
 		viewpoint 1,112,110,2,0xDA70D6;
 		viewpoint 1,112,110,2,0xDA70D6;
 		close;
 		close;
 	case 4:
 	case 4:
 		mes "[Raffoh]";
 		mes "[Raffoh]";
 		mes "Laoh~!";
 		mes "Laoh~!";
-		mes "This is where they keep all kinds of packages and groceries.";
+		mes F_Navi("This","mora,182,161")+" is where they keep all kinds of packages and groceries.";
 		mes "There are many things that don't belong to the Raffles, so be careful!";
 		mes "There are many things that don't belong to the Raffles, so be careful!";
 		viewpoint 1,182,161,3,0xFF1493;
 		viewpoint 1,182,161,3,0xFF1493;
 		close;
 		close;
@@ -67,32 +69,33 @@ mora,167,76,3	script	Raffle Guide#east	522,{
 	mes "Uh...";
 	mes "Uh...";
 	mes "This, this is the Village of Mora.";
 	mes "This, this is the Village of Mora.";
 	mes "Uh... which place do you want to know about?";
 	mes "Uh... which place do you want to know about?";
+	F_Navi("[Raffuh]");
 	next;
 	next;
 	switch(select("[ Inn ]:[ Residences ]:[ Stores ]:[ Warehouse ]:Remove markers from the mini-map:Quit")) {
 	switch(select("[ Inn ]:[ Residences ]:[ Stores ]:[ Warehouse ]:Remove markers from the mini-map:Quit")) {
 	case 1:
 	case 1:
 		mes "[Raffuh]";
 		mes "[Raffuh]";
 		mes "Uh...";
 		mes "Uh...";
 		mes "Are, are you sleepy?";
 		mes "Are, are you sleepy?";
-		mes "You can sleep here uh!! Put your stuff down uh! And-- and---";
+		mes "You can sleep "+F_Navi("here","mora,44,138")+" uh!! Put your stuff down uh! And-- and---";
 		viewpoint 1,44,134,0,0x0A82FF;
 		viewpoint 1,44,134,0,0x0A82FF;
 		close;
 		close;
 	case 2:
 	case 2:
 		mes "[Raffuh]";
 		mes "[Raffuh]";
 		mes "Uh...";
 		mes "Uh...";
-		mes "Why are you trying to find out where I live--?";
+		mes "Why are you trying to find out "+F_Navi("where","mora,119,170")+" I live--?";
 		mes "Uh, no... I'd like to live with my friends--";
 		mes "Uh, no... I'd like to live with my friends--";
 		viewpoint 1,119,170,1,0xAAFF00;
 		viewpoint 1,119,170,1,0xAAFF00;
 		close;
 		close;
 	case 3:
 	case 3:
 		mes "[Raffuh]";
 		mes "[Raffuh]";
 		mes "Uh...";
 		mes "Uh...";
-		mes "There are a lot of things in those stores-- oh, there is a hot spring also uh!";
+		mes "There are a lot of things in those "+F_Navi("stores","mora,112,110")+"-- oh, there is a hot spring also uh!";
 		viewpoint 1,112,110,2,0xDA70D6;
 		viewpoint 1,112,110,2,0xDA70D6;
 		close;
 		close;
 	case 4:
 	case 4:
 		mes "[Raffuh]";
 		mes "[Raffuh]";
 		mes "Uh...";
 		mes "Uh...";
-		mes "You can't just march into the warehouse, or you'll be in trouble--";
+		mes "You can't just march into the "+F_Navi("warehouse","mora,182,161")+", or you'll be in trouble--";
 		mes "Many of the things there are from outside the village-- Raffuh has been in trouble several times--";
 		mes "Many of the things there are from outside the village-- Raffuh has been in trouble several times--";
 		viewpoint 1,182,161,3,0xFF1493;
 		viewpoint 1,182,161,3,0xFF1493;
 		close;
 		close;
@@ -117,19 +120,20 @@ mora,115,138,5	script	Raffle Guide#center	524,{
 	mes "Lala!";
 	mes "Lala!";
 	mes "Welcome to the Village of Mora la!";
 	mes "Welcome to the Village of Mora la!";
 	mes "If you need to know anything about the village, just ask me la!";
 	mes "If you need to know anything about the village, just ask me la!";
+	F_Navi("[Raffla]");
 	next;
 	next;
 	switch(select("[ Inn ]:[ Residences ]:[ Stores ]:[ Warehouse ]:Remove markers from the mini-map:Quit.")) {
 	switch(select("[ Inn ]:[ Residences ]:[ Stores ]:[ Warehouse ]:Remove markers from the mini-map:Quit.")) {
 	case 1:
 	case 1:
 		mes "[Raffla]";
 		mes "[Raffla]";
 		mes "Lala!";
 		mes "Lala!";
-		mes "This is where travelers can rest la!";
+		mes F_Navi("This","mora,44,138")+" is where travelers can rest la!";
 		mes "The innkeeper is very kind, so try to talk to him a lot la!";
 		mes "The innkeeper is very kind, so try to talk to him a lot la!";
 		viewpoint 1,44,134,0,0x0A82FF;
 		viewpoint 1,44,134,0,0x0A82FF;
 		close;
 		close;
 	case 2:
 	case 2:
 		mes "[Raffla]";
 		mes "[Raffla]";
 		mes "Lala!";
 		mes "Lala!";
-		mes "This is where Raffles live la!";
+		mes F_Navi("This","mora,119,170")+" is where Raffles live la!";
 		mes "Head over there la!";
 		mes "Head over there la!";
 		viewpoint 1,119,170,1,0xAAFF00;
 		viewpoint 1,119,170,1,0xAAFF00;
 		close;
 		close;
@@ -137,13 +141,13 @@ mora,115,138,5	script	Raffle Guide#center	524,{
 		mes "[Raffla]";
 		mes "[Raffla]";
 		mes "Lala!";
 		mes "Lala!";
 		mes "So you want to buy something la?";
 		mes "So you want to buy something la?";
-		mes "There are a lot of stores and cafes, so check them out la!";
+		mes "There are a lot of "+F_Navi("stores and cafes","mora,112,110")+", so check them out la!";
 		viewpoint 1,112,110,2,0xDA70D6;
 		viewpoint 1,112,110,2,0xDA70D6;
 		close;
 		close;
 	case 4:
 	case 4:
 		mes "[Raffla]";
 		mes "[Raffla]";
 		mes "Lala!";
 		mes "Lala!";
-		mes "The warehouse is where you keep your valuables la!";
+		mes "The "+F_Navi("Warehouse","mora,182,161")+" is where you keep your valuables la!";
 		mes "Be careful so you don't get robbed la!";
 		mes "Be careful so you don't get robbed la!";
 		viewpoint 1,182,161,3,0xFF1493;
 		viewpoint 1,182,161,3,0xFF1493;
 		close;
 		close;
@@ -168,19 +172,20 @@ mora,72,51,3	script	Raffle Guide#south	518,{
 	mes "Lali?";
 	mes "Lali?";
 	mes "Welcome to the Village of Mora.";
 	mes "Welcome to the Village of Mora.";
 	mes "If you need to know anything about the village, just ask me.";
 	mes "If you need to know anything about the village, just ask me.";
+	F_Navi("[Raffli]");
 	next;
 	next;
 	switch(select("[ Inn ]:[ Residences ]:[ Stores ]:[ Warehouse ]:Remove markers from the mini-map:Quit")) {
 	switch(select("[ Inn ]:[ Residences ]:[ Stores ]:[ Warehouse ]:Remove markers from the mini-map:Quit")) {
 	case 1:
 	case 1:
 		mes "[Raffli]";
 		mes "[Raffli]";
 		mes "Lali?";
 		mes "Lali?";
-		mes "This is where travelers can rest.";
+		mes F_Navi("This","mora,44,138")+" is where travelers can rest.";
 		mes "The innkeeper is very kind, so get to know him.";
 		mes "The innkeeper is very kind, so get to know him.";
 		viewpoint 1,44,134,0,0x0A82FF;
 		viewpoint 1,44,134,0,0x0A82FF;
 		close;
 		close;
 	case 2:
 	case 2:
 		mes "[Raffli]";
 		mes "[Raffli]";
 		mes "Lali?";
 		mes "Lali?";
-		mes "This is where Raffles live.";
+		mes F_Navi("This","mora,119,170")+" is where Raffles live.";
 		mes "Are you coming to Raffli's house li? I'm so happy.";
 		mes "Are you coming to Raffli's house li? I'm so happy.";
 		viewpoint 1,119,170,1,0xAAFF00;
 		viewpoint 1,119,170,1,0xAAFF00;
 		close;
 		close;
@@ -188,13 +193,13 @@ mora,72,51,3	script	Raffle Guide#south	518,{
 		mes "[Raffli]";
 		mes "[Raffli]";
 		mes "Lali?";
 		mes "Lali?";
 		mes "There are a lot of things I want to buy.";
 		mes "There are a lot of things I want to buy.";
-		mes "You can find tons of places to eat and shop, and tons of things to buy.";
+		mes "You can find tons of "+F_Navi("places","mora,112,110")+" to eat and shop, and tons of things to buy.";
 		viewpoint 1,112,110,2,0xDA70D6;
 		viewpoint 1,112,110,2,0xDA70D6;
 		close;
 		close;
 	case 4:
 	case 4:
 		mes "[Raffli]";
 		mes "[Raffli]";
 		mes "Lali?";
 		mes "Lali?";
-		mes "The warehouse is where you keep your valuables.";
+		mes "The "+F_Navi("Warehouse","mora,182,161")+" is where you keep your valuables.";
 		mes "But don't get robbed.";
 		mes "But don't get robbed.";
 		viewpoint 1,182,161,3,0xFF1493;
 		viewpoint 1,182,161,3,0xFF1493;
 		close;
 		close;

+ 35 - 29
npc/re/guides/guides_morroc.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Renewal guide.
 //= 1.0 First version, Renewal guide.
 //= 1.1 Fixed and optimized. [Euphy]
 //= 1.1 Fixed and optimized. [Euphy]
+//= 1.2 Navigation system update. [Euphy]
 //============================================================ 
 //============================================================ 
 
 
 morocc,153,286,6	script	Guide#01morocc::GuideMorroc	707,{
 morocc,153,286,6	script	Guide#01morocc::GuideMorroc	707,{
@@ -20,6 +21,7 @@ morocc,153,286,6	script	Guide#01morocc::GuideMorroc	707,{
 	mes "Welcome to ^8B4513Morroc^000000,";
 	mes "Welcome to ^8B4513Morroc^000000,";
 	mes "the Desert Town.";
 	mes "the Desert Town.";
 	mes "Do you need help navigating the town?";
 	mes "Do you need help navigating the town?";
+	F_Navi("[Morroc Guide]");
 	next;
 	next;
 	while (1) {
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
@@ -29,7 +31,7 @@ morocc,153,286,6	script	Guide#01morocc::GuideMorroc	707,{
 				switch(select("[ Thief Guild ]:[ Sphinx Dungeon ]:[ Oasis Entrance ]:[ Forge ]:[ Weapon & Armor Shop ]:[ Inn ]:[ Tavern ]:Previous Menu")) {
 				switch(select("[ Thief Guild ]:[ Sphinx Dungeon ]:[ Oasis Entrance ]:[ Forge ]:[ Weapon & Armor Shop ]:[ Inn ]:[ Tavern ]:Previous Menu")) {
 				case 1:
 				case 1:
 					mes "[Morroc Guide]";
 					mes "[Morroc Guide]";
-					mes "The ^B9062FThief Guild^000000 is located";
+					mes "The "+F_Navi("Thief Guild","morocc,26,294","^B9062F")+" is located";
 					mes "inside the ^B9062FPyramids^000000";
 					mes "inside the ^B9062FPyramids^000000";
 					mes "that is near the ^B9062FOasis^000000.";
 					mes "that is near the ^B9062FOasis^000000.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
@@ -38,7 +40,7 @@ morocc,153,286,6	script	Guide#01morocc::GuideMorroc	707,{
 					break;
 					break;
 				case 2:
 				case 2:
 					mes "[Morroc Guide]";
 					mes "[Morroc Guide]";
-					mes "The ^0000FFSphinx Dungeon^000000 is";
+					mes "The "+F_Navi("Sphinx Dungeon","morocc,26,164","^0000FF")+" is";
 					mes "right outside the western gate.";
 					mes "right outside the western gate.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,26,164,1,0x0A82FF;
 					viewpoint 1,26,164,1,0x0A82FF;
@@ -46,25 +48,25 @@ morocc,153,286,6	script	Guide#01morocc::GuideMorroc	707,{
 					break;
 					break;
 				case 3:
 				case 3:
 					mes "[Morroc Guide]";
 					mes "[Morroc Guide]";
-					mes "Let me mark the entrance to the ^FF5400Oasis^000000";
+					mes "Let me mark the entrance to the "+F_Navi("Oasis","morocc,26,294","^FF5400");
 					mes "on your mini-map.";
 					mes "on your mini-map.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,26,294,2,0xFFB400;
 					viewpoint 1,26,294,2,0xFFB400;
 					next;
 					next;
 					break;
 					break;
 				case 4:
 				case 4:
-					callsub L_Mark,"^006400Forge";
+					callsub L_Mark, F_Navi("Forge","morocc,47,47","^006400");
 					viewpoint 1,47,47,3,0xAAFF00;
 					viewpoint 1,47,47,3,0xAAFF00;
 					next;
 					next;
 					break;
 					break;
 				case 5:
 				case 5:
-					callsub L_Mark,"^7F3300Weapon & Armor Shop";
+					callsub L_Mark, F_Navi("Weapon & Armor Shop","morocc,253,56","^7F3300");
 					viewpoint 1,253,56,4,0xD2691E;
 					viewpoint 1,253,56,4,0xD2691E;
 					next;
 					next;
 					break;
 					break;
 				case 6:
 				case 6:
 					mes "[Morroc Guide]";
 					mes "[Morroc Guide]";
-					mes "Currently the ^800080Inn^000000";
+					mes "Currently the "+F_Navi("Inn","morocc,273,269","^800080");
 					mes "has been shut down until further notice,";
 					mes "has been shut down until further notice,";
 					mes "but I'll mark its location";
 					mes "but I'll mark its location";
 					mes "on your mini-map.";
 					mes "on your mini-map.";
@@ -73,7 +75,7 @@ morocc,153,286,6	script	Guide#01morocc::GuideMorroc	707,{
 					next;
 					next;
 					break;
 					break;
 				case 7:
 				case 7:
-					callsub L_Mark,"^B9062FTavern";
+					callsub L_Mark, F_Navi("Tavern","morocc,52,259","^B9062F");
 					viewpoint 1,52,259,6,0xFF0000;
 					viewpoint 1,52,259,6,0xFF0000;
 					next;
 					next;
 					break;
 					break;
@@ -88,19 +90,19 @@ morocc,153,286,6	script	Guide#01morocc::GuideMorroc	707,{
 			while (.@loop) {
 			while (.@loop) {
 				switch(select("[ Kafra Employee ]:[ Poison Herb Salesman ]:[ Dye Maker ]:[ Seiyablem ]:Previous Menu")) {
 				switch(select("[ Kafra Employee ]:[ Poison Herb Salesman ]:[ Dye Maker ]:[ Seiyablem ]:Previous Menu")) {
 				case 1:
 				case 1:
-					callsub L_Mark,"^0000FFKafra Employees";
+					callsub L_Mark,"^0000FFKafra Employees^000000";
 					viewpoint 1,156,97,7,0x0A82FF;
 					viewpoint 1,156,97,7,0x0A82FF;
 					viewpoint 1,160,258,8,0x0A82FF;
 					viewpoint 1,160,258,8,0x0A82FF;
 					next;
 					next;
 					break;
 					break;
 				case 2:
 				case 2:
-					callsub L_Mark,"^006400Poison Herb Salesman";
+					callsub L_Mark, F_Navi("Poison Herb Salesman","morocc,191,94","^006400");
 					viewpoint 1,190,96,9,0xAAFF00;
 					viewpoint 1,190,96,9,0xAAFF00;
 					next;
 					next;
 					break;
 					break;
 				case 3:
 				case 3:
 					mes "[Morroc Guide]";
 					mes "[Morroc Guide]";
-					mes "The ^7F3300Dye Maker^000000 is";
+					mes "The "+F_Navi("Dye Maker","morocc,273,269","^7F3300")+" is";
 					mes "currently staying";
 					mes "currently staying";
 					mes "on the 1st floor of the Inn.";
 					mes "on the 1st floor of the Inn.";
 					mes "Let me mark his location";
 					mes "Let me mark his location";
@@ -111,7 +113,7 @@ morocc,153,286,6	script	Guide#01morocc::GuideMorroc	707,{
 					break;
 					break;
 				case 4:
 				case 4:
 					mes "[Morroc Guide]";
 					mes "[Morroc Guide]";
-					mes "^800080Seiyablem^000000";
+					mes F_Navi("Seiyablem","morocc,51,41","^800080");
 					mes "is a technician";
 					mes "is a technician";
 					mes "who can create ^0000FFslots^000000 on weapons and armors,";
 					mes "who can create ^0000FFslots^000000 on weapons and armors,";
 					mes "but not all equipment";
 					mes "but not all equipment";
@@ -156,15 +158,14 @@ morocc,153,286,6	script	Guide#01morocc::GuideMorroc	707,{
 L_Mark:
 L_Mark:
 	mes "[Morroc Guide]";
 	mes "[Morroc Guide]";
 	mes "Let me mark the location of the";
 	mes "Let me mark the location of the";
-	mes getarg(0)+"^000000";
+	mes getarg(0);
 	mes "on your mini-map.";
 	mes "on your mini-map.";
 	mes "Would you like to check any other locations?";
 	mes "Would you like to check any other locations?";
 	return;
 	return;
 }
 }
-
-morocc,154,38,6	duplicate(GuideMorroc)	Guide#02morocc	707,{
-morocc,296,213,4	duplicate(GuideMorroc)	Guide#03morocc	707,{
-morocc,28,170,5	duplicate(GuideMorroc)	Guide#04morocc	707,{
+morocc,154,38,6	duplicate(GuideMorroc)	Guide#02morocc	707
+morocc,296,213,4	duplicate(GuideMorroc)	Guide#03morocc	707
+morocc,28,170,5	duplicate(GuideMorroc)	Guide#04morocc	707
 
 
 moc_ruins,159,53,3	script	Guide#01ruins::GuideMocRuins	707,{
 moc_ruins,159,53,3	script	Guide#01ruins::GuideMocRuins	707,{
 	cutin "moc_soldier",2;
 	cutin "moc_soldier",2;
@@ -172,6 +173,7 @@ moc_ruins,159,53,3	script	Guide#01ruins::GuideMocRuins	707,{
 	mes "Welcome to ^8B4513Morroc^000000,";
 	mes "Welcome to ^8B4513Morroc^000000,";
 	mes "the Desert Town.";
 	mes "the Desert Town.";
 	mes "Do you need help navigating the town?";
 	mes "Do you need help navigating the town?";
+	F_Navi("[Morroc Guide]");
 	next;
 	next;
 	while (1) {
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
@@ -181,7 +183,7 @@ moc_ruins,159,53,3	script	Guide#01ruins::GuideMocRuins	707,{
 				switch(select("[ Thief Guild ]:[ Sphinx Dungeon ]:[ Morroc Entrance ]:Previous Menu")) {
 				switch(select("[ Thief Guild ]:[ Sphinx Dungeon ]:[ Morroc Entrance ]:Previous Menu")) {
 				case 1:
 				case 1:
 					mes "[Morroc Guide]";
 					mes "[Morroc Guide]";
-					mes "The ^B9062FThief Guild^000000 is located";
+					mes "The "+F_Navi("Thief Guild","moc_ruins,56,161","^B9062F")+" is located";
 					mes "inside the ^B9062FPyramids^000000.";
 					mes "inside the ^B9062FPyramids^000000.";
 					mes "Let me mark its location";
 					mes "Let me mark its location";
 					mes "on your mini-map.";
 					mes "on your mini-map.";
@@ -191,7 +193,7 @@ moc_ruins,159,53,3	script	Guide#01ruins::GuideMocRuins	707,{
 					break;
 					break;
 				case 2:
 				case 2:
 					mes "[Morroc Guide]";
 					mes "[Morroc Guide]";
-					mes "The ^0000FFSphinx Dungeon^000000";
+					mes "The "+F_Navi("Sphinx Dungeon","moc_ruins,71,19","^0000FF");
 					mes "is outside the south entrance of this Oasis.";
 					mes "is outside the south entrance of this Oasis.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,71,19,1,0x0A82FF;
 					viewpoint 1,71,19,1,0x0A82FF;
@@ -199,7 +201,7 @@ moc_ruins,159,53,3	script	Guide#01ruins::GuideMocRuins	707,{
 					break;
 					break;
 				case 3:
 				case 3:
 					mes "[Morroc Guide]";
 					mes "[Morroc Guide]";
-					mes "^FF5400Morroc^000000 is";
+					mes F_Navi("Morroc","moc_ruins,158,40","^FF5400")+" is";
 					mes "right outside the southeast entrance of this Oasis.";
 					mes "right outside the southeast entrance of this Oasis.";
 					mes "Let me mark its location";
 					mes "Let me mark its location";
 					mes "on your mini-map.";
 					mes "on your mini-map.";
@@ -218,39 +220,44 @@ moc_ruins,159,53,3	script	Guide#01ruins::GuideMocRuins	707,{
 			while (.@loop) {
 			while (.@loop) {
 				switch(select("[ Eden Teleport Officer ]:[ Tool Dealer ]:[ Kafra Employee ]:[ Repairman ]:[ Pet Groomer ]:[ Chef Assistant ]:[ Leablem ]:Previous Menu")) {
 				switch(select("[ Eden Teleport Officer ]:[ Tool Dealer ]:[ Kafra Employee ]:[ Repairman ]:[ Pet Groomer ]:[ Chef Assistant ]:[ Leablem ]:Previous Menu")) {
 				case 1:
 				case 1:
-					callsub L_Mark,"^006400Eden Teleport Officer";
+					callsub L_Mark, F_Navi("Eden Teleport Officer","moc_ruins,68,164","^006400");
 					viewpoint 1,68,164,3,0xAAFF00;
 					viewpoint 1,68,164,3,0xAAFF00;
 					next;
 					next;
 					break;
 					break;
 				case 2:
 				case 2:
-					callsub L_Mark,"^800080Tool Dealers";
+					mes "[Morroc Guide]";
+					mes "Let me mark the location of the";
+					mes F_Navi("Northern Tool Dealer","moc_ruins,92,128","^800080");
+					mes "and "+F_Navi("Southern Tool Dealer","moc_ruins,114,63","^800080");
+					mes "on your mini-map.";
+					mes "Would you like to check any other locations?";
 					viewpoint 1,92,128,5,0xDA70D6;
 					viewpoint 1,92,128,5,0xDA70D6;
 					viewpoint 1,114,63,6,0xDA70D6;
 					viewpoint 1,114,63,6,0xDA70D6;
 					next;
 					next;
 					break;
 					break;
 				case 3:
 				case 3:
-					callsub L_Mark,"^B9062FKafra Employee";
+					callsub L_Mark, "^B9062FKafra Employee^000000";
 					viewpoint 1,59,157,7,0xFF0000;
 					viewpoint 1,59,157,7,0xFF0000;
 					next;
 					next;
 					break;
 					break;
 				case 4:
 				case 4:
-					callsub L_Mark,"^0000FFRepairman";
+					callsub L_Mark, F_Navi("Repairman","moc_ruins,107,94","^0000FF");
 					viewpoint 1,107,94,8,0x0A82FF;
 					viewpoint 1,107,94,8,0x0A82FF;
 					next;
 					next;
 					break;
 					break;
 				case 5:
 				case 5:
-					callsub L_Mark,"^FF5400Pet Groomer";
+					callsub L_Mark, F_Navi("Pet Groomer","moc_ruins,118,170","^FF5400");
 					viewpoint 1,118,170,9,0xFFB400;
 					viewpoint 1,118,170,9,0xFFB400;
 					next;
 					next;
 					break;
 					break;
 				case 6:
 				case 6:
-					callsub L_Mark,"^006400Chef Assistant";
+					callsub L_Mark, F_Navi("Chef Assistant","moc_ruins,115,123","^006400");
 					viewpoint 1,115,123,10,0xAAFF00;
 					viewpoint 1,115,123,10,0xAAFF00;
 					next;
 					next;
 					break;
 					break;
 				case 7:
 				case 7:
 					mes "[Morroc Guide]";
 					mes "[Morroc Guide]";
-					mes "^7F3300Leablem^000000";
+					mes F_Navi("Leablem","moc_ruins,154,86","^7F3300");
 					mes "is a technician";
 					mes "is a technician";
 					mes "who can create ^0000FFslots^000000 on weapons and armors,";
 					mes "who can create ^0000FFslots^000000 on weapons and armors,";
 					mes "but not all equipment";
 					mes "but not all equipment";
@@ -295,11 +302,10 @@ moc_ruins,159,53,3	script	Guide#01ruins::GuideMocRuins	707,{
 L_Mark:
 L_Mark:
 	mes "[Morroc Guide]";
 	mes "[Morroc Guide]";
 	mes "Let me mark the location of the";
 	mes "Let me mark the location of the";
-	mes getarg(0)+"^000000";
+	mes getarg(0);
 	mes "on your mini-map.";
 	mes "on your mini-map.";
 	mes "Would you like to check any other locations?";
 	mes "Would you like to check any other locations?";
 	return;
 	return;
 }
 }
-
 moc_ruins,70,164,3	duplicate(GuideMocRuins)	Guide#02ruins	707
 moc_ruins,70,164,3	duplicate(GuideMocRuins)	Guide#02ruins	707
 moc_ruins,65,44,5	duplicate(GuideMocRuins)	Guide#03ruins	707
 moc_ruins,65,44,5	duplicate(GuideMocRuins)	Guide#03ruins	707

+ 38 - 26
npc/re/guides/guides_moscovia.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
@@ -12,65 +12,75 @@
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Renewal guide.
 //= 1.0 First version, Renewal guide.
 //= 1.1 Optimized (a little bit). [Euphy]
 //= 1.1 Optimized (a little bit). [Euphy]
+//= 1.2 Navigation system update. [Euphy]
 //============================================================ 
 //============================================================ 
 
 
-moscovia,226,191,4	script	Moscovia Guide#02mosc	959,{
+moscovia,161,76,3	script	Moscovia Guide#01mosc	959,{
 	mes "[Moscovia Guide]";
 	mes "[Moscovia Guide]";
-	mes "A paradise on the sea";
-	mes "beautiful wave and warm sunshine";
-	mes "^8B4513Moscovia^000000 is waitting for you";
-	mes "welcome to come here.";
+	mes "A paradise on the sea,";
+	mes "beautiful waves and warm sunshine.";
+	mes "^8B4513Moscovia^000000 is waiting for you.";
 	mes "I'm supporting to offer information about here.";
 	mes "I'm supporting to offer information about here.";
-	mes "if you want to ask anything just feel free tell me.";
+	mes "If you want to ask anything just feel free tell me.";
+	F_Navi("[Moscovia Guide]");
 	set .@str$,"Is there anything else I can do for you?";
 	set .@str$,"Is there anything else I can do for you?";
 	while (1) {
 	while (1) {
 		next;
 		next;
-		switch(select("[ Palace ]:[ Chapel ]:[ Weapon Shop ]:[ Armor Shop ]:[ Tool Shop ]:[ Inn ]:[ Return to Alberta ]:Remove Marks from Mini-Map:Cancel")) {
+		switch(select("[ Kafra Employee ]:[ Palace ]:[ Chapel ]:[ Weapon Shop ]:[ Armor Shop ]:[ Tool Shop ]:[ Inn ]:[ Return to Alberta ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
 		case 1:
 			mes "[Moscovia Guide]";
 			mes "[Moscovia Guide]";
-			mes "In the ^006400Palace^000000 you will find our Lord the Czar and other servants.";
-			mes .@str$;
-			viewpoint 1,255,140,0,0x0A82FF;
+			mes "The ^0000FFKafra Employee^000000 has";
+			mes "been marked on your mini-map";
+			mes "Check your mini-map.";
+			mes "Do you need anything else?";
+			viewpoint 1,223,191,0,0x0A82FF;
 			break;
 			break;
 		case 2:
 		case 2:
 			mes "[Moscovia Guide]";
 			mes "[Moscovia Guide]";
-			mes "The ^008080Chapel^000000 is located here.";
+			mes "In the "+F_Navi("Palace","moscovia,255,140","^006400")+" you will find our Lord the Czar and other servants.";
 			mes .@str$;
 			mes .@str$;
-			viewpoint 1,253,179,1,0xAAFF00;
+			viewpoint 1,255,140,1,0x0A82FF;
 			break;
 			break;
 		case 3:
 		case 3:
 			mes "[Moscovia Guide]";
 			mes "[Moscovia Guide]";
-			mes "You can buy weapons from the best craftsmen in Moscovia if you go to ^FF1493Weapon Shop^000000.";
+			mes "The "+F_Navi("Chapel","moscovia,253,179","^008080")+" is located here.";
 			mes .@str$;
 			mes .@str$;
-			viewpoint 1,186,191,2,0x008080;
+			viewpoint 1,253,179,2,0xAAFF00;
 			break;
 			break;
 		case 4:
 		case 4:
 			mes "[Moscovia Guide]";
 			mes "[Moscovia Guide]";
-			mes "You will find only the best gear at the Moscovia ^8B4513Armor Shop^000000.";
+			mes "You can buy weapons from the best craftsmen in Moscovia if you go to the "+F_Navi("Weapon Shop","moscovia,186,191","^FF1493")+".";
 			mes .@str$;
 			mes .@str$;
-			viewpoint 1,204,169,3,0xB200FF;
+			viewpoint 1,186,191,3,0x008080;
 			break;
 			break;
 		case 5:
 		case 5:
 			mes "[Moscovia Guide]";
 			mes "[Moscovia Guide]";
-			mes "The ^FF1493Tool Shop^000000 is located just south from the center of town.";
-			mes "You can find all sorts of things you need for your travels.";
+			mes "You will find only the best gear at the Moscovia "+F_Navi("Armor Shop","moscovia,204,169","^8B4513")+".";
 			mes .@str$;
 			mes .@str$;
-			viewpoint 1,221,176,4,0xFF1493;
+			viewpoint 1,204,169,4,0xB200FF;
 			break;
 			break;
 		case 6:
 		case 6:
 			mes "[Moscovia Guide]";
 			mes "[Moscovia Guide]";
-			mes "The Inn 'Sticky Herb Tree' is just north from the center of town.";
-			mes "If you need to rest, there is no better place to stay.";
+			mes "The "+F_Navi("Tool Shop","moscovia,221,176","^FF1493")+" is located just south from the center of town.";
+			mes "You can find all sorts of things you need for your travels.";
 			mes .@str$;
 			mes .@str$;
-			viewpoint 1,227,206,5,0x8B4513;
+			viewpoint 1,221,176,5,0xFF1493;
 			break;
 			break;
 		case 7:
 		case 7:
 			mes "[Moscovia Guide]";
 			mes "[Moscovia Guide]";
-			mes "You can go back to Alberta at the docks.";
+			mes "The Inn "+F_Navi("Sticky Herb Tree","moscovia,227,206")+" is just north from the center of town.";
+			mes "If you need to rest, there is no better place to stay.";
 			mes .@str$;
 			mes .@str$;
-			viewpoint 1,166,53,6,0x00BFFF;
+			viewpoint 1,227,206,6,0x8B4513;
 			break;
 			break;
 		case 8:
 		case 8:
+			mes "[Moscovia Guide]";
+			mes "You can find the";
+			mes F_Navi("Moscovia P.R. Officer","moscovia,166,53")+" at the docks if";
+			mes "you want to return to Alberta.";
+			viewpoint 1,166,53,7,0x00BFFF;
+			break;
+		case 9:
 			mes "[Moscovia Guide]";
 			mes "[Moscovia Guide]";
 			mes "I'll remove all marks from your mini-map.";
 			mes "I'll remove all marks from your mini-map.";
 			mes .@str$;
 			mes .@str$;
@@ -81,11 +91,13 @@ moscovia,226,191,4	script	Moscovia Guide#02mosc	959,{
 			viewpoint 2,1,1,4,0xFFFFFF;
 			viewpoint 2,1,1,4,0xFFFFFF;
 			viewpoint 2,1,1,5,0xFFFFFF;
 			viewpoint 2,1,1,5,0xFFFFFF;
 			viewpoint 2,1,1,6,0xFFFFFF;
 			viewpoint 2,1,1,6,0xFFFFFF;
+			viewpoint 2,1,1,7,0xFFFFFF;
 			break;
 			break;
-		case 9:
+		case 10:
 			mes "[Moscovia Guide]";
 			mes "[Moscovia Guide]";
 			mes "Enjoy your trip~!";
 			mes "Enjoy your trip~!";
 			close;
 			close;
 		}
 		}
 	}
 	}
 }
 }
+moscovia,226,191,4	duplicate(Moscovia Guide#01mosc)	Moscovia Guide#02mosc	959

+ 12 - 6
npc/re/guides/guides_niflheim.txt

@@ -3,15 +3,16 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
 //= [Official Conversion]
 //= [Official Conversion]
-//= Guide for the city of Niflehim.
+//= Guide for the city of Niflheim.
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Renewal guide.
 //= 1.0 First version, Renewal guide.
 //= 1.1 Optimized. [Euphy]
 //= 1.1 Optimized. [Euphy]
+//= 1.2 Navigation system update. [Euphy]
 //============================================================ 
 //============================================================ 
 
 
 niflheim,201,187,3	script	Niflheim Guide#01nif	849,{
 niflheim,201,187,3	script	Niflheim Guide#01nif	849,{
@@ -19,23 +20,28 @@ niflheim,201,187,3	script	Niflheim Guide#01nif	849,{
 	mes "Welcome to.. ^8B4513Niflheim^000000...";
 	mes "Welcome to.. ^8B4513Niflheim^000000...";
 	mes "the Realm of the Dead...";
 	mes "the Realm of the Dead...";
 	mes "Do you need help navigating the realm...?";
 	mes "Do you need help navigating the realm...?";
+	if (F_Navi() == 0) {
+		next;
+		mes "[Niflheim Guide]";
+		mes "When you click on the.. ^B9062F[location name]^000000... you'll receive the most advanced ^B9062FNavigation^000000 services...!";
+	}
 	while (1) {
 	while (1) {
 		next;
 		next;
 		switch(select("[ Tool Shop ]:[ Pub ]:[ Weapon Shop ]:[ Witch's Castle ]:Remove Marks from Mini-Map:Cancel")) {
 		switch(select("[ Tool Shop ]:[ Pub ]:[ Weapon Shop ]:[ Witch's Castle ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
 		case 1:
-			callsub L_Mark,"^0000FFTool Shop";
+			callsub L_Mark, F_Navi("Tool Shop","niflheim,218,196","^0000FF");
 			viewpoint 1,218,196,0,0x0A82FF;
 			viewpoint 1,218,196,0,0x0A82FF;
 			break;
 			break;
 		case 2:
 		case 2:
-			callsub L_Mark,"^006400Pub";
+			callsub L_Mark, F_Navi("Pub","niflheim,189,208","^006400");
 			viewpoint 1,189,208,1,0xAAFF00;
 			viewpoint 1,189,208,1,0xAAFF00;
 			break;
 			break;
 		case 3:
 		case 3:
-			callsub L_Mark,"^800080Weapon Shop";
+			callsub L_Mark, F_Navi("Weapon Shop","niflheim,218,170","^800080");
 			viewpoint 1,218,170,2,0xDA70D6;
 			viewpoint 1,218,170,2,0xDA70D6;
 			break;
 			break;
 		case 4:
 		case 4:
-			callsub L_Mark,"^FF1493Witch's Castle";
+			callsub L_Mark, F_Navi("Witch's Castle","niflheim,255,195","^FF1493");
 			viewpoint 1,255,195,3,0xFF1493;
 			viewpoint 1,255,195,3,0xFF1493;
 			break;
 			break;
 		case 5:
 		case 5:

+ 30 - 28
npc/re/guides/guides_payon.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Renewal guides.
 //= 1.0 First version, Renewal guides.
 //= 1.1 Fixed and optimized. [Euphy]
 //= 1.1 Fixed and optimized. [Euphy]
+//= 1.2 Navigation system update. [Euphy]
 //============================================================ 
 //============================================================ 
 
 
 payon,163,64,3	script	Guide#01payon::GuidePayon	708,{
 payon,163,64,3	script	Guide#01payon::GuidePayon	708,{
@@ -20,16 +21,17 @@ payon,163,64,3	script	Guide#01payon::GuidePayon	708,{
 	mes "Welcome to ^8B4513Payon^000000,";
 	mes "Welcome to ^8B4513Payon^000000,";
 	mes "the Mountain Village.";
 	mes "the Mountain Village.";
 	mes "Do you need help navigating the village?";
 	mes "Do you need help navigating the village?";
+	F_Navi("[Payon Guide]");
 	next;
 	next;
 	while (1) {
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
 		case 1:
 			set .@loop,1;
 			set .@loop,1;
 			while (.@loop) {
 			while (.@loop) {
-				switch(select("[ Archer Village ]:[ Tool Shop]:[ Weapon & Armor Shop ]:[ Inn & Tavern ]:[ Central Palace ]:[ Palace Court ]:[ Royal Kitchen ]:Previous Menu")) {
+				switch(select("[ Archer Village ]:[ Tool Shop ]:[ Weapon & Armor Shop ]:[ Inn & Tavern ]:[ Central Palace ]:[ Palace Court ]:[ Royal Kitchen ]:Previous Menu")) {
 				case 1:
 				case 1:
 					mes "[Payon Guide]";
 					mes "[Payon Guide]";
-					mes "^B9062FArcher Village^000000 is where";
+					mes F_Navi("Archer Village","payon,227,328","^B9062F")+" is where";
 					mes "the Archer Association resides.";
 					mes "the Archer Association resides.";
 					mes "Please use the far north gate to enter the village.";
 					mes "Please use the far north gate to enter the village.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
@@ -37,32 +39,32 @@ payon,163,64,3	script	Guide#01payon::GuidePayon	708,{
 					next;
 					next;
 					break;
 					break;
 				case 2:
 				case 2:
-					callsub L_Mark,"^0000FFTool Shop";
+					callsub L_Mark, F_Navi("Tool Shop","payon,144,85","^0000FF");
 					viewpoint 1,144,85,1,0x0A82FF;
 					viewpoint 1,144,85,1,0x0A82FF;
 					next;
 					next;
 					break;
 					break;
 				case 3:
 				case 3:
-					callsub L_Mark,"^FF5400Weapon & Armor Shop";
+					callsub L_Mark, F_Navi("Weapon & Armor Shop","payon,139,159","^FF5400");
 					viewpoint 1,139,159,2,0xFFB400;
 					viewpoint 1,139,159,2,0xFFB400;
 					next;
 					next;
 					break;
 					break;
 				case 4:
 				case 4:
-					callsub L_Mark,"^006400Inn & Tavern";
+					callsub L_Mark, F_Navi("Inn & Tavern","payon,220,117","^006400");
 					viewpoint 1,220,117,3,0xAAFF00;
 					viewpoint 1,220,117,3,0xAAFF00;
 					next;
 					next;
 					break;
 					break;
 				case 5:
 				case 5:
-					callsub L_Mark,"^7F3300Central Palace";
+					callsub L_Mark, F_Navi("Central Palace","payon,155,245","^7F3300");
 					viewpoint 1,155,245,4,0xD2691E;
 					viewpoint 1,155,245,4,0xD2691E;
 					next;
 					next;
 					break;
 					break;
 				case 6:
 				case 6:
-					callsub L_Mark,"^800080Palace Court";
+					callsub L_Mark, F_Navi("Palace Court","payon,107,325","^800080");
 					viewpoint 1,107,325,5,0xDA70D6;
 					viewpoint 1,107,325,5,0xDA70D6;
 					next;
 					next;
 					break;
 					break;
 				case 7:
 				case 7:
-					callsub L_Mark,"^B9062FRoyal Kitchen";
+					callsub L_Mark, F_Navi("Royal Kitchen","payon,154,325","^B9062F");
 					viewpoint 1,154,325,6,0xFF0000;
 					viewpoint 1,154,325,6,0xFF0000;
 					next;
 					next;
 					break;
 					break;
@@ -75,36 +77,36 @@ payon,163,64,3	script	Guide#01payon::GuidePayon	708,{
 		case 2:
 		case 2:
 			set .@loop,1;
 			set .@loop,1;
 			while (.@loop) {
 			while (.@loop) {
-				switch(select("[ Eden Teleport Officer ]:[ Kafra Shop ]:[ Repair / Armsmith ]:[ Kafra Employee]:[ Trap Specialist ]:[ Seiayblem ]:[ Leablem ]:[ Jade ]:[ Pet Groomer ]:[ Chef Assistant ]:Previous Menu")) {
+				switch(select("[ Eden Teleport Officer ]:[ Kafra Shop ]:[ Repair / Armsmith ]:[ Kafra Employee ]:[ Trap Specialist ]:[ Seiayblem ]:[ Leablem ]:[ Jade ]:[ Pet Groomer ]:[ Chef Assistant ]:Previous Menu")) {
 				case 1:
 				case 1:
-					callsub L_Mark,"^0000FFEden Teleport Officer";
+					callsub L_Mark, F_Navi("Eden Teleport Officer","payon,177,111","^0000FF");
 					viewpoint 1,177,111,7,0x0A82FF;
 					viewpoint 1,177,111,7,0x0A82FF;
 					next;
 					next;
 					break;
 					break;
 				case 2:
 				case 2:
-					callsub L_Mark,"^FF5400Kafra Shop Girls";
+					callsub L_Mark, F_Navi("Kafra Shop Girls","payon,164,157","^FF5400");
 					viewpoint 1,164,157,8,0xFFB400;
 					viewpoint 1,164,157,8,0xFFB400;
 					next;
 					next;
 					break;
 					break;
 				case 3:
 				case 3:
-					callsub L_Mark,"^006400Repairman & Armsmith";
+					callsub L_Mark, F_Navi("Repairman & Armsmith","payon,144,170","^006400");
 					viewpoint 1,144,170,9,0xAAFF00;
 					viewpoint 1,144,170,9,0xAAFF00;
 					next;
 					next;
 					break;
 					break;
 				case 4:
 				case 4:
-					callsub L_Mark,"^7F3300Kafra Employees";
+					callsub L_Mark, "^7F3300Kafra Employees^000000";
 					viewpoint 1,181,104,10,0xD2691E;
 					viewpoint 1,181,104,10,0xD2691E;
 					viewpoint 1,175,226,11,0xD2691E;
 					viewpoint 1,175,226,11,0xD2691E;
 					next;
 					next;
 					break;
 					break;
 				case 5:
 				case 5:
-					callsub L_Mark,"^800080Trap Specialist";
+					callsub L_Mark, F_Navi("Trap Specialist","payon,123,109","^800080");
 					viewpoint 1,123,109,12,0xDA70D6;
 					viewpoint 1,123,109,12,0xDA70D6;
 					next;
 					next;
 					break;
 					break;
 				case 6:
 				case 6:
 					mes "[Payon Guide]";
 					mes "[Payon Guide]";
-					mes "^B9062FSeiyablem^000000";
+					mes F_Navi("Seiyablem","payon,140,151","^B9062F");
 					mes "is a technician";
 					mes "is a technician";
 					mes "who can create ^0000FFslots^000000 on weapons and armors,";
 					mes "who can create ^0000FFslots^000000 on weapons and armors,";
 					mes "but not all equipment";
 					mes "but not all equipment";
@@ -115,7 +117,7 @@ payon,163,64,3	script	Guide#01payon::GuidePayon	708,{
 					break;
 					break;
 				case 7:
 				case 7:
 					mes "[Payon Guide]";
 					mes "[Payon Guide]";
-					mes "^0000FFLeablem^000000";
+					mes F_Navi("Leablem","payon,236,199","^0000FF");
 					mes "is a technician";
 					mes "is a technician";
 					mes "who can create ^0000FFslots^000000 on weapons and armors,";
 					mes "who can create ^0000FFslots^000000 on weapons and armors,";
 					mes "but not all equipment";
 					mes "but not all equipment";
@@ -126,7 +128,7 @@ payon,163,64,3	script	Guide#01payon::GuidePayon	708,{
 					break;
 					break;
 				case 8:
 				case 8:
 					mes "[Payon Guide]";
 					mes "[Payon Guide]";
-					mes "^FF5400Jade^000000";
+					mes F_Navi("Jade","payon,173,238","^FF5400");
 					mes "can exchange different types of";
 					mes "can exchange different types of";
 					mes "^FF5400Gemstones^000000.";
 					mes "^FF5400Gemstones^000000.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
@@ -134,12 +136,12 @@ payon,163,64,3	script	Guide#01payon::GuidePayon	708,{
 					next;
 					next;
 					break;
 					break;
 				case 9:
 				case 9:
-					callsub L_Mark,"^006400Pet Groomer";
+					callsub L_Mark, F_Navi("Pet Groomer","payon,177,131","^006400");
 					viewpoint 1,177,131,16,0xAAFF00;
 					viewpoint 1,177,131,16,0xAAFF00;
 					next;
 					next;
 					break;
 					break;
 				case 10:
 				case 10:
-					callsub L_Mark,"^7F3300Chef Assistant";
+					callsub L_Mark, F_Navi("Chef Assistant","payon,206,119","^7F3300");
 					viewpoint 1,206,119,17,0xD2691E;
 					viewpoint 1,206,119,17,0xD2691E;
 					next;
 					next;
 					break;
 					break;
@@ -185,7 +187,7 @@ payon,163,64,3	script	Guide#01payon::GuidePayon	708,{
 L_Mark:
 L_Mark:
 	mes "[Payon Guide]";
 	mes "[Payon Guide]";
 	mes "Let me mark the location of the";
 	mes "Let me mark the location of the";
-	mes getarg(0)+"^000000";
+	mes getarg(0);
 	mes "on your mini-map.";
 	mes "on your mini-map.";
 	mes "Would you like to check any other locations?";
 	mes "Would you like to check any other locations?";
 	return;
 	return;
@@ -201,6 +203,7 @@ pay_arche,86,33,4	script	Guide#05payon	708,{
 	mes "Welcome to ^8B4513Archer Village^000000,";
 	mes "Welcome to ^8B4513Archer Village^000000,";
 	mes "a subsidiary village of Payon.";
 	mes "a subsidiary village of Payon.";
 	mes "Do you need help navigating the village?";
 	mes "Do you need help navigating the village?";
+	F_Navi("[Payon Guide]");
 	next;
 	next;
 	set .@str$,"Would you like to check any other locations?";
 	set .@str$,"Would you like to check any other locations?";
 	while (1) {
 	while (1) {
@@ -208,7 +211,7 @@ pay_arche,86,33,4	script	Guide#05payon	708,{
 		case 1:
 		case 1:
 			mes "[Payon Guide]";
 			mes "[Payon Guide]";
 			mes "Let me mark the entrance of";
 			mes "Let me mark the entrance of";
-			mes "the ^B9062FPayon Dungeon^000000";
+			mes "the "+F_Navi("Payon Dungeon","pay_arche,38,131","^B9062F");
 			mes "on your mini-map.";
 			mes "on your mini-map.";
 			mes .@str$;
 			mes .@str$;
 			viewpoint 1,38,131,0,0xFF0000;
 			viewpoint 1,38,131,0,0xFF0000;
@@ -216,7 +219,7 @@ pay_arche,86,33,4	script	Guide#05payon	708,{
 			break;
 			break;
 		case 2:
 		case 2:
 			mes "[Payon Guide]";
 			mes "[Payon Guide]";
-			mes "The ^0000FFArcher Guild^000000";
+			mes "The "+F_Navi("Archer Guild","pay_arche,143,164","^0000FF");
 			mes "is where you can change";
 			mes "is where you can change";
 			mes "your job to Archer.";
 			mes "your job to Archer.";
 			mes .@str$;
 			mes .@str$;
@@ -226,7 +229,7 @@ pay_arche,86,33,4	script	Guide#05payon	708,{
 		case 3:
 		case 3:
 			mes "[Payon Guide]";
 			mes "[Payon Guide]";
 			mes "Let me mark the location of the";
 			mes "Let me mark the location of the";
-			mes "^FF5400Tool Shop^000000";
+			mes F_Navi("Tool Shop","pay_arche,72,156","^FF5400");
 			mes "on your mini-map.";
 			mes "on your mini-map.";
 			mes .@str$;
 			mes .@str$;
 			viewpoint 1,72,156,2,0xFFB400;
 			viewpoint 1,72,156,2,0xFFB400;
@@ -243,8 +246,7 @@ pay_arche,86,33,4	script	Guide#05payon	708,{
 		case 5:
 		case 5:
 			mes "[Payon Guide]";
 			mes "[Payon Guide]";
 			mes "Let me mark the location of the";
 			mes "Let me mark the location of the";
-			mes "^7F3300Bow Mercenary Manager^000000 and";
-			mes "^7F3300Mercenary Goods Merchant^000000";
+			mes F_Navi("Mercenary Guildsman","pay_arche,101,166","^7F3300");
 			mes "on your mini-map.";
 			mes "on your mini-map.";
 			mes .@str$;
 			mes .@str$;
 			viewpoint 1,101,166,4,0xD2691E;
 			viewpoint 1,101,166,4,0xD2691E;
@@ -253,7 +255,7 @@ pay_arche,86,33,4	script	Guide#05payon	708,{
 		case 6:
 		case 6:
 			mes "[Payon Guide]";
 			mes "[Payon Guide]";
 			mes "Let me mark the location of the";
 			mes "Let me mark the location of the";
-			mes "^800080Alchemist Guildsman^000000";
+			mes F_Navi("Alchemist Guildsman","pay_arche,126,113,","^800080");
 			mes "on your mini-map.";
 			mes "on your mini-map.";
 			mes .@str$;
 			mes .@str$;
 			viewpoint 1,127,113,5,0xDA70D6;
 			viewpoint 1,127,113,5,0xDA70D6;
@@ -261,7 +263,7 @@ pay_arche,86,33,4	script	Guide#05payon	708,{
 			break;
 			break;
 		case 7:
 		case 7:
 			mes "[Payon Guide]";
 			mes "[Payon Guide]";
-			mes "The ^0000FFEden Teleport Officer^000000";
+			mes "The "+F_Navi("Eden Teleport Officer","pay_arche,143,164","^0000FF");
 			mes "is currently staying inside";
 			mes "is currently staying inside";
 			mes "the Archer Guild building.";
 			mes "the Archer Guild building.";
 			mes .@str$;
 			mes .@str$;

+ 87 - 92
npc/re/guides/guides_prontera.txt

@@ -3,14 +3,16 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
-//= rAthena  SVN
+//= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
 //= [Official Conversion]
 //= [Official Conversion]
-//= Guides for the city of Prontera
+//= Guides for the city of Prontera.
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Renewal guides.
 //= 1.0 First version, Renewal guides.
+//= 1.1 Navigation system update. [Euphy]
+//=     Optimized.
 //============================================================ 
 //============================================================ 
 
 
 prontera,154,187,4	script	Guide#01prontera::GuideProntera	105,{
 prontera,154,187,4	script	Guide#01prontera::GuideProntera	105,{
@@ -20,7 +22,9 @@ prontera,154,187,4	script	Guide#01prontera::GuideProntera	105,{
 	mes "the beautiful capital of the";
 	mes "the beautiful capital of the";
 	mes "Rune-Midgarts Kingdom.";
 	mes "Rune-Midgarts Kingdom.";
 	mes "Do you need help navigating the city?";
 	mes "Do you need help navigating the city?";
+	F_Navi("[Prontera Guide]");
 	next;
 	next;
+	set .@str$,"Would you like to check any other locations?";
 	while (1) {
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
 		case 1:
@@ -28,63 +32,53 @@ prontera,154,187,4	script	Guide#01prontera::GuideProntera	105,{
 			while (.@loop) {
 			while (.@loop) {
 				switch(select("[ Tool Shop ]:[ Weapon & Armor Shop ]:[ Forge ]:[ Sanctuary ]:[ Chivalry Office ]:[ Inn ]:[ Tavern ]:[ Library ]:[ Prontera Castle ]:[ Job Agency ]:[ City Hall ]:Previous Menu")) {
 				switch(select("[ Tool Shop ]:[ Weapon & Armor Shop ]:[ Forge ]:[ Sanctuary ]:[ Chivalry Office ]:[ Inn ]:[ Tavern ]:[ Library ]:[ Prontera Castle ]:[ Job Agency ]:[ City Hall ]:Previous Menu")) {
 				case 1:
 				case 1:
-					mes "[Prontera Guide]";
-					mes "Let me mark the location of the ^B9062FTool Shop^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark, F_Navi("Tool Shop","prontera,134,221","^B9062F");
+					mes .@str$;
 					viewpoint 1,134,221,0,0xFF0000;
 					viewpoint 1,134,221,0,0xFF0000;
 					next;
 					next;
 					break;
 					break;
 				case 2:
 				case 2:
-					mes "[Prontera Guide]";
-					mes "Let me mark the location of the ^0000FFWeapon & Armor Shop^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark, F_Navi("Weapon & Armor Shop","prontera,175,220","^0000FF");
+					mes .@str$;
 					viewpoint 1,175,220,1,0x0A82FF;
 					viewpoint 1,175,220,1,0x0A82FF;
 					next;
 					next;
 					break;
 					break;
 				case 3:
 				case 3:
-					mes "[Prontera Guide]";
-					mes "Let me mark the location of the ^FF5400Forge^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark, F_Navi("Forge","prontera,179,184","^FF5400");
+					mes .@str$;
 					viewpoint 1,179,184,2,0xFFB400;
 					viewpoint 1,179,184,2,0xFFB400;
 					next;
 					next;
 					break;
 					break;
 				case 4:
 				case 4:
 					mes "[Prontera Guide]";
 					mes "[Prontera Guide]";
-					mes "The ^006400Prontera Sanctuary^000000 is";
+					mes "The "+F_Navi("Prontera Sanctuary","prontera,236,316","^006400")+" is";
 					mes "where you can change your job to Acolyte,";
 					mes "where you can change your job to Acolyte,";
 					mes "its located in the far northeast of Prontera.";
 					mes "its located in the far northeast of Prontera.";
 					mes "Let me mark the location on your mini-map.";
 					mes "Let me mark the location on your mini-map.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,236,316,3,0xAAFF00;
 					viewpoint 1,236,316,3,0xAAFF00;
 					next;
 					next;
 					break;
 					break;
 				case 5:
 				case 5:
 					mes "[Prontera Guide]";
 					mes "[Prontera Guide]";
-					mes "The Chivalry Office is";
+					mes "The "+F_Navi("Chivalry Office","prontera,46,345")+" is";
 					mes "where you can change your job to ^7F3300Knight^000000";
 					mes "where you can change your job to ^7F3300Knight^000000";
 					mes "or apply for the ^7F3300Culvert^000000 Subjugation Party.";
 					mes "or apply for the ^7F3300Culvert^000000 Subjugation Party.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,46,345,4,0xD2691E;
 					viewpoint 1,46,345,4,0xD2691E;
 					next;
 					next;
 					break;
 					break;
 				case 6:
 				case 6:
-					mes "[Prontera Guide]";
-					mes "Let me mark the location of the ^800080Inn^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark, F_Navi("Inn","prontera,203,191","^800080");
+					mes .@str$;
 					viewpoint 1,204,191,5,0xDA70D6;
 					viewpoint 1,204,191,5,0xDA70D6;
 					next;
 					next;
 					break;
 					break;
 				case 7:
 				case 7:
-					mes "[Prontera Guide]";
-					mes "Let me mark the location of the ^B9062FTaverns^000000";
-					mes "on your mini-map.";
-					mes "Only the ^B9062Fnorthern^000000 tavern";
+					callsub L_Mark, "^B9062FTaverns^000000";
+					mes "Only the "+F_Navi("northern","prontera,208,154","^B9062F")+" tavern";
 					mes "is open for now.";
 					mes "is open for now.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,208,154,6,0xFF0000;
 					viewpoint 1,208,154,6,0xFF0000;
 					viewpoint 1,46,67,7,0xFF0000;
 					viewpoint 1,46,67,7,0xFF0000;
 					next;
 					next;
@@ -93,38 +87,36 @@ prontera,154,187,4	script	Guide#01prontera::GuideProntera	105,{
 					mes "[Prontera Guide]";
 					mes "[Prontera Guide]";
 					mes "The ^0000FFLibrary^000000 is";
 					mes "The ^0000FFLibrary^000000 is";
 					mes "where you can find useful information, like the Monster Encyclopedia.";
 					mes "where you can find useful information, like the Monster Encyclopedia.";
-					mes "There are currently twi libaries available";
-					mes "in the northern area of Prontera.";
-					mes "Would you like to check any other locations?";
+					mes "There are currently two libaries available,";
+					mes "One to the "+F_Navi("northeast","prontera,120,264")+" and the other to the "+F_Navi("northwest","prontera,192,264")+".";
+					mes .@str$;
 					viewpoint 1,120,264,8,0x0A82FF;
 					viewpoint 1,120,264,8,0x0A82FF;
 					viewpoint 1,192,264,9,0x0A82FF;
 					viewpoint 1,192,264,9,0x0A82FF;
 					next;
 					next;
 					break;
 					break;
 				case 9:
 				case 9:
 					mes "[Prontera Guide]";
 					mes "[Prontera Guide]";
-					mes "The ^FF5400Prontera Castle^000000 is north from here,";
+					mes "The "+F_Navi("Prontera Castle","prontera,156,360","^FF5400")+" is north from here,";
 					mes "and its rear gate is connected to";
 					mes "and its rear gate is connected to";
 					mes "the northern Prontera Fields.";
 					mes "the northern Prontera Fields.";
 					mes "Let me mark the castle on your mini-map.";
 					mes "Let me mark the castle on your mini-map.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,156,360,10,0xFFB400;
 					viewpoint 1,156,360,10,0xFFB400;
 					next;
 					next;
 					break;
 					break;
 				case 10:
 				case 10:
-					mes "[Prontera Guide]";
-					mes "Let me mark the location of the ^006400Job Agency^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark, F_Navi("Job Agency","prontera,133,183","^006400");
+					mes .@str$;
 					viewpoint 1,133,183,11,0xAAFF00;
 					viewpoint 1,133,183,11,0xAAFF00;
 					next;
 					next;
 					break;
 					break;
 				case 11:
 				case 11:
 					mes "[Prontera Guide]";
 					mes "[Prontera Guide]";
-					mes "Let me mark the location of ^7F3300City Hall^000000";
+					mes "Let me mark the location of "+F_Navi("City Hall","prontera,75,91","^7F3300");
 					mes "on your mini-map.";
 					mes "on your mini-map.";
 					mes "There's a hairstylist";
 					mes "There's a hairstylist";
 					mes "there that can change your hair color.";
 					mes "there that can change your hair color.";
-					mes "Would you like to check any other locations?";
+					mes .@str$;
 					viewpoint 1,75,91,12,0xD2691E;
 					viewpoint 1,75,91,12,0xD2691E;
 					next;
 					next;
 					break;
 					break;
@@ -137,72 +129,66 @@ prontera,154,187,4	script	Guide#01prontera::GuideProntera	105,{
 		case 2:
 		case 2:
 			set .@loop,1;
 			set .@loop,1;
 			while (.@loop) {
 			while (.@loop) {
-				switch(select("[ Eden Teleport Officer ]:[ Peco Peco Breeder ]:[ Riding Creature Master ]:[ Magic Gear Master ]:[ Peco Peco Remover ]:[ Rune Salesman ]:[ Mercenary Guildsman ]:[ Hypnotist ]:[ Kafra Employee ]:[ Leablem ]:[ Apprentice Craftsman ]:Previous Menu")) {
+				switch(select("[ Eden Teleport Officer ]:[ Peco Peco Breeder ]:[ Riding Creature Master ]:[ Magic Gear Master ]:[ Peco Peco Remover ]:[ Trading Merchants ]:[ Mercenary Guildsman ]:[ Hypnotist ]:[ Kafra Employee ]:[ Leablem ]:[ Apprentice Craftsman ]:[ Pet Groomer ]:Previous Menu")) {
 				case 1:
 				case 1:
-					mes "[Prontera Guide]";
-					mes "Let me mark the location of the";
-					mes "^800080Eden Teleport Officer^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
+					callsub L_Mark, F_Navi("Eden Teleport Officer","prontera,124,76","^800080"),1;
+					mes .@str$;
 					viewpoint 1,124,76,13,0xDA70D6;
 					viewpoint 1,124,76,13,0xDA70D6;
 					next;
 					next;
 					break;
 					break;
 				case 2:
 				case 2:
 					mes "[Prontera Guide]";
 					mes "[Prontera Guide]";
 					mes "Two ^0000FFPeco Peco Breeders^000000 are available,";
 					mes "Two ^0000FFPeco Peco Breeders^000000 are available,";
-					mes "one for ^0000FFKnights^000000 to the ^0000FFnorthwest^000000";
-					mes "and the other for ^0000FFCrusaders^000000 to the ^0000FFnortheast^000000.";
-					viewpoint 1,55,350,15,0x0A82FF;
-					viewpoint 1,232,310,16,0x0A82FF;
+					mes "one for ^0000FFKnights^000000 to the "+F_Navi("northwest","prontera,55,350","^0000FF");
+					mes "and the other for ^0000FFCrusaders^000000 to the "+F_Navi("northeast","prontera,232,310","^0000FF")+".";
+					viewpoint 1,55,350,14,0x0A82FF;
+					viewpoint 1,232,310,15,0x0A82FF;
 					next;
 					next;
 					break;
 					break;
 				case 3:
 				case 3:
 					mes "[Prontera Guide]";
 					mes "[Prontera Guide]";
-					mes "The ^FF5400Riding Creature Master^000000 provides services for";
+					mes "The "+F_Navi("Riding Creature Master","prontera,131,213","^FF5400")+" provides services for";
 					mes "^FF5400Rune Knights^000000 and ^FF5400Royal Guards^000000.";
 					mes "^FF5400Rune Knights^000000 and ^FF5400Royal Guards^000000.";
 					mes "Let me mark his location";
 					mes "Let me mark his location";
 					mes "on your mini-map.";
 					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,131,213,17,0xFFB400;
+					mes .@str$;
+					viewpoint 1,131,213,16,0xFFB400;
 					next;
 					next;
 					break;
 					break;
 				case 4:
 				case 4:
 					mes "[Prontera Guide]";
 					mes "[Prontera Guide]";
-					mes "The ^006400Magic Gear Master^000000";
+					mes "The "+F_Navi("Magic Gear Master","prontera,163,178","^006400");
 					mes "provides services for";
 					mes "provides services for";
 					mes "^006400Mechanics^000000.";
 					mes "^006400Mechanics^000000.";
 					mes "Let me mark his location";
 					mes "Let me mark his location";
 					mes "on your mini-map.";
 					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,163,178,18,0xAAFF00;
+					mes .@str$;
+					viewpoint 1,163,178,17,0xAAFF00;
 					next;
 					next;
 					break;
 					break;
 				case 5:
 				case 5:
 					mes "[Prontera Guide]";
 					mes "[Prontera Guide]";
 					mes "If your beloved Peco Peco refuses";
 					mes "If your beloved Peco Peco refuses";
 					mes "to leave you,";
 					mes "to leave you,";
-					mes "please talk to the ^7F3300Peco Peco Remover^000000";
+					mes "please talk to the "+F_Navi("Peco Peco Remover","prontera,125,208","^7F3300");
 					mes "near the central fountain.";
 					mes "near the central fountain.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,125,208,19,0xD2691E;
+					mes .@str$;
+					viewpoint 1,125,208,18,0xD2691E;
 					next;
 					next;
 					break;
 					break;
 				case 6:
 				case 6:
 					mes "[Prontera Guide]";
 					mes "[Prontera Guide]";
-					mes "Let me mark the location of";
-					mes "the ^800080Rune Salesman^000000";
+					mes "The Rune Merchant, Amatsu Trader, and other";
+					mes F_Navi("Trading Merchants","prontera,178,244","^800080")+" have been marked";
 					mes "on your mini-map.";
 					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,168,228,20,0xDA70D6;
+					mes .@str$;
+					viewpoint 1,178,244,19,0xDA70D6;
 					next;
 					next;
 					break;
 					break;
 				case 7:
 				case 7:
-					mes "[Prontera Guide]";
-					mes "Let me mark the location of ^0000FFSpear Mercenary Manager^000000 and";
-					mes "^0000FFMercenary Goods Merchant^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,35,337,21,0x0A82FF;
+					callsub L_Mark, F_Navi("Mercenary Guildsman","prontera,35,337","^0000FF"),1;
+					mes .@str$;
+					viewpoint 1,35,337,20,0x0A82FF;
 					next;
 					next;
 					break;
 					break;
 				case 8:
 				case 8:
@@ -210,46 +196,46 @@ prontera,154,187,4	script	Guide#01prontera::GuideProntera	105,{
 					mes "The ^FF5400Hypnotist^000000";
 					mes "The ^FF5400Hypnotist^000000";
 					mes "helps beginner adventurers";
 					mes "helps beginner adventurers";
 					mes "to reset their skills.";
 					mes "to reset their skills.";
-					mes "Let me mark his location";
-					mes "on your mini-map.";
+					mes "He has moved to Izlude, Prontera's satellite town to the southeast.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
-					viewpoint 1,146,232,22,0xFFB400;
+					mes .@str$;
+					//viewpoint 1,146,232,21,0xFFB400;
 					next;
 					next;
 					break;
 					break;
 				case 9:
 				case 9:
-					mes "[Prontera Guide]";
-					mes "Let me mark the location of the";
-					mes "^006400Kafra Employees^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,152,326,23,0xAAFF00;
-					viewpoint 1,30,207,24,0xAAFF00;
-					viewpoint 1,282,200,25,0xAAFF00;
-					viewpoint 1,151,29,26,0xAAFF00;
-					viewpoint 1,146,89,27,0xAAFF00;
+					callsub L_Mark, "^006400Kafra Employees^000000",1;
+					mes .@str$;
+					viewpoint 1,152,326,22,0xAAFF00;
+					viewpoint 1,30,207,23,0xAAFF00;
+					viewpoint 1,282,200,24,0xAAFF00;
+					viewpoint 1,151,29,25,0xAAFF00;
+					viewpoint 1,146,89,26,0xAAFF00;
 					next;
 					next;
 					break;
 					break;
 				case 10:
 				case 10:
 					mes "[Prontera Guide]";
 					mes "[Prontera Guide]";
-					mes "^0000FFLeablem^000000";
+					mes F_Navi("Leablem","prontera,244,169","^0000FF");
 					mes "is a technician";
 					mes "is a technician";
 					mes "who can create ^0000FFslots^000000 on weapons and armors,";
 					mes "who can create ^0000FFslots^000000 on weapons and armors,";
 					mes "As amazing as it sounds,";
 					mes "As amazing as it sounds,";
 					mes "not all equipment can be slotted.";
 					mes "not all equipment can be slotted.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,244,169,28,0x0A82FF;
+					mes .@str$;
+					viewpoint 1,244,169,27,0x0A82FF;
 					next;
 					next;
 					break;
 					break;
 				case 11:
 				case 11:
-					mes "[Prontera Guide]";
-					mes "Let me mark the location of the";
-					mes "^800080Apprentice Craftsman^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,165,60,29,0xDA70D6;
+					callsub L_Mark, F_Navi("Apprentice Craftsman","prontera,165,60","^800080"),1;
+					mes .@str$;
+					viewpoint 1,165,60,28,0xDA70D6;
 					next;
 					next;
 					break;
 					break;
 				case 12:
 				case 12:
+					callsub L_Mark, F_Navi("Pet Groomer","prontera,218,211"),1;
+					mes .@str$;
+					viewpoint 1,218,211,29,0xFF0000;
+					next;
+					break;
+				case 13:
 					set .@loop,0;
 					set .@loop,0;
 					break;
 					break;
 				}
 				}
@@ -280,7 +266,7 @@ prontera,154,187,4	script	Guide#01prontera::GuideProntera	105,{
 			viewpoint 2,1,1,18,0xFFFF00;
 			viewpoint 2,1,1,18,0xFFFF00;
 			viewpoint 2,1,1,19,0xFFFF00;
 			viewpoint 2,1,1,19,0xFFFF00;
 			viewpoint 2,1,1,20,0xFFFF00;
 			viewpoint 2,1,1,20,0xFFFF00;
-			viewpoint 2,1,1,21,0xFFFF00;
+			//viewpoint 2,1,1,21,0xFFFF00;
 			viewpoint 2,1,1,22,0xFFFF00;
 			viewpoint 2,1,1,22,0xFFFF00;
 			viewpoint 2,1,1,23,0xFFFF00;
 			viewpoint 2,1,1,23,0xFFFF00;
 			viewpoint 2,1,1,24,0xFFFF00;
 			viewpoint 2,1,1,24,0xFFFF00;
@@ -299,8 +285,17 @@ prontera,154,187,4	script	Guide#01prontera::GuideProntera	105,{
 			end;
 			end;
 		}
 		}
 	}
 	}
+	end;
+L_Mark:
+	mes "[Prontera Guide]";
+	if (getarg(1,0)) {
+		mes "Let me mark the location of the";
+		mes getarg(0);
+	} else
+		mes "Let me mark the location of the "+getarg(0);
+	mes "on your mini-map.";
+	return;
 }
 }
-
 prontera,282,208,2	duplicate(GuideProntera)	Guide#02prontera	105
 prontera,282,208,2	duplicate(GuideProntera)	Guide#02prontera	105
 prontera,29,200,6	duplicate(GuideProntera)	Guide#03prontera	105
 prontera,29,200,6	duplicate(GuideProntera)	Guide#03prontera	105
 prontera,160,29,0	duplicate(GuideProntera)	Guide#04prontera	105
 prontera,160,29,0	duplicate(GuideProntera)	Guide#04prontera	105

+ 13 - 11
npc/re/guides/guides_rachel.txt

@@ -3,20 +3,22 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
-//= rAthena  SVN
+//= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
 //= [Official Conversion]
 //= [Official Conversion]
-//= Guide for the city of Rachel
+//= Guide for the city of Rachel.
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Renewal guide.
 //= 1.0 First version, Renewal guide.
+//= 1.1 Navigation system update. [Euphy]
 //============================================================ 
 //============================================================ 
 
 
 rachel,138,146,5	script	Rachel Guide#rachel	934,{
 rachel,138,146,5	script	Rachel Guide#rachel	934,{
 	mes "[Rachel Guide]";
 	mes "[Rachel Guide]";
 	mes "Welcome to the capital of Arunafeltz, ^8B4513Rachel^000000 where the warm breath of the goddess Freya reaches.";
 	mes "Welcome to the capital of Arunafeltz, ^8B4513Rachel^000000 where the warm breath of the goddess Freya reaches.";
 	mes "If this is the first time for you to use the guide services, I suggest you ask many questions.";
 	mes "If this is the first time for you to use the guide services, I suggest you ask many questions.";
+	F_Navi("[Rachel Guide]");
 	next;
 	next;
 	while (1) {
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
@@ -26,35 +28,35 @@ rachel,138,146,5	script	Rachel Guide#rachel	934,{
 				switch(select("[ Inn ]:[ Weapon Shop ]:[ Tool Shop ]:[ Airport ]:[ Cheshrumnir ]:[ Priest Zed's Mansion ]:Previous Menu")) {
 				switch(select("[ Inn ]:[ Weapon Shop ]:[ Tool Shop ]:[ Airport ]:[ Cheshrumnir ]:[ Priest Zed's Mansion ]:Previous Menu")) {
 				case 1:
 				case 1:
 					mes "[Rachel Guide]";
 					mes "[Rachel Guide]";
-					mes "You can rest your fatigue of the journey in the Inn. The left building next to me is the Inn of Rachel.";
+					mes "You can rest your fatigue of the journey in the "+F_Navi("Inn","rachel,115,144")+". The left building next to me is the Inn of Rachel.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,115,144,0,0xFF0000;
 					viewpoint 1,115,144,0,0xFF0000;
 					next;
 					next;
 					break;
 					break;
 				case 2:
 				case 2:
 					mes "[Rachel Guide]";
 					mes "[Rachel Guide]";
-					mes "Do you want to check out the weapons that are sold in Rachel? The Weapon Shop is located near the west gate.";
+					mes "Do you want to check out the weapons that are sold in Rachel? The "+F_Navi("Weapon Shop","rachel,42,82")+" is located near the west gate.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,42,82,1,0xFF4500;
 					viewpoint 1,42,82,1,0xFF4500;
 					next;
 					next;
 					break;
 					break;
 				case 3:
 				case 3:
 					mes "[Rachel Guide]";
 					mes "[Rachel Guide]";
-					mes "Rachel's Tool Shop sells the best quality potions. It's located near the west gate.";
+					mes "Rachel's "+F_Navi("Tool Shop","rachel,83,73")+" sells the best quality potions. It's located near the west gate.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,83,73,2,0xDAA520;
 					viewpoint 1,83,73,2,0xDAA520;
 					next;
 					next;
 					break;
 					break;
 				case 4:
 				case 4:
 					mes "[Rachel Guide]";
 					mes "[Rachel Guide]";
-					mes "The Airport is located outside of the east gate.";
+					mes "The "+F_Navi("Airport","rachel,272,125")+" is located outside of the east gate.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,272,125,3,0x008000;
 					viewpoint 1,272,125,3,0x008000;
 					next;
 					next;
 					break;
 					break;
 				case 5:
 				case 5:
 					mes "[Rachel Guide]";
 					mes "[Rachel Guide]";
-					mes "Cheshrumnir is a holy ground where pope, the incarnation of goddess Freya stays.";
+					mes F_Navi("Cheshrumnir","rachel,150,243")+" is a holy ground where pope, the incarnation of goddess Freya stays.";
 					mes "Take the road to the north to find the building.";
 					mes "Take the road to the north to find the building.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,150,243,4,0x0000FF;
 					viewpoint 1,150,243,4,0x0000FF;
@@ -63,7 +65,7 @@ rachel,138,146,5	script	Rachel Guide#rachel	934,{
 				case 6:
 				case 6:
 					mes "[Rachel Guide]";
 					mes "[Rachel Guide]";
 					mes "I will mark the location";
 					mes "I will mark the location";
-					mes "of the ^000080Priest Zed's Mansion^000000";
+					mes "of the "+F_Navi("Priest Zed's Mansion","rachel,98,238","^000080");
 					mes "on your mini-map.";
 					mes "on your mini-map.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,98,238,5,0x000080;
 					viewpoint 1,98,238,5,0x000080;
@@ -82,7 +84,7 @@ rachel,138,146,5	script	Rachel Guide#rachel	934,{
 				case 1:
 				case 1:
 					mes "[Rachel Guide]";
 					mes "[Rachel Guide]";
 					mes "I will mark the location";
 					mes "I will mark the location";
-					mes "of the ^803232Cool Event Corp. Staff^000000";
+					mes "of the "+F_Navi("Cool Event Corp. Staff","rachel,110,138","^803232");
 					mes "on your mini map.";
 					mes "on your mini map.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,110,138,7,0x803232;
 					viewpoint 1,110,138,7,0x803232;
@@ -91,7 +93,7 @@ rachel,138,146,5	script	Rachel Guide#rachel	934,{
 				case 2:
 				case 2:
 					mes "[Rachel Guide]";
 					mes "[Rachel Guide]";
 					mes "I will mark the location";
 					mes "I will mark the location";
-					mes "of the ^556B2FEden Teleport Officer^000000";
+					mes "of the "+F_Navi("Eden Teleport Officer","rachel,125,144","^556B2F");
 					mes "on your mini-map.";
 					mes "on your mini-map.";
 					mes "Would you like to check any other locations?";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,125,144,8,0x556B2F;
 					viewpoint 1,125,144,8,0x556B2F;

+ 13 - 10
npc/re/guides/guides_umbala.txt

@@ -3,23 +3,27 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
-//= rAthena  SVN
+//= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
 //= [Official Conversion]
 //= [Official Conversion]
-//= Guides for the city of Umbala
+//= Guides for the city of Umbala.
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Renewal guides.
 //= 1.0 First version, Renewal guides.
+//= 1.1 Navigation system update. [Euphy]
 //============================================================ 
 //============================================================ 
 
 
 umbala,128,94,3	script	Umbala Guide#01umbala::GuideUmbala	702,{
 umbala,128,94,3	script	Umbala Guide#01umbala::GuideUmbala	702,{
+	mes "[Umbala Guide]";
 	mes "Welcome to ^8B4513Umbala^000000,";
 	mes "Welcome to ^8B4513Umbala^000000,";
 	mes "the Village of the Utan Tribe.";
 	mes "the Village of the Utan Tribe.";
 	next;
 	next;
+	mes "[Umbala Guide]";
 	mes "Since I have been exploring here for several months.";
 	mes "Since I have been exploring here for several months.";
 	mes "I am familiar with this area's geography and the points of interest in this village.";
 	mes "I am familiar with this area's geography and the points of interest in this village.";
 	mes "Do you need help navigating the village?";
 	mes "Do you need help navigating the village?";
+	F_Navi("[Umbala Guide]");
 	while (1) {
 	while (1) {
 		next;
 		next;
 		switch(select("[ Kafra Employee ]:[ Chief's House ]:[ Shaman's House ]:[ Weapon Shop ]:[ Tool Shop ]:[ Bungee Jump Area ]:[ Tree of Yggdrasil ]:Remove Marks from Mini-Map:Cancel")) {
 		switch(select("[ Kafra Employee ]:[ Chief's House ]:[ Shaman's House ]:[ Weapon Shop ]:[ Tool Shop ]:[ Bungee Jump Area ]:[ Tree of Yggdrasil ]:Remove Marks from Mini-Map:Cancel")) {
@@ -33,21 +37,21 @@ umbala,128,94,3	script	Umbala Guide#01umbala::GuideUmbala	702,{
 			break;
 			break;
 		case 2:
 		case 2:
 			mes "[Umbala Guide]";
 			mes "[Umbala Guide]";
-			mes "Only the ^006400Chief^000000 knows the language of the outside world.";
+			mes "Only the "+F_Navi("Chief","umbala,68,251","^006400")+" knows the language of the outside world.";
 			mes "So you'd better visit him before anything else.";
 			mes "So you'd better visit him before anything else.";
 			mes "Would you like to check any other locations?";
 			mes "Would you like to check any other locations?";
 			viewpoint 1,68,251,1,0xAAFF00;
 			viewpoint 1,68,251,1,0xAAFF00;
 			break;
 			break;
 		case 3:
 		case 3:
 			mes "[Umbala Guide]";
 			mes "[Umbala Guide]";
-			mes "The ^008080Shaman^000000 has some sort of mystic power.";
+			mes "The "+F_Navi("Shaman","umbala,219,188","^008080")+" has some sort of mystic power.";
 			mes "People say she can create rough enchanted stones, and divide a pure enchanted stone into rough ones.";
 			mes "People say she can create rough enchanted stones, and divide a pure enchanted stone into rough ones.";
 			mes "Would you like to check any other locations?";
 			mes "Would you like to check any other locations?";
 			viewpoint 1,219,188,2,0x008080;
 			viewpoint 1,219,188,2,0x008080;
 			break;
 			break;
 		case 4:
 		case 4:
 			mes "[Umbala Guide]";
 			mes "[Umbala Guide]";
-			mes "The ^FF1493Weapon Shop^000000 inside Umbala";
+			mes "The "+F_Navi("Weapon Shop","umbala,125,155","^FF1493")+" inside Umbala";
 			mes "supplies the weapons";
 			mes "supplies the weapons";
 			mes "for defending against their enemies.";
 			mes "for defending against their enemies.";
 			mes "Would you like to check any other locations?";
 			mes "Would you like to check any other locations?";
@@ -56,14 +60,14 @@ umbala,128,94,3	script	Umbala Guide#01umbala::GuideUmbala	702,{
 		case 5:
 		case 5:
 			mes "[Umbala Guide]";
 			mes "[Umbala Guide]";
 			mes "There are many useful things for";
 			mes "There are many useful things for";
-			mes "traveling in the ^8B4513Tool Shop^000000 in Umbala.";
+			mes "traveling in the "+F_Navi("Tool Shop","umbala,136,127","^8B4513")+" in Umbala.";
 			mes "Would you like to check any other locations?";
 			mes "Would you like to check any other locations?";
 			viewpoint 1,136,127,4,0x8B4513;
 			viewpoint 1,136,127,4,0x8B4513;
 			break;
 			break;
 		case 6:
 		case 6:
 			mes "[Umbala Guide]";
 			mes "[Umbala Guide]";
 			mes "Umbala has a unique locale called";
 			mes "Umbala has a unique locale called";
-			mes "the 'Bungee Jump Area'.";
+			mes "the "+F_Navi("Bungee Jump Area","umbala,138,198")+".";
 			mes "If you're interested in testing";
 			mes "If you're interested in testing";
 			mes "your courage, why don't you try it.";
 			mes "your courage, why don't you try it.";
 			mes "Would you like to check any other locations?";
 			mes "Would you like to check any other locations?";
@@ -71,7 +75,7 @@ umbala,128,94,3	script	Umbala Guide#01umbala::GuideUmbala	702,{
 			break;
 			break;
 		case 7:
 		case 7:
 			mes "[Umbala Guide]";
 			mes "[Umbala Guide]";
-			mes "There's the Tree of Yggdrasil in the northern part of town.";
+			mes "There's the "+F_Navi("Tree of Yggdrasil","umbala,107,284")+" in the northern part of town.";
 			mes "You should pay it a visit since that's a place I recommend when you visit Umbala.";
 			mes "You should pay it a visit since that's a place I recommend when you visit Umbala.";
 			mes "Would you like to check any other locations?";
 			mes "Would you like to check any other locations?";
 			viewpoint 1,107,284,6,0xA52A2A;
 			viewpoint 1,107,284,6,0xA52A2A;
@@ -95,5 +99,4 @@ umbala,128,94,3	script	Umbala Guide#01umbala::GuideUmbala	702,{
 		}
 		}
 	}
 	}
 }
 }
-
 umbala,99,158,3	duplicate(GuideUmbala)	Umbala Guide#02umbala	702
 umbala,99,158,3	duplicate(GuideUmbala)	Umbala Guide#02umbala	702

+ 13 - 11
npc/re/guides/guides_veins.txt

@@ -3,26 +3,28 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
-//= rAthena  SVN
+//= rAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
 //= [Official Conversion]
 //= [Official Conversion]
 //= Guides for the city of Veins
 //= Guides for the city of Veins
 //===== Additional Comments: ================================= 
 //===== Additional Comments: ================================= 
 //= 1.0 First version, Renewal guides.
 //= 1.0 First version, Renewal guides.
+//= 1.1 Navigation system update. [Euphy]
 //============================================================ 
 //============================================================ 
 
 
 veins,210,345,5	script	Veins Guide#veins01::GuideVeins	934,{
 veins,210,345,5	script	Veins Guide#veins01::GuideVeins	934,{
 	mes "[Veins Guide]";
 	mes "[Veins Guide]";
 	mes "Thank you for coming through the rough sand storms. Welcome to ^8B4513Veins^000000, the Canyon Village.";
 	mes "Thank you for coming through the rough sand storms. Welcome to ^8B4513Veins^000000, the Canyon Village.";
 	mes "If this is the first time for you to use the guide services, why don't you check the \"Notice\" menu first?";
 	mes "If this is the first time for you to use the guide services, why don't you check the \"Notice\" menu first?";
+	F_Navi("[Veins Guide]");
 	next;
 	next;
 	while (1) {
 	while (1) {
 		switch(select("[ Temple ]:[ Inn ]:[ Pub ]:[ Weapon Shop ]:[ Tool Shop ]:[ Airport ]:[ Geological Research Institute ]:[ Cool Event Corp. Staff ]:Remove Marks from Mini-Map:Cancel")) {
 		switch(select("[ Temple ]:[ Inn ]:[ Pub ]:[ Weapon Shop ]:[ Tool Shop ]:[ Airport ]:[ Geological Research Institute ]:[ Cool Event Corp. Staff ]:Remove Marks from Mini-Map:Cancel")) {
 		case 1:
 		case 1:
 			mes "[Veins Guide]";
 			mes "[Veins Guide]";
-			mes "The Temple is always filled with praying the faithful of the incarnation of goddess Freya.";
+			mes "The "+F_Navi("Temple","veins,197,256")+" is always filled with praying the faithful of the incarnation of goddess Freya.";
 			mes "It's located on the North side of Veins.";
 			mes "It's located on the North side of Veins.";
 			mes "Would you like to check any other locations?";
 			mes "Would you like to check any other locations?";
 			viewpoint 1,197,256,0,0xFF0000;
 			viewpoint 1,197,256,0,0xFF0000;
@@ -30,14 +32,14 @@ veins,210,345,5	script	Veins Guide#veins01::GuideVeins	934,{
 			break;
 			break;
 		case 2:
 		case 2:
 			mes "[Veins Guide]";
 			mes "[Veins Guide]";
-			mes "You can rest your fatigue of the journey in the Inn. The Inn is located on the North-West side of Veins.";
+			mes "You can rest your fatigue of the journey in the "+F_Navi("Inn","veins,110,278")+". The Inn is located on the North-West side of Veins.";
 			mes "Would you like to check any other locations?";
 			mes "Would you like to check any other locations?";
 			viewpoint 1,110,278,1,0xFF4500;
 			viewpoint 1,110,278,1,0xFF4500;
 			next;
 			next;
 			break;
 			break;
 		case 3:
 		case 3:
 			mes "[Veins Guide]";
 			mes "[Veins Guide]";
-			mes "If you want to talk to the Veins Towners, visit the Veins Pub.";
+			mes "If you want to talk to the Veins Towners, visit the Veins "+F_Navi("Pub","veins,150,215")+".";
 			mes "The pub is located on the west side of Veins.";
 			mes "The pub is located on the west side of Veins.";
 			mes "Would you like to check any other locations?";
 			mes "Would you like to check any other locations?";
 			viewpoint 1,150,215,2,0xDAA520;
 			viewpoint 1,150,215,2,0xDAA520;
@@ -46,7 +48,7 @@ veins,210,345,5	script	Veins Guide#veins01::GuideVeins	934,{
 		case 4:
 		case 4:
 			mes "[Veins Guide]";
 			mes "[Veins Guide]";
 			mes "You have to be able to protect your own body.";
 			mes "You have to be able to protect your own body.";
-			mes "The Weapon Shop in Veins is selling the good weapons at a reasonable price..";
+			mes "The "+F_Navi("Weapon Shop","veins,150,175")+" in Veins is selling the good weapons at a reasonable price..";
 			mes "It is located on the West side of Veins.";
 			mes "It is located on the West side of Veins.";
 			mes "Would you like to check any other locations?";
 			mes "Would you like to check any other locations?";
 			viewpoint 1,150,175,3,0x008000;
 			viewpoint 1,150,175,3,0x008000;
@@ -54,14 +56,14 @@ veins,210,345,5	script	Veins Guide#veins01::GuideVeins	934,{
 			break;
 			break;
 		case 5:
 		case 5:
 			mes "[Veins Guide]";
 			mes "[Veins Guide]";
-			mes "The essential items! Check out the Veins Tool Shop in the center of town..";
+			mes "The essential items! Check out the Veins "+F_Navi("Tool Shop","veins,230,161")+" in the center of town..";
 			mes "Would you like to check any other locations?";
 			mes "Would you like to check any other locations?";
 			viewpoint 1,230,161,4,0x0000FF;
 			viewpoint 1,230,161,4,0x0000FF;
 			next;
 			next;
 			break;
 			break;
 		case 6:
 		case 6:
 			mes "[Veins Guide]";
 			mes "[Veins Guide]";
-			mes "The Airport of Veins is currently only used for Cargo.";
+			mes "The "+F_Navi("Airport","veins,273,287")+" of Veins is currently only used for Cargo.";
 			mes "Would you like to check any other locations?";
 			mes "Would you like to check any other locations?";
 			viewpoint 1,273,287,5,0x000080;
 			viewpoint 1,273,287,5,0x000080;
 			next;
 			next;
@@ -69,7 +71,8 @@ veins,210,345,5	script	Veins Guide#veins01::GuideVeins	934,{
 		case 7:
 		case 7:
 			mes "[Veins Guide]";
 			mes "[Veins Guide]";
 			mes "Are you interested in Geology?";
 			mes "Are you interested in Geology?";
-			mes "If so, please visit the Geological Research Institute at the second floor of Weapon Shop.";
+			mes "If so, please visit the ";
+			mes F_Navi("Geological Research Institute","veins,150,175")+" at the second floor of Weapon Shop.";
 			mes "Would you like to check any other locations?";
 			mes "Would you like to check any other locations?";
 			viewpoint 1,150,175,6,0x800080;
 			viewpoint 1,150,175,6,0x800080;
 			next;
 			next;
@@ -77,7 +80,7 @@ veins,210,345,5	script	Veins Guide#veins01::GuideVeins	934,{
 		case 8:
 		case 8:
 			mes "[Veins Guide]";
 			mes "[Veins Guide]";
 			mes "I will mark the location";
 			mes "I will mark the location";
-			mes "of the ^808080Cool Event Corp. Staff^000000";
+			mes "of the "+F_Navi("Cool Event Corp. Staff","veins,209,127","^808080");
 			mes "on your mini map.";
 			mes "on your mini map.";
 			mes "Would you like to check any other locations?";
 			mes "Would you like to check any other locations?";
 			viewpoint 1,209,127,7,0x808080;
 			viewpoint 1,209,127,7,0x808080;
@@ -104,5 +107,4 @@ veins,210,345,5	script	Veins Guide#veins01::GuideVeins	934,{
 		}
 		}
 	}
 	}
 }
 }
-
 veins,189,101,5	duplicate(GuideVeins)	Veins Guide#veins02	934
 veins,189,101,5	duplicate(GuideVeins)	Veins Guide#veins02	934

+ 41 - 0
npc/re/guides/navigation.txt

@@ -0,0 +1,41 @@
+//===== rAthena Script ======================================= 
+//= Navigation Functions
+//===== By: ================================================== 
+//= Euphy
+//===== Current Version: ===================================== 
+//= 1.0
+//===== Compatible With: ===================================== 
+//= rAthena SVN
+//===== Description: ========================================= 
+//= Controls the navigation system for Renewal guides.
+//= Clients before 2011-10-10 do not support navigation
+//= links, so disable the system if this applies to you.
+//===== Additional Comments: ================================= 
+//= 1.0 First version.
+//============================================================ 
+
+function	script	F_Navi	{
+
+	// Uncomment to disable the navigation system.
+	//set .@disabled,1;
+
+	// This function takes 0 ~ 3 parameters.
+	switch(getargcount()) {
+	case 0:	// Check if system is disabled.
+		return .@disabled;
+	case 1:	// Display information message, if enabled.
+		if (!.@disabled) {
+			next;
+			mes getarg(0);
+			mes "When you click on the ^B9062F[location name]^000000, you'll receive the most advanced ^B9062FNavigation^000000 services!";
+		}
+		return;
+	default:	// Display navigation link, if enabled; else set text color, if available.
+		if (!.@disabled)
+			return "<NAVI>[" + getarg(0) + "]<INFO>" + getarg(1) + ",0,000,0</INFO></NAVI>";
+		else if (getargcount() == 3)
+			return getarg(2)+getarg(0)+"^000000";
+		else
+			return getarg(0);
+	}
+}

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 3317 - 1
npc/re/quests/quests_malaya.txt


+ 1 - 0
npc/re/scripts_athena.conf

@@ -18,6 +18,7 @@ npc: npc/re/cities/malaya.txt
 npc: npc/re/cities/mora.txt
 npc: npc/re/cities/mora.txt
 
 
 // --------------------------- Guides ---------------------------
 // --------------------------- Guides ---------------------------
+npc: npc/re/guides/navigation.txt
 npc: npc/re/guides/guides_alberta.txt
 npc: npc/re/guides/guides_alberta.txt
 npc: npc/re/guides/guides_aldebaran.txt
 npc: npc/re/guides/guides_aldebaran.txt
 npc: npc/re/guides/guides_amatsu.txt
 npc: npc/re/guides/guides_amatsu.txt

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.