- 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

6 files changed, 95 insertions, 106 deletions

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