* Updated Super Novice Quest with iRO dialog.

- Also restructured the NPCs significantly according to iRO's script.

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

2 files changed, 359 insertions, 270 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 43c52c17e..aee5127f2 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,9 +1,11 @@
 Date		Added
 ======
 2007/11/25
-	* 11801 Updated Novice Potion exhanger and juice maker. [L0ne_W0lf]
-	* 11800 Updated Bunny Band and Mr. Smile quests. [L0ne_W0lf]
-	* Fixed an NPC error in lutie quest file (scrap " left behind.) [l0ne_W0lf]
+	* Rev. 11802 Updated Super Novice Quest with iRO dialog. [L0ne_W0lf]
+	- Also restructured the NPCs significantly according to iRO's script.
+	* Rev. 11801 Updated Novice Potion exhanger and juice maker. [L0ne_W0lf]
+	* Rev. 11800 Updated Bunny Band and Mr. Smile quests. [L0ne_W0lf]
+	* Rev. 11799 Fixed an NPC error in lutie quest file (scrap " left behind.) [l0ne_W0lf]
 	* Changed item names to item IDs on some scripts. [Samuray22]
 2007/11/24
 	* Rescripted Soul Linker Quest to Aegis 10.3 Standars. [Samuray22]
diff --git a/npc/jobs/novice/supernovice.txt b/npc/jobs/novice/supernovice.txt
index d3c36b5e2..f1cf0851b 100644
--- a/npc/jobs/novice/supernovice.txt
+++ b/npc/jobs/novice/supernovice.txt
@@ -1,376 +1,463 @@
 //===== eAthena Script ======================================= 
 //= Super Novice Script
 //===== By: ================================================== 
-//= Darkchild & Samuray22
+//= Darkchild
 //===== Current Version: ===================================== 
-//= 1.9
+//= 2.0
 //===== Compatible With: ===================================== 
-//= Any eAthena
+//= eAthena SVN
 //===== Description: ========================================= 
 //= [Aegis Conversion]
-//= Job Change quest for Super Novice class.
+//= Super Novice Job Change Npc
+//= Super Novice Cart Rental Npc
+//= Some Other Useless Super Novice Npc
 //===== Additional Comments: ================================= 
 //= 1.9 Rescripted to the Aegis 10.3 Standars. [Samuray22]
-//============================================================
-//=======================Job Changer==========================
-aldeba_in,223,167,5	script	Tzerero	709,{
-	if(Upper == 1) {
+//= 2.0 Rescripted again, this time using an iRO base. [L0ne_W0lf]
+//============================================================ 
+
+aldeba_in,223,167,3	script	Tzerero#sn	709,{
+	if (BaseClass == Job_SuperNovice) {
 		mes "[Tzerero]";
-		mes "You've become one of the members of" ;
-		mes "the Great Novice Club.....";
+		mes "I trust that you are enjoying";
+		mes "life as a Super Novice? Ah,";
+		mes "good good...just as I expected.";
+		mes "Verily, the light of mediocrity is shining brightly within you...";
 		next;
 		mes "[Tzerero]";
-		mes "YeahYeahYeah!!?!?";
-		mes "Oh my god!!! You are!! Are you..!!!?";
-		mes "- DiRiRinggg -";
+		mes "I encourage you to live";
+		mes "life as Mister Kimu-Shaun did...";
+		mes "Become a Jack of All Trades...";
+		mes "...and a master of none.";
+		close;
+	}
+	if (countitem(938) > 29 && countitem(907) > 29 && SUPNOV_Q == 1) {
+		delitem 938,30; //Sticky_Mucus
+		delitem 907,30; //Resin
+		mes "[Tzerero]";
+		mes "Ah, you've brought the";
+		mes "items I've requested!";
+		mes "You've proven yourself";
+		mes "worthy of joining our";
+		mes "Super Novice Society.";
 		next;
-		mes "- Crash -";
+		mes "[Tzerero]";
+		mes "Then, as promised, I will";
+		mes "change your job into a";
+		mes "^3355FFSuper Novi--^000000Huh?";
+		mes "What's that behind you?";
 		next;
+		select("Huh?:What is that?");
+		mes "^3355FFYou look behind you, but...";
+		mes "There's nothing's there.";
+		mes "Something fishy is going on here!^000000";
+		next;
+		callfunc "F_ClearJobVar";
+		getitem 2339,1; //G_Strings
+		if (Upper==0) jobchange Job_SuperNovice;
+		if (Upper==2) jobchange Job_Super_Baby;
 		mes "[Tzerero]";
-		mes "Uhoh, yes, yes, yes";
-		mes "Yes....I knew it, yes, Ah! No! You haven't mentioned it! Yes, of course";
-		mes "-Crash -";
+		mes "Bwaha! I got you!";
+		mes "So...how do you like my joke?";
+		mes "Oh well, let's forget that...";
 		next;
 		mes "[Tzerero]";
-		mes "...............";
-		mes "Good bye then~";
-		close;
-	} else if(BaseJob == Job_SuperNovice) {
+		mes "As well as any possible";
+		mes "reason a grown man such as";
+		mes "myself would carry around";
+		mes "a pair of Panties.";
+		next;
 		mes "[Tzerero]";
-		mes "I have become one of the brightest member of the Novice Club.";
-		mes "You have learned everything";
-		mes "and you are near perfection.";
-		mes "You're just a normal novice.";
+		mes "The important thing is...";
+		mes "you have joined the esteemed";
+		mes "ranks of the great Super Novices.";
 		next;
 		mes "[Tzerero]";
-		mes "I hope that you will continue to enjoy the average life,";
-		mes "and promote the";
-		mes "existance of a novice.";
+		mes "Consider these Panties a gift...";
+		mes "This very garment is rumored";
+		mes "to be worn by Mister Kimu-Shaun,";
+		mes "our legendary club founder, in";
+		mes "his early days in striving for";
+		mes "exemplary mediocrity.";
+		next;
+		mes "[Tzerero]";
+		mes "Go out, and enjoy your new life";
+		mes "as a Super Novice! Venture";
+		mes "forth and help the common";
+		mes "man, while being one at at";
+		mes "the same time!";
 		close;
-	} else if(countitem(938) > 29 && countitem(907) > 29 && SUPNOV_Q == 1) {
-		delitem 938, 30;	//Sticky_Mucus
-		delitem 907, 30;	//Resin
+	}
+	if (SUPNOV_Q == 1) {
 		mes "[Tzerero]";
-		mes "If my prediction is correct,";
-		mes "it is better for you to be an average person who leads a normal life.";
-		mes "You have nothing to lose";
-		mes "if you join the";
-		mes "Novice Club.";
+		mes "Huh? Did you forget what I";
+		mes "wanted from you? Okay,";
+		mes "I will let you know once";
+		mes "again. Please remember";
+		mes "this time...";
 		next;
 		mes "[Tzerero]";
-		mes "Then let's follow the agreement";
-		mes "and upgrade your profession to a Super Novice...Hmm?";
-		mes "Ah! What's that thing behind you?" ;
+		mes "I asked you to bring me";
+		mes "^FF000030 Sticky Mucus^000000 and";
+		mes "^FF000030 Resin^000000.";
+		close;
+	}
+	if (BaseClass == Job_Novice && upper != 1) {
+		mes "[Tzerero]";
+		mes "...Hmm?";
+		mes "Stop.";
+		mes "Let me look at you.";
 		next;
-		if(select("Hmm?","What?") == 1) {
-			mes "-You turn back and look-";
-			mes "-but there's nothing-";
-			mes "-nothing...how suspicious!";
-			next;
-			getitem 2339, 1;	//Pantie
-			callfunc "F_ClearJobVar";
-			callfunc "Job_Change",Job_SuperNovice;
-			mes "[Tzerero]";
-			mes "Wahaha! You're shocked!";
-			mes "Making jokes in your daily life";
-			mes "will create another normal life.";
-			mes "What do you think about";
-			mes "the ability of Tzerero.";
-			next;
-			mes "[Tzerero]";
-			mes "Hmm... Joking is nothing important.";
-			mes "The main point is,";
-			mes "you've become a Super Novice.";
-			next;
-			mes "And there's something for you";
-			mes "as a token for joining the club.";
-			mes "This is also the legendary defensive equipment";
-			mes "owned by the Mr. Kimu=Shon?!";
-			next;
-			mes "[Tzerero]";
-			mes "May you lead a normal life";
-			mes "and make our";
-			mes "Novice Club shine.";
-			mes "I wish you a happy life!";
-			close;
-		}
-			mes "-After you've heard Tzerero's word-";
-			mes "-you're a little shock and try to ask him-";
-			mes "-Suddenly!";
-			next;
-			getitem 2339, 1;	//Pantie
-			callfunc "F_ClearJobVar";
-			callfunc "Job_Change",Job_SuperNovice;
-			mes "[Tzerero]";
-			mes "WaHaHa! You're shocked!";
-			mes "Making jokes in your daily life";
-			mes "will create another normal life.";
-			mes "What do you think about";
-			mes "the ability of Tzerero.";
-			next;
-			mes "[Tzerero]";
-			mes "Hmm... Joking is nothing important.";
-			mes "The main point is";
-			mes "you've become a Super Novice.";
-			next;
-			mes "[Tzerero]";
-			mes "And there's something for you";
-			mes "as a token for joining the club.";
-			mes "This is also the legendary defensive equipment";
-			mes "owned by the Mr. Kimu=Shon?!";
-			next;
-			mes "[Tzerero]";
-			mes "May you lead a normal life";
-			mes "and make our";
-			mes "Novice Club shine.";
-			mes "I wish you a happy life.";
-			close;
-	} else if(SUPNOV_Q == 1) {
 		mes "[Tzerero]";
-		mes "Hmm? Have you forgotten ";
-		mes "to bring anything? ";
-		mes "Let me repeat.";
-		mes "Remember it well.";
+		mes ".....";
+		mes ".......";
+		mes ".........";
+		emotion e_dots;
 		next;
 		mes "[Tzerero]";
-		mes "You'll need^FF0000Sticky Mucus^000000and ^FF0000Resin^000000";
-		mes "Don't forget!";
-		close;
-	} else if(BaseJob == Job_Novice) {
+		mes "I see that the light";
+		mes "of mediocrity shines";
+		mes "brightly within you...";
+		next;
 		mes "[Tzerero]";
-		mes "...Hmm? I can see the";
-		mes "presence of normal all over you.";
-		mes "All of a sudden I think that";
-		mes "you're totally a born commoner who is destined to meet us!";
+		mes "Why don't you join us,";
+		mes "young Novice? Join";
+		mes "us and learn the subtle";
+		mes "greatness of being";
+		mes "mediocre...";
 		next;
 		mes "[Tzerero]";
-		mes "How about that, join us in the Novice Club";
-		mes "and be a commoner.";
-		mes "Walk a common path, lead a common life.";
-		mes "Do you want to enjoy the life";
-		mes "of being the member?";
+		mes "Accept my offer...";
+		mes "Cast off your those";
+		mes "brown, dusty garments";
+		mes "and bloom into...";
 		next;
 		mes "[Tzerero]";
-		mes "Although this is not a substitute";
-		mes "if you become the member of our club.";
-		mes "Let's transfer you from the Novice";
-		mes "to the best Super Novice.";
+		mes "...a ^CE6300Super Novice^000000.";
 		next;
-		switch(select("I want to join","I don't want to join","I need to know the details")) {
+		switch(select("Accept his offer.:Reject his offer.:Listen more carefully.")) {
 		case 1:
-			if(JobLevel < 10 || Skillpoint != 0) {
+			if (getskilllv(1) < 9) {
+				mes "[Tzerero]";
+				mes "Hmm...But do you truly";
+				mes "appreciate the value of";
+				mes "finding strength in";
+				mes "weakness? You must";
+				mes "prove to me that you";
+				mes "are a true underachiever.";
+				next;
 				mes "[Tzerero]";
-				mes "Aiyo... What a pity";
-				mes "The basic status for the job transfer is not enough.";
-				mes "Please increase the skill level to level 9";
-				mes "and come again.";
+				mes "Live life as a Novice...";
+				mes "And return when you";
+				mes "have mastered the";
+				mes "Basic Skills...";
+				mes "Grow in mediocrity and";
+				mes "Become a Level 10 Novice...";
 				close;
-			} else if(BaseLevel < 45) {
+			}
+			if (BaseLevel < 45) {
+				mes "[Tzerero]";
+				mes "Hmm...But do you truly";
+				mes "value the relaxed lifestyle";
+				mes "of the banal adventurer?";
+				mes "Prove to me that you do not";
+				mes "lust for power...";
+				next;
 				mes "[Tzerero]";
-				mes "Aiyo... What a pity.";
-				mes "The basic status for the job transfer is not enough.";
-				mes "Please increase your basic level to level 45";
-				mes "and come again.";
+				mes "Live life mundanely...";
+				mes "Become a Level 45 Novice...";
+				mes "It will be then that you can join us...";
 				close;
 			}
 			mes "[Tzerero]";
-			mes "Oh Oh! you walk the path of a Novice too.";
-			mes "You won't find many of your kind";
-			mes "in this time!";
-			mes "Anyway, you've made a brilliant choice.";
+			mes "I can see in your eyes";
+			mes "the determination to";
+			mes "live life simply...";
 			next;
 			mes "[Tzerero]";
-			mes "Honestly, there's nothing better than being common.";
-			mes "Do you agree?";
+			mes "Only the truly wise can";
+			mes "see that being ordinary";
+			mes "and banal is the best";
+			mes "way to live life.";
 			next;
 			mes "[Tzerero]";
-			mes "Though it maybe be simple, but you won't become a member";
-			mes "of the Novice Guild just by submitting the application.";
-			mes "You need to attend";
-			mes "an additional qualifying test too...";
+			mes "However, we do not welcome";
+			mes "just anyone into our society.";
+			mes "You must first pass our";
+			mes "qualification test.";
 			next;
 			mes "[Tzerero]";
-			mes "To blend with the common life";
-			mes "please catch some common monsters.";
-			mes "and bring some common items, hmm....please bring";
-			mes "^FF0000Sticky Mucus^000000 and ^FF0000Resin^000000";
-			mes "Maybe that'll be better?";
+			mes "For this test, you must";
+			mes "bring me some items which";
+			mes "are dropped from normal,";
+			mes "unexceptional monsters.";
 			next;
 			mes "[Tzerero]";
-			mes "Gather 30 of these two items";
-			mes "and then look for me.";
-			mes "The sound of this number is common too, right? Hahaha!";
+			mes "Hmmmm...";
+			mes "^FF000030 Sticky Mucus^000000";
+			mes "and ^FF000030 Resin";
+			mes "^000000will be suitable to test your";
+			mes "ability to fight meager enemies.";
 			next;
-			set SUPNOV_Q, 1;
 			mes "[Tzerero]";
-			mes "Good luck to you then.";
+			mes "Also, the number 30";
+			mes "is significant. It's not";
+			mes "anything special...just";
+			mes "an ordinary number.";
+			mes "Hahahahaha~";
+			next;
+			set SUPNOV_Q,1;
+			mes "[Tzerero]";
+			mes "Good luck, my friend.";
 			close;
 		case 2:
 			mes "[Tzerero]";
-			mes "Aiyo...You haven't realized";
-			mes "the joy of a common path.";
-			mes "Never mind. It's your choice";
-			mes "of life living in this world.";
+			mes "Well, well...I suppose the";
+			mes "value of the simple life";
+			mes "is difficult for you to";
+			mes "to grasp. It's...okay...";
+			mes "Your life is your own.";
 			next;
 			mes "[Tzerero]";
-			mes "If you have changed your mind,";
-			mes "you can always look for me anytime.";
+			mes "But, if you ever see the";
+			mes "light of banality, you";
+			mes "are welcome to visit me";
+			mes "anytime...";
 			next;
 			mes "[Tzerero]";
-			mes "Ah... Maybe when the size of Novice Club expands";
-			mes "or has a greater influences,";
-			mes "the condition for the member to participate shall increase.";
-			mes "So if you wanted to join the club";
-			mes "be quick!";
+			mes "As our Novice club";
+			mes "grows more popular and";
+			mes "we gain more followers,";
+			mes "we may consider using";
+			mes "a more difficult test...";
 			close;
 		case 3:
 			mes "[Tzerero]";
-			mes "Cough cough, let me tell you something about the club.";
-			mes "The founder of the Novice club";
-			mes "as well as the first president of the club";
-			mes "Mr. Kimu=shon ";
-			mes "feels sorry that most people";
-			mes "have forgotten the path of a commoner...";
+			mes "Our Novice Society was founded";
+			mes "by the legendary Mister";
+			mes "Kimu-Shaun...perhaps the";
+			mes "greatest man in our generation.";
+			next;
+			mes "[Tzerero]";
+			mes "He realized that there";
+			mes "was much suffering in the";
+			mes "world, especially among";
+			mes "the common people of";
+			mes "Rune-Midgard...";
 			next;
-			mes "- You must finish listening to-";
-			mes "- the 10 minutes lecture of -";
-			mes "- Tzerero -";
+			mes "[Tzerero]";
+			mes "He learned many skills from";
+			mes "all the different people he";
+			mes "met...but since he didn't";
+			mes "stay in one place for long,";
+			mes "he became a jack of all";
+			mes "trades...and a master of none.";
+			next;
+			mes "[Tzerero]";
+			mes "In sharing the pain of";
+			mes "the common man, he became";
+			mes "became one himself...";
+			mes "the greatest ordinary";
+			mes "man ever.";
 			next;
 			mes "[Tzerero]";
-			mes "...That the reason why";
-			mes "the Novice Club never dies?";
-			mes "If the Novice Club expands in future,";
-			mes "the concept of Novice Club will be";
-			mes "made into test questions.";
+			mes "The members of our society";
+			mes "try to live as Mister";
+			mes "Kimu-Shaun did, according to";
+			mes "the principles he laid before us...";
 			close;
 		}
 	}
+	else {
+		if (BaseClass == Job_SuperNovice) {
+			mes "[Tzerero]";
+			mes "How do you like living";
+			mes "life simply as a Super";
+			mes "Novice? I'm sure that";
+			mes "you're enjoying it~";
+			next;
+			mes "[Tzerero]";
+			mes "Please grow as a Super";
+			mes "Novice by helping the";
+			mes "common man while being";
+			mes "one at the same time...";
+			next;
+			mes "[Tzerero]";
+			mes "I encourage you to";
+			mes "grow in your Super";
+			mes "Noviceness, and lead";
+			mes "an example in living";
+			mes "an exceptionally";
+			mes "mundane life.";
+			close;
+		}
+		mes "[Tzerero]";
+		mes "Hello, I am Tzerero,";
+		mes "the unofficial executive";
+		mes "director of the Great";
+		mes "Novice Society.";
+		next;
 		mes "[Tzerero]";
-		mes "You're not a common Person";
-		mes "I'm the unofficial leader of the Novice Club.";
-		mes "My Name is Tzerero.";
+		mes "Hmmm...you seem to be well";
+		mes "above the average person.";
+		mes "Yes, you're definitely more";
+		mes "'extraordinary' than you are";
+		mes "'ordinary...'";
 		next;
 		mes "[Tzerero]";
-		mes "To an unusual person like you,";
-		mes "the club will have nothing to do with you in all your life..";
-		mes "It's ok that you don't understand";
-		mes "because it is impossible for us";
-		mes "to make you understand.";
+		mes "*Sigh* I suppose you";
+		mes "could never understand";
+		mes "our way of life, the";
+		mes "subtle greatness in";
+		mes "being ordinary. But";
+		mes "that's alright.";
 		next;
 		mes "[Tzerero]";
-		mes "Hmm... There are different kinds of people in this world";
-		mes "When you have such kinds of people,";
-		mes "there will be another kind, that's how things work.";
-		mes "Don't you think so??";
+		mes "Well...there are thousands";
+		mes "of different people in this";
+		mes "world, so I just try to accept";
+		mes "all of our differences.";
+		mes "I hope you will too.";
 		close;
+	}
 }
 
-//=======================Esere==========================
-aldeba_in,216,169,3	script	Esere	86,{
-	if(BaseJob == Job_Supernovice) {
-		mes "[Esere]";
-		mes "Aiyo? Aren't you the member of the Novice Guild?";
-		mes "Wow~ You have pretty sharp eyes?!";
-		mes "How do you know this is something good~";
+aldeba_in,216,169,5	script	Esseray#sn	86,{
+	if (BaseJob == Job_SuperNovice) {
+		mes "[Esseray]";
+		mes "Hm? Hey, you're a member";
+		mes "of our great Novice Society,";
+		mes "aren't you? Isn't this the";
+		mes "best club ever?!";
+		next;
+		mes "[Essaray]";
+		mes "Living life mundanely,";
+		mes "according to the principles";
+		mes "of Mister Kimu-Shaun...";
+		mes "It's great to be ordinary!";
 		next;
-		mes "[Esere]";
-		mes "And we can continue to fool around...No no.";
-		mes "I mean enjoy a common life! And for your info";
-		mes "I am the best member under my leader";
-		mes "Tzerero?!";
+		mes "[Esseray]";
+		mes "Let's try to lead our lives";
+		mes "as normally as we can!";
+		mes "For your reference, I am";
+		mes "the number one member,";
+		mes "under Mister Tzerero of";
+		mes "course!";
 		close;
-	} else if(BaseJob == Job_Novice) {
-		mes "[Esere]";
-		mes "You still haven't realize the joy";
-		mes "of being a commoner!";
-		mes "And you have already become the member of Novice Guild?~";
-		mes "Well, it's not a bad thing being a Novice. Hehe.";
+	}
+	if (BaseJob == Job_Novice && upper != 1) {
+		mes "[Esseray]";
+		mes "Hah~ you don't know anything";
+		mes "about being a normal person yet!";
+		mes "Why don't you join our Novice";
+		mes "Society? This club is the best in the world~";
 		next;
-		mes "[Esere]";
-		mes "Actually, Novice is the best! Hahaha!";
+		mes "[Esseray]";
+		mes "Yup, Super Novices";
+		mes "are the best characters!";
+		mes "Hahahahahahahaha!";
 		close;
 	}
-		mes "[Esere]";
-		mes "Aiyo...You have went far from the road of commoner.";
-		mes "And it's already too late,";
-		mes "even if you feel regret now!";
-		mes "Hmm... Then you should live the dangerous life as an adventurer";
-		mes "on behalf of us.";
+	else {
+		mes "[Esseray]";
+		mes "Bah~! You're better than";
+		mes "average...Hell, you may";
+		mes "even be 'special.'";
+		mes "What a shame! Well...";
+		mes "I hope you still live";
+		mes "your life positively.";
 		close;
+	}
 }
 
-//=======================Cart Rental==========================
-aldebaran,54,238,3	script	Kafra Employee	117,{
-	if(BaseJob == Job_Supernovice) {
+aldebaran,54,238,5	script	Kafra Employee#sn	117,{
+	if (BaseJob == Job_SuperNovice) {
 		mes "[Kafra Employee]";
-		mes "Hmm? So, you are a Super Novice.";
-		mes "Are you feeling sad because";
-		mes "other Kapra Staffs do not let you use";
-		mes "the push cart? But now,";
-		mes "you won't need to worry anymore.";
+		if (Sex )
+			mes "Hello, Mister Super Novice~";
+		else
+			mes "Hello, Super Novice, Ma'am.";
+		mes "You must have been really";
+		mes "dissapointed that the other";
+		mes "Kafra Employees wouldn't let";
+		mes "you rent a cart from them.";
+		mes "But don't you worry now...";
 		next;
 		mes "[Kafra Employee]";
-		mes "Due to the overwhelming demands,";
-		mes "we have launched a push cart especially";
-		mes "for the Super Novice...";
-		mes "However, this has offended";
-		mes "the orders from the Kapra Headquarters.";
-		mes "Therefore, we have to provide this service secretly.. Hehe";
+		mes "I'm here to support you guys";
+		mes "by providing carts...";
 		next;
 		mes "[Kafra Employee]";
-		mes "Anyway, let's end the introduction lecture here!";
-		mes "So, do you want to rent a push cart?";
-		mes "the rental fee is 1900 zeny";
+		mes "^3355FF*whispers*^000000";
+		mes "^555555I am not supposed to do this";
+		mes "because it's against our";
+		mes "company policy. But I felt";
+		mes "really sorry for Super Novices";
+		mes "...so here I am.^000000";
 		next;
-		if(select("Yes","No, thanks") == 1) {
+		mes "[Kafra Employee]";
+		mes "Anyway, would you like to rent a cart? The service fee is 1,900 zeny.";
+		next;
+		if (select("Rent a Cart.:Cancel.") == 1) {
 			mes "[Kafra Employee]";
-			mes "Ah, there's something you need to take note!";
-			mes "Have you learned";
-			mes "the skill of Push cart?";
-			mes "I have nothing to lose because I can rent the cart to you anytime.";
-			mes "But if you didn't learn that skill,";
-			mes "it will only be a waste of zeny and you won't get a push cart.";
+			mes "Oh, here's the thing...";
+			mes "Have you learned the 'Push Cart'";
+			mes "skill? I can just rent you a";
+			mes "cart, but if you haven't";
+			mes "learned to push it, you'll";
+			mes "just be wasting your zeny.";
 			next;
 			mes "[Kafra Employee]";
-			mes "Please take note that..I do this secretly.";
-			mes "So there's nothing";
-			mes "to be confirmed.";
+			mes "So make sure that you have";
+			mes "the 'Push Cart' skill already.";
 			next;
-			if(select("I'll use it", "No thanks") == 1) {
-				if(checkcart() == 1) {
+			if (select("Rent a Cart.:Cancel.") == 1) {
+				if (checkcart()) {
 					mes "[Kafra Employee]";
-					mes "You have equipped the push cart, dear customer.";
+					mes "Oh, you've already equipped a cart.";
 					close;
-				} else if(Zeny > 1899) {
-					set Zeny,Zeny-1900;
-					setcart;
+				}
+				if (Zeny >= 1899) {
+					set RESRVPTS, RESRVPTS + 190;
+					set zeny,zeny-1900;
+					if (getskilllv(39) > 0) setcart;
 					mes "[Kafra Employee]";
-					mes "Thank you for using.";
-					mes "Although this is not legal,";
-					mes "I am the Kafra Staff";
-					mes "that will be at your service ~";
+					mes "Thank you for using my service.";
+					mes "Although what I am doing might";
+					mes "not be legitimate to other";
+					mes "Kafra Employees, I strongly";
+					mes "believe I am doing what's right for the customers.";
 					close;
 				}
+				else {
 					mes "[Kafra Employee]";
-					mes "You have not pay enough zeny.";
-					mes "The amount of push cart rental is 1900 zeny.";
+					mes "I am sorry, but you do not have enough zeny with you. The service fee is 1,900 zeny.";
 					close;
+				}
 			}
-		}
 			mes "[Kafra Employee]";
-			mes "Maybe you can use it";
-			mes "in future.";
+			mes "Please come again.";
+			mes "Thank you for using my services.";
 			close;
-	}
+		}
 		mes "[Kafra Employee]";
-		mes "Welcome~ Uh Oh? I am sorry.";
-		mes "I don't think there's anything that I can do to help you.";
-		mes "Please look for";
-		mes "other Kafra Employees.";
+		mes "Please come again.";
+		mes "Thank you for using my services.";
 		close;
+	}
+	mes "[Kafra Employee]";
+	mes "Good da--Oops...!";
+	mes "I don't think I can provide you";
+	mes "with the services you want...";
+	mes "Please go talk to another";
+	mes "Kafra employee. I apologize";
+	mes "for such inconvenience...";
+	close;
 }
 
-//===== Old Changelog: ================================= 
+//============================================================ 
+// Old changelog
+//============================================================ 
 //= Dialogs From Some Other Scripts (Most Of It)
 //= 1.3-1.5 Added Baby class support (and to the Kafta SN Cart
 //= renter, too) [Lupus]
@@ -378,4 +465,4 @@ aldebaran,54,238,3	script	Kafra Employee	117,{
 //= this Job Quests again. [Lupus]
 //= 1.7 Fixed Baby Class Support. [Lupus]
 //= 1.8 Now a Baby can become a Super Baby [Lupus]
-//============================================================ 
\ No newline at end of file
+//============================================================