- Added ability for all 2nd baby classes to change into their 3rd baby job doing the 3rd job change quest. bugreport:5789

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

11 files changed, 277 insertions, 310 deletions

diff --git a/npc/jobs/3-1/archbishop.txt b/npc/jobs/3-1/archbishop.txt
index 6d46403b2..adff55987 100644
--- a/npc/jobs/3-1/archbishop.txt
+++ b/npc/jobs/3-1/archbishop.txt
@@ -45,24 +45,6 @@ prt_church,103,88,3	script	Praying Minister#arch	60,{
 		close;
 	}
 	else {
-		if (Upper == 2) {
-			mes "[Praying Minister]";
-			mes "In front of the Almighty God Odin, there shall be no person smarter than him, and there will be no person more merciful than him.";
-			next;
-			mes "[Praying Minister]";
-			mes "All ministers of Odin should be diligent. They should never be too lazy to serve Odin.";
-			next;
-			mes "[Praying Minister]";
-			mes "Thesedays, I've heard that ministers are becoming lax in their duty to Odin and adorn themselves with the splendors of the world.";
-			next;
-			mes "[Praying Minister]";
-			mes "If you see any of these ministers, can you ask to them to go to the church in prontera?";
-			next;
-			mes "[Praying Minister]";
-			mes "They give out a special aura so you can easily recognize them.";
-			mes "I'm going to make them ministers worthy of serving Odin.";
-			close;
-		}
 		if ((BaseLevel == 99) && (JobLevel > 49)) {
 			if (job_arch == 0) {
 				if (SkillPoint) {
@@ -818,13 +800,7 @@ OnInit:
 }
 
 job3_arch01,29,34,3	script	Valkyrie#arch	403,{
-	if (Upper == 2) {
-		mes "[Valkyrie]";
-		//Custom translation
-		mes "You are only a child.";
-		mes "My job is very difficult, I do not need to tollerate a child's joke. Away with you!";
-		close;
-	}
+
 	if(checkweight(1201,1) == 0){
 		//Custom translation
 		mes "- bags must be emptied before they can proceed. -";
@@ -859,7 +835,7 @@ job3_arch01,29,34,3	script	Valkyrie#arch	403,{
 		mes "- you put some items into Kafra Storage. -";
 		close;
 	}
-	if ((Class != Job_Priest) && (Class != Job_High_Priest)) {
+	if ((Class != Job_Priest) && (Class != Job_High_Priest) && (Class != Job_Baby_Priest)) {
 		warp "odin_tem02",282,263;
 		end;
 	}
@@ -1423,7 +1399,10 @@ OnTouch:
 	completequest 2191;
 	getitem 5747,1; //Mitra
 	getitem 2795,1; //Green_Apple_Ring
-	if (Class == Job_Priest) {
+	if(Class == Job_Baby_Priest){
+		jobchange Job_Baby_Bishop;
+	}
+	else if (Class == Job_Priest) {
 		jobchange Job_Archbishop;
 	}
 	else {
diff --git a/npc/jobs/3-1/mechanic.txt b/npc/jobs/3-1/mechanic.txt
index d24f1b0e0..a61a9a555 100644
--- a/npc/jobs/3-1/mechanic.txt
+++ b/npc/jobs/3-1/mechanic.txt
@@ -16,20 +16,6 @@
 
 yuno,129,156,3	script	Chainheart	923,{
 
-	if (Upper == 2)
-	{
-		mes "[Chainheart]";
-		mes "Huh? This is not place for Children. Children,";
-		mes "you should stay with your mom and dad.";
-		mes "You shouldn't wander around.";
-		next;
-		mes "[Chainheart]";
-		mes "Truth or technology?";
-		mes "Perhaps you children should wait";
-		mes "till you are a little older.";
-		close;
-	}
-
 	if(BaseLevel > 99)
 	{
 		mes "[Chainheart]";
@@ -50,7 +36,7 @@ yuno,129,156,3	script	Chainheart	923,{
 	}
 	if(job__mechanic == 11)
 	{
-		if((Class == Job_Blacksmith || Class == Job_Whitesmith) && (JobLevel > 49) && (SkillPoint == 0) && (BaseLevel > 98))
+		if((Class == Job_Blacksmith || Class == Job_Whitesmith || Job_Baby_Blacksmith) && (JobLevel > 49) && (SkillPoint == 0) && (BaseLevel > 98))
 		{
 			mes "[Chainheart]";
 			mes "What is it? Is that you?";
@@ -96,7 +82,10 @@ yuno,129,156,3	script	Chainheart	923,{
 				getitem 5760,1; //Driver_Band_
 			}
 			getitem 2795,1; //Green_Apple_Ring
-			if(Class == Job_Blacksmith) {
+			if(Class == Job_Baby_Blacksmith){
+				jobchange Job_Baby_Mechanic;
+			}
+			else if(Class == Job_Blacksmith) {
 				jobchange Job_Mechanic;
 			} else if(Class == Job_Whitesmith) {
 				jobchange Job_Mechanic_T;
@@ -246,7 +235,7 @@ yuno,129,156,3	script	Chainheart	923,{
 		mes "Anyway if you become one of us you can form your own definition and explanation of Mechanics yourself.";
 		close;
 	}
-	if (Class == Job_Blacksmith || Class == Job_Whitesmith)
+	if (Class == Job_Blacksmith || Class == Job_Whitesmith || Class == Job_Baby_Blacksmith)
 	{
 		if ((JobLevel > 49) && (SkillPoint == 0) && (BaseLevel > 98))
 		{
diff --git a/npc/jobs/3-1/ranger.txt b/npc/jobs/3-1/ranger.txt
index c66af34cf..63df1b7f7 100644
--- a/npc/jobs/3-1/ranger.txt
+++ b/npc/jobs/3-1/ranger.txt
@@ -22,22 +22,10 @@
 
 tur_dun01,156,36,5	script	Survival Instructor#jr01	59,{
 
-	if (Class == Job_Hunter || Class == Job_Sniper)
+	if (Class == Job_Hunter || Class == Job_Sniper || Class == Job_Baby_Hunter)
 	{
 		if (job_ranger01 < 1)
 		{
-			if (Class >= 4022 && Class <= 4045)
-			{
-				mes "[Survival Instructor, Rescue]";
-				mes "The weather is really great.";
-				next;
-				mes "[Survival Instructor, Rescue]";
-				mes "What are you kids doing here?";
-				mes "The monsters here are a";
-				mes "little tough so be careful.";
-				mes "And stay close to your parents!";
-				close;
-			}
 			mes "[Survival Instructor, Rescue]";
 			mes "The weather is really great.";
 			next;
@@ -93,7 +81,7 @@ tur_dun01,156,36,5	script	Survival Instructor#jr01	59,{
 			mes "[Survival Instructor, Rescue]";
 			mes "For the second qualification to judge one's ability exactly, you need to lighten your body and mind.";
 			next;
-			if (Class == Job_Hunter)
+			if (Class == Job_Hunter || Class == Job_Baby_Hunter)
 			{
 				mes "[Survival Instructor, Rescue]";
 				mes "Ah wait, before that.";
@@ -382,7 +370,7 @@ tur_dun01,156,36,5	script	Survival Instructor#jr01	59,{
 
 tur_dun01,91,169,3	script	Test Instructor#jr02	732,{
 
-	if (Class == Job_Hunter || Class == Job_Sniper)
+	if (Class == Job_Hunter || Class == Job_Sniper || Class == Job_Baby_Hunter)
 	{
 		if (job_ranger01 < 3)
 		{
@@ -3017,7 +3005,32 @@ job3_rang01,90,43,3	script	Ranger Master#jr_29	832,{
 		case 2:
 			break;
 		}
-		if (Class == Job_Hunter)
+		if(Class == Job_Baby_Hunter){
+			mes "[Ranger Master, Neveragain]";
+			mes "Your firm answer seems very trustworthy!";
+			next;
+			nude;
+			if (countitem(1703) > 0)
+			{
+				mes "[Ranger Master, Neveragain]";
+				mes "From now on be active as a splendid Ranger!";
+				mes "I wish you luck in your future!";
+				delitem 1703,1;
+				set job_ranger01,7;
+				completequest 8262;
+				jobchange Job_Baby_Ranger;
+				getitem 5748,1;
+				getitem 2795,1;
+				getitem 6124,1;
+				close;
+			}
+			mes "[Ranger Master, Neveragain]";
+			mes "...However,";
+			mes "You have to return your test items.";
+			mes "What did you do with your testing Bow?";
+			close;
+		}
+		else if (Class == Job_Hunter)
 		{
 			mes "[Ranger Master, Neveragain]";
 			mes "Your firm answer seems very trustworthy!";
@@ -3031,7 +3044,7 @@ job3_rang01,90,43,3	script	Ranger Master#jr_29	832,{
 				delitem 1703,1;
 				set job_ranger01,7;
 				completequest 8262;
-				jobchange 4056;
+				jobchange Job_Ranger;
 				getitem 5748,1;
 				getitem 2795,1;
 				getitem 6124,1;
@@ -3056,7 +3069,7 @@ job3_rang01,90,43,3	script	Ranger Master#jr_29	832,{
 				delitem 1703,1;
 				set job_ranger01,7;
 				completequest 8262;
-				jobchange 4062;
+				jobchange Job_Ranger_T;
 				getitem 5748,1;
 				getitem 2795,1;
 				getitem 6124,1;
diff --git a/npc/jobs/3-1/rune_knight.txt b/npc/jobs/3-1/rune_knight.txt
index c2720d30a..566513ad2 100644
--- a/npc/jobs/3-1/rune_knight.txt
+++ b/npc/jobs/3-1/rune_knight.txt
@@ -16,142 +16,124 @@
 //============================================================
 
 prt_in,162,24,3	script	Splendid-Looking Knight	470,{
-	if (Upper == 4) {
-		// custom translation
+
+	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
+		mes "[Rune Knight Manuel]";
+		mes "Your are now a member of our select brethren. I can still remember when I first met you.";
+		next;
 		mes "[Rune Knight Manuel]";
-		mes "You're certainly a big child. Where are your parents?";
+		mes "Strive to live the way of the sword with honor...";
 		next;
 		mes "[Rune Knight Manuel]";
-		mes "Your parents wouldn't happen to be a Knight, or Rune Knight, would they? You should introduce me to them.";
+		mes "Cheers to our new future...";
 		close;
 	}
-	else {
-		if (BaseClass == Job_Rune_Knight) {
-			mes "[Rune Knight Manuel]";
-			mes "Your are now a member of our select brethren. I can still remember when I first met you.";
-			next;
-			mes "[Rune Knight Manuel]";
-			mes "Strive to live the way of the sword with honor...";
-			next;
-			mes "[Rune Knight Manuel]";
-			mes "Cheers to our new future...";
-			close;
-		}
-		else {
-			if (job_rune_edq == 0) {
+	if (job_rune_edq == 0) {
+		mes "[Rune Knight Manuel]";
+		mes "There are many paths one can take in the world. Most people can see their path but don't really follow it...";
+		next;
+		mes "[Rune Knight Manuel]";
+		mes "Anyway the drinks here are really good. Would you like to have one?";
+		next;
+		switch(select("Sure, let's have a drink.:I refuse.")) {
+		case 1:
+			if (Class == Job_Knight || Class == Job_Lord_Knight || Class == Job_Baby_Knight) {
 				mes "[Rune Knight Manuel]";
-				mes "There are many paths one can take in the world. Most people can see their path but don't really follow it...";
+				mes "You walk the way of sword too don't you? Then we can understand each other. Drinks taste better when it's with a fellow Swordman.";
 				next;
 				mes "[Rune Knight Manuel]";
-				mes "Anyway the drinks here are really good. Would you like to have one?";
+				mes "I'll buy this round.";
+				mes "A toast to friendship~";
 				next;
-				switch(select("Sure, let's have a drink.:I refuse.")) {
-				case 1:
-					if (BaseJob == Job_Knight) {
+				if ((BaseLevel > 98) && (JobLevel > 49)) {
+					mes "[Rune Knight Manuel]";
+					mes "In my opinion you seem to be ready to start a new way...";
+					next;
+					mes "[Rune Knight Manuel]";
+					mes "Walking the way of the sword is a perpetual battle. From now on you may have a rough journey ahead of you...";
+					next;
+					mes "[Rune Knight Manuel]";
+					mes "If you want to walk on your new way and surpass your current limits, I'm willing to help you.";
+					next;
+					mes "[Rune Knight Manuel]";
+					mes "The true way of a Swordman who learned harmony to break the limit of a sword is a Rune Knight.";
+					next;
+					mes "[Rune Knight Manuel]";
+					mes "Won't you join our brethren? You look like you're fully qualified to become one of us.";
+					next;
+					mes "[Rune Knight Manuel]";
+					mes "If you are interested, I'll introduce you to the masters who will guide you to the way of the Rune Knight with my recommendation.";
+					next;
+					switch(select("I am not ready yet.:I'm ready to be a Rune Knight.")) {
+					case 1:
 						mes "[Rune Knight Manuel]";
-						mes "You walk the way of sword too don't you? Then we can understand each other. Drinks taste better when it's with a fellow Swordman.";
+						mes "Right. Every challenge always needs preparation. Okay, I'll wait for you.";
 						next;
 						mes "[Rune Knight Manuel]";
-						mes "I'll buy this round.";
-						mes "A toast to friendship~";
+						mes "Of course, I would only accept you if you are one hundred percent sure of your conviction to become a Rune Knight.";
+						close;
+					case 2:
+						mes "[Rune Knight Manuel]";
+						mes "You're sure now?";
+						mes "Let me send a dispatch to my comrades that you are willing to join our ranks.";
 						next;
-						if ((BaseLevel > 98) && (JobLevel > 49)) {
-							mes "[Rune Knight Manuel]";
-							mes "In my opinion you seem to be ready to start a new way...";
-							next;
-							mes "[Rune Knight Manuel]";
-							mes "Walking the way of the sword is a perpetual battle. From now on you may have a rough journey ahead of you...";
-							next;
-							mes "[Rune Knight Manuel]";
-							mes "If you want to walk on your new way and surpass your current limits, I'm willing to help you.";
-							next;
-							mes "[Rune Knight Manuel]";
-							mes "The true way of a Swordman who learned harmony to break the limit of a sword is a Rune Knight.";
-							next;
-							mes "[Rune Knight Manuel]";
-							mes "Won't you join our brethren? You look like you're fully qualified to become one of us.";
-							next;
-							mes "[Rune Knight Manuel]";
-							mes "If you are interested, I'll introduce you to the masters who will guide you to the way of the Rune Knight with my recommendation.";
-							next;
-							switch(select("I am not ready yet.:I'm ready to be a Rune Knight.")) {
-							case 1:
-								mes "[Rune Knight Manuel]";
-								mes "Right. Every challenge always needs preparation. Okay, I'll wait for you.";
-								next;
-								mes "[Rune Knight Manuel]";
-								mes "Of course, I would only accept you if you are one hundred percent sure of your conviction to become a Rune Knight.";
-								close;
-							case 2:
-								mes "[Rune Knight Manuel]";
-								mes "You're sure now?";
-								mes "Let me send a dispatch to my comrades that you are willing to join our ranks.";
-								next;
-								set job_rune_edq,1;
-								setquest 3200;
-								mes "[Rune Knight Manuel]";
-								mes "You know the place called Glast Heim? There's a Rune Knight waiting for you there, he will guide you to the entrance of Glast Heim Tower.";
-								next;
-								mes "[Rune Knight Manuel]";
-								mes "My name is Manuel. I am called the Rune Knight of Brilliance. When you tell him that you are a Rune Knight candidate with my recommendation, he will handle the rest.";
-								next;
-								mes "[Rune Knight Manuel]";
-								mes "I will wait for the day that you become our comrade as a true Rune Knight.";
-								close;
-							}
-						}
-						else {
-							mes "[Rune Knight Manuel]";
-							mes "If you continually walk the way of the sword, you will eventually feel the limits of your powers. Like myself before...";
-							next;
-							mes "[Rune Knight Manuel]";
-							mes "When the time comes there will be a way to help you surpass that limit. Until the day that your strength has grown comes, we can at least still have a drink together.";
-							next;
-							mes "[Rune Knight Manuel]";
-							mes "A toast to the day that your strength can withstand the powers of a Rune Knight!";
-							close;
-						}
-					}
-					else {
+						set job_rune_edq,1;
+						setquest 3200;
 						mes "[Rune Knight Manuel]";
-						mes "I believe that the wind of change is not always a good one.";
+						mes "You know the place called Glast Heim? There's a Rune Knight waiting for you there, he will guide you to the entrance of Glast Heim Tower.";
 						next;
 						mes "[Rune Knight Manuel]";
-						mes "Just like the taste of this drink. I wish the taste of this drink is kept here forever.";
+						mes "My name is Manuel. I am called the Rune Knight of Brilliance. When you tell him that you are a Rune Knight candidate with my recommendation, he will handle the rest.";
+						next;
+						mes "[Rune Knight Manuel]";
+						mes "I will wait for the day that you become our comrade as a true Rune Knight.";
 						close;
 					}
-				case 2:
-					mes "[Rune Knight Manuel]";
-					mes "Are you sure? You don't know the true elegance of these drinks...";
-					close;
 				}
-			}
-			else if (job_rune_edq == 1) {
-				mes "[Rune Knight Manuel]";
-				mes "The Rune Knight is waiting for you at Glast Heim. He will guide you to the entrance of Glast Heim Tower.";
-				next;
 				mes "[Rune Knight Manuel]";
-				mes "Tell him that you are a candidate to be a Rune Knight and he will handle the rest.";
+				mes "If you continually walk the way of the sword, you will eventually feel the limits of your powers. Like myself before...";
 				next;
 				mes "[Rune Knight Manuel]";
-				mes "I will wait for the day you become our comrade as a true Rune Knight.";
-				close;
-			}
-			else {
-				mes "[Rune Knight Manuel]";
-				mes "Don't you have things to do right now?";
+				mes "When the time comes there will be a way to help you surpass that limit. Until the day that your strength has grown comes, we can at least still have a drink together.";
 				next;
 				mes "[Rune Knight Manuel]";
-				mes "No? Well then never mind.";
-				mes "Don't you love the smell of alcohol?";
+				mes "A toast to the day that your strength can withstand the powers of a Rune Knight!";
 				close;
 			}
+			mes "[Rune Knight Manuel]";
+			mes "I believe that the wind of change is not always a good one.";
+			next;
+			mes "[Rune Knight Manuel]";
+			mes "Just like the taste of this drink. I wish the taste of this drink is kept here forever.";
+			close;
+		case 2:
+			mes "[Rune Knight Manuel]";
+			mes "Are you sure? You don't know the true elegance of these drinks...";
+			close;
 		}
 	}
+	if (job_rune_edq == 1) {
+		mes "[Rune Knight Manuel]";
+		mes "The Rune Knight is waiting for you at Glast Heim. He will guide you to the entrance of Glast Heim Tower.";
+		next;
+		mes "[Rune Knight Manuel]";
+		mes "Tell him that you are a candidate to be a Rune Knight and he will handle the rest.";
+		next;
+		mes "[Rune Knight Manuel]";
+		mes "I will wait for the day you become our comrade as a true Rune Knight.";
+		close;
+	}
+	mes "[Rune Knight Manuel]";
+	mes "Don't you have things to do right now?";
+	next;
+	mes "[Rune Knight Manuel]";
+	mes "No? Well then never mind.";
+	mes "Don't you love the smell of alcohol?";
+	close;
 }
 
 glast_01,44,363,3	script	Guide, Jungberg	468,{
-	if (BaseClass == Job_Rune_Knight) {
+	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "[Guide, Jungberg]";
 		mes "Oh you must be, " + strcharinfo(0) + ".";
 		mes "Welcome.";
@@ -173,7 +155,7 @@ glast_01,44,363,3	script	Guide, Jungberg	468,{
 			close;
 		}
 	}
-	else if (BaseJob == Job_Knight) {
+	else if (Class == Job_Knight || Class == Job_Lord_Knight || Class == Job_Baby_Knight) {
 		if (job_rune_edq == 0) {
 			mes "[Guide, Jungberg]";
 			mes "Are you a cursed ghost of this place? Or are you an ignorant adventurer?";
@@ -183,7 +165,7 @@ glast_01,44,363,3	script	Guide, Jungberg	468,{
 			next;
 			switch(select("Who are you?:What are you doing here?:Cancel.")) {
 			case 1:
-				if (BaseJob == Job_Knight) {
+				if (Class == Job_Knight || Class == Job_Lord_Knight || Class == Job_Baby_Knight) {
 					mes "[Guide, Jungberg]";
 					mes "I am the only knight who's keeping the way of the Swordman in this cursed place Glast Heim.";
 					next;
@@ -200,7 +182,7 @@ glast_01,44,363,3	script	Guide, Jungberg	468,{
 					close;
 				}
 			case 2:
-				if (BaseJob == Job_Knight) {
+				if (Class == Job_Knight || Class == Job_Lord_Knight || Class == Job_Baby_Knight) {
 					mes "[Guide, Jungberg]";
 					mes "I am a man walking the way of the Sword. But I'm not exactly the same as the likes of you, Rune-Midgart knight.";
 					next;
@@ -320,7 +302,7 @@ glast_01,44,363,3	script	Guide, Jungberg	468,{
 }
 
 gl_knt02,150,55,3	script	Rune Knight Staff	83,{
-	if (BaseClass == Job_Rune_Knight) {
+	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "[Rune Knight Staff]";
 		mes "Welcome, " + strcharinfo(0) + ". Are you going to the gathering place?";
 		next;
@@ -339,7 +321,7 @@ gl_knt02,150,55,3	script	Rune Knight Staff	83,{
 			close;
 		}
 	}
-	else if (BaseJob == Job_Knight) {
+	else if (Class == Job_Knight || Class == Job_Lord_Knight || Class == Job_Baby_Knight) {
 		if ((job_rune_edq > 0) && (job_rune_edq < 2)) {
 			// custom translation
 			mes "[Rune Knight Staff]";
@@ -379,7 +361,7 @@ job3_rune01,80,60,3	script	Rune Knight Captain	470,{
 		mes "You've got too many things. You cannot proceed anymore. Please try again after losing some weight.";
 		close;
 	}
-	if (BaseClass == Job_Rune_Knight) {
+	if (BaseJob == Job_Swordman) {
 		if (job_rune_edq == 23) {
 			mes "[Captain Tigris]";
 			mes "Oh, I see... Please wait a moment.";
@@ -429,7 +411,7 @@ job3_rune01,80,60,3	script	Rune Knight Captain	470,{
 			close;
 		}
 	}
-	else if (BaseJob == Job_Knight) {
+	else if (Class == Job_Knight || Class == Job_Lord_Knight || Class == Job_Baby_Knight) {
 		if (job_rune_edq == 2) {
 			mes "A man wearing glorious armor and passion in his eyes is standing in front of me.";
 			next;
@@ -655,7 +637,13 @@ job3_rune01,80,60,3	script	Rune Knight Captain	470,{
 					getitem 2795,1; //Green_Apple_Ring
 					set job_rune_edq,23;
 					completequest 3219;
-					jobchange Job_Rune_Knight,Upper;
+					if(Class == Job_Baby_Knight){
+						jobchange Job_Baby_Rune;
+					} else if(Class == Job_Knight){
+						jobchange Job_Rune_Knight;
+					} else {
+						jobchange Job_Rune_Knight_T;
+					}
 					mes "[Captain Tigris]";
 					mes "Remember this moment forever for you are now a Rune Knight.";
 					next;
@@ -685,13 +673,13 @@ job3_rune01,80,60,3	script	Rune Knight Captain	470,{
 }
 
 job3_rune01,90,50,3	script	Rune Knight Lunarea	469,{
-	if (BaseClass == Job_Rune_Knight) {
+	if (BaseJob != Job_Swordman) {
 		mes "She holds up her chin quietly, nods lightly and notices me.";
 		next;
 		mes "Then after a moment she puts her face down and seems absorbed with other thoughts.";
 		close;
 	}
-	else if (BaseJob == Job_Knight) {
+	else if (Class == Job_Knight || Class == Job_Lord_Knight || Class == Job_Baby_Knight) {
 		if (job_rune_edq < 3) {
 			mes "This pale-skinned absent-looking female Rune Knight doesn't seem to care. Of course she doesn't seem interested with my existence";
 			close;
@@ -855,7 +843,7 @@ job3_rune01,90,50,3	script	Rune Knight Lunarea	469,{
 }
 
 job3_rune01,55,50,3	script	Rune Knight, Renoa	469,{
-	if (BaseClass == Job_Rune_Knight) {
+	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "[Rune Knight, Renoa]";
 		mes "Congratulations for becoming one of us. Junior Rune Knight, " + strcharinfo(0) + ".";
 		next;
@@ -866,7 +854,7 @@ job3_rune01,55,50,3	script	Rune Knight, Renoa	469,{
 		mes "Until then, I'll be here to discover more candidates just like you.";
 		close;
 	}
-	else if (BaseJob == Job_Knight) {
+	else if (Class == Job_Knight || Class == Job_Lord_Knight || Class == Job_Baby_Knight) {
 		if (job_rune_edq < 7) {
 			mes "[Rune Knight, Renoa]";
 			mes "Are you the one who wants to be a Rune Knight? There have been so many today.";
@@ -2335,7 +2323,7 @@ job3_rune01,50,36,1	script	Runes, Make & Use	844,{
 }
 
 mid_camp,238,250,3	script	Rune Knight Sage Guard	468,{
-	if (BaseClass == Job_Rune_Knight) {
+	if (BaseJob != Job_Swordman) {
 		mes "[Rune Knight Sage Guard]";
 		mes "The sage Serpeone is the one who has been with us since the beginning of the Rune Knights.";
 		next;
@@ -2343,7 +2331,7 @@ mid_camp,238,250,3	script	Rune Knight Sage Guard	468,{
 		mes "I am very proud as a Rune Knight to serve beside her.";
 		close;
 	}
-	else if (BaseJob == Job_Knight) {
+	else if (Class == Job_Knight || Class == Job_Lord_Knight || Class == Job_Baby_Knight) {
 		if (job_rune_edq < 11) {
 			mes "[Rune Knight Sage Guard]";
 			mes "You might be walking the way of the sword but you are not a Rune Knight yet. Don't wander around here too much if you know what I mean.";
@@ -2369,12 +2357,12 @@ mid_camp,238,250,3	script	Rune Knight Sage Guard	468,{
 }
 
 mid_camp,13,138,3	script	Dispatched Rune Knight#1	83,{
-	if (BaseClass == Job_Rune_Knight) {
+	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "[Dispatch Rune Knight Agent]";
 		mes "Thanks for your work. We will continue our mission for the Rune Knight testers.";
 		close;
 	}
-	else if (BaseJob == Job_Knight) {
+	else if (Class == Job_Knight || Class == Job_Lord_Knight || Class == Job_Baby_Knight) {
 		if (job_rune_edq < 11) {
 			mes "[Dispatch Rune Knight Agent]";
 			mes "Shh... Our mission is not something to be revealed to the public. Please just move along.";
@@ -2420,12 +2408,12 @@ OnTouch:
 }
 
 spl_fild01,361,327,3	script	Dispatched Rune Knight#2	83,{
-	if (BaseClass == Job_Rune_Knight) {
+	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "[Dispatch Rune Knight Agent]";
 		mes "Thanks for your work. We will continue our mission for the Rune Knight testers.";
 		close;
 	}
-	else if (BaseJob == Job_Knight) {
+	else if (Class == Job_Knight || Class == Job_Lord_Knight || Class == Job_Baby_Knight) {
 		if (job_rune_edq < 11) {
 			mes "[Dispatch Rune Knight Agent]";
 			mes "Shh... Our mission is not something to be revealed to the public. Please just move along.";
@@ -2455,7 +2443,7 @@ spl_fild01,361,327,3	script	Dispatched Rune Knight#2	83,{
 }
 
 mid_camp,235,250,3	script	Sage Serpeone	435,{
-	if (BaseClass == Job_Rune_Knight) {
+	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "[Sage Serpeone]";
 		mes "Finally you are an honorable Rune Knight. I'm happy to help you.";
 		next;
@@ -2466,7 +2454,7 @@ mid_camp,235,250,3	script	Sage Serpeone	435,{
 		mes "Please be devoted to the Runes and hopefully your life will be illuminated by it.";
 		close;
 	}
-	else if (BaseJob == Job_Knight) {
+	else if (Class == Job_Knight || Class == Job_Lord_Knight || Class == Job_Baby_Knight) {
 		if (job_rune_edq < 12) {
 			mes "[Sage Serpeone]";
 			mes "It must be surprising that I, a Laphine, am here in your people's base.";
@@ -2662,12 +2650,12 @@ job3_rune01,114,50,3	script	Rune Knight Velpino	468,{
 	set .@strRetPart8,getequipisequiped(EQI_ACC_R);
 	set .@strRetPart10,getequipisequiped(EQI_HEAD_MID);
 	set .@strRetPart11,getequipisequiped(EQI_HEAD_LOW);
-	if (BaseClass == Job_Rune_Knight) {
+	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) {
 		mes "[Rune Knight Velpino]";
 		mes "You still smell like a fledging. Bring honor to the Rune Knights and raise your power...";
 		close;
 	}
-	else if (BaseJob == Job_Knight) {
+	else if (Class == Job_Knight || Class == Job_Lord_Knight || Class == Job_Baby_Knight) {
 		if (job_rune_edq < 17) {
 			mes "A very cold feeling Rune Knight dressed in black from head to toe is scowling at me.";
 			next;
diff --git a/npc/jobs/3-1/warlock.txt b/npc/jobs/3-1/warlock.txt
index 2442de507..7a0f35fa9 100644
--- a/npc/jobs/3-1/warlock.txt
+++ b/npc/jobs/3-1/warlock.txt
@@ -21,13 +21,8 @@
 morocc,103,144,0	script	distorted place morroc	139,1,1,{
 
 OnTouch:
-	if (Class >= 4023 && Class <= 4045){
-		mes " - I can feel a strange distortion around me - ";
-		close;
-	}
-
 	if (job_wl > 1){
-		if (Class == Job_Warlock || Class == Job_Warlock_T){
+		if (Class == Job_Warlock || Class == Job_Warlock_T || Job_Baby_Warlock){
 			mes " - There is a strange distortion here - ";
 			close;
 		}
@@ -44,7 +39,7 @@ OnTouch:
 			close;
 		}
 	}
-	if (BaseLevel > 94 && Class == Job_Wizard || Class == Job_High_Wizard){
+	if (BaseLevel > 94 && Class == Job_Wizard || Class == Job_High_Wizard || Class == Job_Baby_Wizard){
 		mes " - There is a strange distortion here - ";
 		next;
 		switch(select( "Search the area.:Ignore it.")){
@@ -72,10 +67,6 @@ OnTouch:
 splendide,141,284,0	script	Distorted place molco	139,1,1,{
 
 OnTouch:
-	if (Class >= 4023 && Class <= 4045){
-		mes " - I can feel a strange distortion around me - ";
-		close;
-	}
 	if (job_wl > 1){
 		mes " - There is a strange - ";
 		mes "- distortion here -";
@@ -119,7 +110,7 @@ OnTouch:
 spl_in02,77,107,5	script	Assistant#Warlock	446,{
 
 	if (job_wl < 1){
-		if (Class == Job_Wizard || Class == Job_High_Wizard){
+		if (Class == Job_Wizard || Class == Job_High_Wizard || Class == Job_Baby_Wizard){
 			mes "[Assistant]";
 			mes "Huh!!! Human!?!";
 			mes "How did you enter here?";
@@ -602,7 +593,7 @@ spl_in02,60,231,5	script	Yoop#Warlock	446,{
 spl_in02,84,103,3	script	Assistant#Warlock2	445,{
 
 	if (job_wl < 1){
-		if (Class == Job_Wizard || Class == Job_High_Wizard){
+		if (Class == Job_Wizard || Class == Job_High_Wizard || Class == Job_Baby_Wizard){
 			mes "[Assistant]";
 			mes "Huh!!! Human!?!";
 			mes "How did you enter here?";
@@ -888,7 +879,7 @@ spl_in02,84,103,3	script	Assistant#Warlock2	445,{
 spl_in02,78,110,5	script	Assistant#Warlock3	443,{
 
 	if (job_wl < 1){
-		if (Class == Job_Wizard || Class == Job_High_Wizard){
+		if (Class == Job_Wizard || Class == Job_High_Wizard || Class == Job_Baby_Wizard){
 			mes "[Assistant]";
 			mes "Huh!!! Human!?!";
 			mes "How did you enter here?";
@@ -1129,7 +1120,7 @@ spl_in02,78,110,5	script	Assistant#Warlock3	443,{
 spl_in02,80,108,5	script	Guild Master#Warlock	465,{
 
 	if (job_wl < 1){
-		if (Class == Job_Wizard || Class == Job_High_Wizard){
+		if (Class == Job_Wizard || Class == Job_High_Wizard || Class == Job_Baby_Wizard){
 			mes "[Assistant]";
 			mes "Huh!!! Human!?!";
 			mes "How did you enter here?";
@@ -1417,6 +1408,24 @@ spl_in02,80,108,5	script	Guild Master#Warlock	465,{
 				mes "Unless you like being your current job, you should use all your skill points.";
 				close;
 			}
+			if (Class == Job_Baby_Wizard){
+				mes "[Master Egnoloria]";
+				mes "Beautiful light...";
+				mes "Don't make me disappointed at you...";
+				next;
+				mes "[Master Egnoloria]";
+				mes "You have become a member of the Warlocks.";
+				mes "Be proud.";
+				next;
+				mes "[Master Egnoloria]";
+				mes "This crystallized magical stone will keep you safe.";
+				set job_wl,10;
+				jobchange Job_Baby_Warlock;
+				completequest 11112;
+				getitem 5753,1; //Magic_Stone_Hat
+				getitem 2795,1; //Green_Apple_Ring
+				close;
+			}
 			if (Class == Job_Wizard){
 				mes "[Master Egnoloria]";
 				mes "Beautiful light...";
diff --git a/npc/jobs/3-2/genetic.txt b/npc/jobs/3-2/genetic.txt
index 68011fa89..ff8503e1b 100644
--- a/npc/jobs/3-2/genetic.txt
+++ b/npc/jobs/3-2/genetic.txt
@@ -17,23 +17,8 @@
 
 alde_alche,35,186,5	script	Alchemist Union Member	805,{
 
-	if ((Class >= 4023) && (Class <= 4045)){
-		mes "[Alchemist Union Member]";
-		mes "Our Alchemist Union brings up many junior alchemists with various promotions and investigations.";
-		next;
-		mes "[Alchemist Union Member]";
-		mes "They have spread to all corners of Rune-Midgart and were active in many fields like sciences or special item production methods.";
-		next;
-		mes "[Alchemist Union Member]";
-		mes "We call the members of our new union ^3131FF'Geneticists'^000000.";
-		next;
-		mes "[Alchemist Union Member]";
-		mes "Geneticists are the ones who have reached their peak potential in the world of Alchemy. They are the ones who currently spearhead alchemy throughout all of Rune-Midgart.";
-		close;
-	}
-
 	if ((BaseLevel == 99) && (JobLevel > 49)){
-		if (Class == Job_Alchemist || Class == Job_Creator){
+		if (Class == Job_Alchemist || Class == Job_Creator || Job_Baby_Alchemist){
 			if (SkillPoint == 0){
 				if (job_gen == 0){
 					mes "[Alchemist Union Member]";
@@ -563,7 +548,7 @@ job3_gen01,25,58,3	script	Devries#gen	865,{
 			mes "Bubbles!";
 			mes "Good news!";
 			next;
-			if (Class == Job_Alchemist || Class == Job_Creator && ((JobLevel > 49) && (SkillPoint == 0) && (BaseLevel > 98))){
+			if (Class == Job_Alchemist || Class == Job_Creator || Job_Baby_Alchemist && ((JobLevel > 49) && (SkillPoint == 0) && (BaseLevel > 98))){
 				if (checkcart() == 0){
 					mes "[Devries]";
 					mes "Put that heavy and dirty cart away. On such a happy moment, that thing will just ruin it.";
@@ -606,7 +591,10 @@ job3_gen01,25,58,3	script	Devries#gen	865,{
 				mes "[Devries]";
 				mes "Congratulations, Bubbles";
 				mes "From now on, you are a Geneticist!!";
-				if (Class == Job_Alchemist){
+				if(Class == Job_Baby_Alchemist){
+					jobchange Job_Baby_Genetic;
+				}
+				else if (Class == Job_Alchemist){
 					jobchange Job_Genetic;
 				} else {
 					jobchange Job_Genetic_T;
diff --git a/npc/jobs/3-2/minstrel.txt b/npc/jobs/3-2/minstrel.txt
index 9d23b507c..d6cef4d08 100644
--- a/npc/jobs/3-2/minstrel.txt
+++ b/npc/jobs/3-2/minstrel.txt
@@ -17,18 +17,8 @@
 
 alberta,196,133,4	script	Bard#job_min	486,{
 
-	if ((Class >= 4023) && (Class <= 4045)){
-		mes "[Bard]";
-		mes "Youngling~ On the sea, you should be careful!";
-		mes "There are terrible monsters there.";
-		next;
-		mes "[Bard]";
-		mes "I've heard that they eat people!";
-		close;
-	}
-
 	if (job_min == 0){
-		if (Class == Job_Bard || Class == Job_Clown){
+		if (Class == Job_Bard || Class == Job_Clown || Class == Job_Baby_Bard){
 			if ((BaseLevel > 98) && (JobLevel > 49)){
 				mes "[Bard]";
 				mes "The voice of heaven revolves around in my ears";
@@ -547,7 +537,7 @@ hu_in01,361,103,3	script	Tone-deaf person	995,{
 		mes "Lalala...";
 		mes "......!!";
 		next;
-		if (Class == Job_Bard){
+		if (Class == Job_Bard || Class == Job_Baby_Bard){
 			mes "[Tone-deaf person]";
 			mes "Hum!! Hey you, you were listening to my song.";
 			mes "You look like a Bard, how about you sing for me as rewarding my song?";
@@ -2447,11 +2437,6 @@ OnTouch:
 			mes "You should use them.";
 			close;
 		}
-		if ((Class >= 4023) && (Class <= 4045)){
-			mes "[Karian]";
-			mes "Why... Why are you so little?";
-			close;
-		}
 		if(checkweight(1201,1) == 0){
 			mes "^3355FFWait a minute! You're";
 			mes "carrying too many items";
@@ -2466,7 +2451,7 @@ OnTouch:
 			mes "How did you lose levels?";
 			close;
 		}
-		if (Class == Job_Bard || Class == Job_Clown){
+		if (Class == Job_Bard || Class == Job_Clown || Class == Job_Baby_Bard){
 			mes "["+strcharinfo(0)+"]";
 			mes "-It's a poem that you picked up in the desert.-";
 			next;
@@ -2493,11 +2478,6 @@ OnTouch:
 
 prt_in,94,172,4	script	Karian#job_min3	480,{
 
-if ((Class >= 4023) && (Class <= 4045)){
-	mes "[Karian]";
-	mes "Why... Why are you so little?";
-	close;
-}
 if(job_min >= 27)
 {
 	if (job_min > 99){
@@ -2552,7 +2532,7 @@ if(job_min >= 27)
 		mes "You should use them.";
 		close;
 	}
-	if (Class == Job_Bard || Class == Job_Clown){
+	if (Class == Job_Bard || Class == Job_Clown || Class == Job_Baby_Bard){
 		mes "[Karian]";
 		mes "I'm sorry about the lie.";
 		mes "The song written on this paper...";
@@ -2579,7 +2559,16 @@ if(job_min >= 27)
 		mes "[Maestro Song]";
 		mes "This is my present to you.";
 		next;
-		if (Class == Job_Bard){
+		if (Class == Job_Baby_Bard){
+			mes "[Maestro Song]";
+			mes "You are also my friend.";
+			set job_min,100;
+			jobchange Job_Baby_Minstrel;
+			completequest 11154;
+			getitem 5751,1;
+			getitem 2795,1;
+			close;
+		}if (Class == Job_Bard){
 			mes "[Maestro Song]";
 			mes "You are also my friend.";
 			set job_min,100;
diff --git a/npc/jobs/3-2/royal_guard.txt b/npc/jobs/3-2/royal_guard.txt
index 1dd0222d5..a7dc7591e 100644
--- a/npc/jobs/3-2/royal_guard.txt
+++ b/npc/jobs/3-2/royal_guard.txt
@@ -21,12 +21,7 @@ prt_castle,48,163,3	script	Gentleman#4386457567	57,{
 		mes "You have too much items, please make more light.";
 		close;
 	}
-	if(upper == 2 || upper == 6) {
-		mes "[Middle-aged Gentleman]";
-		mes "Cute child, what is your name eh?";
-		close;
-	}
-	if(Class == 4066 || Class == 4073) {
+	if(Class == 4066 || Class == 4073 || Class == 4102) {
 		mes "[Middle-aged Gentleman]";
 		mes "Uh? What am I doing? I came here for an errand...";
 		next;
@@ -43,7 +38,7 @@ prt_castle,48,163,3	script	Gentleman#4386457567	57,{
 		mes "You are dragging something. If you're riding something you better dismount it before proceeding.";
 		close;
 	}
-	if(Class != 14 && Class != 4015) {
+	if((Class != 14) && (Class != 4015) && (Class != 4037)) {
 		mes "[Middle-aged Gentleman]";
 		mes "I don't have anything to say to you. Find another person.";
 		close;
@@ -340,7 +335,7 @@ glast_01,240,366,5	script	Memory of King Schmidtz	844,{
 		mes "You are too heavy. Make yourself lighter.";
 		close;
 	}
-	if(job_royal == 5 && (Class == 14 || Class == 4015)) {
+	if(job_royal == 5 && (Class == 14 || Class == 4015 || Class == 4037)) {
 		if(countitem(6275) < 1) {
 			mes "^000099You seem to have lost the shield. Go back to Heinrich and ask for help^000000.";
 			close;
@@ -414,10 +409,14 @@ glast_01,240,366,5	script	Memory of King Schmidtz	844,{
 		specialeffect2 EF_LORD;
 		delitem 6275,1;
 		erasequest 12094;
-		if(class == 14)
+		if(class == 4037){
+			jobchange 4102;
+		}
+		else if(class == 14){
 			jobchange 4066;
-		else
+		}else{
 			jobchange 4073;
+		}
 		getitem 5757,1;
 		getitem 2795,1;
 		end;
diff --git a/npc/jobs/3-2/sorcerer.txt b/npc/jobs/3-2/sorcerer.txt
index 6a2db312d..a2355a5c9 100644
--- a/npc/jobs/3-2/sorcerer.txt
+++ b/npc/jobs/3-2/sorcerer.txt
@@ -20,12 +20,7 @@ gef_tower,102,34,5	script	Merito	742,{
 		mes "You packed so much in your bag. Try again after emptying your bag.";
 		close;
 	}
-	if ((Class >= 4023) && (Class <= 4045)){
-		mes "[Merito]";
-		mes "Lovely child, what's your name?";
-		close;
-	}
-	if (Class == Job_Sorcerer || Class == Job_Sorcerer_T){
+	if (Class == Job_Sorcerer || Class == Job_Sorcerer_T || Class == Job_Baby_Sorcerer){
 		mes "[Merito]";
 		mes "Please get on with the sprits well~ You should~!";
 		close;
@@ -35,12 +30,12 @@ gef_tower,102,34,5	script	Merito	742,{
 		mes "Wow~ you are a young adventurer. I envy you.";
 		close;
 	}
-	if ((Class != Job_Sage) && (Class != Job_Professor)){
+	if ((Class != Job_Sage) && (Class != Job_Professor) && (Class != Job_Baby_Sage)){
 		mes "[Merito]";
 		mes "Wow~ you are a young adventurer. I envy you.";
 		close;
 	}
-	if (Class == Job_Sage || Class == Job_Professor && (job_soc < 1)){
+	if (Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage && (job_soc < 1)){
 		mes "[Merito]";
 		mes "Welcome. What can I help you with?";
 		next;
@@ -87,7 +82,7 @@ gef_tower,102,34,5	script	Merito	742,{
 		set job_soc,1;
 		close;
 	}
-	if (Class == Job_Sage || Class == Job_Professor && (job_soc == 1)){
+	if (Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage && (job_soc == 1)){
 		mes "[Merito]";
 		mes "Good, then I'll give you a short explanation about the Sorcerer.";
 		next;
@@ -145,7 +140,7 @@ gef_tower,102,34,5	script	Merito	742,{
 			close;
 		}
 	}
-	if (Class == Job_Sage || Class == Job_Professor && (job_soc > 1)){
+	if (Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage && (job_soc > 1)){
 		mes "[Merito]";
 		mes "How about your test? Well, Karacas is a little lazy, so that might bother you some... kkk";
 		close;
@@ -158,11 +153,6 @@ gef_tower,113,161,5	script	Karacas	754,{
 		mes "You packed so much in your bag. Try again after emptying your bag.";
 		close;
 	}
-	if ((Class >= 4023) && (Class <= 4045)){
-		mes "[Merito]";
-		mes "Lovely child, what's your name?";
-		close;
-	}
 	if (Class == Job_Sorcerer || Class == Job_Sorcerer_T){
 		mes "[Karacas]";
 		mes "You look happy. Have a great journey.";
@@ -173,17 +163,17 @@ gef_tower,113,161,5	script	Karacas	754,{
 		mes "Is there anything I can do for you?";
 		close;
 	}
-	if (Class != Job_Sage && Class != Job_Professor){
+	if ((Class != Job_Sage) && (Class != Job_Professor) && (Class != Job_Baby_Sage)){
 		mes "[Karacas]";
 		mes "Is there anything I can do for you?";
 		close;
 	}
-	if (Class == Job_Sage || Class == Job_Professor && (job_soc < 2)){
+	if (Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage && (job_soc < 2)){
 		mes "[Karacas]";
 		mes "More people are visiting Geffen Tower thesedays.";
 		close;
 	}
-	if (Class == Job_Sage || Class == Job_Professor && (job_soc == 2)){
+	if (Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage && (job_soc == 2)){
 		mes "[Karacas]";
 		mes "....";
 		next;
@@ -269,7 +259,7 @@ gef_tower,113,161,5	script	Karacas	754,{
 		changequest 12096,12097;
 		close;
 	}
-	if (Class == Job_Sage || Class == Job_Professor && (job_soc == 3)){
+	if (Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage && (job_soc == 3)){
 		if ((countitem(992) > 2) && (countitem(991) > 2) && (countitem(990) > 2) && (countitem(993) > 2)){
 			mes "[Karacas]";
 			mes "Oh, you have all the materials.";
@@ -359,7 +349,7 @@ gef_tower,113,161,5	script	Karacas	754,{
 		mes "When you bring these basic things, I'll guide you to the next step.";
 		close;
 	}
-	if (Class == Job_Sage || Class == Job_Professor && (job_soc == 4)){
+	if (Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage && (job_soc == 4)){
 		if ((countitem(6276) > 0) && (countitem(6278) > 0) && (countitem(6277) > 0)){
 			mes "[Karacas]";
 			mes "Wow~ your skill is good.";
@@ -382,7 +372,7 @@ gef_tower,113,161,5	script	Karacas	754,{
 		mes "Don't give up and keep on trying~";
 		close;
 	}
-	if (Class == Job_Sage || Class == Job_Professor && (job_soc == 5)){
+	if (Class == Job_Sage || Class == Job_Professor || Class == Job_Baby_Sage && (job_soc == 5)){
 		mes "[Karacas]";
 		mes "Originally my teacher needs to check the Sorcerer job change but after he went out to find the spirit of fish, I can't see him. So I'll check it myself.";
 		next;
@@ -401,7 +391,10 @@ gef_tower,113,161,5	script	Karacas	754,{
 		next;
 		mes "[Karacas]";
 		mes "Congratulations, ["+strcharinfo(0)+"]";
-		if (Class == Job_Sage){
+		if(Class == Job_Baby_Sage){
+			jobchange Job_Baby_Sorcerer;
+		}
+		else if (Class == Job_Sage){
 			jobchange Job_Sorcerer;
 		}else if (Class == Job_Professor){
 			jobchange Job_Sorcerer_T;
diff --git a/npc/jobs/3-2/sura.txt b/npc/jobs/3-2/sura.txt
index 0df0b0d40..57bac1ad9 100644
--- a/npc/jobs/3-2/sura.txt
+++ b/npc/jobs/3-2/sura.txt
@@ -16,16 +16,8 @@
 
 ve_in,237,125,0	script	King Crab#job_shu	107,{
 
-	if ((Class >= 4023) && (Class <= 4045)){
-		mes "[King Crab]";
-		// Custom Translation
-		mes "Dear child - you should not be in a place like this~";
-		mes "Terrible Master would get angry, oh ~";
-		close;
-	}
-
 	if (job_shu == 0){
-		if (Class == Job_Monk || Class == Job_Champion){
+		if (Class == Job_Monk || Class == Job_Champion || Job_Baby_Monk){
 			if ((BaseLevel > 98) && (JobLevel > 49)){
 				mes "[King Crab]";
 				mes "Khh ha ha ha ha ha ha.";
@@ -183,16 +175,8 @@ ve_in,237,125,0	script	King Crab#job_shu	107,{
 
 ve_in,241,128,4	script	Sludge Worm#job_shu	110,{
 
-	if ((Class >= 4023) && (Class <= 4045)){
-		mes "[Sludge Worm]";
-		// Custom Translation
-		mes "Go away, child~";
-		mes "This is no place for childen!";
-		close;
-	}
-
 	if (job_shu == 0){
-		if (Class == Job_Monk || Class == Job_Champion){
+		if (Class == Job_Monk || Class == Job_Champion || Job_Baby_Monk){
 			if ((BaseLevel > 98) && (JobLevel > 49)){
 				mes "[King Crab]";
 				mes "Khh ha ha ha ha ha ha.";
@@ -357,7 +341,7 @@ ve_in,244,126,3	script	Waitress#job_shu	69,{
 		mes "I hope there is someone who can scold them for me.";
 		close;
 	}else if (job_shu == 1){
-		if (Class == Job_Monk){
+		if (Class == Job_Monk || Job_Baby_Monk){
 			mes "[Waitress]";
 			mes "Oh dear~";
 			mes "I really appreciate you, Monk, for helping me a while ago.";
@@ -1006,12 +990,6 @@ sword_1-1,223,167,2	script	Master#job_shu	483,{
 				mes "Please use all your Skill Points or you cannot become a Sura.";
 				close;
 			}
-			if ((Class >= 4023) && (Class <= 4045)){
-				mes "[Master]";
-				// Custom Translation
-				mes "No matter how much you want power, I will not let children set foot on the road to the Sura.";
-				close;
-			}
 			if(checkweight(1201,1) == 0){
 				mes "[Master]";
 				// Custom Translation
@@ -1025,7 +1003,46 @@ sword_1-1,223,167,2	script	Master#job_shu	483,{
 				mes "Go train more.";
 				close;
 			}
-			if (Class == Job_Monk){
+			if (Class == Job_Baby_Monk){
+				mes "[Bruno]";
+				mes "Of course~";
+				mes "I have keen eyes.";
+				next;
+				mes "[Bruno]";
+				mes "Master! This is a wolf fur coat.";
+				mes "Put it on when it's cold.";
+				next;
+				mes "["+strcharinfo(0)+"]";
+				mes "Ahhk! That is the wolf I... caught... Uhh.";
+				next;
+				mes "- Whack -";
+				next;
+				mes "[Bruno]";
+				mes "Ho ho ho~";
+				mes "Do you have something to say, "+strcharinfo(0)+"?";
+				mes "You became a member of our family, let's get along together ~";
+				next;
+				mes "[Master]";
+				mes "Right, I now accept you as my student, too.";
+				next;
+				mes "[Master]";
+				mes "I think you already know it, but to live as a Sura will not be that easy.";
+				next;
+				mes "[Master]";
+				mes "I also shut myself off from the world. If there comes a day when we go to the world again, it must be the day when the world needs ghosts for the wars.";
+				next;
+				mes "[Master]";
+				mes "I hope those days will not come but... I'll willingly be the ghost and kill all enemies.";
+				next;
+				mes "[Master]";
+				mes "You should train yourself steadily until that day.";
+				set job_shu,100;
+				jobchange Job_Baby_Sura;
+				completequest 11158;
+				getitem 5754,1;
+				getitem 2795,1;
+				close;
+			}else if (Class == Job_Monk){
 				mes "[Bruno]";
 				mes "Of course~";
 				mes "I have keen eyes.";
diff --git a/npc/jobs/3-2/wanderer.txt b/npc/jobs/3-2/wanderer.txt
index a373fd302..453f2566e 100644
--- a/npc/jobs/3-2/wanderer.txt
+++ b/npc/jobs/3-2/wanderer.txt
@@ -38,7 +38,7 @@ xmas,162,209,5	script	Little Iraki#job_wan	714,{
 		mes "[Mimi]";
 		mes "But I can understand.";
 		mes "I've heard that wanderers are the most acclaimed dancers, so I'm looking forward to it.";
-		if (Class == Job_Dancer || Class == Job_Gypsy){
+		if (Class == Job_Dancer || Class == Job_Gypsy || Class == Job_Baby_Dancer){
 			if (BaseLevel < 99 || JobLevel < 50){
 				close;
 			}
@@ -129,7 +129,7 @@ xmas,163,209,3	script	Mimi#job_wan	714,{
 		mes "[Mimi]";
 		mes "But I can understand.";
 		mes "I've heard that wanderers are the most acclaimed dancers, so I'm looking forward to it.";
-		if (Class == Job_Dancer || Class == Job_Gypsy){
+		if (Class == Job_Dancer || Class == Job_Gypsy || Class == Job_Baby_Dancer){
 			if (BaseLevel < 99 || JobLevel < 50){
 				close;
 			}
@@ -1197,7 +1197,7 @@ OnTouch:
 xmas,147,135,5	script	Dancer Kim#xmas	485,{
 
 if (job_wan == 9){
-	if (Class == Job_Dancer || Class == Job_Gypsy){
+	if (Class == Job_Dancer || Class == Job_Gypsy || Class == Job_Baby_Dancer){
 		if (BaseLevel < 99){
 			mes "- task execution condition is not met, can not perform the task -";
 			close;
@@ -1287,10 +1287,13 @@ if (job_wan == 9){
 		mes "[Dancer Kim]";
 		mes "The hope and future of wanderers, the new shining star, "+strcharinfo(0)+"!";
 		mapannounce "xmas","Dancer Kim: Let me introduce you! The hope and future of wanderers, the new shining star - "+strcharinfo(0)+"!",bc_map;
-		if (Class == Job_Dancer){
+		if(Class == Job_Baby_Dancer){
+			jobchange Job_Baby_Wanderer;
+		}
+		else if (Class == Job_Dancer){
 			jobchange Job_Wanderer;
 		}
-		if (Class == Job_Gypsy){
+		else {
 			jobchange Job_Wanderer_T;
 		}
 		getitem 5758,1; // Swan