> 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

3 files changed, 19 insertions, 34 deletions

diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt
index d7ea93877..6d5ef573f 100644
--- a/npc/re/jobs/3-1/guillotine_cross.txt
+++ b/npc/re/jobs/3-1/guillotine_cross.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Muad_Dib
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.0a
 //===== Compatible With: ===================================== 
 //= rAthena SVN r16945+
 //===== Description: ========================================= 
@@ -11,6 +11,7 @@
 //= Job change Quest from Assassin / Assassin Cross -> Guillotine Cross.
 //===== Additional Comments: ================================= 
 //= 1.0 Adapted from original script. [Euphy]
+//= 1.0a Added 'npcskill' command. [Euphy]
 //============================================================
 
 que_job01,75,96,3	script	Guild Member#3rdgc01	997,{
@@ -2482,9 +2483,7 @@ OnTouch:
 	select("......");
 	mes "[A man with black clothes]";
 	mes "May the goddess bless you eternally...";
-//	UseSkillToPC 34 0 0 0
-	specialeffect2 EF_BLESSING;
-	sc_start SC_BLESSING,60000,1;
+	npcskill "AL_BLESSING",10,0,0;
 	next;
 	emotion e_gasp;
 	mes "[A man with black clothes]";
diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt
index 5cdbaea11..c29c16da0 100644
--- a/npc/re/jobs/3-1/rune_knight.txt
+++ b/npc/re/jobs/3-1/rune_knight.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf, Muad_Dib
 //===== Current Version: =====================================
-//= 1.3
+//= 1.3a
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
@@ -13,6 +13,7 @@
 //= 1.1 Added forgoten Header. [Masao]
 //= 1.2 Added Energy Rune item reward. [Masao]
 //= 1.3 Updated script, optimized. [Euphy]
+//= 1.3a Added 'npcskill' command. [Euphy]
 //============================================================
 
 prt_in,162,24,3	script	Splendid-Looking Knight	470,2,2,{
@@ -1810,15 +1811,12 @@ job3_rune02,34,46,5	script	Captain Tigris#jrt1	470,2,2,{
 	switch(rand(6)) {
 	case 0:
 		mapannounce "job3_rune02","Captain Tigris : May Beljeve bless you!",bc_map,"0xFFFF00"; //FW_NORMAL 12 0 0
-//		UseSkillToPC 34 0 0 0
-		unitskilluseid getnpcid(0),"AL_BLESSING",10,getcharid(3);
+		npcskill "AL_BLESSING",1,0,0;
 		break;
 	case 1:
 	case 2:
 		mapannounce "job3_rune02","Captain Tigris : The Spark of life... may flame again.",bc_map,"0xFFFF00"; //FW_NORMAL 12 0 0
-//		UseSkillToPC 28 8 70 99
-		percentheal 100,100;
-		skilleffect "AL_HEAL",9999;
+		npcskill "AL_HEAL",8,70,99;
 		break;
 	case 3:
 		mapannounce "job3_rune02","Captain Tigris : Evil demons! I will send you back to your graves!",bc_map,"0xFFFF00"; //FW_NORMAL 12 0 0
@@ -1859,20 +1857,16 @@ job3_rune02,43,46,3	script	Rune Knight Lunarea#jrt1	469,2,2,{
 	switch(rand(6)) {
 	case 0:
 		mapannounce "job3_rune02","Rune Knight Lunarea : Quickly... find and strike at the enemy's weakness!",bc_map,"0xFFFF00"; //FW_NORMAL 12 0 0
-//		UseSkillToPC 29 0 0 0
-		unitskilluseid getnpcid(0),"AL_INCAGI",10,getcharid(3);
+		npcskill "AL_INCAGI",1,0,0;
 		break;
 	case 1:
 	case 2:
 		mapannounce "job3_rune02","Rune Knight Lunarea : It's not over... you need more power...",bc_map,"0xFFFF00"; //FW_NORMAL 12 0 0
-//		UseSkillToPC 28 8 60 90
-		percentheal 100,100;
-		skilleffect "AL_HEAL",9999;
+		npcskill "AL_HEAL",8,60,90;
 		break;
 	case 3:
 		mapannounce "job3_rune02","Rune Knight Lunarea : Everything starts from the beginning!",bc_map,"0xFFFF00"; //FW_NORMAL 12 0 0
-//		UseSkillToPC 35 0 0 0
-		unitskilluseid getnpcid(0),"AL_CURE",1,getcharid(3);
+		npcskill "AL_CURE",1,0,0;
 		break;
 	case 4:
 		mapannounce "job3_rune02","Rune Knight Lunarea : There can't be growth without a trial.",bc_map,"0xFFFF00"; //FW_NORMAL 12 0 0
@@ -1908,15 +1902,12 @@ job3_rune02,43,34,1	script	Rune Knight Renoa#jrt1	469,2,2,{
 	switch(rand(6)) {
 	case 0:
 		mapannounce "job3_rune02","Rune Knight Renoa : The rune of Wind! May it give you strength!",bc_map,"0xFFFF00"; //FW_NORMAL 12 0 0
-//		UseSkillToPC 29 0 0 0
-		unitskilluseid getnpcid(0),"AL_INCAGI",10,getcharid(3);
+		npcskill "AL_INCAGI",1,0,0;
 		break;
 	case 1:
 	case 2:
 		mapannounce "job3_rune02","Rune Knight Renoa : The rune of Birth! May give you the power of life!",bc_map,"0xFFFF00"; //FW_NORMAL 12 0 0
-//		UseSkillToPC 28 8 60 90
-		percentheal 100,100;
-		skilleffect "AL_HEAL",9999;
+		npcskill "AL_HEAL",8,60,90;
 		break;
 	case 3:
 		mapannounce "job3_rune02","Rune Knight Renoa : I am faster than all of them! Different then the others!",bc_map,"0xFFFF00"; //FW_NORMAL 12 0 0
@@ -1957,20 +1948,16 @@ job3_rune02,34,34,7	script	Rune Knight Velpino#jrt1	468,2,2,{
 	switch(rand(6)) {
 	case 0:
 		mapannounce "job3_rune02","Rune Knight Velpino : You are not one who gets to fall down in this kind of place.",bc_map,"0xFFFF00"; //FW_NORMAL 12 0 0
-//		UseSkillToPC 28 8 60 90
-		percentheal 100,100;
-		skilleffect "AL_HEAL",9999;
+		npcskill "AL_HEAL",8,60,90;
 		break;
 	case 1:
 	case 2:
 		mapannounce "job3_rune02","Rune Knight Velpino : Move on! There are obstacles to overcome.",bc_map,"0xFFFF00"; //FW_NORMAL 12 0 0
-//		UseSkillToPC 29 0 0 0
-		unitskilluseid getnpcid(0),"AL_INCAGI",10,getcharid(3);
+		npcskill "AL_INCAGI",1,0,0;
 		break;
 	case 3:
 		mapannounce "job3_rune02","Rune Knight Velpino : You are not alone. We are by your side.",bc_map,"0xFFFF00"; //FW_NORMAL 12 0 0
-//		UseSkillToPC 34 0 0 0
-		unitskilluseid getnpcid(0),"AL_BLESSING",10,getcharid(3);
+		npcskill "AL_BLESSING",1,0,0;
 		break;
 	case 4:
 		mapannounce "job3_rune02","Rune Knight Velpino : Fight and win! Don't give in to the pain!",bc_map,"0xFFFF00"; //FW_NORMAL 12 0 0
diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt
index 8b18eefb9..ebefaff48 100644
--- a/npc/re/jobs/novice/novice.txt
+++ b/npc/re/jobs/novice/novice.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Kisuka
 //===== Current Version: =====================================
-//= 1.4
+//= 1.4a
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
@@ -15,6 +15,7 @@
 //= 1.2 Cleaning. [Euphy]
 //= 1.3 Fixed Eden Group Officer's level requirement. [Joseph]
 //= 1.4 Fixed checkquest to check quest accordingly. [Joseph]
+//= 1.4a Added 'npcskill' command. [Euphy]
 //============================================================
 
 // Sprakki (Stard of Novice Training Ground, Outside Castle)
@@ -932,8 +933,7 @@ new_1-2,35,176,4	script	Soldier#nv	105,{
 		mes "Kill enough Porings.";
 		mes "Porings are easy to deal with, so cheer up.";
 		mes "Try again.";
-		percentheal 100,100;
-		skilleffect 28,9999;
+		npcskill "AL_HEAL",10,99,60;
 		close;
 	}
 	mes "[Brade]";
@@ -946,8 +946,7 @@ new_1-2,35,176,4	script	Soldier#nv	105,{
 	mes "[Brade]";
 	mes "Try using the job manuals to find out the characteristics of each job's skills.";
 	mes "I will restore your HP and SP... Keep it up.";
-	percentheal 100,100;
-	skilleffect 28,9999;
+	npcskill "AL_HEAL",10,99,60;
 	close;
 }