* 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

1 files changed, 165 insertions, 297 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