moved culvert from cities/prontera.txt to quests/quests_prontera.txt

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

3 files changed, 86 insertions, 82 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index da4017011..255d434ae 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -37,7 +37,8 @@ Musashiden
 Date		Added

 ======

 06/25

-	* Moved Umbala quests from cities/ to quests/, namely Skeletal Gate, Umbala Event, and Create/Dismantle Stone [Evera]

+	* Moved Umbala quests from cities/ to quests/, namely Skeletal Gate, Umbala Event, and Create/Dismantle Stone

+	  - Moved Culvert from cities/prontera.txt to quests/quests_prontera.txt [Evera]

 	* Fixed possible exploit in umbala elemental stone quest [Playtester]

 	* Added a shop NPC to Prontera, it's required for the Hellion Quest. [MasterOfMuppets]

 06/24

diff --git a/npc/cities/prontera.txt b/npc/cities/prontera.txt
index 77d06a5f5..45b82e784 100644
--- a/npc/cities/prontera.txt
+++ b/npc/cities/prontera.txt
@@ -3,11 +3,11 @@
 //===== By: ================================================== 

 //= kobra_k88

 //===== Current Version: ===================================== 

-//= 1.7

+//= 1.8

 //===== Compatible With: ===================================== 

 //= eAthena 7.15 +

 //===== Description: ========================================= 

-//=

+//= NPCs in Prontera

 //===== Additional Comments: ================================= 

 //= Fully working

 //= +AntiNovice exploit fix [Lupus] 1.2 added baby novice check

@@ -16,6 +16,7 @@
 //= 1.5a Added a Jawaii related npc [MasterOfMuppets]

 //= 1.6 Replaced sewer_prt with (MISC_QUEST & 8) [Lupus]

 //= 1.7 Removed Duplicates [Silent]

+//= 1.8 Moved Culvert to quests/quests_prontera.txt

 //============================================================

 

 

@@ -125,83 +126,6 @@ prontera.gat,102,287,5	script	Shuger	98,{
 	close;

 }

  

-// ------------------------------------------------------------------------------------------- Culvert -------------------------------------------------------------------------------\\

-// Culvert Guardian ----------------------------------------------------

-prt_fild05.gat,270,212,5	script	Culvert Guardian	105,{

-	mes "[Culvert Guardian]";

-	if(MISC_QUEST & 8) {

-		mes "Here you are. The entrance of the Culvert. Are you sure you want to Go inside?";

-		next;

-		menu "Sure.",-,"Quit.",M_END;

-

-			warp "prt_sewb1.gat",131,247;

-		M_END:

-			close;

-	}

-	mes "Sorry, but only volunteers for the Culvert Campaign can go inside.";

-	mes "Speak with the ^000077Recruiter^000000 about volunteering.  He's located in the ^ff0000Prontera Chivalry^000000.";

-	close;

-}

-

-// Recruiter -----------------------------------------------------------

-prt_in.gat,88,105,2	script	Recruiter	105,{

-	mes "[Recruiter]";

-	if(MISC_QUEST & 8) goto L_WARP;

-	mes "Let me inform about the official Notice from the Capital Defence Headquarter of Rune-Midgard Kingdom";

-	next;

-	mes "[Recruiter]";

-	mes "We decided to recruit volunteers to deal with the 'issues' that have been plauging our cities' sewers.";

-	next;

-	menu "Volunteer.",M_VOL,"Issues...?",-,"Quit",L_END;

-	

-		mes "[Recruiter]";

-		mes "Didn't you hear yet? The Culvert is infested with noxious insects. We found bugs, maggots, and other creatures there.";

-		mes "They've become a huge problem... You've Never heard of this?";

-		emotion e_what;

-		next;

-		mes "[Recruiter]";

-		mes "Because of the severity of these 'issues',it is forbidden for the people to use the water supply for the time being.";

-		next;

-		mes "[Recruiter]";

-		mes "Needless to say, the people have been greatly inconvenienced by this. If this were to linger on it would cause great ill will among the people of the Prontera.";

-		next;

-		mes "[Recruiter]";

-		mes "The situation is becoming critical! There is restlessness among the people!!";

-		next;

-		mes "[Recruiter]";

-		mes "Mighty Warrior!! The People NEED YOU!! Let's EXPEL these VILE creatures from our land!!!";

-		emotion e_go;

-		next;

-		mes "[Recruiter]";

-		mes "WILL YOU volunteer????";

-		next;

-		menu "Volunteer.",M_VOL,"Quit.",-;

-		

-			mes "[Recruiter]";

-			mes "..............";

-			emotion e_swt;

-			close;

-	M_VOL:

-		mes "[Recruiter]";

-		mes "Very good!!! Your Registration is confirmed. We will try to maintain peace and order in Rune-Midgard Kingdom.";

-		mes "I appreciate your support of the Capital Defence Headquarter.  Here are some subsidies....";

-		next;

-		mes "[Recruiter]";

-		mes "3 Red Potions, 1 Milk, and 1 Orange Potion for an emergency.";

-		set MISC_QUEST,MISC_QUEST | 8;

-		getitem 501,3;

-		getitem 519,1;

-		getitem 502,1;

-		next;

-		mes "[Recruiter]";

-	L_WARP:

-		mes "Are you ready? I will warp you to the Culvert.";

-		next;

-		warp "prt_fild05.gat",274,208;

-	L_END:

-		close;

-

-}

 

 

 //------------------------------------------------------------------------------------- Prontera Church -------------------------------------------------------------------------------\\

diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt
index f24eb904c..ec2d52f76 100644
--- a/npc/quests/quests_prontera.txt
+++ b/npc/quests/quests_prontera.txt
@@ -3,15 +3,16 @@
 //===== By: ================================================== 

 //= kobra_k88

 //===== Current Version: ===================================== 

-//= 1.3

+//= 1.4

 //===== Compatible With: ===================================== 

 //= eAthena 7.15 +

 //===== Description: ========================================= 

-//= Ph.D Hat Quest

+//= Ph.D Hat Quest + Culvert

 //===== Additional Comments: ================================= 

 //= Fixed flower name Dreamy -> Illusion

 //= 1.2 Fixed exploit [Lupus]

 //= 1.3 Removed Duplicates [Silent]

+//= 1.4 Moved Culvert from cities/prontera.txt [Evera]

 //============================================================ 

 

 

@@ -96,3 +97,81 @@ L_Start:
 		emotion e_bzz;

 		close;

 }

+

+// ------------------------------------------------------------------------------------------- Culvert -------------------------------------------------------------------------------\\

+// Culvert Guardian ----------------------------------------------------

+prt_fild05.gat,270,212,5	script	Culvert Guardian	105,{

+	mes "[Culvert Guardian]";

+	if(MISC_QUEST & 8) {

+		mes "Here you are. The entrance of the Culvert. Are you sure you want to Go inside?";

+		next;

+		menu "Sure.",-,"Quit.",M_END;

+

+			warp "prt_sewb1.gat",131,247;

+		M_END:

+			close;

+	}

+	mes "Sorry, but only volunteers for the Culvert Campaign can go inside.";

+	mes "Speak with the ^000077Recruiter^000000 about volunteering.  He's located in the ^ff0000Prontera Chivalry^000000.";

+	close;

+}

+

+// Recruiter -----------------------------------------------------------

+prt_in.gat,88,105,2	script	Recruiter	105,{

+	mes "[Recruiter]";

+	if(MISC_QUEST & 8) goto L_WARP;

+	mes "Let me inform about the official Notice from the Capital Defence Headquarter of Rune-Midgard Kingdom";

+	next;

+	mes "[Recruiter]";

+	mes "We decided to recruit volunteers to deal with the 'issues' that have been plauging our cities' sewers.";

+	next;

+	menu "Volunteer.",M_VOL,"Issues...?",-,"Quit",L_END;

+	

+		mes "[Recruiter]";

+		mes "Didn't you hear yet? The Culvert is infested with noxious insects. We found bugs, maggots, and other creatures there.";

+		mes "They've become a huge problem... You've Never heard of this?";

+		emotion e_what;

+		next;

+		mes "[Recruiter]";

+		mes "Because of the severity of these 'issues',it is forbidden for the people to use the water supply for the time being.";

+		next;

+		mes "[Recruiter]";

+		mes "Needless to say, the people have been greatly inconvenienced by this. If this were to linger on it would cause great ill will among the people of the Prontera.";

+		next;

+		mes "[Recruiter]";

+		mes "The situation is becoming critical! There is restlessness among the people!!";

+		next;

+		mes "[Recruiter]";

+		mes "Mighty Warrior!! The People NEED YOU!! Let's EXPEL these VILE creatures from our land!!!";

+		emotion e_go;

+		next;

+		mes "[Recruiter]";

+		mes "WILL YOU volunteer????";

+		next;

+		menu "Volunteer.",M_VOL,"Quit.",-;

+		

+			mes "[Recruiter]";

+			mes "..............";

+			emotion e_swt;

+			close;

+	M_VOL:

+		mes "[Recruiter]";

+		mes "Very good!!! Your Registration is confirmed. We will try to maintain peace and order in Rune-Midgard Kingdom.";

+		mes "I appreciate your support of the Capital Defence Headquarter.  Here are some subsidies....";

+		next;

+		mes "[Recruiter]";

+		mes "3 Red Potions, 1 Milk, and 1 Orange Potion for an emergency.";

+		set MISC_QUEST,MISC_QUEST | 8;

+		getitem 501,3;

+		getitem 519,1;

+		getitem 502,1;

+		next;

+		mes "[Recruiter]";

+	L_WARP:

+		mes "Are you ready? I will warp you to the Culvert.";

+		next;

+		warp "prt_fild05.gat",274,208;

+	L_END:

+		close;

+

+}