Updated Acolyte, Swordman, and Novice quest skill NPCs.

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

1 files changed, 79 insertions, 111 deletions

diff --git a/npc/quests/skills/acolyte_skills.txt b/npc/quests/skills/acolyte_skills.txt
index 455b43193..84cfc6db0 100644
--- a/npc/quests/skills/acolyte_skills.txt
+++ b/npc/quests/skills/acolyte_skills.txt
@@ -1,129 +1,97 @@
-//===== eAthena Script =======================================
-//= Acolyte Skill Quest
-//===== By: ==================================================
-//= kobra_k88
-//===== Current Version: =====================================
-//= 1.4a
-//===== Compatible With: =====================================
-//= eAthena 7.15 +
-//===== Description: =========================================
-//= <Description> 
-//===== Additional Comments: =================================
-//= v1.0a Now using functions found in "Global_Functions.txt"
-//= for class checks.
-//= 1.2 Added Baby Class Support [Lupus]
-//= 1.3 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
-//= 1.4 Fixed an exploit [Lupus]
-//= 1.4a changed perm. variables to temp ones [Lupus]
-//============================================================
-
-
-prt_church,173,23,4	script	Acolyte Klift	79,{
+prt_church,173,23,4	script	Cleric#qsk_al	79,{
 	mes "[Acolyte Klift]";
-	if (baseClass == Job_Acolyte) goto L_Start;
-
-L_Other:
-	mes "Ah, welcome to the Prontera Church also known as the Sanctuary.";
-	mes "Unfortunately I cannot be of much help to you.  For my fellow";
-	mes "Priests and Acolytes however, I can help them to find their ^5555FF'hidden";
-	mes "ability'^000000.";
-	close;
-
-L_Start:
-	if(@HOLYLIGHT) goto L_Check;
-	if(getskilllv(156)>0) goto L_GotSkill;
-	if(sex==1) mes "Ahh... Brother!";
-	if(sex==0) mes "Ahh... Sister!";
-	mes "Does the task of caring for our lost sheep tire you out? Is it too";
-	mes "much of a burden? Do not despair, I am here to assist you.";
+	mes "Ahh . Brothers ! Does the task of";
+	mes "caring for out lost sheep burden";
+	mes "and tire you ?";
+	mes "I am here to assist you.";
 	next;
-	menu "About an Acolyte's ^5555FF'hidden ablitiy'^000000...",M_0, "End Conversation.",M_End;
-
-	M_0:
+	switch(select("^3355FF' About acolyte's hidden ability '^000000 ..:^3355FF' Holy light '^000000 training:End conversation")) {
+	case 1:
 		mes "[Acolyte Klift]";
-		mes "Faced with great danger in an endless struggle with evil, our";
-		mes "brethren are in much need of assistance.";
+		mes "Our members of the clergy";
+		mes "naturally learn a skill as";
+		mes "as they mature. As they approach ";
+		mes "their senior years as an acolyte";
+		mes "this special skill.";
 		next;
 		mes "[Acolyte Klift]";
-		mes "As acolytes approach their senior years in the clergy, they learn to";
-		mes "call upon their inner power to use a special skill to aid them in";
-		mes "battle.";
+		mes "Faced with great danger and";
+		mes "an endless struggle with evil,";
+		mes "our brethren are much in need of assistance.";
+		mes "^3355FF' Holy Light '^000000 is that skill.";
+		mes "To gain this ability for yourself,";
+		mes "takes some work.";
 		next;
 		mes "[Acolyte Klift]";
-		mes "That skill is ^5555FF'Holy Light'^000000.  Holy Light does damage to";
-		mes "all foes but is even more effective on the undead.";
+		mes "To gain the skill, you must find these items.";
+		mes "^FF33551 Opal^000000";
+		mes "^FF33551 Crystal Blue^000000";
+		mes "^FF33551 Rosary^000000 ";
 		next;
 		mes "[Acolyte Klift]";
-		mes "For someone like yourself to learn this skill, takes some hard work.";
-		mes "Would you like to learn this skill?";
+		mes "In order to be able to even use this skill,";
+		mes "one must be have sufficient experience.";
+		mes "^FF3355 Job Level 30^000000";
+		mes "is required to learn this skill.";
 		next;
-		menu "Yes, please.",-, "Let me think about it.",M_End;
-
+		mes "[Acolyte Klift]";
+		mes "As for a priest, because of their";
+		mes "already vast amount of experience,";
+		mes "they are able to gain this skill at any";
+		mes "job level.";
+		close;
+	case 2:
+		if (getskilllv(156) == 1) {
 			mes "[Acolyte Klift]";
-			mes "Very good.  You will need to find these items in order to learn the";
-			mes "skill:";
-			mes "^5555FF1 Opal^000000,";
-			mes "^5555FF1 Crystal Blue^000000,";
-			mes "and ^5555FF1 Rosary^000000.";
-			next;
+			mes "Brother, you already possess";
+			mes "the skill of ` Holy Light '.";
+			mes "You cannot gain a skill you";
+			mes "already possess ..";
+			mes "I pray that you are using";
+			mes "this skill for the work of good . .";
+			close;
+		}
+		else {
+			if (countitem(727) > 0 && countitem(991) > 0 && countitem(2608) > 0) {
+				if ((JobLevel > 29 && BaseJob == Job_Acolyte) || BaseJob == Job_MOnk || BaseJob == Job_Priest) {
+					mes "[Acolyte Klift]";
+					mes "Your faith has proven worthy";
+					mes "for you to gain the ' Holy Light ' skill.";
+					mes "Your skill is adequate";
+					mes "to use this skill.";
+					mes "Use it wisely. . .";
+					next;
+					delitem 727,1; //White_Jewel
+					delitem 991,1; //Crystal_Blue
+					delitem 2608,1; //Rosary
+					skill 156,1,0;
+					mes "[Acolyte Klift]";
+					mes "You now know ' Holy Light '";
+					mes "May you use this skill only in the";
+					mes "best conduct . . . . .";
+					close;
+				}
+			}
 			mes "[Acolyte Klift]";
-			mes "Of course you will also need to have a sufficient level of";
-			mes "experience.  Namely a ^5555FFjob level of at least 30^000000.  This does";
-			mes "not apply to Priests or Monks however, because of the vast amount of";
-			mes "experience they already have.";
+			mes "Oh, it is clear. . .";
+			mes "You are not yet ready to";
+			mes "receive the ' Holy Light ' skill.";
 			next;
 			mes "[Acolyte Klift]";
-			mes "Come back when you are ready.  I will be here.";
-			set @HOLYLIGHT, 1;
+			mes "You should listen carefully to what";
+			mes "is necessary for this skill.";
+			mes "If you listen closely,";
+			mes "you may learn what you lack.";
+			mes "So that you may improve upon yourself.";
 			close;
-	M_End:
+		}
+	case 3:
 		mes "[Acolyte Klift]";
-		mes "I understand your zeal.  You have much time yet to practice and gain";
-		mes "experience.  Go forth with many blessings...";
-		close;
-
-L_Check:
-	mes "So, are you ready for the Holy Light training? Let me check....";
-	next;
-	mes "[Acolyte Klift]";
-	if(BaseJob==Job_Acolyte && JobLevel<30) goto L_LowLvl;
-	if(countitem(727)<1 || countitem(991)<1 || countitem(2608)<1) goto L_NoItems;
-	delitem 727,1;
-	delitem 991,1;
-	delitem 2608,1;
-	mes "Oh! Very good.  You have brought back all of the items I asked for.";
-	next;
-	mes "[Acolyte Klift]";
-	mes "Ok lets get started...";
-	next;
-	mes "(after hours of praying and meditation)";
-	next;
-	mes "[Acolyte Klift]";
-	mes "Yes! I feel it. You have released your hidden abilities and can now";
-	mes "use ^5555FFHoly Light^000000!";
-	skill 156,1,0;
-	set @HOLYLIGHT, 0;
-	next;
-	mes "[Priest]";
-	mes "You have done well.  May God bless you!";
-	emotion e_no1;
-	close;
-
-	L_LowLvl:
-		mes "I'm sorry but you need more training before I can teach you Holy";
-		mes "Light.  Come back when your job level is at least 30.";
-		close;
-	L_NoItems:
-		mes "I'm sorry but you don't have the required items for Holy Light.";
-		mes "You need:";
-		mes "^5555FF1 Opal^000000,";
-		mes "^5555FF1 Crystal Blue^000000,";
-		mes "and ^5555FF1 Rosary^000000.";
+		mes ". . . . .";
+		mes "I understand your zeal.";
+		mes "You have much time yet to";
+		mes "practice and gain experience.";
+		mes "Blessings upon you . . . . .";
 		close;
-
-L_GotSkill:
-	mes "Ah, I see you have been using Holy Light.  It is such a great skill";
-	mes "that I truly believe it to be a gift from the lord himself.  May";
-	mes "God be with you always.";
-	close;
+	}
 }