- Updated 1st class platinum skill NPC's.

- Fixed [bugreport:5606] .

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

1 files changed, 354 insertions, 221 deletions

diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt
index b2f8a5acc..889123868 100644
--- a/npc/quests/skills/merchant_skills.txt
+++ b/npc/quests/skills/merchant_skills.txt
@@ -3,20 +3,20 @@
 //===== By: ==================================================
 //= kobra_k88
 //===== Current Version: =====================================
-//= 1.5
+//= 1.6
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Aegis Conversion]
 //= Quests for skills: Crazy Uproar, Change Cart, Cart
 //  Revolution
 //===== Additional Comments: =================================
 //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
+//= 1.6 Updated to latest available official file. [Masao]
 //============================================================
 
-alberta,83,96,5	script	Necko#qsk_mc	98,7,7,{
-	if (BaseClass == Job_Merchant) {
-		if (getskilllv("MC_LOUD") == 1) {
+alberta,83,96,5	script	Necko	98,7,7,{
+	if (BaseJob == Job_Merchant) {
+		if (mc_loud_x == 1) {
 			mes "[Necko]";
 			mes "I'm sorry. Necko's store is...";
 			mes "Oh? Who's this?";
@@ -40,7 +40,7 @@ alberta,83,96,5	script	Necko#qsk_mc	98,7,7,{
 			mes "Ppyakikakikakakakakakakaka!!";
 			close;
 		}
-		else if (BaseJob == Job_Merchant && JobLevel < 15) {
+		else if ((Class == Job_Merchant) && (JobLevel < 15)) {
 			mes "[Necko]";
 			mes "Oh, did you come because";
 			mes "you are infatuated with my voice?";
@@ -61,14 +61,14 @@ alberta,83,96,5	script	Necko#qsk_mc	98,7,7,{
 			mes "Kyukwakakakakakakakakakaka!";
 			close;
 		}
-		else if (countitem(722) > 6 && countitem(532) > 0 && countitem(921) > 49) {
+		else if ((countitem(722) > 6) && (countitem(532) > 0) && (countitem(921) > 49) && (BaseJob == Job_Merchant) & (JobLevel >= 15)) {
 			mes "[Necko]";
 			mes "Oh! You!";
 			mes "You are qualified to learn how to shout!";
 			mes "Learn how to shout with my help.";
 			mes "Would you like to learn Crazy Uproar?";
 			next;
-			switch(select("Yes!!!!:No.:What is that?")) {
+			switch (select("Yes!!!!:No.:What is that?")) {
 			case 1:
 				mes "[Necko]";
 				mes "Ahahahahaha!! Good!!!";
@@ -79,6 +79,7 @@ alberta,83,96,5	script	Necko#qsk_mc	98,7,7,{
 				delitem 532,1; //Banana_Juice
 				delitem 921,50; //Mushroom_Spore
 				skill "MC_LOUD",1,0;
+				set mc_loud_x,1;
 				mes "[Necko]";
 				mes "You have learned Crazy Uproar!!";
 				mes "Shout as much as you wish!";
@@ -166,24 +167,21 @@ alberta,83,96,5	script	Necko#qsk_mc	98,7,7,{
 		mes "Bboowuuuuuuuuuuuuuuuuh~~~!!";
 		close;
 	}
-	else {
-		mes "[Necko]";
-		mes "Necko's store is closed right now.";
-		mes "come again later. Hehe~";
-		close;
-	}
+	mes "[Necko]";
+	mes "Necko's store is closed right now.";
+	mes "come again later. Hehe~";
+	close;
 
 OnTouch:
 	mes "[!?]";
 	mes "Muahahahahahahahahahahahaha!!";
 	mes "Pukakakakakakakakakakakakaka!";
 	close;
-
 }
 
-alberta,119,221,6	script	Charlron#qsk_mc	107,{
-	if (BaseClass == Job_Merchant) {
-		if (getskilllv("MC_CHANGECART") == 1) {
+alberta,119,221,6	script	Charlron	107,5,5,{
+	if (BaseJob == Job_Merchant) {
+		if (mc_changecart_x == 1) {
 			mes "[Charlron]";
 			mes "Mmm? I was wondering who was making all";
 			mes "the raucus carrying around a cart.";
@@ -203,7 +201,7 @@ alberta,119,221,6	script	Charlron#qsk_mc	107,{
 			mes "Be healthy~";
 			close;
 		}
-		else if ((BaseJob == Job_Merchant && JobLevel >= 30) || BaseJob == Job_Blacksmith || BaseJob == Job_Alchemist) {
+		else if ((BaseJob == Job_Merchant) && (JobLevel >= 30)) {
 			mes "[Charlron]";
 			mes "Nice to see you fellow merchant";
 			mes "If I remember correctly,";
@@ -214,9 +212,9 @@ alberta,119,221,6	script	Charlron#qsk_mc	107,{
 			mes "seem to fit your fame.";
 			mes "How pitiful.";
 			next;
-			switch(select("That's why I came here.:What about my cart?:Two pairs is pitiful?")) {
+			switch (select("That's why I came here.:What about my cart?:Two pairs is pitiful?")) {
 			case 1:
-				if (countitem(1019) > 49 && countitem(998) > 9 && countitem(919) > 19) {
+				if ((countitem(1019) > 49) && (countitem(998) > 9) && (countitem(919) > 19)) {
 					mes "[Charlron]";
 					mes "Haha! Ok, ok!";
 					mes "With the things you brought";
@@ -226,6 +224,7 @@ alberta,119,221,6	script	Charlron#qsk_mc	107,{
 					delitem 998,10; //Iron
 					delitem 919,20; //Animal's_Skin
 					skill "MC_CHANGECART",1,0;
+					set mc_changecart_x,1;
 					mes "[Charlron]";
 					mes "Congratulations.";
 					mes "You can choose a cart";
@@ -246,25 +245,23 @@ alberta,119,221,6	script	Charlron#qsk_mc	107,{
 					mes "Hahaha! Have a nice day!";
 					close;
 				}
-				else {
-					mes "[Charlron]";
-					mes "Mmm... It's true that I";
-					mes "change carts but...";
-					mes "In order to do so, I need";
-					mes "some materials to use.";
-					next;
-					mes "[Charlron]";
-					mes "50 Trunks.";
-					mes "10 Iron.";
-					mes "20 Animal Skins.";
-					mes "I need at least these things";
-					mes "to change your cart.";
-					next;
-					mes "[Charlron]";
-					mes "So come see me when you";
-					mes "have prepared everything.";
-					close;
-				}
+				mes "[Charlron]";
+				mes "Mmm... It's true that I";
+				mes "change carts but...";
+				mes "In order to do so, I need";
+				mes "some materials to use.";
+				next;
+				mes "[Charlron]";
+				mes "50 Trunks.";
+				mes "10 Iron.";
+				mes "20 Animal Skins.";
+				mes "I need at least these things";
+				mes "to change your cart.";
+				next;
+				mes "[Charlron]";
+				mes "So come see me when you";
+				mes "have prepared everything.";
+				close;
 			case 2:
 				mes "[Charlron]";
 				mes "Oh no, you don't know at all?(changes tone)";
@@ -306,43 +303,39 @@ alberta,119,221,6	script	Charlron#qsk_mc	107,{
 				close;
 			}
 		}
-		else {
-			mes "[Charlron]";
-			mes "Welcome young one.";
-			mes "Is selling fun? I am the";
-			mes "merchant Charlron. I have been";
-			mes "doing some research about.";
-			mes "carts recently.";
-			next;
-			mes "[Charlron]";
-			mes "Aren't you tired of that cart?";
-			mes "Come to me if you want to";
-			mes "change your cart. I'll do a good job.";
-			mes "But, there are some conditions.";
-			next;
-			mes "[Charlron]";
-			mes "I'm a pretty famous merchant,";
-			mes "so I don't really deal with beginners.";
-			mes "Once you are level 30";
-			mes "I may consider establishing";
-			mes "a deal with you.";
-			close;
-		}
-	}
-	else {
 		mes "[Charlron]";
-		mes "I am a merchant that";
-		mes "deals with many things, Charlron.";
-		mes "If you ever find anything interesting";
-		mes "come back and try to ";
-		mes "negotiate a deal with me.";
+		mes "Welcome young one.";
+		mes "Is selling fun? I am the";
+		mes "merchant Charlron. I have been";
+		mes "doing some research about.";
+		mes "carts recently.";
+		next;
+		mes "[Charlron]";
+		mes "Aren't you tired of that cart?";
+		mes "Come to me if you want to";
+		mes "change your cart. I'll do a good job.";
+		mes "But, there are some conditions.";
+		next;
+		mes "[Charlron]";
+		mes "I'm a pretty famous merchant,";
+		mes "so I don't really deal with beginners.";
+		mes "Once you are level 30";
+		mes "I may consider establishing";
+		mes "a deal with you.";
 		close;
 	}
+	mes "[Charlron]";
+	mes "I am a merchant that";
+	mes "deals with many things, Charlron.";
+	mes "If you ever find anything interesting";
+	mes "come back and try to ";
+	mes "negotiate a deal with me.";
+	close;
 }
 
-alberta,232,106,6	script	Gershaun#qsk_mc	57,{
-	if (BaseClass == Job_Merchant) {
-		if (getskilllv("MC_CARTREVOLUTION") == 1) {
+alberta,232,106,6	script	Gershaun	57,5,5,{
+	if (BaseJob == Job_Merchant) {
+		if (mc_cartrevolution_x == 1) {
 			mes "[Gershaun]";
 			mes "Ah, long time no see!";
 			mes "Ohh, the red marks on your cart.";
@@ -356,7 +349,7 @@ alberta,232,106,6	script	Gershaun#qsk_mc	57,{
 			mes "Here! Hurry!";
 			close;
 		}
-		else if ((BaseJob == Job_Merchant && JobLevel >= 35) || BaseJob == Job_Blacksmith || BaseJob == Job_Alchemist) {
+		else if ((BaseJob == Job_Merchant) && (JobLevel >= 35)) {
 			mes "[Gershaun]";
 			mes "Ooh. You have a firm body";
 			mes "for a merchant. You must be";
@@ -364,81 +357,222 @@ alberta,232,106,6	script	Gershaun#qsk_mc	57,{
 			mes "Mmm you should be able to learn";
 			mes "Cart Revolution!";
 			next;
-			switch(select("Hey~ that's why I came.:What's that?")) {
+			switch (select("Hey~ that's why I came.:What's that?")) {
 			case 1:
-				switch(rand(1,3)) {
-				case 1: setarray .@Quantity[0],2,20,30,20,5; break;
-				case 2: setarray .@Quantity[0],2,15,25,15,5; break;
-				case 3: setarray .@Quantity[0],2,23,32,23,6; break;
-				}
-				if (countitem(533) >= .@Quantity[0] && countitem(998) >= .@Quantity[1] && countitem(938) >= .@Quantity[2] && countitem(601) >= .@Quantity[3] && countitem(962) >= .@Quantity[4]) {
-					mes "[Gershaun]";
-					mes "Hoho!";
-					mes "Got it! I shall teach you";
-					mes "Cart Revolution!";
-					next;
-					mes "[Gershaun]";
-					mes "Ah, such a nice day!";
-					mes "I shall reward those who";
-					mes "eagerly swing their carts!";
-					next;
-					delitem 533,.@Quantity[0]; //Grape_Juice
-					delitem 998,.@Quantity[1]; //Iron
-					delitem 938,.@Quantity[2]; //Sticky_Mucus
-					delitem 601,.@Quantity[3]; //Wing_Of_Fly
-					delitem 962,.@Quantity[4]; //Tentacle
-					skill "MC_CARTREVOLUTION",1,0;
-					mes "[Gershaun]";
-					mes "Now you can use Cart Revolution";
-					mes "I expect you to make merchants";
-					mes "famous by using this amazing";
-					mes "destruction power. Muahahahahaha!!!";
-					next;
+				set .@care_random,rand(1,3);
+				if (.@care_random == 1) {
+					if ((countitem(533) > 1) && (countitem(998) > 19) && (countitem(938) > 29) && (countitem(601) > 19) && (countitem(962) > 4)) {
+						mes "[Gershaun]";
+						mes "Hoho!";
+						mes "Got it! I shall teach you";
+						mes "Cart Revolution!";
+						next;
+						mes "[Gershaun]";
+						mes "Ah, such a nice day!";
+						mes "I shall reward those who";
+						mes "eagerly swing their carts!";
+						next;
+						delitem 533,2; //Grape_Juice
+						delitem 998,20; //Iron
+						delitem 938,30; //Sticky_Mucus
+						delitem 601,20; //Wing_Of_Fly
+						delitem 962,5; //Tentacle
+						skill "MC_CARTREVOLUTION",1,0;
+						set mc_cartrevolution_x,1;
+						mes "Now you can use Cart Revolution";
+						mes "I expect you to make merchants";
+						mes "famous by using this amazing";
+						mes "destruction power. Muahahahahaha!!!";
+						next;
+						mes "[Gershaun]";
+						mes "Have a great day!!";
+						close;
+					}
+					else if (countitem(532) > 0) {
+						mes "[Gershaun]";
+						mes "Ooh!";
+						mes "It's banana juice!";
+						mes "Thank you very much!";
+						mes "...............Kaah!";
+						delitem 532,1; //Banana_Juice
+						mes "Very refreshing! Thank you! Goodbye!";
+						next;
+						mes "[Gershaun]";
+						mes "Hmm?";
+						mes "You didn't leave yet?";
+						mes "Ah! You are still attached";
+						mes "to Cart Revolution!";
+						mes "Ok then. Considering you brought";
+						mes "the Banana Juice, I'll teach you.";
+						next;
+						mes "[Gershaun]";
+						mes "It's not hard to teach you";
+						mes "Cart Revolution, but I need you to prepare";
+						mes "the materials to modify your cart.";
+						mes "The items I need are..";
+						next;
+						mes "[Gershaun]";
+						mes "First I need 20 Irons to make the cart";
+						mes "durable. Then 30 Sticky Mucus to absorb";
+						mes "the shock.";
+						mes "And about 20 Fly Wings and 5 Tentacles?";
+						mes "And 2 bottles of Grape Juice for me!";
+						next;
+						mes "[Gershaun]";
+						mes "Just bring those.";
+						mes "I'm not saying ONLY 30 or 20.";
+						mes "It depends on my condition!";
+						mes "Hahahaha!";
+						mes "I'll be waiting. Then byebye~";
+						close;
+					}
 					mes "[Gershaun]";
-					mes "Have a great day!!";
+					mes "Mmm!";
+					mes "Nothing can be done without a refreshing drink!";
+					mes "How about starting a conversation";
+					mes "with at least a bottle of Banana Juice?";
 					close;
 				}
-				else if (countitem(532) > 0) {
-					mes "[Gershaun]";
-					mes "Ooh!";
-					mes "It's banana juice!";
-					mes "Thank you very much!";
-					mes "...............Kaah!";
-					delitem 532,1; //Banana_Juice
-					mes "Very refreshing! Thank you! Goodbye!";
-					next;
-					mes "[Gershaun]";
-					mes "Hmm?";
-					mes "You didn't leave yet?";
-					mes "Ah! You are still attached";
-					mes "to Cart Revolution!";
-					mes "Ok then. Considering you brought";
-					mes "the Banana Juice, I'll teach you.";
-					next;
-					mes "[Gershaun]";
-					mes "It's not hard to teach you";
-					mes "Cart Revolution, but I need you to prepare";
-					mes "the materials to modify your cart.";
-					mes "The items I need are..";
-					next;
-					// Do not "Correct" this dialog. It IS correct already.
-					// You're not suposed to know the exact amount to bring.
-					mes "[Gershaun]";
-					mes "First I need 20 Irons to make the cart";
-					mes "durable. Then 30 Sticky Mucus to absorb";
-					mes "the shock.";
-					mes "And about 20 Fly Wings and 5 Tentacles?";
-					mes "And 2 bottles of Grape Juice for me!";
-					next;
+				if (.@care_random == 2) {
+					if ((countitem(533) > 1) && (countitem(998) > 14) && (countitem(938) > 24) && (countitem(601) > 14) && (countitem(962) > 4)) {
+						mes "[Gershaun]";
+						mes "Mmm that's good!";
+						mes "Great! I shall teach you";
+						mes "...Cart Revolution!";
+						next;
+						mes "[Gershaun]";
+						mes "Ah, such a nice day!";
+						mes "I shall reward those who";
+						mes "eagerly swing their carts!";
+						next;
+						delitem 533,2; //Grape_Juice
+						delitem 998,15; //Iron
+						delitem 938,25; //Sticky_Mucus
+						delitem 601,15; //Wing_Of_Fly
+						delitem 962,5; //Tentacle
+						skill "MC_CARTREVOLUTION",1,0;
+						set mc_cartrevolution_x,1;
+						mes "Now you can use Cart Revolution";
+						mes "I expect you to make merchants";
+						mes "famous by using its amazing";
+						mes "destruction power. Muahahahahaha!!!";
+						next;
+						mes "[Gershaun]";
+						mes "Have a good day!!";
+						close;
+					}
+					else if (countitem(532) > 0) {
+						mes "[Gershaun]";
+						mes "Ooh!";
+						mes "It's banana juice!";
+						mes "Thanks a lot!";
+						mes "...............Kaaah!";
+						delitem 532,1; //Banana_Juice
+						mes "Very good! Thank you! Good-bye!";
+						next;
+						mes "[Gershaun]";
+						mes "Mmm?";
+						mes "You didn't leave yet?";
+						mes "Ah! You're still attached";
+						mes "to Cart Revolution!";
+						mes "Ok then. Considering you brought";
+						mes "the banana juice, I'll teach you.";
+						next;
+						mes "[Gershaun]";
+						mes "It's not hard to teach you";
+						mes "Cart Revolution, but I need you to prepare";
+						mes "the materials to modify your cart.";
+						mes "The items I need are..";
+						next;
+						mes "[Gershaun]";
+						mes "First I need 20 Irons to make the cart";
+						mes "durable. Then 30 Sticky Mucus to absorb";
+						mes "the shock.";
+						mes "And about 20 Fly Wings and 5 Tentacles?";
+						mes "And 2 bottles of Grape Juice for me!";
+						next;
+						mes "[Gershaun]";
+						mes "Bring these to me.";
+						mes "But that doesn't mean I want only 30 and 20.";
+						mes "It all depends on my condition!";
+						mes "Just bring me these for now.";
+						mes "Hahahaha!";
+						mes "I'm looking forward to it. Good bye then~";
+						close;
+					}
 					mes "[Gershaun]";
-					mes "Just bring those.";
-					mes "I'm not saying ONLY 30 or 20.";
-					mes "It depends on my condition!";
-					mes "Hahahaha!";
-					mes "I'll be waiting. Then byebye~";
+					mes "Mmm!";
+					mes "Nothing's free nowadays!";
+					mes "How about trying to start a conversation";
+					mes "by offering a bottle of Banana Juice or something?";
 					close;
 				}
-				else {
+				if (.@care_random == 3) {
+					if ((countitem(533) > 1) && (countitem(998) > 22) && (countitem(938) > 31) && (countitem(601) > 22) && (countitem(962) > 5)) {
+						mes "[Gershaun]";
+						mes "Mmm that's good!";
+						mes "Great! I shall teach you";
+						mes "...Cart Revolution!";
+						next;
+						mes "[Gershaun]";
+						mes "Ah, such a nice day!";
+						mes "I shall reward those who";
+						mes "eagerly swing their carts!";
+						next;
+						delitem 533,2; //Grape_Juice
+						delitem 998,23; //Iron
+						delitem 938,32; //Sticky_Mucus
+						delitem 601,23; //Wing_Of_Fly
+						delitem 962,6; //Tentacle
+						skill "MC_CARTREVOLUTION",1,0;
+						set mc_cartrevolution_x, 1;
+						mes "Now you can use Cart Revolution";
+						mes "I expect you to make merchants";
+						mes "famous by using its amazing";
+						mes "destruction power. Muahahahahaha!!!";
+						next;
+						mes "[Gershaun]";
+						mes "Have a good day!!";
+						close;
+					}
+					else if (countitem(532) > 0) {
+						mes "[Gershaun]";
+						mes "Ooh!";
+						mes "It's Banana Juice!";
+						mes "Thanks a lot!";
+						mes "...............Kaaah!";
+						delitem 532,1; //Banana_Juice
+						mes "Very good! Thank you! Good-bye!";
+						next;
+						mes "[Gershaun]";
+						mes "Mmm?";
+						mes "You didn't leave yet?";
+						mes "Ah! You're still attached";
+						mes "to Cart Revolution!";
+						mes "Ok then. Considering you brought";
+						mes "the banana juice, I'll teach you.";
+						next;
+						mes "[Gershaun]";
+						mes "It's not hard to teach you";
+						mes "Cart Revolution, but I need you to prepare";
+						mes "the materials to modify your cart.";
+						mes "The items I need are..";
+						next;
+						mes "[Gershaun]";
+						mes "First I need 20 Irons to make the cart";
+						mes "durable. Then 30 Sticky Mucus to absorb";
+						mes "the shock.";
+						mes "And about 20 Fly Wings and 5 Tentacles?";
+						mes "And 2 bottles of Grape Juice for me!";
+						next;
+						mes "[Gershaun]";
+						mes "Just bring those.";
+						mes "I'm not saying ONLY 30 or 20.";
+						mes "It depends on my condition!";
+						mes "Hahahaha!";
+						mes "I'll be waiting. Then byebye~";
+						close;
+					}
 					mes "[Gershaun]";
 					mes "Mmm!";
 					mes "Nothing can be done without a refreshing drink!";
@@ -500,95 +634,94 @@ alberta,232,106,6	script	Gershaun#qsk_mc	57,{
 				close;
 			}
 		}
-		else {
+		mes "[Gershaun]";
+		mes "Mmm, a young merchant.";
+		mes "You must use carts, too.";
+		mes "Since you need to do business.";
+		mes "But is that all?";
+		next;
+		mes "[Gershaun]";
+		mes "I did research about a different";
+		mes "way to use the cart.";
+		mes "I tried cooking ramen";
+		mes "and even tried jump-roping.";
+		mes "But none of them were able";
+		mes "to satisfy me.";
+		next;
+		switch (select("I know, I know.:...?")) {
+		case 1:
 			mes "[Gershaun]";
-			mes "Mmm, a young merchant.";
-			mes "You must use carts, too.";
-			mes "Since you need to do business.";
-			mes "But is that all?";
+			mes "...no, what I'm saying is.";
+			close;
+		case 2:
+			mes "[Gershaun]";
+			mes "In despair, I wandered";
+			mes "through the fields with my cart.";
+			mes "After wandering dazed day after day..";
+			mes "I met a very strong monster.";
+			mes "Life was in danger!";
+			mes "Why me - a weaponless, armor-less merchant!";
 			next;
 			mes "[Gershaun]";
-			mes "I did research about a different";
-			mes "way to use the cart.";
-			mes "I tried cooking ramen";
-			mes "and even tried jump-roping.";
-			mes "But none of them were able";
-			mes "to satisfy me.";
+			mes "I was scared to death.. thinking";
+			mes "and hoping that this wasn't the";
+			mes "last of me. With little hope left";
+			mes "I tried the last thing possible.";
+			mes "I used my cart to hit the monster!";
+			mes "And then! And then!";
 			next;
-			if (select("I know, I know.:...?") == 2) {
-				mes "[Gershaun]";
-				mes "In despair, I wandered";
-				mes "through the fields with my cart.";
-				mes "After wandering dazed day after day..";
-				mes "I met a very strong monster.";
-				mes "Life was in danger!";
-				mes "Why me - a weaponless, armor-less merchant!";
-				next;
-				mes "[Gershaun]";
-				mes "I was scared to death.. thinking";
-				mes "and hoping that this wasn't the";
-				mes "last of me. With little hope left";
-				mes "I tried the last thing possible.";
-				mes "I used my cart to hit the monster!";
-				mes "And then! And then!";
-				next;
-				mes "[Gershaun]";
-				mes "The monster died in one hit.";
-				mes "It was then that I realized something.";
-				mes "Carts can become weapons, too!";
-				mes "I finally realized that we can";
-				mes "attack with carts!";
-				next;
-				mes "[Gershaun]";
-				mes "Cart Revolution!";
-				mes "That's the new attack skill I developed.";
-				mes "Using 12 SP you lift your cart";
-				mes "to hit your opponent..";
-				mes "right in the head!";
-				next;
-				mes "[Gershaun]";
-				mes "The heavier your cart is, the";
-				mes "stronger you can attack! With one hit,";
-				mes "your opponent will be hurt and";
-				mes "forced to back off!";
-				next;
+			mes "[Gershaun]";
+			mes "The monster died in one hit.";
+			mes "It was then that I realized something.";
+			mes "Carts can become weapons, too!";
+			mes "I finally realized that we can";
+			mes "attack with carts!";
+			next;
+			mes "[Gershaun]";
+			mes "Cart Revolution!";
+			mes "That's the new attack skill I developed.";
+			mes "Using 12 SP you lift your cart";
+			mes "to hit your opponent..";
+			mes "right in the head!";
+			next;
+			mes "[Gershaun]";
+			mes "The heavier your cart is, the";
+			mes "stronger you can attack! With one hit,";
+			mes "your opponent will be hurt and";
+			mes "forced to back off!";
+			next;
+			mes "[Gershaun]";
+			mes "Would you like to learn this skill?";
+			next;
+			switch (select("Yes!!:I want to learn sushi skills...")) {
+			case 1:
 				mes "[Gershaun]";
-				mes "Would you like to learn this skill?";
-				next;
-				switch(select("Yes!!:I want to learn sushi skills...")) {
-				case 1:
-					mes "[Gershaun]";
-					mes "Ok!";
-					mes "I'll give you special training!";
-					mes "First you need health!";
-					mes "Get yourself to merchant";
-					mes "level 35!";
-					mes "We'll talk after that!";
-					close;
-				case 2:
-					mes "[Sushi King Gershaun]";
-					if (Sex)
-						mes "Stupid girl!";
-					else
-						mes "Stupid boy!";
-					mes "It's way to early for you to";
-					mes "even put your hands on sushi!";
-					close;
+				mes "Ok!";
+				mes "I'll give you special training!";
+				mes "First you need health!";
+				mes "Get yourself to merchant";
+				mes "level 35!";
+				mes "We'll talk after that!";
+				close;
+			case 2:
+				mes "[Sushi King Gershaun]";
+				if (Sex > 1) {
+					mes "Stupid girl!";
 				}
+				else {
+					mes "Stupid boy!";
+				}
+				mes "It's way to early for you to";
+				mes "even put your hands on sushi!";
+				close;
 			}
-			mes "[Gershaun]";
-			mes "...no, what I'm saying is.";
-			close;
 		}
-
-	}
-	else {
-		mes "[Gershaun]";
-		mes "If it doesn't work, make it work.";
-		mes "If it doesn't work, make it work.";
-		mes "If it doesn't work, make it work.";
-		close;
 	}
+	mes "[Gershaun]";
+	mes "If it doesn't work, make it work.";
+	mes "If it doesn't work, make it work.";
+	mes "If it doesn't work, make it work.";
+	close;
 }
 
 //============================================================