Fixed Umbala, Umbalian Quests (Fabius' Umbalian language, Turban Thief Quest), Niflheim (fixed some bugs and fixed one big exploit 8)

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

1 files changed, 101 insertions, 47 deletions

diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt
index 01cd46bf9..d1dbac930 100644
--- a/npc/quests/quests_umbala.txt
+++ b/npc/quests/quests_umbala.txt
@@ -3,16 +3,22 @@
 //===== By: ================================================== 

 //= sabernet09 & eAthena Team

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

-//= 1.1

+//= 1.5

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

 //= eAthena 7.15 +

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

 //= Umbalian Language Quest, +

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

 //= fixed by x[tsk], Lupus, PoW

-//= location of the "card removing old lady" should be revised

 //= Quest completion is now registered

 //= 1.1 fixed Poporing Egg ID -> Poring Egg, fixed condition

+//= 1.2-1.5 fixed some Umbalian Language quests:

+//= 	- Now if Umbalian Chief tell u about meaning of masks

+//=	  you can interact with activated Sphinx Mask Quest

+//=	- with Wise Man Fabius you can learn Umbalian Language

+//=	  in alternative way.

+//= TODO: Put WEREWOLF in Umbla - and add some conditions to

+//=	  the Dungeon entrance quest

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

 

 

@@ -20,8 +26,8 @@
 //===========================================================================

 //this quest is related to Umbalian Chief

 morocc.gat,140,156,5	script	Turban Thief	58,{

+	if(mask_q == 0) goto AWAY;

 	if(mask_q == 2) goto NoBus;

-	if(umb_quest != 1) goto AWAY;

 	mes "[Turban Thief]";

 	mes "E'llo mah frien, would I interesst tu with this rare mask?  Its value I assure you is real mah frien.  Tis manific!";

 	next;

@@ -34,7 +40,7 @@ morocc.gat,140,156,5	script	Turban Thief	58,{
 		mes "[Turban Thief]";

 		mes "O ho ho, its a deal then!";

 		set zeny,zeny-1000000;

-		getitem 7114,1;

+		getitem 7114,1;//Items: Sphinx Mask,

 		set mask_q,2;

 		close;

 	NoGo:

@@ -48,7 +54,7 @@ morocc.gat,140,156,5	script	Turban Thief	58,{
 			mes "[Turban Thief]";

 			mes "It is a done deal, no refunds!";

 			set zeny,zeny-750000;

-			getitem 7114,1;

+			getitem 7114,1;//Items: Sphinx Mask,

 			set mask_q,2;

 			close;

 		NoGoB:

@@ -61,7 +67,7 @@ morocc.gat,140,156,5	script	Turban Thief	58,{
 				mes "[Turban Thief]";

 				mes "Alright, here you go then...";

 				set zeny,zeny-500000;

-				getitem 7114,1;

+				getitem 7114,1;//Items: Sphinx Mask,

 				set mask_q,2;

 				close;

 			NoGoC:

@@ -84,126 +90,156 @@ morocc.gat,140,156,5	script	Turban Thief	58,{
 }

 		

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

-//				Umbala Language Quest

+//				Umbala Language Quest (optional)

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

 

 prontera.gat,145,290,5	script	Mason	742,{

-	if(ulquest == 1) goto Got;

 	mes "[Mason]";

+	if(umb_lang==0) goto L_NOT_GOT_QUEST;

+	if(umb_lang==2 || umb_mason==1) goto L_AGAIN;

+

 	mes "Hey there, I came here to Prontera in search of an old lady who can remove cards from slots. Do you know where I can find her?";

-	menu "Yes",-, "No",No;

+	menu "Yes",-, "No",M_NO;

 

 	mes "Oooo, could you please tell me where she's at? I'd be really appreciative.";

-	menu "Swordsman Association",-, "Sanctuary",Boo1,"Prontera Chivalry",Boo2,"Armory",Boo3,"Kit Shop",Boo4,"Inn",Boo5,"Trading Post",Yay,"Library",Boo6,"Job Agency",Boo7,"Prontera Castle",Boo8,"City Hall",Boo9;

+	menu "Swordsman Association",-, "Sanctuary",M_Boo1,"Prontera Chivalry",M_Boo2,"Trading Post",M_Boo3,"Kit Shop",M_Boo4,"Inn",M_Boo5,"Armory",M_DONE,"Library",M_Boo6,"Job Agency",M_Boo7,"Prontera Castle",M_Boo8,"City Hall",M_Boo9;

 

 	next;

 	mes "[Mason]";

 	mes "Hmm... I dunno why she would be there... guess I'll take a look.";

 	close;

-Boo1:

+M_Boo1:

 	next;

 	mes "[Mason]";

 	mes "Wow I never knew she was a religious person... I'll see to it thanks.";

 	close;

-Boo2:

+M_Boo2:

 	next;

 	mes "[Mason]";

 	mes "Hmm.... are you sure about that?";

 	close;

-Boo3:

+M_Boo3:

 	next;

 	mes "[Mason]";

 	mes "Why would she need to go there? I think you might be mistaken.";

 	close;

-Boo4:

+M_Boo4:

 	next;

 	mes "[Mason]";

 	mes "The only thing she'd need at a Kit shop is medicine for her rheumatism. She's probably long gone from there by now.";

 	close;

-Boo5:

+M_Boo5:

 	next;

 	mes "[Mason]";

 	mes "I don't think she needs to be there, she LIVES here in Prontera.";

 	close;

-Boo6:

+M_Boo6:

 	next;

 	mes "[Mason]";

 	mes "Ah I see, if she's studying then I don't want to bother her. Thanks anyways.";

 	close;

-Boo7:

+M_Boo7:

 	next;

 	mes "[Mason]";

 	mes "Job Agency?  I don't think so.  Don't lead me all around Prontera please! She's already a teacher here.";

 	close;

-Boo8:

+M_Boo8:

 	next;

 	mes "[Mason]";

 	mes "The castle eh, I don't want to step in there... just doesn't feel like my style. I don't like that noble feeling of importance type of thing.";

 	close;

-Boo9:

+M_Boo9:

 	next;

 	mes "[Mason]";

 	mes "O wow, did she become an important part of Prontera? I'd think she's too busy for me to visit. I'll try again later.";

 	close;

-Yay:

+M_DONE:

 	next;

 	mes "[Mason]";

 	mes "Ah, I heard that her class was somewhere around there... thanks a lot! Here's a lil something for your help.";

-	getitem 7117,1;

-	set ulquest,1;

+	getitem 7117,1;//Items: Torn Spell Book,

+	set umb_mason,1;

 	close;

-Got:

-	mes "[Mason]";

+

+L_AGAIN:

+	emotion 15;

 	mes "Yay, I found her! Thank you very much for you help!";

 	close;

 

-No:

-	mes "[Mason]";

-	mes "Oh..Ok..Thanks anyways";

+L_NOT_GOT_QUEST:

+	mes "Hi! I came here to Prontera in search of an old lady... But...";

+	close;

+M_NO:

+	mes "Oh.. Ok.. Thanks anyways.";

 	close;

 }

 

-aldebaran.gat,153,212,1	script	[Mojo]	740,{

+aldebaran.gat,153,212,1	script	Mojo	740,{

 	mes "[Mojo]";

-	mes "Oh no!  I lost my teacher's ^FF0000old magic book^000000!  What am I going to do... those dumb Bathory...";

+	if(umb_lang!=1) goto L_NOT_GOT_QUEST;

+	mes "Oh no!  I lost my teacher's ^FF0000old magic book^000000!";

+	mes "What am I going to do... those dumb Bathory...";

+	if(umb_lang==1) set umb_mojo,1;

+	close;

+L_NOT_GOT_QUEST:

+	emotion 1;

+	mes "I lost my teacher's book!  What am I going to do...";

 	close;

 }

 

 amatsu.gat,267,189,4	script	Marie	744,{

-	if(countitem(9001)>0 && countitem(643)>0) goto ForMe;

 	mes "[Marie]";

+	if(umb_lang==0) goto L_NOT_GOT_QUEST;

+	if(umb_lang==2 || umb_marie==1) goto L_AGAIN;

+	if(countitem(9001)>0 && countitem(643)>0) goto L_DONE;//Items: Poring Egg, Pet Incubator,

 	mes "Hello, is there something you need?";

-	menu "No nothing at all.",Noth,"Your teacher sent me.",-;

+	menu "No nothing at all.",M_NO,"Your teacher sent me.",-;

 

 	mes "What does he want from me?";

+	emotion 1;

 	next;

 	mes "[Marie]";

 	mes "Oh wait, I see... he wants his reference scroll back am I right? Well, I'm kinda still using it buuut... I'll give it back if you can gimme a poring egg and an incubator. Those things are so cute!";

 	close;

-Noth:

+

+L_NOT_GOT_QUEST:

+	emotion 1;

+	mes "Hi! What do you want from me?";

+	close;

+M_NO:

 	mes "Hrrmm okay? Cya then..";

 	close;

-ForMe:

-	mes "[Marie]";

+L_DONE:

 	mes "Heyyy there, you have a poring egg and the pet incubator to go with it! Are those for me?";

-	menu "Yep",-, "Sorry no",DOH;

+	menu "Yep!",-, "Sorry, no.",M_DOH;

 

 	mes "Yatta!  Here's a lil something in return.";

-	getitem 7118,1;

-	delitem 9001,1;

-	delitem 643,1;

+	getitem 7118,1;//Items: Torn Scroll,

+	delitem 9001,1;//Items: Poring Egg,

+	delitem 643,1;//Items: Pet Incubator,

+	set umb_marie,1; //got Torn Scroll

 	close;

-DOH:

+M_DOH:

 	mes "O pooo... sigh...";

 	close;

+L_AGAIN:

+	emotion 15;

+	mes "Yay! I love Porings!";

+	close;

 }

 

 yuno.gat,157,366,2	script	Wise Man Fabius	743,{

-	if((countitem(1006) < 1) || (countitem(7118) < 1) || (countitem(7117) < 1)) goto FIN;

-	delitem 1006,1;	

-	delitem 7118,1;	

-	delitem 7117,1;

 	mes "[Fabius]";

+	if (event_umbala >= 3) set umb_lang,2; //You already learnt Umbalian language from Umbalian Chief. So this Quest is disabled

+	if (umb_lang<2) goto L_QUEST;

+	mes "You speak Umbalian fluently! So you will never forget the language of Umbalians!";

+	close;

+L_QUEST:

+	if((countitem(1006) < 1) || (countitem(7118) < 1) || (countitem(7117) < 1)) goto L_DONE;//Items: Old Magic Book, Torn Scroll, Torn Spell Book,

+	delitem 1006,1;	//Items: Old Magic Book,

+	delitem 7118,1;	//Items: Torn Scroll,

+	delitem 7117,1;//Items: Torn Spell Book,

+	emotion 15;

 	mes "Ah, you've done well in retrieving my references. These artifacts holds information about ruins around the world, from the burning hell of the Magma Dungeon, to the strange eerie Hidden Forest of Yggsadril.";

 	next;

 	mes "[Fabius]";

@@ -217,18 +253,36 @@ yuno.gat,157,366,2	script	Wise Man Fabius	743,{
 	next;

 	mes "^0000FF Learned the language of Umbalians! ^000000";

 	set umb_lang,2;

+	//clear subquests

+	set umb_marie,0;

+	set umb_mason,0;

+	set umb_mojo,0;

+	//make you understand Umbalian people

+	//it's an alternative way to learn Umbalian Language

+	if(event_umbala < 3) set event_umbala,3;

 	close;

-FIN:

-	mes "[Fabius]";

+L_DONE:

+	set umb_lang,1; //got Quest

 	mes "Argh! My three students ran off with my references! Hey you! Can you get them back for me? I'll gladly reward you.";

 	next;

 	mes "[Fabius]";

-	mes "From what I know, they're in different seperate towns making something out of themselves. Oh yeah, tell them I sent you, their names are Marie, Mason, and Mojo";

+	mes "From what I know, they're in different seperate towns making something out of themselves.";

+	if (umb_marie==0 && umb_mason==0 && umb_mojo==0) goto L_NOT_MET;

+	if (umb_marie==1) mes "Oh... You found Marie in Amatsu.";

+	if (umb_mojo==1) mes "You saw Mojo in Aldebaran?";

+	if (umb_mason==1) mes "So... Mason's in Prontera now... Well...";

+	if (umb_marie==0) mes "I wonder where is our sea girl Marie?";

+	if (umb_mojo==0) mes "Mojo should be somewhere near water...";

+	if (umb_mason==0) mes "Where'd Mason go then...";

+	mes "Oh yeah, tell them I sent you";

+	close;

+L_NOT_MET:

+	mes "Oh yeah, tell them I sent you, their names are Marie, Mason and Mojo.";

 	close;

 }

 

 //========================================================================================================================\\

-//                       Litle Quest NPC to enter the dungeon

+//                       Little Quest NPC to enter the dungeon

 //                                Fixed by Akaru

 //========================================================================================================================\\

 umbala.gat,65,253,4	script	Tree Guardian	752,{