* Updated Arch Bishop, Guillotine Cross, Mechanic, and Royal Guard job quests to their latest versions.

* Fixed Izlude RE warps (bugreport:6884, bugreport:6285).
* Fixed experience reward in Cursed Spirit quest (bugreport:6288).

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

4 files changed, 586 insertions, 872 deletions

diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt
index 6fb066902..34251a8de 100644
--- a/npc/re/jobs/3-1/archbishop.txt
+++ b/npc/re/jobs/3-1/archbishop.txt
@@ -4,11 +4,11 @@
 //= L0ne_W0lf
 //= Credits: Gepard
 //===== Current Version: =====================================
-//= 1.6
+//= 1.7
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
-//= [Translated from the Official]
+//= [Official Conversion]
 //= Job change Quest from Priest / High Priest -> Arch Bishop.
 //===== Additional Comments: =================================
 //= 1.0 First version.
@@ -20,10 +20,11 @@
 //= 1.5a Fixed little typo in Baby Priest & Baby Arch Bishop checks. [Masao]
 //= 1.5b More small fixes. [Euphy]
 //= 1.6 Fixed bugs where players unable to continue the quest. [Joseph]
+//= 1.7 Updated script, many bugs fixed. [Euphy]
 //============================================================
 
 prt_church,103,88,3	script	Praying Minister#arch	60,{
-	if ((Class != Job_Priest) && (Class != Job_High_Priest) && (Class != Job_Baby_Priest)) {
+	if (BaseJob != Job_Priest) {
 		if (Class == Job_Arch_Bishop || Class == Job_Arch_Bishop_T || Class == Job_Baby_Bishop) {
 			mes "[Praying Minister]";
 			mes "Ah! An Archbishop.";
@@ -32,13 +33,15 @@ prt_church,103,88,3	script	Praying Minister#arch	60,{
 			close;
 		}
 		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.";
+		mes "In front of the Almighty God Odin,";
+		mes "there shall be no person smarter than him,";
+		mes "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.";
+		mes "These days, 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?";
@@ -55,14 +58,15 @@ prt_church,103,88,3	script	Praying Minister#arch	60,{
 				close;
 			}
 			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.";
+			mes "In front of the Almighty God Odin,";
+			mes "there shall be no person smarter than him,";
+			mes "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 (Sex?"Brother":"Sister")+", how has your life been?";
-			mes "Have you lived it to it's fullest?";
+			mes (Sex?"Brother":"Sister")+", how has your life been? Have you lived it to its fullest?";
 			mes "Have you served your life in the light of Odin?";
 			next;
 			mes "[Praying Minister]";
@@ -81,15 +85,14 @@ prt_church,103,88,3	script	Praying Minister#arch	60,{
 			mes "[Praying Minister]";
 			mes "We always try to keep our original intention in mind and spread Odin's rule.";
 			next;
-			menu "How do I become like that?",-;
+			select("How do I become like that?");
 			mes "[Praying Minister]";
 			mes "That's a good question.";
 			mes "We have lots of methods.";
 			mes "But, I recommend this.";
 			next;
 			mes "[Praying Minister]";
-			mes "Have you ever heard of a";
-			mes "^3131FFHoly Pilgrimage^000000?";
+			mes "Have you ever heard of a^3131FFHoly Pilgrimage^000000?";
 			mes "A Holy Pilgrimage means going to a holy place to pray to the God Odin for protection and grace.";
 			next;
 			mes "[Praying Minister]";
@@ -99,7 +102,7 @@ prt_church,103,88,3	script	Praying Minister#arch	60,{
 			mes "What do you think?";
 			mes "Would you like to do a Holy Pilgrimage?";
 			next;
-			switch (select("Yes I want to.:I'll think about it.")) {
+			switch(select("Yes I want to.:I'll think about it.")) {
 			case 1:
 				mes "[Praying Minister]";
 				mes "That's the correct attitude.";
@@ -111,17 +114,19 @@ prt_church,103,88,3	script	Praying Minister#arch	60,{
 				next;
 				mes "[Praying Minister]";
 				mes "Go there and find Priest Dayan.";
-				mes "Tell him exactly, ''^3131FFI'm here for the Holy Pilgrimage^000000.''";
+				mes "Tell him exactly,";
+				mes "'^3131FFI'm here for the Holy Pilgrimage.^000000'";
 				next;
 				mes "[Praying Minister]";
 				mes "He's very old so he is hard of hearing.";
 				mes "You have to speak loud and clearly. You got it?";
-				mes "I hope that this paves the way for you to live in the light of Odin......";
+				mes "I hope that this paves the way for you to live in the light of Odin.";
 				set job_arch,1;
 				setquest 2187;
 				close;
 			case 2:
 				mes "[Praying Minister]";
+				mes "Mmmm...";
 				mes "A Holy Pilgrimage isn't that difficult.";
 				mes "Just be mindful that once you start the path you will be on your way to the way of a true minister of Odin.";
 				next;
@@ -137,16 +142,18 @@ prt_church,103,88,3	script	Praying Minister#arch	60,{
 		close;
 	}
 	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.";
+	mes "In front of the Almighty God Odin,";
+	mes "there shall be no person smarter than him,";
+	mes "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.";
+	mes "These days, 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?";
+	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.";
@@ -161,12 +168,11 @@ umbala,137,227,5	script	Utan Boy#arch	787,{
 }
 
 umbala,139,227,3	script	Priest#arch	60,{
-	if (job_arch < 1) {
+	if (job_arch == 0) {
 		mes "[Priest]";
 		mes "Un...ba... Unba?";
 		close;
-	}
-	if (job_arch == 1) {
+	} else if (job_arch == 1) {
 		mes "[Priest]";
 		mes "Un...ba... Umba?";
 		next;
@@ -260,17 +266,18 @@ umbala,139,227,3	script	Priest#arch	60,{
 		next;
 		mes "[Priest Dayan]";
 		mes "That big tree is called The ^3131FFYggdrasil^000000.";
-		mes "That tree was created from Ymir's body after Odin created the world as you know it, Rune Midgard.";
+		mes "That tree was created from Ymir's body after Odin created the world as you know it, Rune-Midgard.";
 		next;
 		mes "[Priest Dayan]";
 		mes "A fountain pours out from the end of Yggdrasil's roots that spread to every world.";
 		next;
 		mes "[Priest Dayan]";
-		mes "The roots head to Nifflheim where you can find Hvergelmir spring.";
-		mes "In Rune Midgard there is Mimir's spring. And in Asgard, the world of the Gods, there is the Word spring.";
+		mes "The roots head to Niflheim where you can find the Hvergelmir spring.";
+		mes "In Rune-Midgard there is Mimir's spring.";
+		mes "And in Asgard, the world of the Gods, there is the Word spring.";
 		next;
 		mes "[Priest Dayan]";
-		mes "Mimir spring wells with intelligence, myth says that if Odin lets you have his eye that you will gain all of the knowledge within that spring.";
+		mes "Mimir'’s spring wells with intelligence, myth says that if Odin lets you have his eye that you will gain all of the knowledge within that spring.";
 		next;
 		mes "[Priest Dayan]";
 		mes Sex?"Brother.":"Sister.";
@@ -278,7 +285,8 @@ umbala,139,227,3	script	Priest#arch	60,{
 		next;
 		mes "[Priest Dayan]";
 		mes "Enter the Yggdrasil.";
-		mes "You may be assaulted by creatures in there but be mindful that their intentions are only to protect the Yggdrasil.";
+		mes "You may be assaulted by creatures in there";
+		mes "but be mindful that their intentions are only to protect the Yggdrasil.";
 		next;
 		mes "[Priest Dayan]";
 		mes "Follow your steps with purpose.";
@@ -302,13 +310,12 @@ umbala,139,227,3	script	Priest#arch	60,{
 		set job_arch,2;
 		changequest 2187,2188;
 		close;
-	}
-	if (job_arch == 2) {
+	} else if (job_arch == 2) {
 		mes "[Priest Dayan]";
 		mes "This place is the holiest place in the world, Yggdrasil.";
 		mes "This holy ceremony will brighten your soul.";
 		next;
-		switch (select("How should I pray?:Cancel.")) {
+		switch(select("How should I pray?:Cancel.")) {
 		case 1:
 			mes "[Priest Dayan]";
 			mes "Through prayer, we can follow four paths.";
@@ -357,11 +364,11 @@ umbala,139,227,3	script	Priest#arch	60,{
 			mes "I hope that my prayer can weaken your agony...";
 			close;
 		}
-	}
-	if (job_arch == 3) {
+	} else if (job_arch == 3) {
 		mes "[Priest Dayan]";
 		mes "Oh, you've come back.";
-		mes "I can feel that you have a fresh energy. Maybe you did pray truthfully.";
+		mes "I can feel that you have a fresh energy.";
+		mes "Maybe you did pray truthfully.";
 		next;
 		mes "[" + strcharinfo(0) + "]";
 		mes "I feel light-hearted. Like I was just reborn...";
@@ -375,45 +382,38 @@ umbala,139,227,3	script	Priest#arch	60,{
 		mes "Thanks for your kind words.";
 		next;
 		mes "[Priest Dayan]";
-		if (Sex == 1) {
-			mes "Brother.";
-		}
-		else {
-			mes "Sister.";
-		}
+		mes Sex?"Brother.":"Sister.";
 		mes "Now, there is a place you should go to.";
 		next;
 		mes "[Priest Dayan]";
 		mes "That place is Hugel in Schwaltzvalt.";
-		mes "There is a Nun praying there named Vinue, she is a true minister who prays for the suffering people in the world.";
+		mes "There is a Nun praying there named Vinue,";
+		mes "she is a true minister who prays for the suffering people in the world.";
 		mes "But the last time I saw her she seemed sad.";
 		next;
 		mes "[Priest Dayan]";
 		mes "Can you convince her to make a pilgrimage to Yggdrasil?";
-		mes "I think she is exhausted due to praying too much. I hope the air of Yggdrasil will be helpful to her.";
+		mes "I think she is exhausted due to praying too much.";
+		mes "I hope the air of Yggdrasil will be helpful to her.";
 		next;
 		mes "[" + strcharinfo(0) + "]";
 		mes "Don't worry.";
 		mes "I'll go and meet her.";
 		next;
 		mes "[Priest Dayan]";
-		if (Sex == 1) {
-			mes "Feel free to visit here when you want to pray, brother.";
-		}
-		else {
-			mes "Feel free to visit here when you want to pray, sister.";
-		}
+		mes "Thank you very much.";
+		mes "Feel free to visit here when you want to pray, "+(Sex?"brother.":"sister.");
 		mes "A visit from a friend always makes me happy.";
 		set job_arch,4;
 		changequest 2188,2189;
 		close;
 	}
 	mes "[Dayan]";
-	mes "Did you find Vinue in Hugel?";
+	mes "Did you find Vinue in Hugel? How's she doing?";
 	close;
 }
 
-yggdrasil01,220,47,0	script	#A pilgrimage to the Ho	139,5,5,{
+yggdrasil01,220,47,0	script	#arch_pilgrimage	139,5,5,{
 OnTouch:
 	if (job_arch == 2) {
 		mes "[" + strcharinfo(0) + "]";
@@ -423,15 +423,16 @@ OnTouch:
 		next;
 		mes "[" + strcharinfo(0) + "]";
 		mes "Time to genuflect...";
+		mes "Time to start...";
 		mes "Hmm, what did that priest say to me?";
 		next;
 		mes "[" + strcharinfo(0) + "]";
 		mes "Hmm... What is the first way?";
 		next;
-		switch (select("The way of silence.:The way of confession.:The way of meditation.")) {
+		switch(select("The way of silence.:The way of confession.:The way of meditation.")) {
 		case 1:
 			mes "[" + strcharinfo(0) + "]";
-			mes "";
+			mes "The way of silence...?";
 			mes "I don't think so.";
 			close;
 		case 2:
@@ -444,7 +445,6 @@ OnTouch:
 			mes "The way of meditation...?";
 			mes "Yes, it's the way of meditation.";
 			next;
-			break;
 		}
 		mes "^3131FF[Priest Dayan]^000000";
 		mes "^3131FFThe 1st way is the way of meditation.^000000";
@@ -501,6 +501,9 @@ OnTouch:
 		mes "^3131FFAnd also they will bless you because you are an existence of joy overcoming an affliction. We call that Aspersio^000000.";
 		mes "^3131FFYou must drink a Holy Water with appreciation of Aspersio.^000000";
 		next;
+		mes "^3131FF[Priest Dayan]^000000";
+		mes "^3131FFYou're drinking the Holy Water.^000000";
+		next;
 		if (countitem(523) == 0) {
 			mes "[" + strcharinfo(0) + "]";
 			mes "Oh no! I forgot to bring a Holy Water!";
@@ -529,7 +532,7 @@ OnTouch:
 		mes "^3131FFYou were reborn as light, sing a Gloria of joy and soul that love you.^000000";
 		next;
 		mes "- You breath in deep and start to sing a Gloria.";
-		mes "A chord crashs out in the spring of Hvergelmir and a waterfall sound gives you a refreshing feeling. -";
+		mes "A chord crashes out in the spring of Hvergelmir and a waterfall sound gives you a refreshing feeling. -";
 		specialeffect2 EF_GLORIA;
 		next;
 		mes "[" + strcharinfo(0) + "]";
@@ -559,8 +562,7 @@ OnTouch:
 		close2;
 		warp "umbala",138,219;
 		end;
-	}
-	if (job_arch == 3) {
+	} else if (job_arch == 3) {
 		mes "[" + strcharinfo(0) + "]";
 		mes "The song is over. It's time to go back to Priest Dayan.";
 		close2;
@@ -574,7 +576,7 @@ hu_in01,205,204,7	script	Praying Nun#benew	79,{
 	if (job_arch == 4) {
 		mes "- There is a nun closing her eyes as she murmurs something which sounds like a prayer. -";
 		next;
-		if (select("Talk to her.:Stay Quiet.") == 2) {
+		if(select("Talk to her.:Stay Quiet.") == 2) {
 			mes "- You don't feel like disturbing her -";
 			close;
 		}
@@ -613,7 +615,7 @@ hu_in01,205,204,7	script	Praying Nun#benew	79,{
 		mes "Evil is always watching for our souls.";
 		mes "If you are indifferent to praying, it never misses an opportunity.";
 		next;
-		if (select("A dream? What kind of dream?:Your soul should be fine.") == 2) {
+		if(select("A dream? What kind of dream?:Your soul should be fine.") == 2) {
 			mes "[Vinue]";
 			mes "Oh but that's where you're wrong.";
 			mes "My soul may be the most at risk.";
@@ -657,11 +659,11 @@ hu_in01,205,204,7	script	Praying Nun#benew	79,{
 		mes "Nobody tried to subdue the evil?";
 		next;
 		mes "[Vinue]";
-		mes "Unfortunely, I'm a nun who doesn't have any exorcism skill...";
+		mes "Unfortunately, I'm a nun who doesn't have any exorcism skill...";
 		mes "Residents of Hugel just stood aghast of the sight because they are not familiar with adventure.";
 		next;
 		mes "[Vinue]";
-		mes "Thesedays, there are a lot of people because of the development of the Odin shrine, but their situation is not so good.";
+		mes "These days, there are a lot of people because of the development of the Odin shrine, but their situation is not so good.";
 		next;
 		mes "[" + strcharinfo(0) + "]";
 		mes "Is the dream related with the evil in the Odin shrine?";
@@ -671,7 +673,7 @@ hu_in01,205,204,7	script	Praying Nun#benew	79,{
 		mes "I don't have any way to find out.";
 		mes "I don't have a method, so I just pray.";
 		next;
-		if (select("I'll investgate for you.:I'll pray with you.") == 2) {
+		if(select("I'll investgate for you.:I'll pray with you.") == 2) {
 			mes "[Vinue]";
 			mes "Thank you.";
 			mes "I'll pray that the darkness stays away.";
@@ -704,11 +706,10 @@ hu_in01,205,204,7	script	Praying Nun#benew	79,{
 		mes "[Vinue]";
 		mes "I'll pray for your safe return.";
 		mes "I hope that Odin gives you his protection as well.";
-		set job_arch, 5;
+		set job_arch,5;
 		changequest 2189,2190;
 		close;
-	}
-	if ((job_arch > 4) && (job_arch < 100)) {
+	} else if ((job_arch > 4) && (job_arch < 100)) {
 		mes "[Vinue]";
 		mes "I'll pray for your safe return.";
 		close;
@@ -716,15 +717,14 @@ hu_in01,205,204,7	script	Praying Nun#benew	79,{
 	mes "[Vinue]";
 	mes "I feel refreshed.";
 	mes "It must be good news?";
-	mes "Thanks the Gods.";
+	mes "Thank the Gods.";
 	close;
 }
 
 odin_tem02,282,263,0	script	#find_val	139,3,3,{
 OnTouch:
-	if ((job_arch > 4) && (job_arch < 100)) {
+	if ((job_arch > 4) && (job_arch < 100))
 		hideoffnpc "Valkyrie Illusion#arch";
-	}
 	end;
 }
 
@@ -732,7 +732,7 @@ odin_tem02,281,275,3	script	Valkyrie Illusion#arch	403,{
 	if ((job_arch > 4) && (job_arch < 100)) {
 		mes "You can see Valkyrie who has a despairing face.";
 		next;
-		switch (select("Touch Valkyrie's Illusion.:Turn away.")) {
+		switch(select("Touch Valkyrie's Illusion.:Turn away.")) {
 		case 1:
 			mes "You lose your consciousness while getting a closer view of Valkyrie's Illusion.";
 			close2;
@@ -748,14 +748,21 @@ odin_tem02,281,275,3	script	Valkyrie Illusion#arch	403,{
 		}
 	}
 	end;
-
 OnInit:
 	hideonnpc "Valkyrie Illusion#arch";
 	end;
 }
 
 job3_arch01,29,34,3	script	Valkyrie#arch	403,{
-	if ((BaseLevel != 99) && (JobLevel < 50)) {
+	if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 2000) {
+		mes "- Wait a Sec !! -";
+		mes "- You are carrying too many items, -";
+		mes "- you won't be able to obtain any new items. -";
+		mes "- Please take off some items -";
+		mes "- and come for the challenge again. -";
+		close;
+	}
+	if ((BaseLevel != 99) || (JobLevel < 50) || (BaseJob != Job_Priest)) {
 		warp "odin_tem02",282,263;
 		end;
 	}
@@ -768,21 +775,11 @@ job3_arch01,29,34,3	script	Valkyrie#arch	403,{
 		mes "You can't progress without using all your skill points. Please use all of your skill points before progressing~";
 		close;
 	}
-	if (checkweight(1201,4) == 0 || (MaxWeight - Weight) < 2000) {
-		mes "- Wait a moment! -";
-		mes "- Currently you are carrying -";
-		mes "- too many items with you. -";
-		mes "- Please come back after -";
-		mes "- you put some items into Kafra Storage. -";
-		close;
-	}
-	if ((Class != Job_Priest) && (Class != Job_High_Priest) && (Class != Job_Baby_Priest)) {
-		warp "odin_tem02",282,263;
-	}
 	if (Class != Job_Arch_Bishop || Class != Job_Arch_Bishop_T || Class != Job_Baby_Bishop) {
-		if (job_arch < 5)
+		if (job_arch < 5) {
 			warp "odin_tem02",282,263;
-		if (job_arch == 5) {
+			end;
+		} else if (job_arch == 5) {
 			mes "[Valkyrie]";
 			mes "In the heavens the sound of pipes spread out, but a bird that can't fly crawls and finally is crushed to pieces on the ground.";
 			mes "Ah, I'm resentful! so regretful!";
@@ -853,7 +850,7 @@ job3_arch01,29,34,3	script	Valkyrie#arch	403,{
 			mes "I don't know why they came here and from where they came from.";
 			next;
 			mes "[Valkyrie Anguhilde]";
-			mes "They seiged the temple and I exhausted my energy tring to fight them all myself.";
+			mes "They sieged the temple and I exhausted my energy trying to fight them all myself.";
 			next;
 			mes "[Valkyrie Anguhilde]";
 			mes "The holy shrine was tainted by the devils.";
@@ -876,7 +873,7 @@ job3_arch01,29,34,3	script	Valkyrie#arch	403,{
 			mes "I've lost all of my energy and my body is sealed so there is no way for me to protect the shrine.";
 			mes "You have to send a message to Valhalla to ask for help from a Valkyrie quickly.";
 			next;
-			menu "How can I do that?",-;
+			select("How can I do that?");
 			mes "[Valkyrie Anguhilde]";
 			mes "At the ^3131FFtop of the shrine^000000, You can contact to them with a ^3131FFGolden pipe^000000.";
 			next;
@@ -902,8 +899,7 @@ job3_arch01,29,34,3	script	Valkyrie#arch	403,{
 			mes "It'll be a long journey...";
 			set job_arch,6;
 			close;
-		}
-		if (job_arch == 6) {
+		} else if (job_arch == 6) {
 			if ($@archbs == 0) {
 				set $@archbs,1;
 				mes "[Valkyrie Anguhilde]";
@@ -911,9 +907,8 @@ job3_arch01,29,34,3	script	Valkyrie#arch	403,{
 				next;
 				if (getmapusers("job3_arch02") > 0) {
 					mes "[Valkyrie Anguhilde]";
-					//Custom translation
-					mes "Ah, it seems someone is already combating the evil in the temple.";
-					mes "I will go see who it is, please wait a moment.";
+					mes "Hmm, someone is battling the devil in the shrine right now.";
+					mes "You just wait a minute while I'm finding who it is.";
 					set $@archbs,0;
 					close;
 				}
@@ -923,9 +918,8 @@ job3_arch01,29,34,3	script	Valkyrie#arch	403,{
 				set $@archbs,0;
 				close2;
 				nude;
-				if (countitem(2798) > 0) {
+				if (countitem(2798))
 					delitem 2798,countitem(2798); //Will_Of_Exhausted_Angel
-				}
 				donpcevent "start#arch::OnEnable";
 				set job_arch,7;
 				changequest 2190,2191;
@@ -934,13 +928,11 @@ job3_arch01,29,34,3	script	Valkyrie#arch	403,{
 				end;
 			}
 			mes "[Valkyrie Anguhilde]";
-			//Custom translation
-			mes "I am already talking to someone, please wait and talk to me again.";
+			mes "I'm talking with another person now, so give me a second.";
 			close;
-		}
-		if (job_arch == 7) {
-			if (countitem(12381) > 0) delitem 12381,countitem(12381); //ValkyrieA_Scroll
-			if (countitem(12382) > 0) delitem 12382,countitem(12382); //ValkyrieB_Scroll
+		} else if (job_arch == 7) {
+			if (countitem(12381)) delitem 12381,countitem(12381); //ValkyrieA_Scroll
+			if (countitem(12382)) delitem 12382,countitem(12382); //ValkyrieB_Scroll
 			if ($@archbs == 0) {
 				set $@archbs,1;
 				mes "[Valkyrie Anguhilde]";
@@ -951,9 +943,8 @@ job3_arch01,29,34,3	script	Valkyrie#arch	403,{
 				if (getmapusers("job3_arch02") > 0) {
 					set $@archbs,0;
 					mes "[Valkyrie Anguhilde]";
-					//Custom translation
-					mes "Ah, it seems someone is already combating the evil in the temple.";
-					mes "I will see who it is, please wait a moment.";
+					mes "Hmm, someone is battling the devil in the shrine right now.";
+					mes "You just wait a minute while I'm finding who it is.";
 					close;
 				}
 				set $@archbs,0;
@@ -964,70 +955,55 @@ job3_arch01,29,34,3	script	Valkyrie#arch	403,{
 				mes "But you have to be careful if an imeprsonation falls down.";
 				close2;
 				nude;
-				if (countitem(2798) > 0) {
+				if (countitem(2798))
 					delitem 2798,countitem(2798); //Will_Of_Exhausted_Angel
-				}
 				donpcevent "start#arch::OnEnable";
-				set job_arch, 7;
+				set job_arch,7;
 				warp "job3_arch02",119,49;
 				hideonnpc "Valkyrie#arch";
 				end;
 			}
 			mes "[Valkyrie Anguhilde]";
-			//Custom translation
-			mes "I am already talking to someone, please wait and talk to me again.";
+			mes "I'm talking with another person now, so give me a second.";
 			close;
 		}
-		end;
 	}
 	end;
-
-OnInit:
-	set $@archbs,0;
-	end;
-
 OnBc:
 	set $@archbs,0;
-	//Custom translation
-	mapannounce "job3_arch01","Valkyrie's Cry: I hear the laughter of the devil, someone has fallen in the temple.",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
+	mapannounce "job3_arch01","Valkyrie: I think someone fell down in the shrine. I can hear the devil's unpleasant laugh.",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
 	hideoffnpc "Valkyrie#arch";
 	end;
 }
 
 job3_arch02,119,49,0	script	#arch_1_start	139,6,6,{
-
 OnTouch:
-	if (countitem(12381) == 0) {
+	if (countitem(12381) == 0)
 		getitem 12381,1; //ValkyrieA_Scroll
-	}
 	mapannounce "job3_arch02","Whispering of an impersonation: I feel heavy! Set me free!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
 	hideonnpc "#arch_1_start";
 	end;
 }
 
--	script	#arch_1_01_0::archbjcq	139,5,5,{
+-	script	#arch_1_01_0::archbjcq	-1,{
 OnTouch:
-	if (countitem(12381) > 0) {
+	if (countitem(12381)) {
 		delitem 12381,1; //ValkyrieA_Scroll
 		mapannounce "job3_arch02","Whispering of an impersonation: You can't do anything by yourself! Let's go back!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
 		mapwarp "job3_arch02","job3_arch01",29,29;
-		end;
 	}
 	if (getmercinfo(1) == 2037) {
 		set .@randht, rand(1,10);
-		if (.@randht < 8) {
+		if (.@randht < 8)
 			mapannounce "job3_arch02","Whispering of an impersonation: I can feel the devil's spirits! Be careful!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
-		}
-		else if (.@randht == 8 || .@randht == 9) {
-			mapannounce "job3_arch02","Embodiment of the voice: They are close to you!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0 //Custom translation
-		}
+		else if ((.@randht == 8) || (.@randht == 9))
+			mapannounce "job3_arch02","Whispering of an impersonation: They are coming!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
 		end;
 	}
 	mapannounce "job3_arch02","Whispering of an impersonation: You can't do anything by yourself! Let's go back!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
 	mapwarp "job3_arch02","job3_arch01",29,29;
 	end;
 }
-
 job3_arch02,112,73,0	duplicate(archbjcq)	#arch_1_01	139,5,5
 job3_arch02,94,123,0	duplicate(archbjcq)	#arch_1_02	139,5,5
 job3_arch02,93,173,0	duplicate(archbjcq)	#arch_1_03	139,5,5
@@ -1043,36 +1019,31 @@ job3_arch02,245,289,0	duplicate(archbjcq)	#arch_1_12	139,5,5
 
 job3_arch02,203,286,0	script	#arch_1_boss	139,5,5,{
 OnTouch:
-	if (countitem(12381) > 0) {
+	if (countitem(12381)) {
 		delitem 12381,1; //ValkyrieA_Scroll
 		mapannounce "job3_arch02","Whispering of an impersonation: You can't do anything by yourself! Let's go back!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
 		mapwarp "job3_arch02","job3_arch01",29,29;
 		end;
 	}
-	if (GetMyMercenary == 2037) {
+	if (getmercinfo(1) == 2037) {
 		mapannounce "job3_arch02","Valkyrie's Nightmare: An incompetent illusion of Valkyrie came here with the assistance of humans. You wanna have that nightmare?",bc_map,"0xFF0000"; //FW_NORMAL 12 0 0
 		donpcevent "mob#arch_1::OnKill";
-	}
-	else {
+	} else {
 		mapannounce "job3_arch02","Whispering of an impersonation: You can't do anything by yourself! Let's go back!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
 		mapwarp "job3_arch02","job3_arch01",29,29;
 	}
 	end;
 }
 
-job3_arch02,390,390,1	script	#arch_redcell	844,{
-	end;
-
+-	script	#arch_redcell	-1,{
 OnInit:
 	setcell "job3_arch02",276,290,280,294,cell_walkable,0;
 	setcell "job3_arch02",276,290,280,294,cell_shootable,0;
 	end;
-
 OnGreen:
 	setcell "job3_arch02",276,290,280,294,cell_walkable,1;
 	setcell "job3_arch02",276,290,280,294,cell_shootable,1;
 	end;
-
 OnRed:
 	setcell "job3_arch02",276,290,280,294,cell_walkable,0;
 	setcell "job3_arch02",276,290,280,294,cell_shootable,0;
@@ -1081,13 +1052,11 @@ OnRed:
 
 job3_arch02,390,389,1	script	#arch_val01	844,{
 	end;
-
 OnEnable:
 	areamonster "job3_arch02",111,325,115,329,"Valkyrie's Nightmare",2036,1,"#arch_val01::OnMyMobDead";
 	end;
-
 OnMyMobDead:
-	if (mobcount ("job3_arch02","#arch_val01::OnMyMobDead") < 1) {
+	if (mobcount("job3_arch02","#arch_val01::OnMyMobDead") < 1) {
 		donpcevent "#arch_redcell::OnGreen";
 		mapannounce "job3_arch02","Valkyrie's Nightmare: Your win is only a false image! hahahaha!",bc_map,"0xFF0000"; //FW_NORMAL 12 0 0
 		hideoffnpc "Valkyrie#arch_01";
@@ -1107,7 +1076,6 @@ OnMyMobDead:
 		hideonnpc "#arch_1_boss";
 	}
 	end;
-
 OnKill:
 	killmonster "job3_arch02","#arch_val01::OnMyMobDead";
 	end;
@@ -1115,20 +1083,17 @@ OnKill:
 
 job3_arch02,390,387,1	script	#arch_val02	844,{
 	end;
-
 OnEnable:
 	areamonster "job3_arch02",242,44,246,48,"Valkyrie's Nightmare",2036,1,"#arch_val02::OnMyMobDead";
 	end;
-
 OnMyMobDead:
-	if (mobcount ("job3_arch02","#arch_val02::OnMyMobDead") < 1) {
+	if (mobcount("job3_arch02","#arch_val02::OnMyMobDead") < 1) {
 		mapannounce "job3_arch02","Valkyrie's Nightmare: You are so childish. I invite you to a devil's party. I'll make sure you have a fun!",bc_map,"0xFF0000"; //FW_NORMAL 12 0 0
 		hideoffnpc "Valkyrie#arch_02";
 		hideonnpc "#arch_2_boss";
 		viewpoint 1,279,234,1,0xFFFF99;
 	}
 	end;
-
 OnKill:
 	killmonster "job3_arch02","#arch_val02::OnMyMobDead";
 	end;
@@ -1207,26 +1172,25 @@ job3_arch02,244,46,5	script	Valkyrie#arch_02	403,{
 }
 
 job3_arch02,279,234,0	script	#arch_end	139,7,7,{
+	end;
 OnTouch:
 	donpcevent "#arch_3_01::OnKill";
 	donpcevent "#arch_3_02::OnKill";
 	donpcevent "#arch_3_03::OnKill";
 	donpcevent "mob#arch_2::OnKill";
 	hideoffnpc "Valkyrie Anguhilde#end";
-	if (checkweight(1201,4) == 0) {
-		mes "- Wait a moment! -";
-		mes "- Currently you are carrying -";
-		mes "- too many items with you. -";
-		mes "- Please come back after -";
-		mes "- you put some items into Kafra Storage. -";
+	if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 2000) {
+		mes "- Wait a Sec !! -";
+		mes "- You are carrying too many items, -";
+		mes "- you won't be able to obtain any new items. -";
+		mes "- Please take off some items -";
+		mes "- and come for the challenge again. -";
 		close;
 	}
-	if ((MaxWeight - Weight) < 2000) {
-		mes "- Wait a moment! -";
-		mes "- Currently you are carrying -";
-		mes "- too many items with you. -";
-		mes "- Please come back after -";
-		mes "- you put some items into Kafra Storage. -";
+	if (ismounting()) {
+		mes "You are on a riding pet,";
+		mes "so you cannot change your job.";
+		mes "Please unequip your riding pet and try again!";
 		close;
 	}
 	if (countitem(6154) < 2) {
@@ -1240,9 +1204,8 @@ OnTouch:
 		mes "It can be dangerous, so let's go back.";
 		close2;
 		nude;
-		if (countitem(2798) > 0) {
+		if (countitem(2798))
 			delitem 2798,(2798); //Will_Of_Exhausted_Angel
-		}
 		delitem 6154,countitem(6154); //Broken_Horn_Pipe
 		mapwarp "job3_arch02","job3_arch01",29,29;
 		end;
@@ -1271,7 +1234,7 @@ OnTouch:
 	next;
 	mes "[Valkyrie of the heavens]";
 	mes "Yes Anguhilde.";
-	mes "Even though you were expelled because of a incident before, Odin said that he is reconsidering your banishment.";
+	mes "Even though you were expelled because of an incident before, Odin said that he is reconsidering your banishment.";
 	next;
 	mes "[Valkyrie Anguhilde]";
 	mes "Ah! I can go back to Asgard!";
@@ -1318,29 +1281,23 @@ OnTouch:
 	mes "Now, go back to your world.";
 	mes "The sound of the horn pipe and a bird's chirpings will be spread out for you.";
 	next;
+	if (SkillPoint) {
+		mes "You can't progress without using all your skill points. Please use all of your skill points before progressing~";
+		close;
+	}
 	mes "[Valkyrie of the heavens]";
 	mes "Don't forget an altruistic minister's spirit like today forever.";
 	mes "I hope we see each other in Valhalla sometime.";
 	nude;
-	if (countitem(2798) > 0) {
+	if (countitem(2798))
 		delitem 2798,countitem(2798); //Will_Of_Exhausted_Angel
-	}
 	delitem 6154,countitem(6154); //Broken_Horn_Pipe
 	set job_arch,100;
 	completequest 2191;
 	getitem 5747,1; //Mitra
 	getitem 2795,1; //Green_Apple_Ring
-	if(Class == Job_Baby_Priest){
-		jobchange Job_Baby_Bishop;
-	}
-	else if (Class == Job_Priest) {
-		jobchange Job_Arch_Bishop;
-	}
-	else {
-		jobchange Job_Arch_Bishop_T;
-	}
+	jobchange roclass(eaclass()|EAJL_THIRD);
 	close;
-
 OnInit:
 	hideonnpc "#arch_end";
 	end;
@@ -1348,7 +1305,6 @@ OnInit:
 
 job3_arch02,281,232,1	script	Valkyrie Anguhilde#end	403,{
 	end;
-
 OnInit:
 	hideonnpc "Valkyrie Anguhilde#end";
 	end;
@@ -1368,23 +1324,22 @@ job3_arch02,273,235,5	script	Valkyrie of the heavens	811,{
 		end;
 	}
 	end;
-
 OnInit:
 	hideonnpc "Valkyrie of the heavens";
 	end;
 }
 
 job3_arch02,132,323,0	script	#arch_2_01	139,5,5,{
+	end;
 OnTouch:
-	if (countitem(12382) > 0) {
+	if (countitem(12382))
 		mapannounce "job3_arch02","Whispering of Valkyrie: I see a new ancient scroll!",bc_map; //FW_NORMAL 12 0 0
-	}
 	end;
 }
 
--	script	#arch_2_02_0::archbjcq2	139,5,5,{
+-	script	#arch_2_02_0::archbjcq2	-1,{
 OnTouch:
-	if (countitem(12382) > 0) {
+	if (countitem(12382)) {
 		delitem 12382,1; //ValkyrieB_Scroll
 		mapannounce "job3_arch02","Whispering of an impersonation: You can't do anything by yourself! Let's go back!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
 		mapwarp "job3_arch02","job3_arch01",29,29;
@@ -1392,22 +1347,18 @@ OnTouch:
 	}
 	if (getmercinfo(1) == 2038) {
 		set .@randht, rand(1,10);
-		if (.@randht < 8) {
+		if (.@randht < 8)
 			mapannounce "job3_arch02","Whispering of an impersonation: I can feel the devil's spirits. Can you hear? The sound of gathering in crowds.",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
-		}
-		else if (.@randht == 8 || .@randht == 9) {
-			mapannounce "job3_arch02","Embodiment of Sounds: Battle Stance!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0 //Custom translation
-		}
-		else {
-			mapannounce "job3_arch02","Whispering of an impersonation: I can't leave you! Die!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
-		}
+		else if ((.@randht == 8) || (.@randht == 9))
+			mapannounce "job3_arch02","Whispering of an impersonation: Combat readiness!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
+		else
+			mapannounce "job3_arch02","Whispering of an impersonation: I can't leave you. Die!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
 		end;
 	}
 	mapannounce "job3_arch02","Whispering of an impersonation: You can't do anything by yourself! Let's go back!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
 	mapwarp "job3_arch02","job3_arch01",29,29;
 	end;
 }
-
 job3_arch02,167,313,0	duplicate(archbjcq2)	#arch_2_02	139,5,5
 job3_arch02,127,304,0	duplicate(archbjcq2)	#arch_2_03	139,5,5
 job3_arch02,207,279,0	duplicate(archbjcq2)	#arch_2_04	139,5,5
@@ -1433,15 +1384,13 @@ OnTouch:
 
 job3_arch02,206,113,0	script	#arch_2_boss	139,5,5,{
 OnTouch:
-	if (countitem(12382) > 0) {
+	if (countitem(12382)) {
 		delitem 12382,1; //ValkyrieB_Scroll
 		mapannounce "job3_arch02","Whispering of an impersonation: You can't do anything by yourself! Let's go back!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
 		mapwarp "job3_arch02","job3_arch01",29,29;
-		end;
 	}
-	if (getmercinfo(1) == 2038) {
+	if (getmercinfo(1) == 2038)
 		mapannounce "job3_arch02","A shout of devil: You are so childish. I invite you a party of devil. I'll make you have a fun!",bc_map,"0xFF0000"; //FW_NORMAL 12 0 0
-	}
 	else {
 		mapannounce "job3_arch02","Whispering of an impersonation: You can't do anything by yourself! Let's go back!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
 		mapwarp "job3_arch02","job3_arch01",29,29;
@@ -1451,17 +1400,15 @@ OnTouch:
 
 job3_arch02,284,159,0	script	#arch_3_01	139,20,20,{
 OnTouch:
-	if ((Class != Job_Priest) && (Class != Job_Baby_Priest)) {
+	if (BaseJob != Job_Priest) {
 		mapannounce "job3_arch02","Frus: Do you want to see God? Okay, I'll send you to the land of the dead by myself!",bc_map,"0xFF0000"; //FW_NORMAL 12 0 0
 		areamonster "job3_arch02",242,44,246,48,"Frus",1762,1;
 	}
 	hideonnpc "#arch_3_01";
 	end;
-
 OnKill:
 	killmonster "job3_arch02","#arch_3_01::OnMyMobDead";
 	end;
-
 OnInit:
 	hideoffnpc "#arch_3_01";
 	end;
@@ -1469,21 +1416,18 @@ OnInit:
 
 job3_arch02,307,200,0	script	#arch_3_02	139,5,5,{
 OnTouch:
-	if (Class == Job_Priest || Class == Job_Baby_Priest) {
+	if (BaseJob == Job_Priest) {
 		mapannounce "job3_arch02","Skogul: You are my guest!",bc_map,"0xFF0000"; //FW_NORMAL 12 0 0
 		monster "job3_arch02",307,200,"Skogul",1761,1;
 	}
 	hideonnpc "#arch_3_02";
 	end;
-
 OnKill:
 	killmonster "job3_arch02","#arch_3_02::OnMyMobDead";
 	end;
-
 OnInit:
 	hideoffnpc "#arch_3_02";
 	end;
-
 }
 
 job3_arch02,296,216,0	script	#arch_3_03	139,5,5,{
@@ -1492,20 +1436,16 @@ OnTouch:
 	monster "job3_arch02",296,216,"Frus",1762,1;
 	hideonnpc "#arch_3_03";
 	end;
-
 OnKill:
 	killmonster "job3_arch02","#arch_3_03::OnMyMobDead";
 	end;
-
 OnInit:
 	hideonnpc "#arch_3_03";
 	end;
-
 }
 
 job3_arch02,389,390,1	script	mob#arch_1	844,{
 	end;
-
 OnEnable:
 	monster "job3_arch02",100,102,"Shrine Invader",1394,2;
 	monster "job3_arch02",90,131,"Shrine Invader",1394,2;
@@ -1518,7 +1458,6 @@ OnEnable:
 	monster "job3_arch02",218,250,"Shrine Invader",1427,1;
 	monster "job3_arch02",254,293,"Shrine Invader",1427,1;
 	end;
-
 OnKill:
 	killmonster "job3_arch02","mob#arch_1::OnMyMobDead";
 	end;
@@ -1526,7 +1465,6 @@ OnKill:
 
 job3_arch02,389,389,1	script	mob#arch_2	844,{
 	end;
-
 OnEnable:
 	monster "job3_arch02",156,321,"Shrine Invader",1480,2;
 	monster "job3_arch02",170,305,"Shrine Invader",1480,2;
@@ -1541,7 +1479,6 @@ OnEnable:
 	monster "job3_arch02",190,146,"Shrine Invader",1480,1;
 	monster "job3_arch02",204,177,"Shrine Invader",1453,1;
 	end;
-
 OnKill:
 	killmonster "job3_arch02","mob#arch_2::OnMyMobDead";
 	end;
@@ -1549,11 +1486,9 @@ OnKill:
 
 job3_arch02,389,388,1	script	start#arch	844,{
 	end;
-
 OnInit:
 	mapwarp "job3_arch02","job3_arch02",29,29;
 	end;
-
 OnEnable:
 	mapwarp "job3_arch02","job3_arch02",29,29;
 	hideoffnpc "#arch_1_start";
@@ -1605,78 +1540,20 @@ OnEnable:
 	donpcevent "mob#arch_1::OnEnable";
 	donpcevent "#arch_val01::OnEnable";
 	end;
-
 OnTimeon:
 	initnpctimer;
 	end;
-
 OnTimeoff:
 	stopnpctimer;
 	end;
-
 OnTimer60000:
-	if (getmapusers("job3_arch02") == 0) {
-		mapwarp "job3_arch02","job3_arch01",29,29;
-		donpcevent "Valkyrie#arch::OnBc";
-		stopnpctimer;
-	}
-	end;
-
 OnTimer120000:
-	if (getmapusers("job3_arch02") == 0) {
-		mapwarp "job3_arch02","job3_arch01",29,29;
-		donpcevent "Valkyrie#arch::OnBc";
-		stopnpctimer;
-	}
-	end;
-
 OnTimer180000:
-	if (getmapusers("job3_arch02") == 0) {
-		mapwarp "job3_arch02","job3_arch01",29,29;
-		donpcevent "Valkyrie#arch::OnBc";
-		stopnpctimer;
-	}
-	end;
-
 OnTimer240000:
-	if (getmapusers("job3_arch02") == 0) {
-		mapwarp "job3_arch02","job3_arch01",29,29;
-		donpcevent "Valkyrie#arch::OnBc";
-		stopnpctimer;
-	}
-	end;
-
 OnTimer300000:
-	if (getmapusers("job3_arch02") == 0) {
-		mapwarp "job3_arch02","job3_arch01",29,29;
-		donpcevent "Valkyrie#arch::OnBc";
-		stopnpctimer;
-	}
-	end;
-
 OnTimer360000:
-	if (getmapusers("job3_arch02") == 0) {
-		mapwarp "job3_arch02","job3_arch01",29,29;
-		donpcevent "Valkyrie#arch::OnBc";
-	}
-	end;
-
 OnTimer420000:
-	if (getmapusers("job3_arch02") == 0) {
-		mapwarp "job3_arch02","job3_arch01",29,29;
-		donpcevent "Valkyrie#arch::OnBc";
-		stopnpctimer;
-	}
-	end;
-
 OnTimer480000:
-	if (getmapusers("job3_arch02") == 0) {
-		mapwarp "job3_arch02","job3_arch01",29,29;
-		donpcevent "Valkyrie#arch::OnBc";
-		stopnpctimer;
-	}
-	end;
-
 OnTimer540000:
 	if (getmapusers("job3_arch02") == 0) {
 		mapwarp "job3_arch02","job3_arch01",29,29;
@@ -1684,13 +1561,11 @@ OnTimer540000:
 		stopnpctimer;
 	}
 	end;
-
 OnTimer600000:
-	mapannounce "job3_arch02","Demons cry: Too boring, can no longer imagine what will happen! Friends, we went to lessons learned that could fool arrogant guy, OK?",bc_map,"0xFF0000"; //FW_NORMAL 12 0 0 //Custom translation;
+	mapannounce "job3_arch02","Valkyrie's Nightmare: I can't stand anymore!",bc_map,"0xFF0000"; //FW_NORMAL 12 0 0
 	end;
-
 OnTimer605000:
-	mapannounce "job3_arch02","Valkyrie's voice: No! This can not be. I will send you back soon!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
+	mapannounce "job3_arch02","Whispering of Valkyrie: No way! I can't let you guys do that. Go back!",bc_map,"0xFFCE00"; //FW_NORMAL 12 0 0
 	mapwarp "job3_arch02","job3_arch01",29,29;
 	donpcevent "Valkyrie#arch::OnBc";
 	stopnpctimer;
@@ -1699,7 +1574,6 @@ OnTimer605000:
 
 job3_arch02,390,388,1	script	#arch_2_start	844,{
 	end;
-
 OnInit:
 	hideonnpc "#arch_2_01";
 	hideonnpc "#arch_2_02";
@@ -1714,7 +1588,6 @@ OnInit:
 	hideonnpc "#arch_2_11";
 	hideonnpc "#arch_2_boss";
 	end;
-
 OnEnable:
 	hideoffnpc "#arch_2_01";
 	hideoffnpc "#arch_2_02";
@@ -1735,7 +1608,6 @@ OnEnable:
 
 job3_arch02,390,386,1	script	#arch_3_start	844,{
 	end;
-
 OnEnable:
 	hideoffnpc "#arch_3_01";
 	hideoffnpc "#arch_3_02";
@@ -1753,19 +1625,33 @@ OnTouch:
 
 job3_arch01,29,24,0	warp	#archout	1,1,odin_tem02,282,263
 
+odin_tem02,30,181,0	script	#wherearch01	139,10,10,{
+OnTouch:
+	if (job_arch == 5)
+		viewpoint 1,282,263,1,0xFFFF99;
+	end;
+}
+
+odin_tem02,30,335,0	script	#wherearch02	139,10,10,{
+OnTouch:
+	if (job_arch == 5)
+		viewpoint 1,282,263,1,0xFFFF99;
+	end;
+}
+
 /*
-job3_arch01,1,1,1	script	¿ØÖÆ#arch	844,{
-	mes "[Íç¹ÌµÄÊÞÈË]";
-	mes "ÇëÊäÈëÃÜÂë¡£";
+job3_arch01,1,1,1	script	control#arch	844,{
+	mes "[Troll]";
+	mes "Password please.";
 	next;
 	input .@input;
 	if (.@input == 1854) {
-		mes "[ͨÐÐ]";
-		mes "ÏÖÔÚµÄÈ«¾Ö±äÁ¿ÖµÎª";
-		mes "" + $@archbs + "¡£";
-		mes "ÄãÏëÐÞ¸ÄÂð?";
+		mes "[Transit]";
+		mes "The GlobalVar is";
+		mes "" + $@archbs + ".";
+		mes "Do you want to change it?";
 		next;
-		switch (select("0:1")) {
+		switch(select("0:1")) {
 		case 1:
 			set $@archbs,0;
 			hideoffnpc "Valkyrie#arch";
@@ -1775,28 +1661,10 @@ job3_arch01,1,1,1	script	¿ØÖÆ#arch	844,{
 			hideoffnpc "Valkyrie#arch";
 			close;
 		}
-	}
-	if (.@input < 0 || .@input > 9999) {
-		mes "[Íç¹ÌµÄÊÞÈË]";
-		mes "ÎÒ²»ÊÇ˵¹ýÃÜÂëÒªÊäÈëÕýÈ·Â𣡣¡";
+	} else {
+		mes "[Troll]";
+		mes "Enter the correct password!";
 		close;
 	}
 }
-*/
-
-odin_tem02,30,181,0	script	#wherearch01	139,10,10,{
-OnTouch:
-	if (job_arch == 5) {
-		viewpoint 1,282,263,1,0xFFFF99;
-	}
-	end;
-}
-
-odin_tem02,30,335,0	script	#wherearch02	139,10,10,{
-OnTouch:
-	if (job_arch == 5) {
-		viewpoint 1,282,263,1,0xFFFF99;
-	}
-	end;
-}
-	
\ No newline at end of file
+*/
\ No newline at end of file
diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt
index ec1009ccb..3fa7f087e 100644
--- a/npc/re/jobs/3-1/guillotine_cross.txt
+++ b/npc/re/jobs/3-1/guillotine_cross.txt
@@ -3709,17 +3709,6 @@ job3_guil01,148,53,3	script	Bercasell#3rdgc16	467,{
 								next;
 								mes "[Bercasell]";
 								mes "And... these are presents to celebrate your becoming a Guillotine Cross.";
-								//FIXME: Outdated?
-								/*
-								set Silent_Executer,Silent_Executer+1;
-								next;
-								mes "[Bercasell]";
-								mes "And... A ticket and a ring,";
-								mes "these are presents to celebrate your becoming a Guillotine Cross.";
-								next;
-								mes "[Bercasell]";
-								mes "Unfortunately, we don't have any new weapons to offer at this time.";
-								*/
 								close;
 							case 2:
 								mes "[Bercasell]";
@@ -3789,37 +3778,6 @@ job3_guil01,148,53,3	script	Bercasell#3rdgc16	467,{
 			close;
 		}
 	} else if (Class == Job_Guillotine_Cross || Class == Job_Guillotine_Cross_T || Class == Job_Baby_Cross) {
-		//FIXME: Outdated?
-		/*if (job_3rd_gc > 20 && job_3rd_gc < 25) {
-			if (countitem(6153) > 0) {
-				mes "Long time no see.";
-				mes "Are you doing well lately?";
-				next;
-				mes "[Bercasell]";
-				mes "Actually, supplies from the guild have just arrived.";
-				mes "It's been quite tough work to make new ones.";
-				next;
-				mes "[Bercasell]";
-				mes "There wll be any different in grade about lank by clearing mission. So do not worry.";
-				mes "I'm pretty sure that you made your mind.";
-				next;
-				mes "[Bercasell]";
-				mes "Death doesn't tell anything...";
-				delitem 6153,1; //Special_Exchange_Coupon
-				if (job_3rd_gc > 20 && job_3rd_gc < 25)
-					set job_3rd_gc, job_3rd_gc+4;
-				completequest 7100;
-				set Silent_Executer,Silent_Executer+1;
-				close;
-			} else {
-				mes "Actually, supplies from the guild have just arrived.";
-				mes "It's been quite tough work to make new ones.";
-				next;
-				mes "[Bercasell]";
-				mes "If you give me the exchange ticket I gave you before, I'll give you the supplies.";
-				close;
-			}
-		}*/
 		mes "Don't pursue only strength.";
 		mes "You'll get tired.";
 		mes "It's no better than living.";
diff --git a/npc/re/jobs/3-1/mechanic.txt b/npc/re/jobs/3-1/mechanic.txt
index a61a9a555..0237eb6c7 100644
--- a/npc/re/jobs/3-1/mechanic.txt
+++ b/npc/re/jobs/3-1/mechanic.txt
@@ -1,44 +1,43 @@
 //===== rAthena Script ======================================= 
 //= Mechanic Jobchange Quest
 //===== By: ================================================== 
-//= Masao
+//= Muad_Dib
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Jobchange Quest from Blacksmith / Whitesmith -> Mechanic.
 //===== Additional Comments: ================================= 
-//= v1.0 First Version.
-//= v1.1 Fixed the Door NPC - [JayPee].
+//= 1.0 First Version. [Masao]
+//= 1.1 Fixed the Door NPC [JayPee].
+//= 1.2 Updated script. [Euphy]
 //============================================================ 
 
 yuno,129,156,3	script	Chainheart	923,{
-
-	if(BaseLevel > 99)
-	{
-		mes "[Chainheart]";
+	mes "[Chainheart]";
+	if (BaseLevel > 99) {
 		mes "Living as a Mechanic is tough,";
 		mes "but I am happy that I can";
 		mes "always do what I want.";
 		close;
 	}
-	if(job__mechanic == 12)
-	{
-		mes "[Chainheart]";
+	if (job__mechanic == 12) {
 		mes "There's nothing to say specifically about Mechanics or magic machinery.";
 		mes "You would know more about it than anyone now.";
 		next;
 		mes "[Chainheart]";
 		mes "Continue to grow your knowledge by experiencing what the world has to offer.";
 		close;
-	}
-	if(job__mechanic == 11)
-	{
-		if((Class == Job_Blacksmith || Class == Job_Whitesmith || Job_Baby_Blacksmith) && (JobLevel > 49) && (SkillPoint == 0) && (BaseLevel > 98))
-		{
-			mes "[Chainheart]";
+	} else if (job__mechanic == 11) {
+		if (BaseJob == Job_Blacksmith && BaseLevel > 98 && JobLevel > 49 && SkillPoint == 0) {
+			if (ismounting()) {
+				mes "You are on a riding pet,";
+				mes "so you cannot change your job.";
+				mes "Please unequip your riding pet and try again!";
+				close;
+			}
 			mes "What is it? Is that you?";
 			mes "Oh wait, you look quite different than the last time I saw you.";
 			mes "Did something happen?";
@@ -64,7 +63,7 @@ yuno,129,156,3	script	Chainheart	923,{
 			mes "by actively participating.";
 			next;
 			mes "[Chainheart]";
-			mes "I like who you are and I think we need that kind of new blood for our Mechanics.";
+			mes "I like who you are and I think we need that kind of a new blood for our Mechanics.";
 			next;
 			mes "[Chainheart]";
 			mes "Science is seeking and studying things that can be proven logically.";
@@ -76,22 +75,14 @@ yuno,129,156,3	script	Chainheart	923,{
 			next;
 			set job__mechanic,12;
 			completequest 10101;
-			if(Sex == 1) {
+			if (Sex)
 				getitem 5749,1; //Driver_Band
-			} else {
+			else
 				getitem 5760,1; //Driver_Band_
-			}
 			getitem 2795,1; //Green_Apple_Ring
-			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;
-			}
+			jobchange roclass(eaclass()|EAJL_THIRD);
 			mes "[Chainheart]";
-			mes "Here is, a gift.";
+			mes "This is a gift that I give to you.";
 			mes "If you keep this well, one day";
 			mes "you'll be thankful to me.";
 			next;
@@ -102,13 +93,9 @@ yuno,129,156,3	script	Chainheart	923,{
 			mes "textbook, so let there be a silver lining in the future of Mechanics!";
 			close;
 		}
-		mes "[Chainheart]";
-		mes "If not what?";
+		mes "It seems something not enough?";
 		close;
-	}
-	if(job__mechanic >= 3)
-	{
-		mes "[Chainheart]";
+	} else if (job__mechanic >= 3) {
 		mes "By the way, Franklson is missing.";
 		mes "He said that he wanted to study";
 		mes "and then disappeared.";
@@ -121,14 +108,10 @@ yuno,129,156,3	script	Chainheart	923,{
 		mes "[Chainheart]";
 		mes "Anyway, farewell.";
 		close;
-	}
-	if(job__mechanic == 2)
-	{
-		mes "[Chainheart]";
+	} else if (job__mechanic == 2) {
 		mes "I think I've done all the explanations, is there anything else you want to know?";
 		next;
-		switch(select("I want to know more.:Nothing."))
-		{
+		switch(select("I want to know more.:Nothing.")) {
 		case 1:
 			mes "[Chainheart]";
 			mes "Um..? You want to know more about magic machinery. Is that it?";
@@ -160,7 +143,7 @@ yuno,129,156,3	script	Chainheart	923,{
 			next;
 			mes "[Chainheart]";
 			mes "Come to think of it...";
-			mes "Franklson developed";
+			mes "Franklson developed the";
 			mes "magic machinery on his own.";
 			mes "So why don't you go to";
 			mes "the Ruins of Juperos?";
@@ -184,10 +167,7 @@ yuno,129,156,3	script	Chainheart	923,{
 			mes "I thought that you had what it took to be a true Mechanic.";
 			close;
 		}
-	}
-	if(job__mechanic == 1)
-	{
-		mes "[Chainheart]";
+	} else if (job__mechanic == 1) {
 		mes "Ok let me catch my breath.";
 		mes "You must be interested in";
 		mes "magic machinery and the";
@@ -199,7 +179,7 @@ yuno,129,156,3	script	Chainheart	923,{
 		mes "The two haven't really been connected successfully together until now.";
 		next;
 		mes "[Chainheart]";
-		mes "If you use magic machinery, you really have to be familiar with the inner workings of machines.";
+		mes "If you use the magic machinery, you really have to be familiar with the inner workings of machines.";
 		next;
 		mes "[Chainheart]";
 		mes "It can be used effectively,";
@@ -235,11 +215,8 @@ 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 || Class == Job_Baby_Blacksmith)
-	{
-		if ((JobLevel > 49) && (SkillPoint == 0) && (BaseLevel > 98))
-		{
-			mes "[Chainheart]";
+	if (BaseJob == Job_Blacksmith) {
+		if (BaseLevel > 98 && JobLevel > 49 && SkillPoint == 0) {
 			mes "At a glance, you, seem to be a very versatile person on dealing with various things.";
 			mes "You look quite skilled.";
 			mes "You can be the one.";
@@ -276,8 +253,7 @@ yuno,129,156,3	script	Chainheart	923,{
 			mes "please talk to me again.";
 			close;
 		}
-		mes "[Chainheart]";
-		mes "You, look like someone who has a great sense on dealing with stuff.";
+		mes "You look like someone who has a great sense on dealing with stuff.";
 		next;
 		mes "[Chainheart]";
 		mes "That power has been used on";
@@ -310,7 +286,6 @@ yuno,129,156,3	script	Chainheart	923,{
 		mes "I will guide you to the world of Mechanics.";
 		close;
 	}
-	mes "[Chainheart]";
 	mes "Living as a Mechanic is tough,";
 	mes "but I am happy that I can";
 	mes "always do what I want.";
@@ -321,28 +296,19 @@ yuno,129,156,3	script	Chainheart	923,{
 }
 
 jupe_cave,37,55,5	script	Scholar#Mechanic	883,{
-
-	if(checkweight(1201,1) == 4 || MaxWeight - Weight < 300)
-	{
-		mes "- Wait here!! -";
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 300) {
 		mes "- Your pack is too heavy. -";
-		mes "- Lighten your body first-";
-		mes "- and please try again.-";
+		mes "- Lighten your body first -";
+		mes "- and please try again. -";
 		close;
 	}
-
-	if(job__mechanic > 10)
-	{
-		mes "[Scholar]";
+	mes "[Scholar]";
+	if (job__mechanic > 10) {
 		mes "How was Juperos?";
 		mes "I am so scared that I still";
 		mes "cannot go there.";
 		close;
-	}
-
-	if(job__mechanic > 3)
-	{
-		mes "[Scholar]";
+	} else if (job__mechanic > 3) {
 		mes "^FF0000You won't be able to reach the destination by walking.";
 		mes "^FF0000Strong enemies are not the problem here, you just won't be able to get to the destination.";
 		mes "Please make yourself at home.^000000";
@@ -356,8 +322,7 @@ jupe_cave,37,55,5	script	Scholar#Mechanic	883,{
 		mes "to go to the midway point";
 		mes "at Juperos?";
 		next;
-		switch(select("I am ready!:Not yet"))
-		{
+		switch(select("I am ready!:Not yet")) {
 		case 1:
 			mes "[Scholar]";
 			mes "Uh... you are acting so firmly that I regret a little that I haven't gone there.";
@@ -384,76 +349,50 @@ jupe_cave,37,55,5	script	Scholar#Mechanic	883,{
 			close;
 		}
 	}
-	if(job__mechanic == 3)
-	{
-		mes "[Scholar]";
-		mes "I am a scholar who came here to research the ruins here in Juperos.";
-		next;
-		mes "[Scholar]";
-		mes "But... actually when";
-		mes "I try to go further";
-		mes "I get scared.";
-		mes "I can hardly go inside.";
-		mes "What can I do?";
-		next;
-		mes "[Scholar]";
-		mes "I heard a rumor that humans";
-		mes "aren't welcome inside there.";
-		mes "But it should be very useful to study the marvelous machines in there.";
-		next;
-		mes "[Scholar]";
-		mes "Umm? Are you also going to";
-		mes "Juperos to get something?";
-		mes "I have no courage to go in there.";
-		mes "Goodluck to you.";
-		next;
-		mes "[Scholar]";
-		mes "I know the way to get to";
-		mes "the midway point and I also have";
-		mes "all the stuff I need.";
-		mes "But I'm just too scared.";
-		next;
-		mes "[Scholar]";
-		mes "So if you want, I'll send you";
-		mes "to Juperos. Mr. Elder Scholar";
-		mes "has told me how to warp to";
-		mes "the midway point to Juperos.";
-		next;
-		set job__mechanic,4;
-		mes "[Scholar]";
-		mes "It is true that it becomes easy";
-		mes "but you can't help the fear";
-		mes "it's too bad. Anyway if you are";
-		mes "ready to go please tell me.";
-		close;
-	}
-	mes "[Scholar]";
 	mes "I am a scholar who came here to research the ruins here in Juperos.";
 	next;
 	mes "[Scholar]";
 	mes "But... actually when I try to go further";
-	mes "I'm scared. I can hardly go inside.";
+	mes "I get scared. I can hardly go inside.";
 	mes "What can I do?";
 	next;
 	mes "[Scholar]";
 	mes "I heard a rumor that humans aren't welcome inside there.";
 	mes "But it should be very useful to study the marvelous machines in there.";
+	if (job__mechanic != 3) close;
+	next;
+	mes "[Scholar]";
+	mes "Umm? Are you also going to Juperos to get something?";
+	mes "I have no courage to go in there.";
+	mes "Good luck to you.";
+	next;
+	mes "[Scholar]";
+	mes "I know the way to get to";
+	mes "the midway point and I also have";
+	mes "all the stuff I need. But I'm just too scared.";
+	next;
+	mes "[Scholar]";
+	mes "So if you want, I'll send you";
+	mes "to Juperos. Mr. Elder Scholar";
+	mes "has told me how to warp to";
+	mes "the midway point to Juperos.";
+	next;
+	set job__mechanic,4;
+	mes "[Scholar]";
+	mes "It is true that it becomes easy";
+	mes "but you can't help the fear";
+	mes "it's too bad. Anyway if you are";
+	mes "ready to go please tell me.";
 	close;
 }
 
 jupe_core2,149,273,3	script	Ghostfire#1	802,{
-
-	if(job__mechanic == 11)
-	{
-		mes "[?]";
+	mes "[?]";
+	if (job__mechanic == 11) {
 		mes "I've lost my body and all that's left is my spirit in this place.";
 		mes "I will live and die here in Juperos forever...";
 		close;
-	}
-
-	if(job__mechanic == 10)
-	{
-		mes "[?]";
+	} else if (job__mechanic == 10) {
 		mes "That appearance... Is it so? You also gained the knowledge.";
 		mes "When the future is full of possibilities...";
 		mes "An attitude of a pure child";
@@ -484,193 +423,161 @@ jupe_core2,149,273,3	script	Ghostfire#1	802,{
 		changequest 10100,10101;
 		warp "yuno",157,83;
 		end;
-	}
-	if(job__mechanic > 4)
-	{
-		mes "[?]";
+	} else if (job__mechanic > 4) {
 		mes "I've lost my body and all that's left is my spirit in this place.";
 		mes "I will live and die here in Juperos forever...";
 		close;
-	}
-	if (job__mechanic == 3 || job__mechanic == 4)
-	{
-		mes "[?]";
+	} else if (job__mechanic > 2) {
 		mes "Talented one.";
 		mes "Make sure there are";
 		mes "no enemies around.";
 		mes "If you focus on me,";
 		mes "you might get attacked.";
 		next;
-		switch(select("Well then, later.:Focus."))
-		{
-		case 1:
-			close;
-		case 2:
-			mes "[?]";
-			mes "I was once a human scholar.";
-			mes "I wanted to know the limitation of science that humankind didn't know of, so I learned a lot of things, studied and searched...";
-			next;
-			mes "[?]";
-			mes "That's when I discovered, the uncertain magical power.";
-			next;
-			mes "[?]";
-			mes "The thing with uncertain magic is that it is highly unstable and unpredictable.";
-			mes "During my studies I encountered a pocket of highly volatile magic.";
-			next;
-			mes "[?]";
-			mes "The only memories I have";
-			mes "are from that day forward.";
-			mes "I've been trapped here since.";
-			next;
-			mes "[?]";
-			mes "Juperos is all that I know now.";
-			mes "I'm going to die here.";
-			next;
-			mes "[?]";
-			mes "I don't know who you are...";
-			mes "I won't bother to know if you";
-			mes "want to gain some knowledge.";
-			mes "Find someone who cares.";
-			next;
+		if(select("Well then, later.:Focus.") == 1) close;
+		mes "[?]";
+		mes "I was once a human scholar.";
+		mes "I wanted to know the limitation of science that humankind didn't know of, so I learned a lot of things, studied,";
+		mes "and searched...";
+		next;
+		mes "[?]";
+		mes "That's when I discovered, the uncertain magical power.";
+		next;
+		mes "[?]";
+		mes "The thing, with uncertain magic is that it is highly unstable and unpredictable.";
+		mes "During my studies I encountered a pocket of highly volatile magic.";
+		next;
+		mes "[?]";
+		mes "The only memories I have are from that day forward.";
+		mes "I've been trapped here since.";
+		next;
+		mes "[?]";
+		mes "Juperos is all that I know now.";
+		mes "I'm going to die here.";
+		next;
+		mes "[?]";
+		mes "I don't know who you are...";
+		mes "I won't bother to know if you";
+		mes "want to gain some knowledge";
+		mes "find someone who cares.";
+		next;
+		if (job__mechanic == 3 || job__mechanic == 4)
 			changequest 10092,10094;
-			set job__mechanic,5;
-			mes "[?]";
-			mes "Knowledge isn't obtained from others. It is found through one's own efforts.";
-			mes "Find your own knowledge path.";
-			close;
-		}
+		set job__mechanic,5;
+		mes "[?]";
+		mes "Knowledge isn't obtained from others. It is found through one's own efforts.";
+		mes "Find your own knowledge path.";
+		close;
 	}
+	end;
 }
 
 jupe_core2,53,75,3	script	Ghostfire#2	802,{
-
-	if(job__mechanic > 5)
-	{
-		mes "[?]";
+	mes "[?]";
+	if (job__mechanic > 5) {
 		mes "Juperos... I...";
 		mes "Juperos... What I want";
 		mes "exists all in here...";
 		mes "The power of science...the paradise of machines...";
 		close;
-	}
-
-	if(job__mechanic == 5)
-	{
-		mes "[?]";
+	} else if (job__mechanic == 5) {
 		mes "Talented one.";
 		mes "Make sure there are";
 		mes "no enemies around.";
 		mes "If you focus on me,";
 		mes "you might get attacked.";
 		next;
-		switch(select("Well then, later:Focus"))
-		{
-		case 1:
-			close;
-		case 2:
-			mes "[?]";
-			mes "When I had a body";
-			mes "I wanted to prove the";
-			mes "excellence of science";
-			mes "to the ones who only believe";
-			mes "such occult things...";
-			next;
-			mes "[?]";
-			mes "I wanted to use the power of";
-			mes "magic as a reasonable form";
-			mes "which is visible. With stronger";
-			mes "results, I wanted to control";
-			mes "the power of magic by";
-			mes "using science....";
-			next;
-			mes "[?]";
-			mes "I wanted to show that science";
-			mes "is excellent to control magic";
-			mes "like the occult. I studied a lot";
-			mes "of things and agonized over";
-			mes "making science and magic";
-			mes "co-exist.";
-			next;
-			mes "[?]";
-			mes "My research led me here,";
-			mes "Juperos. In this place there";
-			mes "are many products of science";
-			mes "that could stimulate a scholar's";
-			mes "brain...";
-			next;
-			mes "[?]";
-			mes "I found that it was possible to join the power of magic with science.";
-			mes "Even if it wasn't perfect, it appealed enough to the other scholars...";
-			next;
-			mes "[?]";
-			mes "The recent events of the world have created a confusion so my research hasn't been shared with the rest of the world.";
-			next;
-			set job__mechanic,6;
-			changequest 10094,10095;
-			mes "[?]";
-			mes "So... I came back to Juperos to continue my investigation of science and magic.";
-			close;
-		}
+		if(select("Well then, later:Focus") == 1) close;
+		mes "[?]";
+		mes "When I had a body";
+		mes "I wanted to prove the";
+		mes "excellence of science";
+		mes "to the ones who only believe";
+		mes "such occult things...";
+		next;
+		mes "[?]";
+		mes "I wanted to use the power of";
+		mes "magic as a reasonable form";
+		mes "which is visible. With stronger";
+		mes "results, I wanted to control";
+		mes "the power of magic by";
+		mes "using science....";
+		next;
+		mes "[?]";
+		mes "I wanted to show that science";
+		mes "is excellent to control magic";
+		mes "like the occult. I studied a lot";
+		mes "of things and agonized over";
+		mes "making science and magic";
+		mes "co-exist.";
+		next;
+		mes "[?]";
+		mes "My research led me here,";
+		mes "Juperos. In this place there";
+		mes "are many products of science";
+		mes "that could stimulate a scholar's";
+		mes "brain...";
+		next;
+		mes "[?]";
+		mes "I found that it was possible to join the power of magic with science.";
+		mes "Even if it wasn't perfect, it appealed enough to the other scholars...";
+		next;
+		mes "[?]";
+		mes "The recent events of the world have created a confusion so my research hasn't been shared with the rest of the world.";
+		next;
+		set job__mechanic,6;
+		changequest 10094,10095;
+		mes "[?]";
+		mes "So... I came back to Juperos to continue my investigation of science and magic.";
+		close;
 	}
+	end;
 }
 
 jupe_core2,242,62,3	script	Ghostfire#3	802,{
-
-	if(job__mechanic > 6)
-	{
-		mes "[?]";
+	mes "[?]";
+	if (job__mechanic > 6) {
 		mes "I want to know more about the knowledge...";
 		mes "the features of humans...";
 		mes "The things to be done first and later...";
 		mes "The door of truth will later...";
 		close;
-	}
-
-	if(job__mechanic == 6)
-	{
-		mes "[?]";
+	} else if (job__mechanic == 6) {
 		mes "Talented one.";
 		mes "Make sure there are";
 		mes "no enemies around.";
 		mes "If you focus on me,";
 		mes "you might get attacked.";
 		next;
-		switch(select("Well then, later:Focus"))
-		{
-		case 1:
-			close;
-		case 2:
-			mes "[?]";
-			mes "I wasn't satisfied with my success so I came back here time and time again.";
-			next;
-			mes "[?]";
-			mes "When I stepped on a marker between 2 mechanical statues, the energy I had gathered and learned was absorbed.";
-			next;
-			mes "[?]";
-			mes "But, with that energy being absorbed, I began to gain knowledge that I never knew previously.";
-			next;
-			mes "[?]";
-			mes "But it came at a price. With the knowledge I started losing my humanity.";
-			mes "I lost my body and the only";
-			mes "thing I had was my spirit.";
-			next;
-			mes "[?]";
-			mes "I don't regret gaining the knowledge. All I wish is that I could have my body back.";
-			next;
-			set job__mechanic,7;
-			changequest 10095,10096;
-			mes "[?]";
-			mes "After I had poured my energy into the statue, I discovered that I could move my energy to different statues.";
-			close;
-		}
+		if(select("Well then, later:Focus") == 1) close;
+		mes "[?]";
+		mes "I wasn't satisfied with my success so I came back here time and time again.";
+		next;
+		mes "[?]";
+		mes "When I stepped on the foothold of this statue, the energy I had gathered and learned was absorbed.";
+		next;
+		mes "[?]";
+		mes "But, with that energy being absorbed, I began to gain knowledge that I never knew previously.";
+		next;
+		mes "[?]";
+		mes "But it came at a price. With the knowledge I started losing my humanity.";
+		mes "I lost my body and the only thing I had was my spirit.";
+		next;
+		mes "[?]";
+		mes "I don't regret gaining the knowledge. All I wish is that I could have my body back.";
+		next;
+		set job__mechanic,7;
+		changequest 10095,10096;
+		mes "[?]";
+		mes "After I had poured my energy into the statue, I figured that I could move my energy to different statues.";
+		close;
 	}
+	end;
 }
 
-jupe_core2,29,150,1	script	Foothold	139,1,1,{
-
+jupe_core2,29,150,0	script	#Foothold	139,1,1,{
 OnTouch:
-	if(job__mechanic == 8)
-	{
+	if (job__mechanic == 8) {
 		percentheal 0,-30;
 		mes "-Suddenly I feel power is-";
 		mes "-escaping my whole body-";
@@ -680,9 +587,7 @@ OnTouch:
 		mes "-it is the source of the-";
 		mes "-power drain.-";
 		close;
-	}
-	if(job__mechanic == 7)
-	{
+	} else if (job__mechanic == 7) {
 		percentheal -20,0;
 		mes "-Suddenly, an unidentified-";
 		mes "-voice is ringing in my head-";
@@ -691,181 +596,140 @@ OnTouch:
 		mes "-Handling machines-";
 		mes "-absorbing magic power-";
 		mes "-a sacrificial offering-";
-		mes "-the statue of a human-";
+		mes "-the statue of a human.-";
 		next;
 		set job__mechanic,8;
 		changequest 10096,10097;
 		mes "-Most certain of all is that-";
 		mes "-I started to feel the urge-";
-		mes "-to go to the door of truth-";
+		mes "-to go to the door of truth.-";
 		close;
-	}
-	if(job__mechanic > 2)
-	{
+	} else if (job__mechanic > 2) {
 		percentheal 0,-30;
 		mes "-Suddenly I feel power is-";
 		mes "-escaping from my body-";
 		mes "-What is happening?-";
 		close;
 	}
+	end;
 }
 
-jupe_core2,272,149,1	script	Foothold2	139,1,1,{
-
+jupe_core2,272,149,0	script	#Foothold2	139,1,1,{
 OnTouch:
-	if(job__mechanic == 9)
-	{
+	if (job__mechanic == 9) {
 		mes "-I had a feeling that power-";
 		mes "-has been draining out,-";
 		mes "-but now, I do not-";
 		mes "-feel anything.-";
 		next;
 		mes "-Go to the south of-";
-		mes "-the foothold quickly-";
+		mes "-the foothold quickly.-";
 		close;
-	}
-	if(job__mechanic == 8)
-	{
+	} else if (job__mechanic == 8) {
 		percentheal -20,-30;
 		mes "-Suddenly I feel power is-";
 		mes "-escaping from my body-";
 		mes "-What is happening?-";
 		next;
 		mes "-I feel my senses-";
-		mes "-are returning to me-";
+		mes "-are returning to me.-";
 		next;
-		donpcevent "Door::OnDoorOpen";
+		donpcevent "#Door::OnEnable";
 		changequest 10097,10098;
-		mes "-Walk to the Door of Truth-";
+		mes "-I think that I am becoming-";
+		mes "-the sacrificial offering.-";
 		close;
-	}
-	if(job__mechanic > 2)
-	{
+	} else if (job__mechanic > 2) {
 		percentheal 0,-30;
 		mes "-Suddenly I feel power is-";
 		mes "-escaping from my body-";
 		mes "-What is happening?-";
 		close;
 	}
+	end;
 }
 
-jupe_core2,288,142,3	script	Door	844,1,1,{
-end;
-
+jupe_core2,288,142,3	script	#Door	844,1,1,{
+	end;
 OnInit:
-	disablenpc "Door";
+	hideonnpc "#Door";
 	end;
-
-OnDoorClose:
-	disablenpc "Door";
+OnDisable:
+	hideonnpc "#Door";
 	end;
-
-OnDoorOpen:
-	enablenpc "Door";
+OnEnable:
+	hideoffnpc "#Door";
 	specialeffect EF_MAPPILLAR;
 	initnpctimer;
 	end;
-
 OnTimer180000:
-	donpcevent "Door::OnDoorClose";
+	donpcevent "#Door::OnDisable";
 	end;
-
 OnTouch:
-	if(job__mechanic == 8)
-	{
-		mes "-Once again a voice rings out-";
-		mes "-in my head. This time it is-";
-		mes "-different than before, it is a-";
-		mes "-voice of an impressive person-";
-		next;
-		mes "I know you came this far because you want the knowledge.";
-		mes "Humans are weak animals";
-		mes "and any sacrifice is a hard";
-		mes "decision for them to make.";
-		next;
-		mes "But you are lacking something to pass through this door of truth.";
-		mes "Through this door is knowledge above all human thinking.";
-		next;
-		mes "It won't harm a human's mind if it doesn't surpass your brain capacity.";
-		next;
-		mes "Try to put your body onto the foothold of knowledge at the south.";
-		next;
-		mes "If the knowledge suits you, you'll be able to obtain it without becoming a sacrificial offering.";
-		mes "If you are unqualified, you will lose your body as a sacrifice.";
-		next;
-		mes "When you are qualified, you will be able to pass through the door of truth.";
-		mes "Till that day, don't lose yourself.";
-		next;
-		mes "............";
-		next;
-		mes "-I can't hear any voices-";
-		mes "-anymore and I can't feel-";
-		mes "-anything in this place.-";
-		next;
-		mes "-As the ringing voice in my-";
-		mes "-head instructed, let's go to-";
-		mes "-the southern marker.-";
-		set job__mechanic,9;
-		changequest 10098,10099;
-		close2;
-		donpcevent "Door::OnDoorClose";
-		end;
-	}
-end;
-}
-
-jupe_core2,149,34,1	script	Acquiring Knowledge	139,1,0,{
+	mes "-Once again a voice rings out-";
+	mes "-in my head. This time it is-";
+	mes "-different than before, it is a-";
+	mes "-voice of an impressive person.-";
+	next;
+	mes "I know you came this far because you want the knowledge.";
+	mes "Humans are weak animals";
+	mes "and any sacrifice is a hard";
+	mes "decision for them to make.";
+	next;
+	mes "But you are lacking something to pass through this door of truth.";
+	mes "Through this door is knowledge above all human thinking.";
+	next;
+	mes "It won't harm a human's mind if it doesn't surpass your brain capacity.";
+	next;
+	mes "Try to put your body onto the foothold of knowledge at the south.";
+	next;
+	mes "If the knowledge suits you, you'll be able to obtain it without becoming a sacrificial offering.";
+	mes "If you are unqualified, you will lose your body as a sacrifice.";
+	next;
+	mes "When you are qualified, you will be able to pass through the door of truth.";
+	mes "Till that day, don't lose yourself.";
+	next;
+	mes "............";
+	next;
+	mes "-I can't hear any voices-";
+	mes "-anymore and I can't feel-";
+	mes "-anything in this place.-";
+	next;
+	mes "-As the ringing voice in my-";
+	mes "-head instructed, let's go to-";
+	mes "-the southern foothold.-";
+	close2;
+	set job__mechanic,9;
+	changequest 10098,10099;
+	donpcevent "#Door::OnDisable";
 	end;
-OnTouch:
-	if(job__mechanic == 9)
-	{
-		mes "-The moment I stepped on-";
-		mes "-the marker the voice-";
-		mes "-didn't come into my brain-";
-		mes "-rather new knowledge-";
-		mes "-came in naturally.-";
-		next;
-		mes "-Almost instantaneously-";
-		mes "-you gained all of the-";
-		mes "knowledge that you need-";
-		mes "-to know about mechanics-";
-		mes "-and magic machinery.-";
-		next;
-		set job__mechanic,10;
-		changequest 10099,10100;
-		specialeffect EF_POTION_CON;
-		mes "-This amount of-";
-		mes "-knowledge is enough-";
-		mes "-and find a way out.-";
-		close;
-	}
 }
 
-jupe_core2,150,33,1	script	Acquiring Knowledge#2	139,1,0,{
-	end;
+jupe_core2,149,34,0	script	#Acquiring Knowledge	139,1,0,{
 OnTouch:
-	if(job__mechanic == 9)
-	{
+	if (job__mechanic == 9) {
 		mes "-The moment I stepped on-";
-		mes "-the marker the voice-";
+		mes "-the foothold the voice-";
 		mes "-didn't come into my brain-";
 		mes "-rather new knowledge-";
 		mes "-came in naturally.-";
 		next;
 		mes "-Almost instantaneously-";
 		mes "-you gained all of the-";
-		mes "knowledge that you need-";
+		mes "-knowledge that you need-";
 		mes "-to know about mechanics-";
 		mes "-and magic machinery.-";
 		next;
 		set job__mechanic,10;
 		changequest 10099,10100;
 		specialeffect EF_POTION_CON;
-		mes "-This amount of-";
-		mes "-knowledge is enough-";
+		mes "-This amount of knowledge-";
+		mes "-is enough. Let's get finished-";
 		mes "-and find a way out.-";
 		close;
 	}
+	end;
 }
+jupe_core2,150,33,0	duplicate(#Acquiring Knowledge)	#Acquiring Knowledge2	139,1,0
 
 jupe_core2,0,0,0,0	monster	Dimik	1669,100,0,0,0
\ No newline at end of file
diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt
index 578a39ec0..4a96bed59 100644
--- a/npc/re/jobs/3-2/royal_guard.txt
+++ b/npc/re/jobs/3-2/royal_guard.txt
@@ -1,68 +1,68 @@
 //===== rAthena Script ======================================= 
 // Royal Guard Job change Quest
 //===== By: ================================================== 
-//= brAthena
+//= Muad_Dib
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
-//= Any rAthena or brAthena SVN
+//= rAthena SVN
 //===== Description: ========================================= 
-//= [Translated from the Official]
+//= [Official Conversion]
 //= Job change Quest from Crusader / Paladin -> Royal Guard.
 //===== Additional Comments: ================================= 
-//= 1.0 First Version.
+//= 1.0 First Version. [brAthena]
+//= 1.1 Updated script. [Euphy]
 //============================================================
-prt_castle,48,163,3	script	Gentleman#4386457567	57,{
-	if(!checkweight(1201,1)) {
-		mes "You have too many items. please arrange them then try again.";
-		close;
-	}
-	if(MaxWeight - Weight < 1000) {
-		mes "You have too much items, please make more light.";
+
+prt_castle,48,161,3	script	Middle-aged Gentleman#rg	57,{
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
+		mes "- Your pack is too heavy. -";
+		mes "- Lighten your body first -";
+		mes "- and please try again. -";
 		close;
 	}
-	if(Class == 4066 || Class == 4073 || Class == 4102) {
+	if (Class == Job_Royal_Guard || Class == Job_Royal_Guard_T || Class == Job_Baby_Guard) {
 		mes "[Middle-aged Gentleman]";
 		mes "Uh? What am I doing? I came here for an errand...";
 		next;
-		mes "^000099Maybe my feeling has moved to another body^000000";
+		mes "^000099Maybe my feeling has moved to another body.^000000";
 		close;
 	}
-	if(JobLevel < 50 || SkillPoint || BaseLevel < 99) {
+	if (BaseLevel < 99 || JobLevel < 50 || SkillPoint != 0) {
 		mes "[Middle-aged Gentleman]";
 		mes "Oh you are so young. Keep working hard.";
 		close;
 	}
-	if(checkriding() || checkcart() || checkfalcon()) {
+	if (checkriding() || checkcart() || checkfalcon()) {
 		mes "[Middle-aged Gentleman]";
 		mes "You are dragging something. If you're riding something you better dismount it before proceeding.";
 		close;
 	}
-	if((Class != 14) && (Class != 4015) && (Class != 4037)) {
+	if (BaseJob != Job_Crusader) {
 		mes "[Middle-aged Gentleman]";
 		mes "I don't have anything to say to you. Find another person.";
 		close;
 	}
-	if(job_royal < 1) {
+	if (job_royal == 0) {
 		mes "[Middle-aged Gentleman]";
-		mes "What was I saying... (mumble) the remaining segment is in Glass Heim around 13.......";
+		mes "What was I saying... (mumble) the remaining segment is in Glast Heim around 13.......";
 		next;
 		mes "[Middle-aged Gentleman]";
 		mes "Uhh?";
 		mes "Did you need something?";
 		next;
-		select "I haven't seen you before.";
+		select("I haven't seen you before.");
 		mes "[Middle-aged Gentleman]";
 		mes "Hehehe, don't worry about me.";
 		next;
 		mes "[Middle-aged Gentleman]";
 		mes "If you don't have business with me, just keep going my friend.";
 		next;
-		select "You don't look like a Knight...";
+		select("You don't look like a Knight...");
 		mes "[Middle-aged Gentleman]";
 		mes "You're a curious one. Who are you? What do you want?";
 		next;
-		select "Just looking around!:This is my office!:Who am I? Who are you?";
+		select("Just looking around!:This is my office!:Who am I? Who are you?");
 		mes "[Middle-aged Gentleman]";
 		mes "Do you want to argue with me? Do you know who I am?";
 		next;
@@ -78,7 +78,7 @@ prt_castle,48,163,3	script	Gentleman#4386457567	57,{
 		mes "I'm a member here and have the authority to find out what your business is here.";
 		next;
 		mes "["+strcharinfo(0)+"]";
-		mes "You are a stranger and I'm not sure if you belog here.";
+		mes "You are a stranger and I'm not sure if you belong here.";
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "If you tell me your identity, I will apologize.";
@@ -91,22 +91,32 @@ prt_castle,48,163,3	script	Gentleman#4386457567	57,{
 		mes "I am Heinrich.";
 		mes "I'm collecting information about King Schmidtz's trace which has disappeared.";
 		next;
-		select "Schmidzt's trace? Is it a treasure?";
+		select("Schmidzt's trace? Is it a treasure?");
 		mes "[Heinrich]";
 		mes "Most archaeologists are eager to get treasure. I'm looking for traces of the ^000099Royal Guard^000000 and their sons who belong to the Schmidtz line.";
 		next;
-		select "Royal Guard?";
+		select("Royal Guard?");
 		mes "[Heinrich]";
 		mes "Sounds interesting doesn't it? I can't really say but their history and files are under strict security.";
 		next;
-		select "Can't you tell me?";
+		select("Can't you tell me?");
 		mes "[Heinrich]";
 		mes "I can't really talk about the Royal Guard to just anyone who asks about them.";
 		next;
 		mes "[Heinrich]";
 		mes "BUT!! I want to believe you...";
 		next;
-		if(select("I want to know more.:Stop talking.") == 2) {
+		switch(select("I want to know more.:Stop talking.")) {
+		case 1:
+			mes "[Heinrich]";
+			mes "You are impetuous.";
+			next;
+			mes "[Heinrich]";
+			mes "It's not a simple story to tell a person like you. Go back.";
+			set job_royal,1;
+			setquest 12090;
+			close;
+		case 2:
 			mes "[Heinrich]";
 			mes "Good idea.";
 			next;
@@ -114,21 +124,14 @@ prt_castle,48,163,3	script	Gentleman#4386457567	57,{
 			mes "Just forget it and let your mind do more worthy things.";
 			close;
 		}
-		mes "[Heinrich]";
-		mes "You are impetuous.";
-		next;
-		mes "[Heinrich]";
-		mes "It's not a simple story to tell a person like you. Go back.";
-		set job_royal,1;
-		setquest 12090;
-		close;
 	}
 	mes "[Heinrich]";
-	if(job_royal == 1) {
+	if (job_royal == 1) {
+		mes "[Heinrich]";
 		mes "You are persistent friend.";
 		mes "Do you have more things to talk to me about?";
 		next;
-		select "If you can't trust me, test me pal.";
+		select("If you can't trust me, test me pal.");
 		mes "[Heinrich]";
 		mes "Test?";
 		mes "Did you say the test? Huhu!";
@@ -136,12 +139,12 @@ prt_castle,48,163,3	script	Gentleman#4386457567	57,{
 		mes "[Heinrich]";
 		mes "Friend, you have shown your interest about my job, are you sure? Or are you kidding me?";
 		next;
-		select "I'm serious!";
+		select("I'm serious!");
 		mes "[Heinrich]";
 		mes "Really?";
 		mes "Good. You might have the wrong idea about what a Royal Guard is. So, in your opinion, what do you think is the key to being a Royal Guard?";
 		next;
-		select "Decision and Bravery:Calm Judgment:Sharp wisdom:Benevolent spirit";
+		select("Decision and Bravery:Calm Judgment:Sharp wisdom:Benevolent spirit");
 		mes "[Heinrich]";
 		mes "Good choice.";
 		mes "Actually, the other 3 are also needed to have the Royal Guard spirit, friend.";
@@ -159,8 +162,8 @@ prt_castle,48,163,3	script	Gentleman#4386457567	57,{
 		mes "[Heinrich]";
 		mes "Only those who have qualification can hear the Royal Guard history.";
 		next;
-		select "What can I do to hear that story?";
-		mes "^000099Heinrich has an agonized look on his face. Then he looked like he fell asleep. Finally he says with wreckless abandon.^000000";
+		select("What can I do to hear that story?");
+		mes "^000099Heinrich has an agonized look on his face. Then he looked like he fell asleep. Finally he says with reckless abandon.^000000";
 		next;
 		mes "[Heinrich]";
 		mes "You are too stubborn.";
@@ -172,7 +175,7 @@ prt_castle,48,163,3	script	Gentleman#4386457567	57,{
 		mes "[Heinrich]";
 		mes "If you want to hear more story, you have to show me your similar attitude.";
 		next;
-		if(select("That's an unfair demand.:I will try.") == 2) {
+		if(select("That's an unfair demand.:I will try.") == 1) {
 			mes "[Heinrich]";
 			mes "Good idea, it would better to find something more worthy.";
 			close;
@@ -188,9 +191,8 @@ prt_castle,48,163,3	script	Gentleman#4386457567	57,{
 		set job_royal,2;
 		changequest 12090,12091;
 		close;
-	}
-	if(job_royal == 2) {
-		if(countitem(7097) < 100) {
+	} else if (job_royal == 2) {
+		if (countitem(7097) < 100) {
 			mes "Don't forget to bring 100 Burning Heart.";
 			close;
 		}
@@ -199,16 +201,15 @@ prt_castle,48,163,3	script	Gentleman#4386457567	57,{
 		next;
 		mes "[Heinrich]";
 		mes "Wait while I arrange the stuff that you brought.";
-		delitem 7097,100;
+		delitem 7097,100; //Burning_Heart
 		set job_royal,3;
 		changequest 12091,12092;
 		close;
-	}
-	if(job_royal == 3) {
+	} else if (job_royal == 3) {
 		mes "...";
 		mes "Good. I can feel truth from your heart. Now I can tell you more of the story.";
 		next;
-		select "Ok tell me more.";
+		select("Ok tell me more.");
 		mes "[Heinrich]";
 		mes "The best members of the Crusader and Paladin classes can gain the qualification of the Royal Guard.";
 		next;
@@ -218,7 +219,7 @@ prt_castle,48,163,3	script	Gentleman#4386457567	57,{
 		mes "[Heinrich]";
 		mes "We still have many opinions about how they could have survived. Surely someone had to have believed that their history was not false.";
 		next;
-		select "Are there still documents?";
+		select("Are there still documents?");
 		mes "[Heinrich]";
 		mes "Hmm, documents you say...";
 		next;
@@ -231,7 +232,7 @@ prt_castle,48,163,3	script	Gentleman#4386457567	57,{
 		mes "[Heinrich]";
 		mes "It's like it disappeared with the king.";
 		next;
-		select "So the reason of finding their traces...";
+		select("So the reason of finding their traces...");
 		mes "[Heinrich]";
 		mes "I was worried about past Royal Guards that might not have been able to pass down their history.";
 		next;
@@ -241,11 +242,11 @@ prt_castle,48,163,3	script	Gentleman#4386457567	57,{
 		mes "[Heinrich]";
 		mes "That's why I'm concentrating to revive their job.";
 		next;
-		select "How much progress have you made?";
+		select("How much progress have you made?");
 		mes "[Heinrich]";
 		mes "Fortunately, I excavated most of the treasures and interpreted them. I just have one trace left to find.";
 		next;
-		select "The rest of the traces?";
+		select("The rest of the traces?");
 		mes "[Heinrich]";
 		mes "The Royal Guard carved the mark of King Schmidtz on their clothes. The trace of this custom is the last clue.";
 		next;
@@ -267,9 +268,9 @@ prt_castle,48,163,3	script	Gentleman#4386457567	57,{
 		mes "Are you kidding?";
 		mes "You shouldn't treat it like it's just some normal chore.";
 		next;
-		select "I'm not kidding. I'm serious.";
+		select("I'm not kidding. I'm serious.");
 		mes "[Heinrich]";
-		mes "If you say it like that I don't have anymore options.";
+		mes "If you say it like that I don't have any more options.";
 		next;
 		mes "[Heinrich]";
 		mes "I don't know if it will be helpful or not. I will write an explanation in detail.";
@@ -278,12 +279,14 @@ prt_castle,48,163,3	script	Gentleman#4386457567	57,{
 		set job_royal,4;
 		changequest 12092,12093;
 		close;
-	}
-	if(job_royal == 4) {
-		if(!countitem(6274)) {
+	} else if (job_royal == 4) {
+		if (countitem(6274) == 0) {
 			mes "Our staff has already left to find the last trace, so don't work too hard.";
 			close;
 		}
+		mes "No, it's not the correct one that I want.";
+		next;
+		mes "[Hainrich]";
 		mes "You surprised me. How did you get it? So far no one could get it.";
 		next;
 		mes "[Heinrich]";
@@ -295,7 +298,7 @@ prt_castle,48,163,3	script	Gentleman#4386457567	57,{
 		mes "[Heinrich]";
 		mes "Our staff excavated it. They assumed that King Schmidtz used it. But it wasn't used by him.";
 		next;
-		select "Sure it's wasn't used by the King?";
+		select("Sure it's wasn't used by the King?");
 		mes "[Heinrich]";
 		mes "I can't be entirely sure.";
 		mes "Maybe you are right but, according to when we did the initial identification we can be sure it wasn't used.";
@@ -303,65 +306,72 @@ prt_castle,48,163,3	script	Gentleman#4386457567	57,{
 		mes "[Heinrich]";
 		mes "But it's an old treasure so, somehow it will be useful. I might know how to use it.";
 		next;
-		select "Can I keep it?";
+		select("Can I keep it?");
 		mes "[Heinrich]";
 		mes "Of course.";
 		mes "Someday it might be useful to you.";
 		next;
-		mes "^000099You get the shield from Heinrich. There are some letters carved on the inside of the shield.";
+		mes "^000099You get the shield from Heinrich. There are some letters carved on the inside of the shield.^000000 ";
 		next;
-		mes "If you want to see the letters, please check the quest window.^000000";
+		mes "^000099If you want to see the letters, please check the quest window.^000000";
 		next;
 		mes "[Heinrich]";
 		mes "Ok~~ now.";
 		mes "I'll be deciphering the cloth for now so I will be very busy!";
-		delitem 6274,1;
-		getitem 6275,1;
+		delitem 6274,1; //Saint_Cloth_Piece
+		getitem 6275,1; //King_Shield
 		set job_royal,5;
 		changequest 12093,12094;
 		close;
-	}
-	if(!countitem(6275)) {
-		mes "What? Did you lose the shield? What is the one on your back?";
-		getitem 6275,1;
+	} else if (job_royal == 5) {
+		if (countitem(6275) == 0) {
+			mes "What? Did you lose the shield? What is the one on your back?";
+			getitem 6275,1; //King_Shield
+			close;
+		}
+		mes "Thanks to your help I can finish the excavation work. Thanks a lot.";
 		close;
 	}
-	mes "Thanks to your help I can finish the excavation work. Thanks a lot.";
-	close;
 }
 
 glast_01,240,366,5	script	Memory of King Schmidtz	844,{
-	if(!checkweight(1201,1) || MaxWeight - Weight < 1000) {
-		mes "You are too heavy. Make yourself lighter.";
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
+		mes "- Your pack is too heavy. -";
+		mes "- Lighten your body first -";
+		mes "- and please try again. -";
 		close;
 	}
-	if(job_royal == 5 && (Class == 14 || Class == 4015 || Class == 4037)) {
-		if(countitem(6275) < 1) {
+	if (ismounting() || checkriding()) {
+		mes " Please unequip your riding pet and try again!";
+		close;
+	}
+	if (BaseJob == Job_Crusader && job_royal == 5) {
+		if (countitem(6275) == 0) {
 			mes "^000099You seem to have lost the shield. Go back to Heinrich and ask for help^000000.";
 			close;
 		}
 		mes "[Memory of King Schmidtz]";
 		mes "Who are you?";
 		next;
-		select "I brought a relic...";
+		select("I brought a relic...");
 		mes "[Memory of King Schmidtz]";
 		mes "My relic?";
 		next;
 		mes "[Memory of King Schmidtz]";
 		mes "Too bad. Here is one more friend who has been cheated by Heinrich.";
 		next;
-		select "Do you know Heinrich?";
+		select("Do you know Heinrich?");
 		mes "[Memory of King Schmidtz]";
 		mes "He was my faithful adjutant. And he has continued to be so for hundreds of years.";
 		next;
-		select "How has he lived for hundreds...";
+		select("How has he lived for hundreds...");
 		mes "[Memory of King Schmidtz]";
 		mes "Maybe his body is just a cast. He found a way to move from body to body in order to stay alive.";
 		next;
 		mes "[Memory of King Schmidtz]";
 		mes "He doesn't want to accept my death and wanders the world, continuing to find Royal Guards.";
 		next;
-		select "What's the meaning of this shield?";
+		select("What's the meaning of this shield?");
 		mes "[Memory of King Schmidtz]";
 		mes "The shield from Heinrich is our contract before I died.";
 		next;
@@ -374,7 +384,7 @@ glast_01,240,366,5	script	Memory of King Schmidtz	844,{
 		mes "[Memory of King Schmidtz]";
 		mes "Now he doesn't need to do it anymore, but will remain as a fool whom can't forget his King's final order.";
 		next;
-		select "So what now? Can I leave?";
+		select("So what now? Can I leave?");
 		mes "[Memory of King Schmidtz]";
 		mes "Sorry but I can't send you now.";
 		next;
@@ -401,51 +411,59 @@ glast_01,240,366,5	script	Memory of King Schmidtz	844,{
 			close;
 		}
 		mes "[Memory of King Schmidtz]";
+		if (BaseLevel < 99 || JobLevel < 50 || SkillPoint != 0) {
+			mes "Look at your body before that!";
+			next;
+			mes "[Memory of King Schmidtz]";
+			mes "Are still sentimentally attached to yourself?";
+			mes "You cannot inherit the Royal Guard!";
+			close;
+		}
 		mes "Congratulations! Young Royal Guard.";
 		mes "Be a symbol of honor and continue the great tradition of your new name.";
 		close2;
 		specialeffect2 EF_MAPPILLAR;
 		progressbar "FFFF00",7;
 		specialeffect2 EF_LORD;
-		delitem 6275,1;
+		delitem 6275,1; //King_Shield
 		erasequest 12094;
-		if(class == 4037){
-			jobchange 4102;
-		}
-		else if(class == 14){
-			jobchange 4066;
-		}else{
-			jobchange 4073;
-		}
-		getitem 5757,1;
-		getitem 2795,1;
+		jobchange roclass(eaclass()|EAJL_THIRD);
+		getitem 5757,1; //Schmidt_Helm
+		getitem 2795,1; //Green_Apple_Ring
 		end;
 	}
+	end;
 }
 
 gl_church,173,88,0	script	Delicate trace#01	844,{
-	if(job_royal == 4 && !countitem(6274)) {
+	if (job_royal == 4 && countitem(6274) == 0) {
 		progressbar "ffff00",5;
-		if(set(.@rand,rand(70)) >= 65) {
+		set .@roy_ran, rand(1,70);
+		if (.@roy_ran < 6)
+			getitem 6274,1; //Saint_Cloth_Piece
+		else if (.@roy_ran > 5 && .@roy_ran < 66)
+			getitem 7049,1; //Stone
+		else {
 			mes "While investigating, the topography breaks. It would be better to dig other places for a while.";
 			disablenpc strnpcinfo(0);
 			initnpctimer;
 			close;
 		}
-		getitem (.@rand >= 5 ? 7049:6274),1;
-		end;
 	}
 	mes "There is a trace that someone has already dug here.";
 	close;
-
-	OnTimer60000:
-		enablenpc strnpcinfo(0);
-		stopnpctimer;
-	OnTimer1000:
-	OnTimer20000:
-	OnTimer40000:
-		specialeffect EF_MAPPILLAR;
-		end;
+OnTimer60000:
+	enablenpc strnpcinfo(0);
+	stopnpctimer;
+OnTimer1000:
+OnTimer20000:
+OnTimer40000:
+	specialeffect EF_MAPPILLAR;
+	end;
+	specialeffect EF_MAPPILLAR;
+	end;
+	specialeffect EF_MAPPILLAR;
+	end;
 }
 gl_church,158,103,0	duplicate(Delicate trace#01)	Delicate trace#02	844
 gl_church,139,90,0	duplicate(Delicate trace#01)	Delicate trace#03	844
@@ -460,58 +478,64 @@ gl_church,105,115,0	duplicate(Delicate trace#01)	Delicate trace#11	844
 
 gl_church,158,100,0	script	#Clue of traces	111,4,4,{
 	end;
-	OnTouch:
-		if(job_royal == 4 && !countitem(6274)) {
-			specialeffect2 EF_FREEZE;
-			mes "I can feel strong power around here. It would be better to explore around here.";
-			viewpoint 1,173,88 ,1, 0xFFFF00;
-			viewpoint 1,158,103,2, 0xFFFF00;
-			viewpoint 1,139,90 ,3, 0xFFFF00;
-			viewpoint 1,126,62 ,4, 0xFFFF00;
-			viewpoint 1,148,5  ,5, 0xFFFF00;
-			viewpoint 1,185,72 ,6, 0xFFFF00;
-			viewpoint 1,211,94 ,7, 0xFFFF00;
-			viewpoint 1,185,125,8, 0xFFFF00;
-			viewpoint 1,143,125,9, 0xFFFF00;
-			viewpoint 1,105,115,10,0xFFFF00;
-			close;
-		}
+OnTouch:
+	if (job_royal == 4 && countitem(6274) == 0) {
+		specialeffect2 EF_FREEZE;
+		mes "I can feel strong power around here. It would be better to explore around here.";
+		viewpoint 1,173,88 ,1, 0xFFFF00;
+		viewpoint 1,158,103,2, 0xFFFF00;
+		viewpoint 1,139,90 ,3, 0xFFFF00;
+		viewpoint 1,126,62 ,4, 0xFFFF00;
+		viewpoint 1,148,5  ,5, 0xFFFF00;
+		viewpoint 1,185,72 ,6, 0xFFFF00;
+		viewpoint 1,211,94 ,7, 0xFFFF00;
+		viewpoint 1,185,125,8, 0xFFFF00;
+		viewpoint 1,143,125,9, 0xFFFF00;
+		viewpoint 1,105,115,10,0xFFFF00;
+		close;
+	}
+	end;
 }
 
-sec_in02,12,43,3	script	Caller	57,1,1,{
-	switch(select("Royal Guard:Rune Knight:Call Player")) {
-		case 1:
-			mes "1~5";
-			next;
-			if(input(.@val,1,5)) {
-				mes "Set item to adjust the Royal Guard";
-				mes "You can only set a bumber betweeen 1 to 5.";
-				close;
-				}
-			set job_royal,.@val;
+/*
+sec_in02,12,43,3	script	sorcereryal	57,1,1,{
+	switch(select("Royal Guard:Rune Knight:Sorcerer")) {
+	case 1:
+		mes "1~5";
+		input .@input;
+		next;
+		if (.@input < 1 || .@input > 5) {
+			mes "Set item to adjust the Royal Guard";
+			mes "You can only set a number between 1 to 5.";
+		} else {
+			set job_royal, .@input;
 			mes "Completed";
-			close;
-		case 2:
-			mes "1~24";
-			next;
-			if(input(1,24)) {
-				mes "Set item to adjust the Rune Knight";
-				mes "You can only set a bumber betweeen 1 to 24.";
-				close;
-			}
-			set job_rune_edq,.@val;
+		}
+		close;
+	case 2:
+		mes "1~24";
+		input .@input;
+		next;
+		if (.@input < 1 || .@input > 24) {
+			mes "Set item to adjust the Rune Knight";
+			mes "You can only set a nbumber between 1 to 24.";
+		} else {
+			set job_rune_edq, .@input;
 			mes "Completed";
-			close;
-		case 3:
-			mes "1~5";
-			next;
-			if(input(1,5)) {
-				mes "Item Adjust call";
-				mes "You can only set a bumber betweeen 1 to 5.";
-				close;
-			}
-			set job_soc,.@val;
+		}
+		close;
+	case 3:
+		mes "1~5";
+		input .@input;
+		next;
+		if (.@input < 1 || .@input > 5) {
+			mes "Set item to adjust the Sorcerer";
+			mes "You can only set a number between 1 to 5.";
+		} else {
+			set job_soc, .@input;
 			mes "Completed";
-			close;
+		}
+		close;
 	}
-}
\ No newline at end of file
+}
+*/
\ No newline at end of file