> 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

5 files changed, 47 insertions, 61 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;
 }
 
diff --git a/npc/re/mobs/dungeons/mal_dun.txt b/npc/re/mobs/dungeons/mal_dun.txt
index 30c319240..79efeecbf 100644
--- a/npc/re/mobs/dungeons/mal_dun.txt
+++ b/npc/re/mobs/dungeons/mal_dun.txt
@@ -3,22 +3,22 @@
 //===== By: ==================================================
 //= Chilly
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
 //= Official kRO monster spawns
 //===== Additional Comments: =================================
 //= 1.0 First Release
+//= 1.1 Updated to official script. [Euphy]
 //============================================================
 
 //==================================================
 // mal_dun01 - Lagoon in the Stars
 //==================================================
-mal_dun01,0,0,0,0	monster	Crab	1073,20,0,0,0
-mal_dun01,0,0,0,0	monster	Shellfish	1074,20,0,0,0
-mal_dun01,0,0,0,0	monster	Aster	1266,20,0,0,0
-mal_dun01,0,0,0,0	monster	Red Eruma	2197,120,0,0,0
-mal_dun01,0,0,0,0	monster	Siorava	2199,80,0,0,0
-mal_dun01,0,0,0,0	monster	Wild Rider	2208,1,20000,10000,1
-mal_dun01,0,0,0,0	monster	King Dramoh	2198,1,30000,20000,1
+mal_dun01,0,0,0,0	monster	Crab	1073,10,5000,0,0
+mal_dun01,0,0,0,0	monster	Shellfish	1074,10,5000,0,0
+mal_dun01,0,0,0,0	monster	Aster	1266,20,5000,0,0
+mal_dun01,0,0,0,0	monster	Red Eruma	2197,60,5000,0,0
+mal_dun01,0,0,0,0	monster	Siorava	2199,45,5000,0,0
+mal_dun01,0,0,0,0	monster	Wild Rider	2208,1,5000,0,0
diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt
index a13375198..c6776d9b4 100644
--- a/npc/re/quests/eden/eden_quests.txt
+++ b/npc/re/quests/eden/eden_quests.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4a
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
@@ -16,6 +16,7 @@
 //= 1.3 Added Instructor Ur and the new Quests which come
 //= alongside him. Special thanks to Chilly for the base. [Masao]
 //= 1.4 Partial cleaning and bug fixing. [Euphy]
+//= 1.4a Added 'npcskill' command. [Euphy]
 //============================================================
 
 moc_para01,25,35,4	script	Instructor Boya#para01	469,{
@@ -1182,7 +1183,7 @@ moc_fild11,180,253,5	script	Talking Dog#para03	972,{
 		mes "Oh, if you are tired I will help you.";
 		next;
 		mes "-When the dog barked, your HP and SP recovered.-";
-//		UseSkillToPC 28 10 99 60;
+		npcskill "AL_HEAL",10,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -1220,7 +1221,7 @@ moc_fild11,180,253,5	script	Talking Dog#para03	972,{
 		mes "Oh, if you are tired I will help you.";
 		next;
 		mes "-When the dog barked, your HP and SP recovered.-";
-//		UseSkillToPC 28 10 99 60;
+		npcskill "AL_HEAL",10,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -1276,7 +1277,7 @@ moc_fild11,180,253,5	script	Talking Dog#para03	972,{
 		mes "Oh, if you are tired I will help you.";
 		next;
 		mes "-When the dog barked, your HP and SP recovered.-";
-//		UseSkillToPC 28 10 99 60;
+		npcskill "AL_HEAL",10,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -1422,7 +1423,7 @@ prt_sewb1,131,262,3	script	Timid Cat#para04	422,{
 		mes "[Timid Cat]";
 		mes "Take care to check your map so you don't get lost.";
 		mes "It's a service meeow.";
-//		UseSkillToPC 28 10 99 60;
+		npcskill "AL_HEAL",10,99,60;
 		percentheal 0,100;
 		close;
 	}
@@ -1460,7 +1461,7 @@ prt_sewb1,131,262,3	script	Timid Cat#para04	422,{
 		mes "[Timid Cat]";
 		mes "I will help you a little.";
 		mes "Here, I have recovered your strengh meow..";
-//		UseSkillToPC 28 10 99 60;
+		npcskill "AL_HEAL",10,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -1495,7 +1496,7 @@ prt_sewb1,131,262,3	script	Timid Cat#para04	422,{
 		mes "It's the last course so cheer up.";
 		mes "I will help you a little.";
 		mes "Here, I have recovered your strengh meow..";
-//		UseSkillToPC 28 10 99 60;
+		npcskill "AL_HEAL",10,99,60;
 		percentheal 0,100;
 		close;
 	}
@@ -1607,7 +1608,7 @@ pay_arche,41,136,3	script	Eden Member Karl#para05	904,{
 		mes "[Karl]";
 		mes "Just in case I will recover all your energy.";
 		mes "It's the last step so be careful.";
-//		UseSkillToPC 28 10 99 60;
+		npcskill "AL_HEAL",10,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -1638,7 +1639,7 @@ pay_arche,41,136,3	script	Eden Member Karl#para05	904,{
 		mes "[Karl]";
 		mes "Just in case I will recover all your energy.";
 		mes "It's the last step so be careful.";
-//		UseSkillToPC 28 10 99 60;
+		npcskill "AL_HEAL",10,99,60;
 		percentheal 0,100;
 		close;
 	}
@@ -1761,7 +1762,7 @@ anthell01,29,264,5	script	Eden Member Cloud#para06	899,{
 		mes "What do you think of Ant Hell?";
 		mes "Can you stay longer?";
 		mes "Ok, I will recover your strengh so, keep going.";
-//		UseSkillToPC 28 10 99 60;
+		npcskill "AL_HEAL",10,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -1800,7 +1801,7 @@ anthell01,29,264,5	script	Eden Member Cloud#para06	899,{
 		mes "[Cloud]";
 		mes "See, to cheer you up I will heal you until you finish the training.";
 		mes "Chin up and cheer up.";
-//		UseSkillToPC 28 10 99 60;
+		npcskill "AL_HEAL",10,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -1828,7 +1829,7 @@ anthell01,29,264,5	script	Eden Member Cloud#para06	899,{
 		mes "[Cloud]";
 		mes "Just Vitata, isn't that an easy opponent?";
 		mes "If you see Maya just run away.";
-//		UseSkillToPC 28 10 99 60;
+		npcskill "AL_HEAL",10,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -1943,7 +1944,7 @@ in_orcs01,38,175,3	script	Eden Member Hooksha	803,{
 		mes "[Hooksha]";
 		mes "You look tired I will recover your health.";
 		mes "If you are in trouble just come back here to safety.";
-//		UseSkillToPC 28 10 99 60;
+		npcskill "AL_HEAL",10,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -1974,7 +1975,7 @@ in_orcs01,38,175,3	script	Eden Member Hooksha	803,{
 		mes "[Hooksha]";
 		mes "You look tired, I will recover your health.";
 		mes "If you are in trouble just come back here to safety.";
-//		UseSkillToPC 28 10 99 60;
+		npcskill "AL_HEAL",10,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -2000,7 +2001,7 @@ in_orcs01,38,175,3	script	Eden Member Hooksha	803,{
 		mes "[Hooksha]";
 		mes "You look tired, I will recover your health.";
 		mes "If you are in trouble just come back here to safety.";
-//		UseSkillToPC 28 10 99 60;
+		npcskill "AL_HEAL",10,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -2073,7 +2074,7 @@ in_orcs01,38,175,3	script	Eden Member Hooksha	803,{
 		mes "Can you stay longer?";
 		mes "You look tired, I will recover your health.";
 		mes "If you are in trouble just come back here to safety.";
-//		UseSkillToPC 28 10 99 60;
+		npcskill "AL_HEAL",10,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -2097,7 +2098,7 @@ in_orcs01,38,175,3	script	Eden Member Hooksha	803,{
 		mes "Can you stay longer?";
 		mes "You look tired I will recover your health.";
 		mes "If you are in trouble just come back here to safety.";
-//		UseSkillToPC 28 10 99 60;
+		npcskill "AL_HEAL",10,99,60;
 		percentheal 100,100;
 		close;
 	}
@@ -2201,7 +2202,7 @@ iz_dun04,43,46,3	script	Eden Member Callandiva	745,{
 		mes "Oh are you tired?";
 		mes "Mermans are not easy opponents.";
 		mes "I will help you recover so cheer up.";
-//		UseSkillToPC 28 10 99 60;
+		npcskill "AL_HEAL",10,99,60;
 		percentheal 0,100;
 		close;
 	}
@@ -2235,7 +2236,7 @@ iz_dun04,43,46,3	script	Eden Member Callandiva	745,{
 		mes "Oh are you tired?";
 		mes "Strouf are not easy opponents.";
 		mes "I can help you recover so cheer up.";
-//		UseSkillToPC 28 10 99 60
+		npcskill "AL_HEAL",10,99,60;
 		percentheal 100,100;
 		close;
 	}