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, 117 insertions, 47 deletions

diff --git a/npc/pre-re/guides/guides_niflheim.txt b/npc/pre-re/guides/guides_niflheim.txt
index e698ee954..9a68d10d6 100644
--- a/npc/pre-re/guides/guides_niflheim.txt
+++ b/npc/pre-re/guides/guides_niflheim.txt
@@ -1,64 +1,134 @@
-//===== rAthena Script ======================================= 
+//===== rAthena Script =======================================
 //= Niflheim Guide
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.1
-//===== Compatible With: ===================================== 
+//===== Current Version: =====================================
+//= 1.3
+//===== Compatible With: =====================================
 //= rAthena SVN
-//===== Description: ========================================= 
-//= [Aegis Conversion]
-//= Guide for the city of Niflehim.
-//===== Additional Comments: ================================= 
-//= 1.0 First version, Renewal guide.
-//= 1.1 Optimized. [Euphy]
-//============================================================ 
+//===== Description: =========================================
+//= [Official Conversion]
+//= Guides for the City of Niflheim
+//===== Additional Comments: =================================
+//= 1.1 Fixed location command format [Lupus]
+//= 1.2 Optimized, updated common guide names [Lupus]
+//= 1.3 Rescripted to official 10.3 standards. [L0ne_W0lf]
+//============================================================
 
-niflheim,201,187,3	script	Niflheim Guide#01nif	849,{
-	mes "[Niflheim Guide]";
-	mes "Welcome to.. ^8B4513Niflheim^000000...";
-	mes "the Realm of the Dead...";
-	mes "Do you need help navigating the realm...?";
-	while (1) {
+niflheim,107,156,6	script	Roaming Man#nif	798,{
+	mes "[Ricael]";
+	mes "You must be lost...";
+	mes "Why would anyone come";
+	mes "to this horrid, dreadful";
+	mes "place on purpose...??";
+	next;
+	mes "[Ricael]";
+	mes "Ever since I stumbled fell down into this giant tree, I've suffered endlessly here. I've wasted years in sadness, being unable to escape Niflheim.";
+	next;
+	mes "[Ricael]";
+	mes "But in searching for an";
+	mes "escape route, I probably know";
+	mes "this town better than anyone";
+	mes "else. I guess knowing the";
+	mes "layout might help you escape";
+	mes "if it weren't so futile.";
+	next;
+	switch(select("Ask building locations.:Remove marks on the mini-map.:Cancel.")) {
+	case 1:
+		mes "[Ricael]";
+		mes "So, um, which place do you want to know about?";
 		next;
-		switch(select("[ Tool Shop ]:[ Pub ]:[ Weapon Shop ]:[ Witch's Castle ]:Remove Marks from Mini-Map:Cancel")) {
+		switch(select("Witch's castle:Tool shop:Weapon shop:Pub:Cancel")) {
 		case 1:
-			callsub L_Mark,"^0000FFTool Shop";
-			viewpoint 1,218,196,0,0x0A82FF;
+			mes "[Ricael]";
+			mes "There. I made a ^FF3355+^000000 mark";
+			mes "on your mini-map so that you can";
+			mes "go to the castle where that";
+			mes "creepy witch lives.";
+			next;
+			mes "[Ricael]";
+			mes "I went there once, but then I";
+			mes "ran away and decided that I";
+			mes "should try to not die as much";
+			mes "as possible. That's pretty";
+			mes "much my life goal here in";
+			mes "Niflheim.";
+			viewpoint 1,253,191,2,0xFF3355;
 			break;
 		case 2:
-			callsub L_Mark,"^006400Pub";
-			viewpoint 1,189,208,1,0xAAFF00;
+			mes "[Ricael]";
+			mes "The Tool shop is located";
+			mes "at the ^CE6300+^000000 mark I made";
+			mes "on your mini-map.";
+			next;
+			mes "[Ricael]";
+			mes "They sell some unique items that";
+			mes "you cannot find outside of this";
+			mes "town. Of course, they weren't so";
+			mes "special once I realized no";
+			mes "Potion can ease the pain I feel.";
+			mes "...I wish I was in prison.";
+			Emotion e_wah;
+			viewpoint 1,217,196,3,0xCE6300;
 			break;
 		case 3:
-			callsub L_Mark,"^800080Weapon Shop";
-			viewpoint 1,218,170,2,0xDA70D6;
+			mes "[Ricael]";
+			mes "The Weapon shop is located";
+			mes "at the ^55FF33+^000000 mark I made";
+			mes "on your mini-map.";
+			next;
+			mes "[Ricael]";
+			mes "They sell some unique items which";
+			mes "you cannot find outside of this";
+			mes "town... Of course, fighting";
+			mes "the monsters here will just";
+			mes "make them angrier. You may as";
+			mes "well let them eat you.";
+			Emotion e_wah;
+			viewpoint 1,216,171,4,0x55FF33;
 			break;
 		case 4:
-			callsub L_Mark,"^FF1493Witch's Castle";
-			viewpoint 1,255,195,3,0xFF1493;
+			mes "[Ricael]";
+			mes "The Pub is located at";
+			mes "the ^3355FF+^000000 mark I've made";
+			mes "on your mini-map.";
+			next;
+			mes "[Ricael]";
+			mes "Sometimes I see dead people in the";
+			mes "Pub enjoying themselves, having a";
+			mes "good time. I used to be able to";
+			mes "have fun once, but now all I feel";
+			mes "is the cold tingle of loneliness";
+			mes "and despair...every waking moment.";
+			viewpoint 1,189,207,5,0x3355FF;
 			break;
 		case 5:
-			mes "[Niflheim 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,0xFFFFFF;
-			viewpoint 2,1,1,1,0xFFFFFF;
-			viewpoint 2,1,1,2,0xFFFFFF;
-			viewpoint 2,1,1,3,0xFFFFFF;
-			break;
-		case 6:
-			mes "[Niflheim Guide]";
-			mes "......Bye~!..";
-			close;
+			mes "[Ricael]";
+			mes "If you want to remove the location";
+			mes "marks from your mini-map, please";
+			mes "choose 'Remove marks on the";
+			mes "mini-map' from the menu.";
 		}
+		break;
+	case 2:
+		viewpoint 2,253,191,2,0xFF3355;
+		viewpoint 2,217,196,3,0xCE6300;
+		viewpoint 2,216,171,4,0x55FF33;
+		viewpoint 2,189,207,5,0x3355FF;
+		mes "[Ricael]";
+		mes "I removed the location marks from";
+		mes "your mini-map. Go ahead and ask";
+		mes "me if you want to mark the";
+		mes "building locations again. It";
+		mes "helps me ignore the depression";
+		mes "that gnaws at me constantly.";
+		break;
+	case 3:
+		mes "[Ricael]";
+		mes "It's not a good idea to search";
+		mes "Niflheim by yourself...";
+		mes "At least try to be careful.";
+		break;
 	}
-	end;
-L_Mark:
-	mes "[Niflheim 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;
+	close;
 }