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, 178 insertions, 137 deletions

diff --git a/npc/pre-re/guides/guides_lighthalzen.txt b/npc/pre-re/guides/guides_lighthalzen.txt
index 52ee73902..c9fb40b5b 100644
--- a/npc/pre-re/guides/guides_lighthalzen.txt
+++ b/npc/pre-re/guides/guides_lighthalzen.txt
@@ -1,186 +1,227 @@
-//===== rAthena Script ======================================= 
+//===== rAthena Script =======================================
 //= Lighthalzen Guides
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
+//===== By: ==================================================
+//= MasterOfMuppets; L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.2
+//===== Compatible With: =====================================
 //= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guides for the city of Lighthalzen.
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
-//= 1.1 Optimized. [Euphy]
-//============================================================ 
+//===== Description: =========================================
+//= [Official Conversion]
+//= Guides for the City of Lighthalzen
+//===== Additional Comments: =================================
+//= 1.0 First Version [MasterOfMuppets]
+//= 1.1 Removed Duplicates [Silent]
+//= 1.2 Rescripted to official 10.3 standards. [L0ne_W0lf]
+//============================================================
 
-lighthalzen,207,310,5	script	Lighthalzen Guide#lhz01::GuideLighthazlen	852,{
+lighthalzen,207,310,5	script	Guide#lhz::LhzGuide	852,{
 	cutin "ein_soldier",2;
 	mes "[Lighthalzen Guide]";
-	mes "Welcome to ^8B4513Lighthalzen^000000,";
+	mes "Welcome to Lighthalzen,";
 	mes "the Corporation City-State.";
 	mes "If you need any guidance";
 	mes "around the city, feel free";
 	mes "to ask me and I'll do my";
 	mes "very best to help you.";
-	next;
-	mes "[Lighthalzen Guide]";
-	mes "Please be aware that I'm";
-	mes "in charge of providing info";
-	mes "regarding the West District";
-	mes "of ^8B4513Lighthalzen^000000. Now, please";
-	mes "select the location that you'd";
-	mes "like to learn more about.";
-	next;
-	while (1) {
-		switch(select("[ Main Facilities ]:[ Merchants & Helpers ]:Remove Marks from Mini-Map:Cancel")) {
+	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("[ Hotel ]:[ Bank ]:[ Airport ]:[ Weapon Shop ]:[ Department Store ]:[ Police Station ]:[ Jewelry Store ]:[ Cool Event Corp. ]:[ Somatology Laboratory ]:[ Alchemist Association ]:Previous Menu")) {
+			mes "[Lighthalzen Guide]";
+			mes "Please be aware that I'm";
+			mes "in charge of providing info";
+			mes "regarding the West District";
+			mes "of Lighthalzen. Now, please";
+			mes "select the location that you'd";
+			mes "like to learn more about.";
+			if (.@compass_check == 0) {
+				next;
+				mes "[Lighthalzen Guide]";
+				mes "But before that,";
+				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("^FF0000Rekenber Corporation^000000:Train Station:Police Station:Bank:Hotel:Airport:Merchant Guild:Jewelry Shop:Weapon Shop:Departement Store:Cancel")) {
 				case 1:
-					callsub L_Mark,"^FF0000Hotel";
-					viewpoint 1,160,217,0,0xFF0000;
-					next;
+					mes "[Lighthalzen Guide]";
+					mes "Rekenber Corporation,";
+					mes "the largest company in";
+					mes "the Schwaltzvalt Republic,";
+					mes "in located in northwestern";
+					mes "Lighthalzen. You can't miss";
+					mes "the headquarters building.";
+					if (.@compass_check)
+						viewpoint 1,102,247,2,0xFF0000;
 					break;
 				case 2:
-					callsub L_Mark,"^FF4500Bank";
-					viewpoint 1,203,257,1,0xFF4500;
-					next;
+					mes "[Lighthalzen Guide]";
+					mes "The Train Station is";
+					mes "located in the center of";
+					mes "the city, where we have";
+					mes "a direct railroad to Einbroch.";
+					if (.@compass_check)
+						viewpoint 1,233,164,3,0xFF00FF;
 					break;
 				case 3:
-					callsub L_Mark,"^DAA520Airport";
-					viewpoint 1,262,75,2,0xDAA520;
-					next;
+					mes "[Lighthalzen Guide]";
+					mes "Our Police Station is just";
+					mes "north of the city's center.";
+					mes "Please don't hesitate to report";
+					mes "any suspicious persons and";
+					mes "activity, or if you have any";
+					mes "problems whatsoever.";
+					if (.@compass_check)
+						viewpoint 1,236,276,4,0x99FFFFF;
 					break;
 				case 4:
-					callsub L_Mark,"^7B68EEWeapon Shop";
-					viewpoint 1,194,35,3,0x7B68EE;
-					next;
+					mes "[Lighthalzen Guide]";
+					mes "The Bank is located";
+					mes "just opposite to the";
+					mes "Lighthalzen Police Station,";
+					mes "which is a pretty good idea";
+					mes "when I think about it, actually. ^FFFFFFspacer^000000";
+					if (.@compass_check)
+						viewpoint 1,198,257,5,0x0000FF;
 					break;
 				case 5:
-					callsub L_Mark,"^B91A4DDepartment Store";
-					viewpoint 1,202,106,4,0xB91A4D;
-					next;
+					mes "[Lighthalzen Guide]";
+					mes "Our Hotel is located in";
+					mes "the middle of the South Plaza.";
+					mes "Due to its quality services and";
+					mes "luxurious accomodations, this";
+					mes "hotel is extremely popular.";
+					if (.@compass_check)
+						viewpoint 1,159,133,6,0x00FF00;
 					break;
 				case 6:
-					callsub L_Mark,"^008000Police Station";
-					viewpoint 1,234,276,5,0x008000;
-					next;
+					mes "[Lighthalzen Guide]";
+					mes "The Airport is to the far";
+					mes "west of the Central Promenade.";
+					mes "You can travel anywhere within";
+					mes "the Schwaltzvalt Republic by";
+					mes "riding on one of the Airships.";
+					if (.@compass_check)
+						viewpoint 1,267,75,7,0x00FF00;
 					break;
 				case 7:
-					callsub L_Mark,"^0000FFJewelry Store";
-					viewpoint 1,96,110,6,0x0000FF;
-					next;
+					mes "[Lighthalzen Guide]";
+					mes "The Merchant Guild can be";
+					mes "found in the southwestern";
+					mes "part of Lighthalzen.";
+					if (.@compass_check)
+						viewpoint 1,74,53,8,0xFF99FF;
 					break;
 				case 8:
-					callsub L_Mark,"^000080Cool Event Corp.";
-					viewpoint 1,238,217,7,0x000080;
-					next;
+					mes "[Lighthalzen Guide]";
+					mes "The Jewelry Shop is";
+					mes "located just west of";
+					mes "the South Plaza.";
+					if (.@compass_check)
+						viewpoint 1,93,110,9,0xFF9900;
 					break;
 				case 9:
-					callsub L_Mark,"^800080Somatology Laboratory";
-					viewpoint 1,101,243,8,0x800080;
-					next;
+					mes "[Lighthalzen Guide]";
+					mes "The Weapon Shop is";
+					mes "located at the end of";
+					mes "the Central Promenade.";
+					mes "It's at least worth a look";
+					mes "if you're serious about";
+					mes "adventuring around here.";
+					if (.@compass_check)
+						viewpoint 1,196,46,10,0x330033;
 					break;
 				case 10:
-					callsub L_Mark,"^0A9696Alchemist Association";
-					viewpoint 1,54,132,9,0x0A9696;
-					next;
+					mes "[Lighthalzen Guide]";
+					mes "The Department Store is";
+					mes "located in the middle of";
+					mes "Lighthalzen and is the biggest";
+					mes "and most convenient place for";
+					mes "shopping for almost everything.";
+					if (.@compass_check)
+						viewpoint 1,199,163,11,0xFFFF00;
 					break;
 				case 11:
-					set .@loop,0;
-					break;
+					mes "[Lighthalzen 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("[ Armsmith ]:[ Seiayablem ]:[ Pet Groomer ]:[ Kafra Employees ]:[ Cool Event Corp. Staff ]:Previous Menu")) {
-				case 1:
-					mes "[Lighthalzen Guide]";
-					mes "You may go to Fulerr,";
-					mes "the ^0A9696Armsmith^000000";
-					mes "on the 1st floor of the Weapon Shop.";
-					viewpoint 1,194,35,10,0x0A9696;
-					next;
-					callsub L_Mark,"^0A9696Armsmith";
-					next;
-					break;
-				case 2:
-					mes "[Lighthalzen Guide]";
-					mes "^4B0082Seiyablem^000000 adds";
-					mes "sockets on your items";
-					mes "on the 1st floor";
-					mes "of the Weapon Shop.";
-					viewpoint 1,194,35,11,0x4B0082;
-					next;
-					callsub L_Mark,"^4B0082Seiyablem",1;
-					next;
-					break;
-				case 3:
-					callsub L_Mark,"^FF4500Pet Groomer";
-					viewpoint 1,222,191,12,0xFF4500;
-					next;
-					break;
-				case 4:
-					callsub L_Mark,"^008080Kafra Employees";
-					viewpoint 1,164,99,13,0x008080;
-					viewpoint 1,164,99,14,0x008080;
-					next;
-					break;
-				case 5:
-					callsub L_Mark,"^FF1493Cool Event Corp. Staff";
-					viewpoint 1,94,247,15,0xFF1493;
-					next;
-					break;
-				case 6:
-					set .@loop,0;
-					break;
-				}
-			}
+			viewpoint 2,102,247,2,0xFF0000;
+			viewpoint 2,233,164,3,0xFF00FF;
+			viewpoint 2,236,276,4,0x99FFFF;
+			viewpoint 2,198,257,5,0x0000FF;
+			viewpoint 2,159,133,6,0x00FF00;
+			viewpoint 2,267,75,7,0x00FF00;
+			viewpoint 2,74,53,8,0xFF99FF;
+			viewpoint 2,93,110,9,0xFF9900;
+			viewpoint 2,196,46,10,0x330033;
+			viewpoint 2,199,163,11,0xFFFF00;
+			set .@compass_check,0;
 			break;
 		case 3:
 			mes "[Lighthalzen Guide]";
-			mes "Sure, I'll remove all marks from your mini-map.";
-			mes "Is there anything else I can do for you?";
-			viewpoint 2,160,217,0,0xFFFFFF;
-			viewpoint 2,203,257,1,0xFFFFFF;
-			viewpoint 2,262,75,2,0xFFFFFF;
-			viewpoint 2,194,35,3,0xFFFFFF;
-			viewpoint 2,202,106,4,0xFFFFFF;
-			viewpoint 2,234,276,5,0xFFFFFF;
-			viewpoint 2,96,110,6,0xFFFFFF;
-			viewpoint 2,238,217,7,0xFFFFFF;
-			viewpoint 2,101,243,8,0xFFFFFF;
-			viewpoint 2,54,132,9,0xFFFFFF;
-			viewpoint 2,194,35,10,0xFFFFFF;
-			viewpoint 2,194,35,11,0xFFFFFF;
-			viewpoint 2,222,191,12,0xFFFFFF;
-			viewpoint 2,164,99,13,0xFFFFFF;
-			viewpoint 2,164,99,14,0xFFFFFF;
-			viewpoint 2,94,247,15,0xFFFFFF;
+			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;
+			mes "[Lighthalzen Guide]";
+			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 "[Lighthalzen 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 Lighthalzen.";
 			break;
 		case 4:
 			mes "[Lighthalzen Guide]";
-			mes "Enjoy your adventures!";
+			mes "Lighthalzen is divided";
+			mes "into the East and West";
+			mes "districts by a railroad that";
+			mes "runs right through the middle.";
+			mes "There are always guards on";
+			mes "watch to protect the peace.";
+			next;
+			mes "[Lighthalzen Guide]";
+			mes "Please don't hesitate";
+			mes "to report any suspicious";
+			mes "activity or persons to us.";
+			mes "We hope that you enjoy";
+			mes "our fair city, adventurer.";
 			close2;
-			cutin "ein_soldier",255;
-			end;
+			set .@loop1,0;
 		}
 	}
+	cutin "ein_soldier",255;
 	end;
-L_Mark:
-	mes "[Lighthalzen Guide]";
-	mes "I will mark the location";
-	mes "of "+((getarg(1,0))?"":"the ")+getarg(0)+"^000000";
-	mes "on your mini-map.";
-	mes "Would you like to check any other locations?";
-	return;
 }
 
-lighthalzen,220,310,3	duplicate(GuideLighthazlen)	Lighthalzen Guide#lhz02	852
-lighthalzen,154,100,5	duplicate(GuideLighthazlen)	Lighthalzen Guide#lhz03	852
-lighthalzen,307,224,3	duplicate(GuideLighthazlen)	Lighthalzen Guide#lhz04	852
+lighthalzen,220,311,3	duplicate(LhzGuide)	Guide#2lhz	852
+
+lighthalzen,154,100,5	duplicate(LhzGuide)	Guide#3lhz	852
+
+lighthalzen,307,224,3	duplicate(LhzGuide)	Guide#4lhz	852