Moved the Nameless Island warp npc to warps/cities/nameless.txt

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

4 files changed, 97 insertions, 109 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 836f6eadf..4dae97fb3 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
 Date		Added
 ======
 2007/09/12
+	* Moved the Nameless Island warp npc to warps/cities/nameless.txt [Playtester]
 	* Added first version of Nameless Islet sailor.
 	- Players can now access Cursed Abbey for further testings.
 2007/09/10
diff --git a/npc/scripts_warps.conf b/npc/scripts_warps.conf
index 20fe805b0..64ccd79d0 100644
--- a/npc/scripts_warps.conf
+++ b/npc/scripts_warps.conf
@@ -86,7 +86,6 @@ npc: npc/warps/fields/lhalzen_fild.txt
 npc: npc/warps/fields/lutie_fild.txt
 npc: npc/warps/fields/morroc_fild.txt
 npc: npc/warps/fields/mtmjolnir.txt
-npc: npc/warps/fields/nameless_islet.txt
 npc: npc/warps/fields/payon_fild.txt
 npc: npc/warps/fields/prontera_fild.txt
 npc: npc/warps/fields/rachel_fild.txt
diff --git a/npc/warps/cities/nameless.txt b/npc/warps/cities/nameless.txt
index 8ab516b3e..d9590aaa5 100644
--- a/npc/warps/cities/nameless.txt
+++ b/npc/warps/cities/nameless.txt
@@ -3,13 +3,14 @@
 //===== By: ==================================================
 //= $ephiroth
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
 //= Warp Points for Nameless Island
 //===== Additional Comments: =================================
 //= 1.0 Initial version [$ephiroth]
+//= 1.1 Added SinSloth's warper to this file [Playtester]
 //============================================================
 
 nameless_n,157,184,0	warp	namelesswarp0401	1,1,abbey01,51,12
@@ -21,3 +22,97 @@ nameless_i,79,256,0	warp	namelesswarp1005	1,1,nameless_in,12,172
 nameless_in,12,169,0	warp	namelesswarp1006	1,1,nameless_i,82,256
 nameless_i,78,94,0	warp	namelesswarp1007	1,1,nameless_in,96,180
 nameless_in,96,177,0	warp	namelesswarp1008	1,1,nameless_i,81,96
+
+ve_fild07,128,131,3	script	Desert Coast Man	943,{
+
+	mes "[Desert Coast Sailor]";
+	mes "Hey you! Yes, you!";
+	mes "Have you ever heard";
+	mes "about Nameless Island?...";
+	next;
+	mes "[Desert Coast Sailor]";
+	mes "Shh! Not that loudly!";
+	mes "Rumors say there is an";
+	mes "old monastery... you might";
+	mes "want to take a look at it...";
+	next;
+	mes "[Desert Coast Sailor]";
+	mes "But you know... It is kind";
+	mes "of forbidden to talk about";
+	mes "this place... Sure, going";
+	mes "there is somewhat impossible.";
+	mes "I can lead you there.";
+	next;
+	mes "[Desert Coast Sailor]";
+	mes "10.000 zenys.";
+	mes "And I'll make sure nobody";
+	mes "knows you went there. It looks";
+	mes "like a fair trade, doesn't it?";
+	next;
+	switch( select( "Sure.","Forget it." ) )
+	{
+		case 1:
+			if(Zeny < 10000)
+			{
+				mes "[Desert Coast Sailor]";
+				mes "Did you really think I would";
+				mes "take that much risk for free?";
+				mes "No money, no travel, understood?";
+				close;
+			}
+			mes "[Desert Coast Sailor]";
+			mes "Haha! I knew you truly were";
+			mes "an adventurer! Let's go!";
+			mes "I hope you didn't forget";
+			mes "anything...";
+			set Zeny,Zeny-10000;
+			close2;
+			warp "nameless_n",254,231;
+			end;
+			
+		case 2:
+			mes "[Desert Coast Sailor]";
+			mes "Fine, as you wish.";
+			mes "Remember, don't talk to";
+			mes "anyone about that place,";
+			mes "or you might have problems...";
+			close;
+	}
+}
+
+nameless_n,251,236,3	script	Desert Coast Man	943,{
+
+	mes "[Desert Coast Sailor]";
+	mes "It's not like I care";
+	mes "about you... But please,";
+	mes "be careful, I heard some";
+	mes "screams from the center of";
+	mes "the island...";
+	next;
+	mes "[Desert Coast Sailor]";
+	mes "I'm going back to Veins,";
+	mes "I don't like that place";
+	mes "at all. Do you want to return";
+	mes "with me?";
+	next;
+	switch( select( "Take me far away.","I'll be fine by myself." ) )
+	{
+		case 1:
+			mes "[Desert Coast Sailor]";
+			mes "Okay. I see you are an";
+			mes "adventurer, but at least";
+			mes "you're a wise one.";
+			mes "I don't want to stay here.";
+			close2;
+			warp "ve_fild07",127,135;
+			end;
+			
+		case 2:
+			mes "[Desert Coast Sailor]";
+			mes "That's your problem now.";
+			mes "I don't want to be part";
+			mes "of this expedition.";
+			mes "Take care.";
+			close;
+	}
+}
diff --git a/npc/warps/fields/nameless_islet.txt b/npc/warps/fields/nameless_islet.txt
deleted file mode 100644
index 206e0644b..000000000
--- a/npc/warps/fields/nameless_islet.txt
+++ /dev/null
@@ -1,107 +0,0 @@
-//===== eAthena Script =======================================
-//= Nameless Islet Sailor
-//===== By: ==================================================
-//= SinSloth
-//===== Current Version: =====================================
-//= 0.1
-//===== Compatible With: =====================================
-//= Any Athena Version
-//===== Description: =========================================
-//= Nameless Islet / Cursed Abbey NPC
-//===== Additional Comments: =================================
-//= 0.1 First custom version. [SinSloth]
-//============================================================
-
-ve_fild07,128,131,3	script	Desert Coast Man	943,{
-
-	mes "[Desert Coast Sailor]";
-	mes "Hey you! Yes, you!";
-	mes "Have you ever heard";
-	mes "about Nameless Islet?...";
-	next;
-	mes "[Desert Coast Sailor]";
-	mes "Shh! Not that loudly!";
-	mes "Rumors say there is an";
-	mes "old monastery... you might";
-	mes "want to take a look at it...";
-	next;
-	mes "[Desert Coast Sailor]";
-	mes "But you know... It is kind";
-	mes "of forbidden to talk about";
-	mes "this place... Sure, going";
-	mes "there is somewhat impossible.";
-	mes "I can lead you there.";
-	next;
-	mes "[Desert Coast Sailor]";
-	mes "10.000 zenys.";
-	mes "And I'll make sure nobody";
-	mes "knows you went there. It looks";
-	mes "like a fair trade, doesn't it?";
-	next;
-	switch( select( "Sure.","Forget it." ) )
-	{
-		case 1:
-			if(Zeny < 10000)
-			{
-				mes "[Desert Coast Sailor]";
-				mes "Did you really think I would";
-				mes "take that much risk for free?";
-				mes "No money, no travel, understood?";
-				close;
-			}
-			mes "[Desert Coast Sailor]";
-			mes "Haha! I knew you truly were";
-			mes "an adventurer! Let's go!";
-			mes "I hope you didn't forget";
-			mes "anything...";
-			set Zeny,Zeny-10000;
-			close2;
-			warp "nameless_n",254,231;
-			end;
-			
-		case 2:
-			mes "[Desert Coast Sailor]";
-			mes "Fine, as you wish.";
-			mes "Remember, don't talk to";
-			mes "anyone about that place,";
-			mes "or you might have problems...";
-			close;
-	}
-}
-
-nameless_n,251,236,3	script	Desert Coast Man	943,{
-
-	mes "[Desert Coast Sailor]";
-	mes "It's not like I care";
-	mes "about you... But please,";
-	mes "be careful, I heard some";
-	mes "screams from the center of";
-	mes "the island...";
-	next;
-	mes "[Desert Coast Sailor]";
-	mes "I'm going back to Veins,";
-	mes "I don't like that place";
-	mes "at all. Do you want to return";
-	mes "with me?";
-	next;
-	switch( select( "Take me far away.","I'll be fine by myself." ) )
-	{
-		case 1:
-			mes "[Desert Coast Sailor]";
-			mes "Okay. I see you are an";
-			mes "adventurer, but at least";
-			mes "you're a wise one.";
-			mes "I don't want to stay here.";
-			close2;
-			warp "ve_fild07",127,135;
-			end;
-			
-		case 2:
-			mes "[Desert Coast Sailor]";
-			mes "That's your problem now.";
-			mes "I don't want to be part";
-			mes "of this expedition.";
-			mes "Take care.";
-			close;
-	}
-}
\ No newline at end of file