Update to last rAthena npc.

Fix some typos
change sc_bleeding to -> sc_blooding
Updated RE EXP for quests_brasilis.txt

1 files changed, 23 insertions, 20 deletions

diff --git a/npc/re/guides/guides_comodo.txt b/npc/re/guides/guides_comodo.txt
index 59988459e..85ad31703 100644
--- a/npc/re/guides/guides_comodo.txt
+++ b/npc/re/guides/guides_comodo.txt
@@ -3,15 +3,14 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.2
 //===== Description: =========================================
 //= [Official Conversion]
 //= Guides for the city of Comodo.
 //===== Additional Comments: =================================
 //= 1.0 First version, Renewal guide.
 //= 1.1 Fixed and optimized. [Euphy]
+//= 1.2 Navigation system update. [Euphy]
 //============================================================
 
 comodo,322,178,4	script	Comodo Guide#01comodo::GuideComodo	700,{
@@ -19,6 +18,7 @@ comodo,322,178,4	script	Comodo Guide#01comodo::GuideComodo	700,{
 	mes "Welcome to ^8B4513Comodo^000000,";
 	mes "the Beach Town of the Rune-Midgarts Kingdom.";
 	mes "Do you need help navigating the town?";
+	F_Navi("[Comodo Guide]");
 	next;
 	while (1) {
 		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel:About ^8B4513Comodo^000000")) {
@@ -27,57 +27,61 @@ comodo,322,178,4	script	Comodo Guide#01comodo::GuideComodo	700,{
 			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")) {
 				case 1:
-					callsub L_Mark,"^FF0000Tavern";
+					callsub L_Mark, F_Navi("Tavern","comodo,161,315","^FF0000");
 					viewpoint 1,166,298,0,0xFF0000;
 					next;
 					break;
 				case 2:
-					callsub L_Mark,"^FFA500Casino";
+					callsub L_Mark, F_Navi("Casino","comodo,140,111","^FFA500");
 					viewpoint 1,140,98,1,0xFFA500;
 					next;
 					break;
 				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;
 					next;
 					break;
 				case 4:
-					callsub L_Mark,"^B8860BTool Shop";
+					callsub L_Mark, F_Navi("Tool Shop","comodo,92,128","^B8860B");
 					viewpoint 1,86,128,3,0xB8860B;
 					next;
 					break;
 				case 5:
-					callsub L_Mark,"^32CD32Campsite";
+					callsub L_Mark, F_Navi("Campsite","comodo,209,308","^32CD32");
 					viewpoint 1,210,308,4,0x32CD32;
 					next;
 					break;
 				case 6:
-					callsub L_Mark,"^6B8E23Souvenir Vendor";
+					callsub L_Mark, F_Navi("Souvenir Vendor","comodo,293,125","^6B8E23");
 					viewpoint 1,298,124,5,0x6B8E23;
 					next;
 					break;
 				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;
 					next;
 					break;
 				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;
 					next;
 					break;
 				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;
 					next;
 					break;
 				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;
 					next;
 					break;
 				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;
 					next;
 					break;
@@ -92,26 +96,26 @@ comodo,322,178,4	script	Comodo Guide#01comodo::GuideComodo	700,{
 			while (.@loop) {
 				switch(select("[ Chief's House ]:[ Bor Robin ]:[ Kafra Employee ]:[ Roaming Bard ]:Previous Menu")) {
 				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;
 					next;
 					break;
 				case 2:
 					mes "[Comodo Guide]";
-					mes "^228B22Bor Robin^000000";
+					mes F_Navi("Bor Robin","comodo,193,151","^228B22");
 					mes "helps adventurers to become ^228B22Dancers^000000.";
 					mes "Would you like to check any other locations?";
 					viewpoint 1,193,151,12,0x228B22;
 					next;
 					break;
 				case 3:
-					callsub L_Mark,"^1E90FFKafra Employee";
+					callsub L_Mark,"^1E90FFKafra Employee^000000";
 					viewpoint 1,195,149,13,0x1E90FF;
 					next;
 					break;
 				case 4:
 					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 "Would you like to check any other locations?";
 					viewpoint 1,211,155,14,0xDB7093;
@@ -167,12 +171,11 @@ comodo,322,178,4	script	Comodo Guide#01comodo::GuideComodo	700,{
 L_Mark:
 	mes "[Comodo Guide]";
 	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 "Would you like to check any other locations?";
 	return;
 }
-
 comodo,181,347,4	duplicate(GuideComodo)	Comodo Guide#02comodo	700
 comodo,197,149,3	duplicate(GuideComodo)	Comodo Guide#03comodo	700
 comodo,37,219,4	duplicate(GuideComodo)	Comodo Guide#04comodo	700