> Follow-up r17048:

- Renamed 'useskilltopc' to 'npcskill';
- Removed cast time from NPC objects, code by mkbu95 (suspected official behavior);
- Documented 'npcskill';
- Replaced all instances in scripts.
* Fixed max level bypass, code by malufett (bugreport:5800).
* Updated Malangdo spawns to official.
* Some standardization of npc/quests/first_class/.

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

1 files changed, 41 insertions, 59 deletions

diff --git a/npc/quests/first_class/tu_acolyte.txt b/npc/quests/first_class/tu_acolyte.txt
index d42c9a411..017acc7aa 100644
--- a/npc/quests/first_class/tu_acolyte.txt
+++ b/npc/quests/first_class/tu_acolyte.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Fix up by Jukka
 //===== Current Version: ===================================== 
-//= 1.6
+//= 1.6a
 //===== Compatible With: ===================================== 
 //= rAthena SVN (Testet in Trunk 88xx)
 //===== Description: ========================================= 
@@ -17,10 +17,11 @@
 //= 1.4 Misc. updates. [L0ne_W0lf]
 //= 1.5 Adjusted EXP gains to Renewal values.
 //= 1.6 Fixed a wrong placed curly bracket. [Joseph]
+//= 1.6a Added 'npcskill' command. [Euphy]
 //============================================================ 
 
-
-//=================================================Priest Praupin====================================================
+// Priest Praupin
+//============================================================
 prt_church,179,15,1	script	Priest Praupin	110,{
 	mes "[Priest Praupin]";
 	if(BaseClass != Job_Acolyte){
@@ -52,7 +53,6 @@ prt_church,179,15,1	script	Priest Praupin	110,{
 			mes "[Priest Praupin]";
 			mes "Seeing your eyes filled with such determination assures me. But if you run into any trouble, feel free to ask me for help. Good bye for now, blessed child.";
 			close;
-			break;
 		case 2:
 			mes "[Priest Praupin]";
 			mes "There is a convent northeast";
@@ -81,7 +81,6 @@ prt_church,179,15,1	script	Priest Praupin	110,{
 				mes "you need help, come to me.";
 				close;
 			}
-			break;
 		}
 	case 7:
 		mes "You're looking for someone";
@@ -91,7 +90,6 @@ prt_church,179,15,1	script	Priest Praupin	110,{
 		mes "[Priest Praupin]";
 		mes "Ah, he's away at the convent right now. If you want to meet Bishop Maugins in the Saint Capitolina Convent, travel ^3131FFnorth^000000, ^3131FFeast^000000, ^3131FFeast^000000 and then ^3131FFeast^000000 from Prontera.";
 		close;
-		break;
 	case 22:
 		if(countitem(7181) > 0){	// Receipt_01
 			emotion e_gasp;
@@ -173,7 +171,8 @@ prt_church,179,15,1	script	Priest Praupin	110,{
 	close;
 }
 
-//=================================================Asthe====================================================
+// Asthe
+//============================================================
 prt_monk,230,106,3	script	Asthe#tu	79,{
 	mes "[Asthe]";
 	switch(tu_acolyte01){
@@ -291,14 +290,13 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 		next;
 		mes "[Asthe]";
 		mes "HEAL !!";
-		unitskilluseid getcharid(3),28,10;
+		npcskill "AL_HEAL",10,99,60;
 		set tu_acolyte01, 3;
 		if(getskilllv("AL_HEAL") == 0){
 			getexp 0,10;
 			specialeffect2 EF_CONE;
 		}
 		close;
-		break;
 	case 3:
 		mes "I would like to give you an assignment, but what do you";
 		mes "think? I believe learning the basics is your most important";
@@ -371,10 +369,7 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 				mes "[Asthe]";
 				mes "Would you like me to take the mace away from your inventory now?";
 				next;
-				switch(select("Sure.:Let me check again.")) {
-				case 1:
-					break;
-				case 2:
+				if(select("Sure.:Let me check again.") == 2) {
 					mes "[Asthe]";
 					mes "Okay, no problem.";
 					mes "Please make sure that you do not carry any ^FF0000Mace with an elemental Property^000000.";
@@ -386,15 +381,12 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 				emotion e_heh;
 				set tu_acolyte01, 5;
 				delitem 1504, 1; //Mace
-				if(Class == Job_Acolyte_High){
+				if(Class == Job_Acolyte_High)
 					getexp 200,100;
-					specialeffect2 EF_CONE;
-					close;
-				} else {
+				else
 					getexp 100,50;
-					specialeffect2 EF_CONE;
-					close;
-				}
+				specialeffect2 EF_CONE;
+				close;
 			} else {
 				mes "Oh my!";
 				mes "Welcome back~";
@@ -415,7 +407,6 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 		mes "The basics are crucial to gaining mastery of the more advanced skills that you'll learn later. Just keep in mind that all of your efforts and suffering will become glory";
 		mes "and happiness.";
 		close;
-		break;
 	case 5:
 		mes "I suppose I can tell you a little more about the Acolyte job. You already know that Novices must train and go to Prontera Church to become an Acolyte, your First Job Class.";
 		next;
@@ -440,7 +431,6 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 		mes "Ho ho ho~ No need to try to remember everything right now. You'll get the hang of it.";
 		set tu_acolyte01, 6;
 		close;
-		break;
 	case 6:
 		mes ""+strcharinfo(0)+",";
 		mes "I just received this letter, but it seems to have been a mistake.";
@@ -453,7 +443,6 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 		set tu_acolyte01,7;
 		getitem 7148,1; //Mother_Letter
 		close;
-		break;
 	case 7:
 		mes "Would you please";
 		mes "deliver this letter";
@@ -461,13 +450,12 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 		mes "You can find him in the";
 		mes "building nearby.";
 		close;
-		break;
 	case 9:
 		mes "You went to Prontera on behalf of the convent for Priest Gardron? That must have been tough...";
 		next;
 		mes "[Asthe]";
 		mes "Blessing!";
-		unitskilluseid getcharid(3),34,10;
+		npcskill "AL_BLESSING",10,0,0;
 		next;
 		mes "[Asthe]";
 		mes "Now I'm going to teach you";
@@ -502,7 +490,6 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 		mes "you some dog food.^000000";
 		set tu_acolyte01, 10;
 		close;
-		break;
 	case 11:
 	case 12:
 		mes "How to expel";
@@ -524,7 +511,6 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 		mes "and it will come.";
 		set tu_acolyte01, 12;
 		close;
-		break;
 	case 13:
 		mes "You remember that";
 		mes "you can learn Divine";
@@ -554,7 +540,6 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 		mes "alright? I'll be right here.";
 		set tu_acolyte01, 14;
 		close;
-		break;
 	case 14:
 		mes "Now it's time";
 		mes "for your next lesson.";
@@ -576,9 +561,8 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 		mes "Try it for";
 		mes "yourself, okay?";
 		set tu_acolyte01, 15;
-		unitskilluseid getcharid(3),29,10;
+		npcskill "AL_INCAGI",10,0,0;
 		close;
-		break;
 	case 15:
 		mes "Once you learn";
 		mes "Level 1 Increase AGI,";
@@ -605,7 +589,6 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 		mes "by learning the Heal skill.";
 		set tu_acolyte01, 16;
 		close;
-		break;
 	case 16:
 		mes "You've been learning";
 		mes "really quickly. I'm glad";
@@ -667,15 +650,13 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 			mes "Alright,";
 			mes "give me a moment";
 			mes "to catch my breath~";
-			close;
 		} else {
 			mes "[Asthe]";
 			mes "Ho ho!";
 			mes "What a smart Acolyte~";
 			set tu_acolyte01, 17;
-			close;
 		}
-		break;
+		close;
 	case 17:
 		mes "Oh dear...!";
 		mes "All of these things were delivered to me by accident! And some of these packages were supposed to";
@@ -713,7 +694,6 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 			getitem 7148,1; //Mother_Letter
 		}
 		close;
-		break;
 	case 18:
 	case 19:
 	case 20:
@@ -735,7 +715,6 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 		mes "[Asthe]";
 		mes "Oh, and this last delivery is a receipt for ^3131FFPriest Praupin^000000, the priest who told you about me. Alright, have a safe trip~";
 		close;
-		break;
 	case 23:
 		mes "Ah, you're finishing";
 		mes "making all of those deliveries? Thank you very much! How was it meeting Priest Praupin after such";
@@ -760,7 +739,6 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 		mes "you my final lesson.";
 		set tu_acolyte01, 24;
 		close;
-		break;
 	case 24:
 		mes "The last skill";
 		mes "I will teach you";
@@ -813,7 +791,8 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 }
 
 
-//=================================================Priest Gardron====================================================
+// Priest Gardron
+//============================================================
 monk_in,18,38,6	script	Priest Gardron#tu	110,{
 	mes "[Priest Gardron]";
 	if(tu_acolyte01 == 7){
@@ -921,7 +900,8 @@ monk_in,18,38,6	script	Priest Gardron#tu	110,{
 	close;
 }
 
-//=================================================Dog====================================================
+// Dog
+//============================================================
 prt_monk,235,245,5	script	Dog#tu	81,{
 	mes "[Dog]";
 	mes "^CDB79EBark bark!";
@@ -968,7 +948,8 @@ prt_monk,235,245,5	script	Dog#tu	81,{
 	close;
 }
 
-//=================================================Boy====================================================
+// Boy
+//============================================================
 prt_monk,243,238,5	script	Boy#boy_voi	139,5,5,{
 OnTouch_:
 	if(tu_acolyte01 != 10)end;
@@ -978,7 +959,8 @@ OnTouch_:
 	close;
 }
 
-//=================================================Ill Girl====================================================
+// Ill Girl
+//============================================================
 prt_monk,226,257,6	script	Ill Girl#tu	93,{
 	mes "[Angelic]";
 	if(tu_acolyte01 > 12){
@@ -1056,15 +1038,13 @@ prt_monk,226,257,6	script	Ill Girl#tu	93,{
 		mes "For sure.";
 		set tu_acolyte01, 11;
 		close;
-	} else
-	if(tu_acolyte01 == 11){
+	} else if(tu_acolyte01 == 11){
 		next;
 		mes "[Angelic]";
 		mes "It hurts...!";
 		mes "I... I can't...!";
 		close;
-	} else
-	if(tu_acolyte01 == 12){
+	} else if(tu_acolyte01 == 12){
 		next;
 		mes "^3355FFYou go towards";
 		mes "the girl, place your hands";
@@ -1136,12 +1116,10 @@ prt_monk,226,257,6	script	Ill Girl#tu	93,{
 				mes "not able to use it for now.^000000";
 				close;
 			}
-			break;
 		case 4:
 			mes "^3355FFThis isn't a skill";
 			mes "that Acolytes can use...^000000";
 			close;
-			break;
 		case 5:
 			if(getskilllv("AL_CRUCIS") > 0){
 				mes "["+strcharinfo(0)+"]";
@@ -1159,12 +1137,10 @@ prt_monk,226,257,6	script	Ill Girl#tu	93,{
 				mes "not able to use it for now.^000000";
 				close;
 			}
-			break;
 		case 6:
 			mes "^3355FFThis isn't a skill";
 			mes "that Acolytes can use...^000000";
 			close;
-			break;
 		}
 
 		mes "[Angelic]";
@@ -1182,7 +1158,8 @@ prt_monk,226,257,6	script	Ill Girl#tu	93,{
 	close;
 }
 
-//=================================================Veiner====================================================
+// Veiner
+//============================================================
 prt_monk,197,228,3	script	Veiner	89,{
 	mes "[Veiner]";
 	if(countitem(1081) && tu_acolyte01 == 18){
@@ -1225,7 +1202,8 @@ prt_monk,197,228,3	script	Veiner	89,{
 	close;
 }
 
-//=================================================Hedrick====================================================
+// Hedrick
+//============================================================
 prt_monk,28,260,5	script	Hedrick	50,{
 	mes "[Hedrick]";
 	mes "^333333*Whew!*^000000";
@@ -1260,7 +1238,8 @@ prt_monk,28,260,5	script	Hedrick	50,{
 	close;
 }
 
-//=================================================Weapon Merchant====================================================
+// Weapon Merchant
+//============================================================
 prt_monk,136,261,0	script	Weapon Merchant#tu	139,9,9,{
 OnTouch:
 	if(tu_acolyte01 != 20 || countitem(1081)==0) end;
@@ -1277,7 +1256,8 @@ OnTouch:
 	close;
 }
 
-//=================================================Karven====================================================
+// Karven
+//============================================================
 monk_in,103,176,7	script	Karven	60,{
 	mes "[Karven]";
 	mes "May you rest";
@@ -1310,7 +1290,8 @@ monk_in,103,176,7	script	Karven	60,{
 	close;
 }
 
-//=================================================Gloria====================================================
+// Gloria
+//============================================================
 prt_monk,219,164,3	script	Gloria#tu	95,{
 	mes "[Gloria]";
 	if(BaseJob != Job_Acolyte){
@@ -1365,7 +1346,6 @@ prt_monk,219,164,3	script	Gloria#tu	95,{
 			mes "Wow, I'm touched!";
 			emotion e_sob;
 			close;
-			break;
 		case 2:
 			mes "[Gloria]";
 			mes "Leave it to me!";
@@ -1374,7 +1354,6 @@ prt_monk,219,164,3	script	Gloria#tu	95,{
 			close2;
 			warp "prontera",116,72;
 			end;
-			break;
 		}
 	}
 	mes "Wow...";
@@ -1384,7 +1363,8 @@ prt_monk,219,164,3	script	Gloria#tu	95,{
 	close;
 }
 
-//=================================================Cleope Verce====================================================  
+// Cleope Verce
+//============================================================
 prt_monk,153,210,3	script	Cleope Verce	95,{
 	mes "[Cleope Verce]";
 	if(BaseJob != Job_Acolyte){
@@ -1557,7 +1537,8 @@ prt_monk,153,210,3	script	Cleope Verce	95,{
 	mes "weather today...";
 	close;
 }
-//=================================================Range NPC====================================================  
+// Range NPC
+//============================================================
 prt_monk,217,123,0	script	#tu_monk	139,10,10,{
 OnTouch_:
 	if(BaseJob == Job_Acolyte){
@@ -1577,7 +1558,8 @@ OnTouch_:
 	end;
 }
 
-//=================================================Eavesdrop====================================================  
+// Eavesdrop
+//============================================================
 prt_monk,223,123,3	script	Eavesdrop#tu	111,{
 	if(BaseJob != Job_Acolyte){
 		mes "^3355FFThere's nothing here.^000000";