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, 120 insertions, 145 deletions

diff --git a/npc/pre-re/guides/guides_izlude.txt b/npc/pre-re/guides/guides_izlude.txt
index 45fe0cd8a..df214fb67 100644
--- a/npc/pre-re/guides/guides_izlude.txt
+++ b/npc/pre-re/guides/guides_izlude.txt
@@ -1,186 +1,161 @@
-//===== rAthena Script ======================================= 
+//===== rAthena Script =======================================
 //= Izlude Guides
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena  SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guides for the city of Izlude
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
-//============================================================ 
+//===== By: ==================================================
+//= kobra_k88; L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.5a
+//===== Compatible With: =====================================
+//= rAthena SVN
+//===== Description: =========================================
+//= [Official Conversion]
+//= Guides for the City of Izlude
+//===== Additional Comments: =================================
+//= 1.2 Optimized, updated common guide names [Lupus]
+//= 1.3 Updated the guide according to how it is on iRO, thanks [MasterOfMuppets]
+//=     to Muad_Dib
+//= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
+//= 1.5 Rescripted to official 10.3 standards. [L0ne_W0lf]
+//= 1.5a Fixed some errors with the loop[Samuray22]
+//	-Thanks to $ephiroth.
+//============================================================
 
-izlude,121,87,6	script	Guide#01izlude::GuideIzlude	105,{
+izlude,121,87,6	script	Guide#iz	105,{
 	cutin "prt_soldier",2;
 	mes "[Izlude Guide]";
-	mes "Welcome to ^8B4513Izlude^000000,";
-	mes "Prontera's satellite 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 Izlude,";
+	mes "Prontera's satellite city.";
+	mes "If you need any guidance";
+	mes "around Izlude, feel free";
+	mes "to ask me at anytime.";
+	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("[ Marina ]:[ Airport ]:[ Arena ]:[ Tool Shop ]:[ Weapon & Armor Shop ]:[ Swordsman Guild ]:[ Swordsman Association ]:Previous Menu")) {
+			mes "[Izlude 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("^FF0000Swordman Association^000000:Swordman Hall:Arena:Izlude Marina:Weapon Shop:Tool Shop:Cancel")) {
 				case 1:
 					mes "[Izlude Guide]";
-					mes "You can use the northeast ^B9062FMarina^000000";
-					mes "to go to ^8B4513Alberta^000000 or ^8B4513Byalan Island^000000.";
-					mes "Beware of ^8B4513Izlude Dungeon^000000";
-					mes "on Byalan Island since it is";
-					mes "filled with dreadful monsters.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,200,180,0,0xFF0000;
-					next;
+					mes "The Swordman Association";
+					mes "is located on an island that is";
+					mes "in west Izlude. If you're thinking of changing jobs to Swordman,";
+					mes "you should check it out.";
+					if (.@compass_check)
+						viewpoint 1,52,140,0,0xFF0000;
 					break;
 				case 2:
 					mes "[Izlude Guide]";
-					mes "The ^0000FFInternational Airship^000000 to the southeast";
-					mes "goes to ^8B4513Juno^000000 and ^8B4513Rachel^000000.";
-					mes "Let me mark its location";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,145,39,1,0x0A82FF;
-					next;
+					mes "The Swordman Hall";
+					mes "is located in the eastern";
+					mes "island connected to Izlude.";
+					if (.@compass_check)
+						viewpoint 1,214,130,1,0x00FF00;
 					break;
 				case 3:
 					mes "[Izlude Guide]";
-					mes "The ^FF5400Arena^000000 at the north";
-					mes "is a perfect place to";
-					mes "test your combat capabilities.";
-					mes "Let me mark its location";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,128,255,2,0xFF5400;
-					next;
+					mes "Izlude's famous";
+					mes "Arena is located at the";
+					mes "northern end of Izlude.";
+					if (.@compass_check)
+						viewpoint 1,128,225,2,0x00FF00;
 					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,148,148,3,0xAAFF00;
-					next;
+					mes "You can find the";
+					mes "Marina in the northeast";
+					mes "part of Izlude. There, you can";
+					mes "ride a ship which will take you";
+					mes "to Alberta or Byalan Island.";
+					if (.@compass_check)
+						viewpoint 1,200,180,3,0xFF0000;
 					break;
 				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,114,149,4,0xD2691E;
-					next;
+					mes "You can easily";
+					mes "find the Weapon Shop";
+					mes "in northwest Izlude.";
+					if (.@compass_check)
+						viewpoint 1,111,149,4,0xFF00FF;
 					break;
 				case 6:
 					mes "[Izlude Guide]";
-					mes "The Swordsman Guild is where you can ^800080change your job to Swordsman.^000000";
-					mes "Let me mark its location";
-					mes "on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,52,140,5,0xDA70D6;
-					next;
+					mes "The Tool Shop shouldn't";
+					mes "be too hard to find in the";
+					mes "northeast part of Izlude.";
+					if (.@compass_check)
+						viewpoint 1,148,148,5,0xFF00FF;
 					break;
 				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,214,130,6,0xFF0000;
-					next;
-					break;
-				case 8:
-					set .@loop,0;
+					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;
 				}
 			}
 			break;
 		case 2:
-			set .@loop,1;
-			while (.@loop) {
-				switch(select("[ Eden Teleport Officer ]:[ Kafra Employee ]:[ Newlywed Helper ]:[ Bullet Merchant ]:[ Mercenary Guildsman ]:Previous Menu")) {
-				case 1:
-					mes "[Izlude Guide]";
-					mes "The ^0000FFEden Teleport Officer^000000";
-					mes "is currently staying inside";
-					mes "the Swordsman Guild building.";
-					mes "Let me mark his location on your mini-map.";
-					mes "Would you like to check any other locations?";
-					viewpoint 1,52,140,7,0x0A82FF;
-					next;
-					break;
-				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,134,88,8,0xFF5400;
-					next;
-					break;
-				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,171,185,9,0xFF0000;
-					next;
-					break;
-				case 4:
-					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 "Would you like to check any other locations?";
-					viewpoint 1,171,130,10,0xD2691E;
-					next;
-					break;
-				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,48,137,11,0xDA70D6;
-					next;
-					break;
-				case 6:
-					set .@loop,0;
-					break;
-				}
-			}
+			viewpoint 2,237,41,0,0x00FF00;
+			viewpoint 2,237,41,1,0x0000FF;
+			viewpoint 2,46,345,2,0x00FF00;
+			viewpoint 2,175,220,3,0xFF0000;
+			viewpoint 2,134,221,4,0xFF0000;
+			viewpoint 2,204,214,5,0xFF0000;
+			set .@compass_check,0;
 			break;
 		case 3:
 			mes "[Izlude 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;
+			mes "[Izlude 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 "[Izlude 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 Izlude.";
 			break;
 		case 4:
 			mes "[Izlude Guide]";
-			mes "Enjoy your stay.";
-			mes "Bye~!";
+			mes "Okay then, feel";
+			mes "free to come to me";
+			mes "if you ever feel lost";
+			mes "around Izlude, alright?";
 			close2;
-			cutin "prt_soldier",255;
-			end;
+			set .@loop1,0;
+			break;
 		}
 	}
+	cutin "prt_soldier",255;
+	end;
 }
-
-izlude,131,177,4	duplicate(GuideIzlude)	Guide#02izlude	105