* Updated Job quests for 1-1 classes and Rebirthed classes.

- Moved valkyrie.txt from ../cities/ to ../jobs/. It's not a city. Doofus. 

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

1 files changed, 460 insertions, 379 deletions

diff --git a/npc/jobs/1-1/thief.txt b/npc/jobs/1-1/thief.txt
index a6ed2f28a..8a70598cd 100644
--- a/npc/jobs/1-1/thief.txt
+++ b/npc/jobs/1-1/thief.txt
@@ -3,11 +3,12 @@
 //===== By: ==================================================
 //= eAthena dev team
 //===== Current Version: =====================================
-//= 1.6a
+//= 1.7
 //===== Compatible With: =====================================
-//= eAthena 1.0 +
+//= eAthena SVN
 //===== Description: =========================================
-//= <Description>
+//= [Aegis Conversion]
+//= Job quest for Thief classes
 //===== Additional Comments: =================================
 //= Fully working
 //= v1.1 Added instant job change for High Novice [Lupus]
@@ -16,445 +17,525 @@
 //= Fixed possible EXP abuse [Lupus]
 //= 1.5 Now saves/restores all quest skills [Lupus]
 //= 1.6 Merged back JFunc [Lupus] 1.6a typos
+//= 1.7 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
+//=	No longer uses function "F_ToHigh"
 //============================================================
 
-
-// == Monsters ==
-//Spawn is included in this file so make shure its not elsewhere to!
-job_thief1,0,0,0,0	monster	Orange Mushroom	1182,180,0,0,0
-job_thief1,0,0,0,0	monster	Fabre	1184,50,0,0,0
-job_thief1,0,0,0,0	monster	Chonchon	1183,50,0,0,0
-job_thief1,0,0,0,0	monster	Spore	1014,30,0,0,0
-
-
-// == NPCs ==
-// -- Interviewer --
-moc_prydb1,39,129,5	script	Thief Guide	69,{
-
-	mes "[Thief Guide]";
-	if(BaseJob == Job_Thief) {
-		mes "You're already a thief.....  What do you want from me... go away!";
-		emotion e_swt;
-		close;
-	}
-	if(BaseClass == Job_Swordman) {
-		mes "What the heck...? Meh!~Here's another 'Bash' head.  Do me a favor... why don't you go 'BASH', yourself in the head.  Ha!";
-		emotion e_gg;
-		close;
-	}
-	if(BaseClass == Job_Mage) {
-		mes "What the heck...? Ehhh??? A Circus Sideshow? Make a fire without a Matchstick, will ya?";
-		emotion e_swt2;
-		close;
-	}
-	if(BaseClass == Job_Archer) {
-		mes "What the heck...? Hahahaha~are you a 'Kill Stealing' Archer...?";
-		emotion e_heh;
-		close;
-	}
-	if(BaseClass == Job_Acolyte) {
-		mes "What the heck...? Ohhhhhh~GOD... PORING's worshipper, Acolyte...";
-		mes "So why aren't you in church praying, instead of wandering about here, huh?";
-		close;
-	}
-	if(BaseClass == Job_Merchant) {
-		mes "What the heck...? Eeeeeek~Merchant Scammer here...!!!! I am gonna report you to the GM!!!";
-		emotion e_gasp;
-		close;
+moc_prydb1,39,129,2	script	Thief Guide	69,{
+	if (Upper == 1) {
+		if (ADVJOB == Job_Assassin_Cross || ADVJOB == Job_Stalker) {
+			if (BaseJob == Job_Novice_High) {
+				mes "[Thief Guide]";
+				mes "Huh? Do I know you? It's creepy that you seem so familiar. You don't have a twin, do you?";
+				next;
+				if (getskilllv(1) < 9) {
+					mes "[Thief Guide]";
+					mes "What, do you want to be a Thief? I'm sorry, but you look like you need more training.";
+					next;
+					mes "[Thief Guide]";
+					mes "Take your time and learn all the Basic Skills, will you? Well then, see you later~!";
+					close;
+				}
+				mes "[Thief Guide]";
+				mes "Well, I got this feeling like you've been through a lifetime of fighting, so I'm promoting you to a Thief right this minute. I better give you tough guys what you want...";
+				next;
+				skill 143,0,0;
+				jobchange Job_Thief_High;
+				skill 149,1,0;
+				skill 150,1,0;
+				skill 151,1,0;
+				skill 152,1,0;
+				mes "[Thief Guide]";
+				mes "Since you've become a Thief, live as a Thief. Now, go for it! Next~";
+				close;
+			}
+			else {
+				mes "[Thief Guide]";
+				if (sex)
+					mes "Hey, dude.";
+				else
+					mes "Hey, baby~";
+				close;
+			}
+		}
+		else {
+			mes "[Thief Guide]";
+			if (sex)
+				mes "Hey, dude.";
+			else
+				mes "Hey, baby.";
+			mes "...Hey! You look too goody-goody to want to be a Thief!! Now scram, I'm busy. Next!";
+			close;
+		}
 	}
-	if(BaseClass != Job_Novice) {
-		mes "You already have a job.  Stop bothering me and go help out some newbies or something.";
-		emotion e_no1;
+	if (BaseJob == Job_Thief) {
+		mes "[Thief Guide]";
+		mes "If you have a problem, feel free to speak to me anytime, alright?";
 		close;
 	}
-
-	if(job_thief_q==2) goto L_1;
-	if(job_thief_q==1) goto L_Back;
-
-	if(Sex) {
-		mes "Heh... You look like a well to do boy... what brought you down to this rat hole?";
-	}else{
-		mes "Heh... You look like a well to do girl... what brought you down to this rat hole?";
-	}
-	next;
-M_Menu:
-	menu "'I didn't come here for the atmosphere.....",M_0,"Me? I'm just looking around...",M_End,"Just looking for the one truth",M_Truth;
-
-		M_0:
+	else if (BaseJob != Job_Novice && BaseJob != Job_Thief) {
 		mes "[Thief Guide]";
-		mes "Hmph... you sound a little cocky....  Yah know, being a Thief isn't all it's cracked up to be....";
-		mes "That reminds me.... I must have been at lvl 9 or 10 when I did my first robbery....";
-		next;
-		mes "[Thief Guide]";
-		mes "Hahahaha... I can still remember the look on that guy's face...";
-		emotion e_heh;
-		next;
-		mes "[Thief Guide]";
-		mes "But anyways... I assume you're here to become a thief...";
-		next;
-		menu "You got it.",sM_0a, "Nope.  Just wasting your time. ^ ^",sM_0b, "Why did you steal from that man?",sM_0c;
-
-		sM_0a:
-			goto L_Test;
-		sM_0b:
+		mes "What the heck...?";
+		switch(Class) {
+		case 1:
+			mes "Huh.";
+			mes "Now, that's";
+			mes "a big sword.";
+			next;
 			mes "[Thief Guide]";
-			mes "Wow... thanks... now get the HELL OUTA HERE!!";
-			emotion e_an;
-			close;
-		sM_0c:
+			mes "So...";
+			mes "Trying to make";
+			mes "up for something";
+			mes "...Buddy?";
+			break;
+		case 2:
+			mes "What's a Mage doin' here? Shouldn't you be doing card tricks elsewhere? Oh well, it's a free country...";
+			next;
+			mes "[Thief Guide]";
+			mes "Oh wait,";
+			mes "it's not...";
+			mes "Get outta here!";
+			break;
+		case 3:
+			mes "Man, shouldn't you";
+			mes "Archers be playing";
+			mes "in the forest";
+			mes "or something?";
+			break;
+		case 4:
+			mes "You know we all steal for a living, right? What are you doing in this kinda place, Acolyte?";
+			break;
+		case 5:
+			mes "You're a Merchant,";
+			mes "right? Why are you";
+			mes "walking into a den";
+			mes "of Thieves?!";
+			next;
 			mes "[Thief Guide]";
-			mes "Eh? Me?... Well... I really had no other choice at the time.... It was either I stole or I starved.";
-			mes "I really couldn't go hungry another day.";
+			mes "It's like you're begging";
+			mes "us to steal from you!";
+			mes "Come on, hurry and";
+			mes "get outta here~";
+			break;
+		case 8:
+			mes "Oh my God...";
+			mes "Am I dying?";
+			next;
+			mes "[Thief Guide]";
+			mes "Why else would a Priest come here? I guess I better start confessing all of my misdeeds.";
 			close;
-
-	M_Truth:
-		mes "[Thief Guide]";
-		mes "To see one's light, you need to be under the magic of the book where the royalty looms.";
-		close;
-
-	M_End:
+		case 12:
+			mes "Didn't you use to be one of us?! Man, you changed. You seem real dangerous now...";
+			close;
+		case 17:
+			mes "Man, you got real cool all of a sudden! You must have some skills I can only dream of!";
+			close;
+		}
+		next;
 		mes "[Thief Guide]";
-		mes "Must you people keep wasting my time!!?";
-		emotion e_pif;
+		mes "*Sigh* Look, there's really no need for you to be in this kind of place. You oughta go where you ought to go.";
 		close;
-
-	L_Test:
-		mes "[Thief Guide]";
-		mes "Okay then; first, fill out this application form.";
-		next;
-		mes "^0000FF(You fill out the form and hand it back)^000000";
-		next;
-		if(JobLevel < 10) goto sL_JobLvl;
-
+	}
+	if (job_thief_q == 3 && countitem(1069) > 0 || countitem(1070) > 0) {
 		mes "[Thief Guide]";
-		mes "Alrighty ^FF0000"+ strcharinfo(0) + "^000000, if that IS your real name..... looks like you've got quite a 'record' here.";
-		mes "Let's see.... aggravated assualt... felony larson..... hmm....";
+		mes "Hmmm?";
+		mes "You gathered Mushrooms for";
+		mes "the Thief test, right?";
 		next;
 		mes "[Thief Guide]";
-		mes "Ah, here we go...... you've got the job and skill requirements to become a Thief.  Now all you've got to do is pass the ^FF0000Morroc Thief Test^000000.";
-		next;
-
-		L_Explain:
+		mes "Here, talk to the other guy right next to me. He's the one in charge of checking your Mushrooms.";
+		close;
+	}
+	else if (job_thief_q == 3) {
 		mes "[Thief Guide]";
-		mes "   The test will require you to ^FF0000'sneak'^000000 into ^FF0000'Shibu's Farm'^000000, and ^FF0000'borrow'^000000 some ^AAAA00'Mushrooms'^000000.";
-		mes "   There are ^ff00002^000000 kinds of ^AAAA00Mushrooms^000000 on the farm, ^FFBB00Orange Net Mushrooms^000000 and ^FFBB00Orange Gooey Mushrooms^000000.";
+		mes "So how was the";
+		mes "Mushroom Farm?";
+		mes "Have any fun?";
 		next;
+		if (select("Yeah, kinda Cool.:It was horrible.") == 1) {
+			mes "[Thief Guide]";
+			mes "Heh heh! That's a good attitude. In our line of work, you gotta enjoy getting your hands dirty, one way or another.";
+			close;
+		}
 		mes "[Thief Guide]";
-		mes "'Shibu just happens to be the worst merchant scammer in Morroc, in case you're wondering why he's our target.";
-		next;
+		mes "Yeah? I've been there too, so I can see why that place isn't everyone's cup of tea. Still, being a Thief isn't all glamour and trendy night life.";
+		close;
+	}
+	if (job_thief_q == 2) {
 		mes "[Thief Guide]";
-		mes "   Bring the Mushrooms back here and someone will give you a score based on the type and the amount of mushrooms you get.";
-		mes "   1 Orange Net Mushroom = ^0000FF3 points^000000 while 1 Orange Gooey Mushroom = ^0000FF1 point^000000.  You need ^FF000025^000000 points to pass the test.";
+		mes "Hey, whaddya doin' here? Aren't you supposed to be gathering Mushrooms? Or did you need it explained to you again?";
 		next;
+		if  (select("Yes.:No, that's okay.") == 1) {
+			mes "[Thief Guide]";
+			mes "*Sigh* Well, there's always one in the bunch. Alright, listen carefully.";
+			next;
+			mes "[Thief Guide]";
+			mes "Alright, for your test, you gotta steal Mushrooms from a farm. Don't worry, the guy who owns the farm deserves to be robbed.";
+			next;
+			mes "[Thief Guide]";
+			mes "Anyway, you gotta gather two kinds of Mushrooms: ^0000FFOrange Net Mushrooms^000000 and ^0000FFOrange Gooey Mushrooms^000000.";
+			next;
+			mes "[Thief Guide]";
+			mes "Be careful, since there are monsters are the farm that are there to protect the Mushrooms. So this will be no walk in the park.";
+			next;
+			mes "[Thief Guide]";
+			mes "When you come back here after gathering Mushrooms, you'll be graded on the Mushrooms you've collected.";
+			next;
+			mes "[Thief Guide]";
+			mes "Each Orange Net Mushroom gets you 3 points, and you get 1 point for each Orange Gooey Mushroom. You need a total of 25 points to pass the test.";
+			next;
+			mes "[Thief Guide]";
+			mes "Go outside and keep going ahead toward the Eastern Field of the Pyramids. Then you will see one of our comrades between two columns.";
+			next;
+			mes "[Thief Guide]";
+			mes "Speak to that guy, and he'll take you to the farm through the backdoor.";
+			next;
+			mes "[Thief Guide]";
+			mes "On that field, I think his coordinates are '^FF0000141, 125^000000.' Just type ^3355FF/where^000000 in the right side of your chat box to check your present coordinates.";
+			close;
+		}
 		mes "[Thief Guide]";
-		mes "   In order to get into Shibu's Farm you'll need to talk to one of our 'associates'.  You can find him just ouside of this pyramid standing near some columns.";
-		mes "   He goes by the name ^DDCC00'Irrelevant Man'^000000.";
-		next;
+		mes "Huh. For a second there, I thought you had something really important to tell me.";
+		close;
+	}
+	mes "[Thief Guide]";
+	if (job_thief_q == 0) {
+		mes "What brings you down";
+		mes "here to this rathole?";
+	}
+	else {
+		mes "Ah...";
+		mes "You came back.";
+		mes "Are you sure you're";
+		mes "ready to try again?";
+	}
+	next;
+	if (select("Hey, I came here to be a Thief!:Nah, I'm just looking around.") == 1) {
+		if (job_thief_q == 0) {
+			mes "[Thief Guide]";
+			mes "Heh, I like your confidence. Still, you know being a Thief isn't all what it's cracked up to be.";
+			next;
+			mes "[Thief Guide]";
+			mes "Still...";
+			mes "Do you really";
+			mes "want to be";
+			mes "a Thief?";
+			next;
+			switch(select("Yeah.:No, just wasting your time.:Why did you become a Thief?")) {
+			case 1:
+				mes "[Thief Guide]";
+				mes "Really...";
+				break;
+			case 2:
+				mes "[Thief Guide]";
+				mes "Yeah...";
+				mes "I can see that.";
+				break;
+			case 3:
+				mes "[Thief Guide]";
+				mes "Me...?";
+				mes "I had no choice at the time. It was either steal or starve. But it's not like I need to give you my life story.";
+				break;
+			}
+			next;
+			mes "[Thief Guide]";
+			mes "So do you want to";
+			mes "apply to become";
+			mes "a Thief or not?";
+			next;
+			switch(select("Yes, I will.:I'm too scared to be a Thief!")) {
+			case 1:
+				mes "[Thief Guide]";
+				mes "Alright, tell";
+				mes "me your name.";
+				next;
+				mes "[Thief Guide]";
+				mes "" + strcharinfo(0) + "?";
+				mes "What kind of name is " + strcharinfo(0) + "? Anyway, give me a second.";
+				set job_thief_q,1;
+				next;
+				mes "[Thief Guide]";
+				mes "Alright, your registration has been processed. Okay, you can begin your test if you're ready.";
+				next;
+				switch(select("Yeah, I'm ready.:No, I'm not ready yet.")) {
+				case 1:
+					break;
+				case 2:
+					mes "[Thief Guide]";
+					mes "Not ready?";
+					mes "How can you";
+					mes "not be ready?!";
+					close;
+				}
+				break;
+			case 2:
+				mes "[Thief Guide]";
+				mes "Too scared?!?";
+				mes "Hahahahahahah!";
+				mes "Oh, please...!";
+				mes "That's hilarious!";
+				close;
+			}
+		}
+		else {
+			mes "[Thief Guide]";
+			mes "Okay...";
+			mes "Give me";
+			mes "one second.";
+			next;
+		}
 		mes "[Thief Guide]";
-		mes "   Here are his exact coordinates just in case you are 'directionaly challenged': '^FF0000141, 125^000000'.";
-		mes  "  Find him and he'll show you a secrect way into the Farm.";
+		mes "Your name is...";
+		mes strcharinfo(0) + "? Um, where is it? Ah, here it is. Let's see...";
 		next;
 		mes "[Thief Guide]";
-		mes "   This sounds easy but ^009900do know, there are Monsters who guard Mushrooms^000000?";
-		mes "   Stop reading Fairy Tales and ^FF0000brace up your nerves; this will be the toughest experience ever^000000.";
+		if (getskilllv(1) < 9) {
+			mes "Isn't that cute? I can see you're ambitious, but you gotta learn all of the Basic Skills before you can become a Thief.";
+			close;
+		}
+		mes "Alright. I looked at your Felony Record, and you seem to have a very interesting history. You might have what it takes to be a Thief.";
 		next;
 		mes "[Thief Guide]";
-		mes "   So, I will give you one tip. ^FF0000Elaborate the Strategy^000000 before you going inside the Farm.";
+		mes "Because I feel like it, I now decree that you have passed this interview. Good work!";
+		set job_thief_q,2;
 		next;
 		mes "[Thief Guide]";
-		mes "   Try to steal the mushrooms as quickly as you can.  You may even have to ^0000FFunequip some weapons or armor to attack faster^000000.";
-		mes "   Try not to get killed while doing this... at the very least try to give me the mushrooms first.... then you can go get yourself killed... HA!";
+		mes "Now, your actual abilities will need to be tested. Do you know anything about the test?";
 		next;
-		mes "[Thief Guide]";
-		mes "   If you don't have any questions... then GET moving!";
-		emotion e_go;
-		set job_thief_q,1;
-		close;
-
-		sL_JobLvl:
+		switch(select("Yes, I do.:Sorry, I don't.")) {
+		case 1:
 			mes "[Thief Guide]";
-			mes "Err... I can see how ambitious you are, but we can't hand a gun to a baby only for that. Come back when you learn all Basic Skills.";
-			close;
-
-	L_Back:
-		if(countitem(1069)>0 || countitem(1070)>0) goto sL_1;//Items: Orange_Net_Mushroom, Orange_Gooey_Mushroom_,
-
-			mes "..... What are you doing here? You're supposed to be gathering mushrooms remember??";
-			mes "Don't tell me you forget what to do??? Jeeze... do you want me to explain it to you one more time?......";
-			emotion e_hmm;
+			mes "Oh yeah? Well, this makes things a lot easier.";
+			break;
+		case 2:
+			mes "[Thief Guide]";
+			mes "Alright, let me inform you then. Listen carefully. This test decides if you are worthy of becoming a Thief.";
 			next;
-			menu "Heh.. yeah I guess..",sM_1a, "Nope.",sM_1b;
-
-			sM_1a:
-				mes "[Thief Guide]";
-				mes "(~sigh~) There's always someone who gets left behind.... This is the last time so listen CAREFULLY!!....";
-				emotion e_pif;
-				next;
-				goto L_Explain;
-			sM_1b:
-				mes "[Thief Guide]";
-				mes ".... Then what is it??? Do you have something to tell me? YOUR the one who came TO ME...";
-				mes "What... you wanna a piece of me?? HUH!!??";
-				emotion e_ag;
-				close;
-
-		sL_1:
-			mes "What? You actually went and stole some mushrooms?? Are you some kinda idiot?";
-			mes "Haha... I can't believe you listened to me..... ";
-			emotion e_what;
+			mes "[Thief Guide]";
+			mes "You will be sneaking to Shibu's Farm. He is the worst Merchant, in terms of character, in Morroc.";
 			next;
 			mes "[Thief Guide]";
-			mes ".... Psych!! Just kidding... heheheh! Speak with the guy next to me about rating the mushrooms you swiped.";
-			emotion e_heh;
-			close;
-
-	L_1:
-		mes "So how was the Mushroom Farm?  Did yah have much fun?";
-		next;
-		menu "Yeah, kinda Cool.",M_Cool,"It was horrible.",M_Not;
-
-		M_Cool:
+			mes "Alright, for your test, you gotta steal Mushrooms from his farm. Don't worry, that guy deserves to be robbed.";
+			next;
 			mes "[Thief Guide]";
-			mes "   Wow! I like you! Fabulous! Everyone before you was #&$@ bloody As#$%^&s#!";
+			mes "Anyway, you gotta gather two kinds of Mushrooms: ^0000FFOrange Net Mushrooms^000000 and ^0000FFOrange Gooey Mushrooms^000000.";
 			next;
 			mes "[Thief Guide]";
-			mes "...... You won't take my place, will you?  If you have any ambition like that, I'll ^ff0000DESTROY YOU^000000!";
-			// mes "...... You won't take my place, will you?  If you have any ambition like that, I will kick your ^ff0000'ASS OUT OF YOUR BUTT'^000000!";
-			// this is just too much lol.
-			// That line before was just too precious to delete.  [KillerBox]
-			emotion e_gasp;
+			mes "Be careful, since there are monsters are the farm that are there to protect the Mushrooms. So this will be no walk in the park.";
 			next;
 			mes "[Thief Guide]";
-			mes "   Still, in order to pass the test you need to go get some mushrooms.";
-			close;
-		M_Not:
+			mes "When you come back here after gathering Mushrooms, you'll be graded on the Mushrooms you've collected.";
+			next;
 			mes "[Thief Guide]";
-			mes "   I know what yah mean.  I was there before and it was awful:  all those smelly mushrooms and aggressive monsters.";
+			mes "Each Orange Net Mushroom gets you 3 points, and you get 1 point for each Orange Gooey Mushroom. You need a total of 25 points to pass the test.";
 			next;
 			mes "[Thief Guide]";
-			mes "   Eeewww! Yuuuckk! Still, in order to pass the test you need to go get some mushrooms.";
-			emotion e_wah;
-			close;
-}
-
-
-// -- Test Grader --
-moc_prydb1,42,133,2	script	Comrade Brad	118,{
-	callfunc "F_ToHigh",Job_Thief_High,"Thief High",Job_Assassin_Cross,"Brad";
-	if(BaseJob == Job_Novice) goto L_Novice;
-	if(BaseJob == Job_Thief) goto L_Thief;
-
-L_Other:
-	mes "[Brad]";
-	mes "Hey~ Hey~!! You don't look like a Thief.  What the heck? You'd BETTER NOT be trying to start someting on THIEF TERRITORY!!";
-	emotion e_omg;
-	close;
-L_Thief:
-	mes "[Brad]";
-	mes "We don't have any Special events for Thieves yet.  Come back some other time, alright?";
-	close;
-
-L_Novice:
-	mes "[Comrade Brad]";
-	if((job_thief_q == 2) && ((countitem(1069) > 0) || (countitem(1070) > 0))) goto L_4;//Items: Orange_Net_Mushroom, Orange_Gooey_Mushroom_,
-	if(job_thief_q >= 1) goto L_3;
-
-	mes "Errr? What's matter newbie? If you want to be a thief, speak to the girl beside me.";
-	close;
-L_3:
-	mes "Go get some mushrooms so that I can grade them ok.";
+			mes "Go outside and keep going ahead toward the Eastern Field of the Pyramids. Then you will see one of our comrades between two columns.";
+			next;
+			mes "[Thief Guide]";
+			mes "Speak to that guy, and he'll take you to the farm through the backdoor.";
+			next;
+			mes "[Thief Guide]";
+			mes "On that field, I think his coordinates are '^FF0000141, 125^000000.' Just type ^3355FF/where^000000 in the right side of your chat box to check your present coordinates.";
+		}
+		next;
+		mes "[Thief Guide]";
+		mes "Don't forget to make plans and prepare yourself before you go inside the Mushroom Farm. Move as quickly as you can and try not to get killed, alright?";
+		close;
+	}
 	close;
-L_4:
-	mes "Good.  You got some mushrooms from that crooked merchant Shibu";
-	next;
-
-	set @mushrm1,countitem(1069)*3;//Items: Orange_Net_Mushroom,
-	set @mushrm2,countitem(1070);//Items: Orange_Gooey_Mushroom_,
-	set @TotMush,@mushrm1 + @mushrm2;
-	set @money_thief,((countitem(1069) * 5) + (countitem(1070)* 2)) + 200;//Items: Orange_Net_Mushroom, Orange_Gooey_Mushroom_,
-
-	mes "[Comrade Brad]";
-	mes "Let's see you got:";
-	mes "^0000ff"+countitem(1069)+"^000000 Orange Net Mushrooms for ^ffbb00"+@mushrm1+"^000000 points,";//Items: Orange_Net_Mushroom,
-	mes "^0000ff"+countitem(1070)+"^000000 Orange Gooey Mushrooms for ^ffbb00"+@mushrm2+"^000000 points,";//Items: Orange_Gooey_Mushroom_,
-	mes "Giving you a total score of ^ff0000"+@TotMush+"^000000.";
-	next;
-	if (@TotMush > 25) goto L_High;
-	if (@TotMush == 25) goto L_Medium;
+}
 
-		mes "[Comrade Brad]";
-		mes "Meh!.... looks like you failed.  C'mon!  You can do better than that!  Go get some more mushrooms!!!";
+moc_prydb1,42,133,2	script	Comrade	118,{
+	if (BaseJob == Job_Thief) {
+		mes "[Brad]";
+		mes "We don't have any special events yet. Come some other time when there's news, alright?";
 		close;
-
-	L_Medium:
-		mes "[Comrade Brad]";
-		mes "Good. You passed the Test.";
+	}
+	else if (BaseJob != Job_Novice && BaseJob != Job_Thief) {
+		mes "[Comrade]";
+		mes "Um...";
+		mes "You don't look";
+		mes "like a Thief.";
 		next;
-		goto L_Final;
-
-	L_High:
-		mes "[Comrade Brad]";
-		mes "Ooooh.  Above 25, you will make an excellent thief.";
+		mes "[Comrade]";
+		mes "What the heck are";
+		mes "you doing here anyway?";
+		close;
+	}
+	if (job_thief_q == 0 || job_thief_q == 1) {
+		mes "[Comrade]";
+		mes "What's the matter? If you want to be a Thief, speak to the girl beside me.";
+		close;
+	}
+	else if (job_thief_q == 2) {
+		mes "[Comrade]";
+		mes "Did you pass the interview?";
+		mes "Then what are you waiting for?";
+		close;
+	}
+	else if (job_thief_q == 3) {
+		mes "[Comrade]";
+		mes "Ah, the guide told me about you. So, let me check your mushrooms...";
+		if (countitem(1069) == 0 && countitem(1070) == 0) {
+			next;
+			mes "[Comrade]";
+			mes "What the hell...";
+			mes "You don't have any Mushrooms at all! Go back and get them. Otherwise, you won't pass the test and become a Thief!";
+			close;
+		}
 		next;
-	L_Final:
-		mes "[Comrade Brad]";
-		mes "Congratulations ^ff0000"+strcharinfo(0)+"^000000, you passed the official Thief Test!  You can now become a Thief!!";
-		emotion e_no1;
+		set .@thief_item1,countitem(1069) * 3;
+		set .@thief_item2,countitem(1070);
+		set .@total_thief,.@thief_item1 + .@thief_item2;
+		set .@money_thief,((.@thief_item1 * 5) + (.@thief_item2 * 2)) + 200;
+		mes "[Comrade]";
+		if (countitem(1069) != 0) {
+			mes "First, let me check the Orange Net Mushrooms you got.";
+			mes "Huh, " + countitem(1069) + " of them.";
+		}
+		if (countitem(1070) != 0)
+			mes "Now I'll just check your Orange Gooey Mushrooms. That's " + countitem(1070) + " you gathered.";
 		next;
-		if(SkillPoint > 0) goto sL_SkPoint;
-		delitem 1069, countitem(1069);//Items: Orange_Net_Mushroom,
-		delitem 1070, countitem(1070);//Items: Orange_Gooey_Mushroom_,
-
+		mes "[Comrade]";
+		mes "So that would";
+		mes "bring your total to...";
+		next;
+		mes "[Comrade]";
+		mes "Hmmm. " + .@total_thief + " degrees, multiplied by the speed of light, divided by the integral of pi times height plus the absolute value of politics...";
+		next;
+		mes "[Comrade]";
+		mes "Okay!";
+		mes "I got it.";
+		next;
+		mes "[Comrade]";
+		if (.@total_thief > 25) {
+			mes "You got more";
+			mes "than 25 points!";
+			mes "Awesome!";
+		}
+		else if (.@total_thief == 25) {
+			mes "Exactly 25 points!";
+			mes "You did it! Badass!";
+		}
+		else {
+			mes "Definitely less than the 25 points you need to pass. Go out there and get me more Mushrooms!";
+			close;
+		}
+		next;
+		mes "[Comrade]";
+		mes strcharinfo(0) + "...";
+		mes "You have passed the official Thief Test. You are now one of us.";
+		if (countitem(1069) != 0) delitem 1069,countitem(1069); //Mushroom_Of_Thief_1
+		if (countitem(1070) != 0) delitem 1070,countitem(1070); //Mushroom_Of_Thief_2
 		callfunc "Job_Change",Job_Thief;
-		callfunc "F_ClearJobVar";		// clears all job variables for the current player
-
-		mes "[Comrade Brad]";
-		mes "Here's a small reward for your hard work.  Spend it any way you want to.";
+		callfunc "F_ClearJobVar";
 		next;
-		set Zeny,Zeny+@money_thief;
-		mes "[Comrade Brad]";
-		mes "From now on you must act, think, and even smell like a Thief.";
-		mes "You are one of us now, which means you have the trust and freindship of Thieves all over Rune Midgard";
+		mes "[Comrade]";
+		mes "Congratulations on becoming a Thief! From now, be an honorable representative of the Thief's Guild.";
 		next;
-		mes "[Comrade Brad]";
-		mes "However, If you bring disgrace to our Guild, or ever betray us, we will not hesitate to have you......";
-		mes "How shall I say, ^ff0000'REMOVED'^000000 from the Thief Guild.";
-		emotion e_gg;
+		mes "[Comrade]";
+		mes "If you bring disgrace to our guild, you will be killed. I expect you to bring our comrades pride.";
 		next;
-		mes "[Comrade Brad]";
-		mes "Good luck and always remeber the ^0000cc'Thief Motto'^000000: ^ff0000DON'T Get Caught^000000l!";
+		mes "[Brad]";
+		mes "*Ahem* Welcome to the Guild, comrade! I'm Brad, and I'm in charge of human resources here.";
+		next;
+		mes "[Brad]";
+		mes "Here is a small subsidy for a Newbie like you. Spend it whereever you want. Alright then, I'll see you around~";
+		set zeny,zeny+.@money_thief;
 		close;
-
-		sL_SkPoint:
-			mes "[Comrade Brad]";
-			mes "But before that happens please use up all of your skill points, okay?";
-			close;
-
+	}
 }
 
-
-// -- Irrelevant Man --
-moc_ruins,141,125,3	script	Irrelevant Man	118,{
-	if(BaseJob == Job_Thief) goto L_Thief;
-	if(BaseJob == Job_Novice) goto L_Novice;
-
-L_Other:
-	if(@s_flag==1) goto L_1b;
-	if(@s_flag==2) goto L_1c;
-	if(@s_flag==3) goto L_1d;
-	if(@s_flag==4) goto L_1e;
-	set @s_flag, 0;
-
-	L_1a:
-		mes "[Irrelevant Man]";
-		mes "Howdy~ Howdy. What a Wonderful day today,isn't it?";
-		mes "I feel like going on a 'Picnic' in the Pyramids with a couple freinds of mine today.";
-		set @s_flag, @s_flag+1;
-		close;
-	L_1b:
-		mes "[Irrelevant Man]";
-		mes "'Lalalala, Home sweet Home.'";
-		mes "I like this saying.  Home Sweet Home....";
-		set @s_flag, @s_flag+1;
-		close;
-	L_1c:
-		mes "[Irrelevant Man]";
-		mes "...... I could fly if I fell off............ ";
-		set @s_flag, @s_flag+1;
-		close;
-	L_1d:
-		mes "[Irrelevant Man]";
-		mes ".......Hmm?.....";
+moc_ruins,141,125,3	script	Mr. Irrelevant	83,{
+	if (BaseJob == Job_Thief) {
+		mes "[Mr. Irrelevant]";
+		mes "Ah, I see that you are now a Thief. I always knew you'd join us.";
 		next;
-		mes "[Irrelevent Man]";
-		mes "Hey!! DON'T LOOK AT ME like that! I'M NOT some WACKO okay!!!";
-		set @s_flag, @s_flag+1;
-		emotion e_an;
+		mes "[Mr. Irrelevant]";
+		mes "Stealing from a Mushroom farm is too easy for you now. You should build up your skills and master our craft.";
 		close;
-	L_1e:
-		mes "[Irrelevant Man]";
-		mes "Dude! I got nothin to say with you!  Mind your own business!  Sheesh!!";
-		emotion e_pif;
+	}
+	else if (BaseJob != Job_Novice && BaseJob != Job_Thief) {
+		mes "[Mr. Irrelevant]";
+		switch(rand(4)) {
+		case 1:
+			mes "I could use a good, hard drink.";
+			close;
+		case 2:
+			mes "Gimme your money.";
+			next;
+			mes "[Mr. Irrelevant]";
+			mes "Kidding, I'm off the clock.";
+			close;
+		case 3:
+			mes "WHO YOU CALLING A PSYCHO?!?!";
+			close;
+		case 4:
+			mes "I've got nothing to say to you. Would you mind leaving me alone?";
+			close;
+		default:
+			mes "Today looks like a good day to go to the pyramids and hunt with some of my friends.";
+			close;
+		}
+	}
+	if (job_thief_q == 3) {
+		mes "[Mr. Irrelevant]";
+		mes "Hahahahaha~!";
+		mes "You haven't";
+		mes "passed the test yet?";
+		mes "Alright, I'll let you in...";
+		close2;
+		switch(rand(5)) {
+		case 1: warp "job_thief1",228,106; end;
+		case 2: warp "job_thief1",38,50; end;
+		case 3: warp "job_thief1",66,331; end;
+		case 4: warp "job_thief1",196,331; end;
+		default: warp "job_thief1",309,234; end;
+		}
+	}
+	else if (job_thief_q == 2) {
+		mes "[Mr. Irrelevant]";
+		mes "Hmm...";
+		mes "You've come to take the test, right? I can see in your eyes that you know something.";
+		next;
+		mes "[Mr. Irrelevant]";
+		mes "Your name is " + strcharinfo(0) + "? Ah, it's on the list. Alright, I'll let you into the Mushroom Farm , but I can't guarantee your safety...";
+		close2;
+		set job_thief_q,3;
+		switch(rand(5)) {
+		case 1: warp "job_thief1",228,106; end;
+		case 2: warp "job_thief1",38,50; end;
+		case 3: warp "job_thief1",66,331; end;
+		case 4: warp "job_thief1",196,331; end;
+		default: warp "job_thief1",309,234; end;
+		}
+	}
+	else if (job_thief_q == 1) {
+		mes "[Mr. Irrelevant]";
+		mes "There is this strange smell coming from... You. Now why would that be?";
 		close;
-
-L_Thief:
-	mes "[Irrelevant Man]";
-	mes "Yah Hoo! Look at you! You became a Kool Thief!";
-	emotion e_no1;
-	next;
-	mes "[Irrelevant Man]";
-	mes "Don't worry about Shibu's Farm.  Let the newbies handle that.  Why don't yah go out and kill some stronger monsters?";
-	close;
-
-L_Novice:
-	if(job_thief_q==2) goto L_3;
-	if(job_thief_q==1) goto L_2;
-	mes "[Irrelevant Man]";
-	mes "Hey!! Novice! Want to be Stronger and more Powerful!? Do you like hiding and sneeking around?";
-	mes "If so, Join the Thief Guild! You are always welcome! Join now!";
+	}
+	mes "[Mr. Irrelevant]";
+	mes "Hey Novice! Why don't you join the ranks of the Thief Guild? You newbies are always welcome to join us and our selfish cause.";
 	next;
-	mes "[Irrelevant Man]";
-	mes "You can get more information in the 1st floor basement of the Pyramid!";
+	mes "[Mr. Irrelevant]";
+	mes "You can get more information in the Underground Room in the Pyramid 1 BF.";
 	close;
-L_2:
-	mes "[Irrelevant Man]";
-	mes "Pssst......Pssst......hey you!  You look like your gonna take the ^ff0000'Test'^000000.  Am I right?";
-	next;
-	mes "[Irrelevant Man]";
-	mes "Lets see here.....(checks his list).... you're ^ff0000"+ strcharinfo(0) +"^000000 right?  Good.";
-	next;
-	mes "[Irrelevant Man]";
-	mes "Okay! I'm gonna show you the way in but keep quite.  I can't guarantee your safety so watch your back.";
-	next;
-
-	L_Warp:
-	set @TEMP,rand(5);
-	set job_thief_q,2;
-	if(@TEMP != 0) goto warpL03a;
-		warp "job_thief1",228,106;
-		close;
-	warpL03a:
-		if(@TEMP != 1) goto warpL03b;
-		warp "job_thief1",38,50;
-		close;
-	warpL03b:
-		if(@TEMP != 2) goto warpL03c;
-		warp "job_thief1",66,331;
-		close;
-	warpL03c:
-		if(@TEMP != 3) goto warpL03d;
-		warp "job_thief1",196,331;
-		close;
-	warpL03d:
-		warp "job_thief1",309,234;
-		close;
-
-L_3:
-	mes "[Irrelevant Man]";
-	mes "Muhahahaha~~ WHAT???~~ You HAVEN'T PASSED the Test yet? Are you some sort of Idiot!! Kakakaka!!";
-	emotion e_heh;
-	next;
-	mes "[Irrelevant Man]";
-	mes "Just kidding..... NOT!!.  Anywho I'll let yah back in!";
-	next;
-	menu "Ready",M_Yes,"Not yet",M_No;
-
-	M_Yes:
-		goto L_Warp;
-
-	M_No:
-		mes "[Irrelevant Man]";
-		mes "Okay, let me know when you are.";
-		close;
-
 }
 
-//==============================================================================
+// Monsters
+//============================================================
+job_thief1,0,0,0,0	monster	Orange Mushroom	1182,180,0,0,0
+job_thief1,0,0,0,0	monster	Fabre	1184,50,0,0,0
+job_thief1,0,0,0,0	monster	Chonchon	1183,50,0,0,0
+job_thief1,0,0,0,0	monster	Spore	1014,30,0,0,0
+
+//============================================================
 // mapflag
-//==============================================================================
+//============================================================
 job_thief1	mapflag	nomemo
 job_thief1	mapflag	noteleport
 job_thief1	mapflag	nosave	SavePoint
 job_thief1	mapflag	nopenalty
 job_thief1	mapflag	nobranch
-job_thief1	mapflag	noexp