- Merged /branches/renewal/conf (partial)

- Merged /branches/renewal/db (only mob_db.txt and mob_skill_db.txt)
- Merged /branches/renewal/npc (full)

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

1 files changed, 0 insertions, 134 deletions

diff --git a/npc/guides/guides_nif.txt b/npc/guides/guides_nif.txt
deleted file mode 100644
index 13115a96f..000000000
--- a/npc/guides/guides_nif.txt
+++ /dev/null
@@ -1,134 +0,0 @@
-//===== eAthena Script ======================================= 
-//= Niflheim Guide
-//===== By: ================================================== 
-//= eAthena Team; L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.3
-//===== Compatible With: ===================================== 
-//= eAthena SVN
-//===== Description: ========================================= 
-//= [Aegis 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 Aegis 10.3 standards. [L0ne_W0lf]
-//============================================================ 
-
-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("Witch's castle:Tool shop:Weapon shop:Pub:Cancel")) {
-		case 1:
-			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:
-			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:
-			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:
-			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 "[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;
-	}
-	close;
-}