Follow up r16430, reverted all the pre-re guides to their pre-renewal version. Disabled a couple of renewal quests from pre-renewal.

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

1 files changed, 122 insertions, 263 deletions

diff --git a/npc/pre-re/guides/guides_morroc.txt b/npc/pre-re/guides/guides_morroc.txt
index d12859251..f0b5b343b 100644
--- a/npc/pre-re/guides/guides_morroc.txt
+++ b/npc/pre-re/guides/guides_morroc.txt
@@ -1,305 +1,164 @@
-//===== rAthena Script ======================================= 
+//===== rAthena Script =======================================
 //= Morroc Guides
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
+//===== By: ==================================================
+//= kobra_k88; L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.4a
+//===== Compatible With: =====================================
 //= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guides for the city of Morroc and Morroc Ruins.
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
-//= 1.1 Fixed and optimized. [Euphy]
-//============================================================ 
+//===== Description: =========================================
+//= [Official Conversion]
+//= Guides for the City of Morroc
+//===== Additional Comments: =================================
+//= 1.1 Now using duplicate command.
+//= 1.2 Optimized, updated common guide names [Lupus]
+//= 1.3 Removed Duplicates [Silent]
+//= 1.4 rescripted to official 10.3 standards. [L0ne_W0lf]
+//= 1.4a Fixed some errors with the loop[Samuray22]
+//	-Thanks to $ephiroth.
+//============================================================
 
-morocc,153,286,6	script	Guide#01morocc::GuideMorroc	707,{
+morocc,153,286,6	script	Guide#moc::MocGuide	707,{
 	cutin "moc_soldier",2;
 	mes "[Morroc Guide]";
-	mes "Welcome to ^8B4513Morroc^000000,";
-	mes "the Desert Town.";
-	mes "Do you need help navigating the town?";
-	next;
-	while (1) {
-		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
+	mes "Welcome to Morroc,";
+	mes "the frontier town of the";
+	mes "Rune-Midgarts Kingdom.";
+	mes "Please ask me for help if";
+	mes "you're having any trouble";
+	mes "finding anything in town.";
+	set .@loop1,1;
+	while (.@loop1) {
+		next;
+		switch(select("City Guide:Remove Marks from Mini-Map:Notice:Cancel")) {
 		case 1:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Thief Guild ]:[ Sphinx Dungeon ]:[ Oasis Entrance ]:[ Forge ]:[ Weapon & Armor Shop ]:[ Inn ]:[ Tavern ]:Previous Menu")) {
+			mes "[Morroc Guide]";
+			mes "Please select";
+			mes "a location from";
+			mes "the following menu.";
+			if (.@compass_check == 0) {
+				mes "Would you like me";
+				mes "to mark locations";
+				mes "on your Mini-Map?";
+				next;
+				if (select("Yes.:No.") == 1) set .@compass_check,1;
+			}
+			set .@loop2,1;
+			while(.@loop2) {
+				if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+				else next;
+				
+				switch(select("^FF0000Thief Guild^000000:Weapon Shop:Inn:Pub:Mercenary Guild:Forge:Cancel")) {
 				case 1:
 					mes "[Morroc Guide]";
-					mes "The ^B9062FThief Guild^000000 is located";
-					mes "inside the ^B9062FPyramids^000000";
-					mes "that is near the ^B9062FOasis^000000.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,26,294,0,0xFF0000;
-					next;
+					mes "The Thief Guild is";
+					mes "in charge of all Job";
+					mes "Changes to the Thief";
+					mes "Class. From what I hear,";
+					mes "you can find them inside";
+					mes "the Pyramids nearby...";
+					if (.@compass_check)
+						viewpoint 1,24,297,2,0xFF0000;
 					break;
 				case 2:
 					mes "[Morroc Guide]";
-					mes "The ^0000FFSphinx Dungeon^000000 is";
-					mes "right outside the western gate.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,26,164,1,0x0A82FF;
-					next;
+					mes "The Weapon Shop";
+					mes "is in the southeast";
+					mes "end of Morroc.";
+					if (.@compass_check)
+						viewpoint 1,253,56,3,0xFF00FF;
 					break;
 				case 3:
 					mes "[Morroc Guide]";
-					mes "Let me mark the entrance to the ^FF5400Oasis^000000";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,26,294,2,0xFFB400;
-					next;
+					mes "There are Inns";
+					mes "where you can rest";
+					mes "at the southeast and";
+					mes "northeast ends of Morroc.";
+					if (.@compass_check) {
+						viewpoint 1,197,66,4,0xFF00FF;
+						viewpoint 1,273,269,5,0xFF00FF;
+					}
 					break;
 				case 4:
-					callsub L_Mark,"^006400Forge";
-					viewpoint 1,47,47,3,0xAAFF00;
-					next;
+					mes "[Morroc Guide]";
+					mes "You can find the";
+					mes "Pub in northeast Morroc.";
+					if (.@compass_check)
+						viewpoint 1,52,259,6,0xFF00FF;
 					break;
 				case 5:
-					callsub L_Mark,"^7F3300Weapon & Armor Shop";
-					viewpoint 1,253,56,4,0xD2691E;
-					next;
+					mes "[Morroc Guide]";
+					mes "The Mercenary";
+					mes "Guild is located";
+					mes "in East Morroc.";
+					if (.@compass_check)
+						viewpoint 1,284,171,7,0x00FF00;
 					break;
 				case 6:
 					mes "[Morroc Guide]";
-					mes "Currently the ^800080Inn^000000";
-					mes "has been shut down until further notice,";
-					mes "but I'll mark its location";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,273,269,5,0xDA70D6;
-					next;
+					mes "The Forge is";
+					mes "located just";
+					mes "southwest from";
+					mes "the center of Morroc.";
+					if (.@compass_check)
+						viewpoint 1,47,47,7,0xFF00FF;
 					break;
 				case 7:
-					callsub L_Mark,"^B9062FTavern";
-					viewpoint 1,52,259,6,0xFF0000;
-					next;
-					break;
-				case 8:
-					set .@loop,0;
-					break;
+					mes "[Morroc Guide]";
+					mes "Please ask me to ''Remove";
+					mes "Marks from Mini-Map'' if you";
+					mes "no longer wish to have the";
+					mes "location marks displayed";
+					mes "on your Mini-Map.";
+					set .@loop2,0;
 				}
 			}
 			break;
 		case 2:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Kafra Employee ]:[ Poison Herb Salesman ]:[ Dye Maker ]:[ Seiyablem ]:Previous Menu")) {
-				case 1:
-					callsub L_Mark,"^0000FFKafra Employees";
-					viewpoint 1,156,97,7,0x0A82FF;
-					viewpoint 1,160,258,8,0x0A82FF;
-					next;
-					break;
-				case 2:
-					callsub L_Mark,"^006400Poison Herb Salesman";
-					viewpoint 1,190,96,9,0xAAFF00;
-					next;
-					break;
-				case 3:
-					mes "[Morroc Guide]";
-					mes "The ^7F3300Dye Maker^000000 is";
-					mes "currently staying";
-					mes "on the 1st floor of the Inn.";
-					mes "Let me mark his location";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,273,269,10,0xD2691E;
-					next;
-					break;
-				case 4:
-					mes "[Morroc Guide]";
-					mes "^800080Seiyablem^000000";
-					mes "is a technician";
-					mes "who can create ^0000FFslots^000000 on weapons and armors,";
-					mes "but not all equipment";
-					mes "can be slotted. Well, that's what he says.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,51,41,11,0xDA70D6;
-					next;
-					break;
-				case 5:
-					set .@loop,0;
-					break;
-				}
-			}
+			viewpoint 2,237,41,2,0x00FF00;
+			viewpoint 2,237,41,3,0x0000FF;
+			viewpoint 2,46,345,4,0x00FF00;
+			viewpoint 2,175,220,5,0xFF0000;
+			viewpoint 2,175,220,6,0xFF0000;
+			viewpoint 2,175,220,7,0xFF0000;
+			set .@compass_check,0;
 			break;
 		case 3:
 			mes "[Morroc Guide]";
-			mes "Sure, I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 2,1,1,0,0xFFFF00;
-			viewpoint 2,1,1,1,0x000000;
-			viewpoint 2,1,1,2,0xFF0000;
-			viewpoint 2,1,1,3,0xFFFF00;
-			viewpoint 2,1,1,4,0xFFFF00;
-			viewpoint 2,1,1,5,0xFFFF00;
-			viewpoint 2,1,1,6,0xFFFF00;
-			viewpoint 2,1,1,7,0xFFFF00;
-			viewpoint 2,1,1,8,0xFFFF00;
-			viewpoint 2,1,1,9,0xFFFF00;
-			viewpoint 2,1,1,10,0xFFFF00;
-			viewpoint 2,1,1,11,0xFFFF00;
+			mes "Advances in sorcery and";
+			mes "technology have allowed";
+			mes "us to update our information";
+			mes "system, enabling up to mark";
+			mes "locations on your Mini-Map";
+			mes "for easier navigation.";
 			next;
-			break;
-		case 4:
-			mes "[Morroc Guide]";
-			mes "Be safe on your travels.";
-			close2;
-			cutin "moc_soldier",255;
-			end;
-		}
-	}
-	end;
-L_Mark:
-	mes "[Morroc Guide]";
-	mes "Let me mark the location of the";
-	mes getarg(0)+"^000000";
-	mes "on your mini-map.";
-	mes "Would you like to check any other locations?";
-	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,{
-
-moc_ruins,159,53,3	script	Guide#01ruins::GuideMocRuins	707,{
-	cutin "moc_soldier",2;
-	mes "[Morroc Guide]";
-	mes "Welcome to ^8B4513Morroc^000000,";
-	mes "the Desert Town.";
-	mes "Do you need help navigating the town?";
-	next;
-	while (1) {
-		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
-		case 1:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Thief Guild ]:[ Sphinx Dungeon ]:[ Morroc Entrance ]:Previous Menu")) {
-				case 1:
-					mes "[Morroc Guide]";
-					mes "The ^B9062FThief Guild^000000 is located";
-					mes "inside the ^B9062FPyramids^000000.";
-					mes "Let me mark its location";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,56,161,0,0xFF0000;
-					next;
-					break;
-				case 2:
-					mes "[Morroc Guide]";
-					mes "The ^0000FFSphinx Dungeon^000000";
-					mes "is outside the south entrance of this Oasis.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,71,19,1,0x0A82FF;
-					next;
-					break;
-				case 3:
-					mes "[Morroc Guide]";
-					mes "^FF5400Morroc^000000 is";
-					mes "right outside the southeast entrance of this Oasis.";
-					mes "Let me mark its location";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,158,40,2,0xFFB400;
-					next;
-					break;
-				case 4:
-					set .@loop,0;
-					break;
-				}
-			}
-			break;
-		case 2:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Eden Teleport Officer ]:[ Tool Dealer ]:[ Kafra Employee ]:[ Repairman ]:[ Pet Groomer ]:[ Chef Assistant ]:[ Leablem ]:Previous Menu")) {
-				case 1:
-					callsub L_Mark,"^006400Eden Teleport Officer";
-					viewpoint 1,68,164,3,0xAAFF00;
-					next;
-					break;
-				case 2:
-					callsub L_Mark,"^800080Tool Dealers";
-					viewpoint 1,92,128,5,0xDA70D6;
-					viewpoint 1,114,63,6,0xDA70D6;
-					next;
-					break;
-				case 3:
-					callsub L_Mark,"^B9062FKafra Employee";
-					viewpoint 1,59,157,7,0xFF0000;
-					next;
-					break;
-				case 4:
-					callsub L_Mark,"^0000FFRepairman";
-					viewpoint 1,107,94,8,0x0A82FF;
-					next;
-					break;
-				case 5:
-					callsub L_Mark,"^FF5400Pet Groomer";
-					viewpoint 1,118,170,9,0xFFB400;
-					next;
-					break;
-				case 6:
-					callsub L_Mark,"^006400Chef Assistant";
-					viewpoint 1,115,123,10,0xAAFF00;
-					next;
-					break;
-				case 7:
-					mes "[Morroc Guide]";
-					mes "^7F3300Leablem^000000";
-					mes "is a technician";
-					mes "who can create ^0000FFslots^000000 on weapons and armors,";
-					mes "but not all equipment";
-					mes "can be slotted. Well, that's what he says.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,154,86,11,0xD2691E;
-					next;
-					break;
-				case 8:
-					set .@loop,0;
-					break;
-				}
-			}
-			break;
-		case 3:
 			mes "[Morroc Guide]";
-			mes "Sure, I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 2,1,1,0,0xFFFF00;
-			viewpoint 2,1,1,1,0x000000;
-			viewpoint 2,1,1,2,0xFF0000;
-			viewpoint 2,1,1,3,0xFFFF00;
-			viewpoint 2,1,1,4,0xFFFF00;
-			viewpoint 2,1,1,5,0xFFFF00;
-			viewpoint 2,1,1,6,0xFFFF00;
-			viewpoint 2,1,1,7,0xFFFF00;
-			viewpoint 2,1,1,8,0xFFFF00;
-			viewpoint 2,1,1,9,0xFFFF00;
-			viewpoint 2,1,1,10,0xFFFF00;
-			viewpoint 2,1,1,11,0xFFFF00;
+			mes "Your Mini-Map is located";
+			mes "in the upper right corner";
+			mes "of the screen. If you can't";
+			mes "see it, press the Ctrl + Tab";
+			mes "keys or click the ''Map'' button in your Basic Info Window.";
 			next;
+			mes "[Morroc Guide]";
+			mes "On your Mini-Map,";
+			mes "click on the ''+'' and ''-''";
+			mes "symbols to zoom in and";
+			mes "our of your Mini-Map. We";
+			mes "hope you enjoy your travels";
+			mes "here in the city of Morroc.";
 			break;
 		case 4:
 			mes "[Morroc Guide]";
-			mes "Be safe on your travels.";
+			mes "Alright then,";
+			mes "try to stay out of";
+			mes "too much trouble";
+			mes "out there, adventurer.";
 			close2;
-			cutin "moc_soldier",255;
-			end;
+			set .@loop1,0;
 		}
 	}
+	cutin "moc_soldier",255;
 	end;
-L_Mark:
-	mes "[Morroc Guide]";
-	mes "Let me mark the location of the";
-	mes getarg(0)+"^000000";
-	mes "on your mini-map.";
-	mes "Would you like to check any other locations?";
-	return;
 }
 
-moc_ruins,70,164,3	duplicate(GuideMocRuins)	Guide#02ruins	707
-moc_ruins,65,44,5	duplicate(GuideMocRuins)	Guide#03ruins	707
+morocc,54,97,0	duplicate(MocGuide)	Guide#2moc	707