Converted skill commands integers to strings. Follow up on r12814

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

5 files changed, 44 insertions, 44 deletions

diff --git a/npc/quests/first_class/tu_acolyte.txt b/npc/quests/first_class/tu_acolyte.txt
index 0ed8a8575..244407f9d 100644
--- a/npc/quests/first_class/tu_acolyte.txt
+++ b/npc/quests/first_class/tu_acolyte.txt
@@ -285,7 +285,7 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 		mes "HEAL !!";
 		unitskilluseid getcharid(3),28,10;
 		set tu_acolyte01, 3;
-		if(getskilllv(28) == 0){
+		if(getskilllv("AL_HEAL") == 0){
 			getexp 0,100;
 			//misceffect EF_CONE;
 		}
@@ -296,7 +296,7 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 		mes "think? I believe learning the basics is your most important";
 		mes "task for now.";
 		next;
-		if(getskilllv(28) < 3){
+		if(getskilllv("AL_HEAL") < 3){
 			mes "[Asthe]";
 			mes "Well then, learn";
 			mes "the Heal skill up to";
@@ -346,7 +346,7 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 		}
 		break;
 	case 4:
-		if(getskilllv(28) > 2){
+		if(getskilllv("AL_HEAL") > 2){
 			if(countitem(1504) > 0){
 				mes "Oh my!";
 				mes "Welcome back~";
@@ -1053,12 +1053,12 @@ prt_monk,226,257,6	script	Ill Girl#tu	93,{
 			close; 
 			break;
 		case 2:
-			if(getskilllv(34) == 0) goto L_NONE;
+			if(getskilllv("AL_BLESSING") == 0) goto L_NONE;
 			mes "["+strcharinfo(0)+"]";
 			mes "B...";
 			mes "Blessing!";
 			next;
-			if(rand(100) < getskilllv(34)*10){
+			if(rand(100) < getskilllv("AL_BLESSING")*10){
 				//misceffect EF_BLESSING;
 				mes "["+strcharinfo(0)+"]";
 				mes "I...";
@@ -1083,7 +1083,7 @@ prt_monk,226,257,6	script	Ill Girl#tu	93,{
 			}
 			break;
 		case 3:
-			if(getskilllv(35) == 0) goto L_NONE;
+			if(getskilllv("AL_CURE") == 0) goto L_NONE;
 			mes "["+strcharinfo(0)+"]";
 			mes "C-Cure...!";
 			//misceffect EF_CURE;
@@ -1099,7 +1099,7 @@ prt_monk,226,257,6	script	Ill Girl#tu	93,{
 			close;
 			break;
 		case 5:
-			if(getskilllv(32) == 0) goto L_NONE;
+			if(getskilllv("AL_CRUCIS") == 0) goto L_NONE;
 			mes "["+strcharinfo(0)+"]";
 			mes "S-Signum...";
 			mes "Signum Crucis!";
diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt
index 27c9e618b..7e8c933d3 100644
--- a/npc/quests/first_class/tu_archer.txt
+++ b/npc/quests/first_class/tu_archer.txt
@@ -541,7 +541,7 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 				mes "if you can't aim at your targets, you'd be horrible at archery, right? You gotta have Accuracy!";
 				next;
 				mes "[Raiden Karus]";
-				set @skill_owl, getskilllv(43);
+				set @skill_owl, getskilllv("AC_OWL");
 				if(@skill_owl < 3){
 					set tu_archer01, 6;
 					mes "Now, your first assignment";
@@ -716,7 +716,7 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 			mes "practice from a distance!";
 			next;
 
-			set @eagle, getskilllv(44);
+			set @eagle, getskilllv("AC_VULTURE");
 			if(@eagle < 3){
 				mes "Alright, Mandagora usually live around Mt. Mjolnir. I can send you to Prontera, so just travel north, then east from there to find";
 				mes "some of them.";
@@ -772,7 +772,7 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 				next;
 			}
 		} else if(tu_archer01 == 8){
-			set @eagle, getskilllv(44);
+			set @eagle, getskilllv("AC_VULTURE");
 			if(@eagle < 3){
 				mes "Mandagora lives in the area north and east of Prontera. Learn up to Level 3 Vulture's Eye and get acquainted with your attack range.";
 				next;
@@ -823,7 +823,7 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 			mes "Whaddya think?";
 			mes "Exciting, yes?";
 			next;
-			set @eagle, getskilllv(46);
+			set @eagle, getskilllv("AC_DOUBLE");
 			if(@eagle > 2){
 				mes "["+strcharinfo(0)+"]";
 				mes "I...";
diff --git a/npc/quests/first_class/tu_merchant.txt b/npc/quests/first_class/tu_merchant.txt
index 51c9e69b3..469a8da62 100644
--- a/npc/quests/first_class/tu_merchant.txt
+++ b/npc/quests/first_class/tu_merchant.txt
@@ -54,7 +54,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 		mes "you learned";
 		mes "about Vending?";
 		next;
-		set @chk_vend, getskilllv(41);
+		set @chk_vend, getskilllv("MC_VENDING");
 		if((@chk_vend > 3) && (@chk_vend < 10)){
 			mes "[Guarnien]";
 			mes "Excellent!";
@@ -116,7 +116,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 		mes "to vend a total of 3 items at one time. Each time you level up the Vending skill, the total number of items you can vend will";
 		mes "increase by one.";
 		next;
-		set @chk_vend, getskilllv(41);
+		set @chk_vend, getskilllv("MC_VENDING");
 		if((@chk_vend > 3) && (@chk_vend < 10)){
 			mes "[Guarnien]";
 			mes "But I see that you must already know that, huh? Well, seeing as you're so clever, I think you've earned this little prize~";
@@ -166,7 +166,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 		mes "learned Push Cart up";
 		mes "to Level 4 like I asked?";
 		next;
-		set @chk_cart, getskilllv(39);
+		set @chk_cart, getskilllv("MC_PUSHCART");
 		if(@chk_cart > 3 && @chk_cart < 10){
 			mes "[Guarnien]";
 			mes "Well done~";
@@ -221,7 +221,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 		mes "the level of the Push Cart skill, your movement speed will slowly be restored. With Push Cart Level 10, a PushCart won't slow you";
 		mes "down at all!";
 		next;
-		set @chk_cart, getskilllv(39);
+		set @chk_cart, getskilllv("MC_PUSHCART");
 		if(@chk_cart > 3 && @chk_cart < 10){
 			mes "[Guarnien]";
 			mes "Ah, and I see that you've been focusing on learning Push Cart. Although you might still have a problem with your movement";
@@ -263,7 +263,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 		mes "with learning that";
 		mes "^871F78Over Charge^000000 skill?";
 		next;
-		set @chk_over, getskilllv(38);
+		set @chk_over, getskilllv("MC_OVERCHARGE");
 		if(@chk_over > 3 && @chk_over < 10){
 			mes "[Guarnien]";
 			mes "Nice work!";
@@ -313,7 +313,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 		mes "[Guarnien]";
 		mes "Over Charge allows you to sell items to NPC shops for more Zeny. The higher your Over Charge Skill Level, the more Zeny you'll receive for items sold to NPCs.";
 		next;
-		set @chk_over, getskilllv(38);
+		set @chk_over, getskilllv("MC_OVERCHARGE");
 		if(@chk_over > 3 && @chk_over < 10){
 			mes "[Guarnien]";
 			mes "Ah, you've already learned Level 4 Over Charge. Perfect! Let me give you a little reward~";
@@ -422,7 +422,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 		mes "So, how is it going with learning the Discount skill? Like I always say, if you can't make a bargain, you can't be a Merchant!";
 		next;
 		mes "[Guarnien]";
-		set @chk_disc, getskilllv(37);
+		set @chk_disc, getskilllv("MC_DISCOUNT");
 		if(@chk_disc > 3 && @chk_disc < 10){
 			mes "Ah, you've learned";
 			mes "how to use the Discount skill";
@@ -463,7 +463,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 		mes "mastered at ^871F78Level 10^000000. The higher the skill level, the less you have to pay for items at NPC shops.";
 		next;
 		mes "[Guarnien]";
-		set @chk_disc, getskilllv(37);
+		set @chk_disc, getskilllv("MC_DISCOUNT");
 		if(@chk_disc > 3 && @chk_disc < 10){
 			mes "Oooh, good work.";
 			mes "I see that you've";
@@ -516,7 +516,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 		mes "So if you use this skill too often, you might end up bankrupt! So be really careful. Also, as the Skill Level for Mammonite increases, so does the attack strength and Zeny consumption.";
 		next;
 		mes "[Guarnien]";
-		set @chk_mam, getskilllv(42);
+		set @chk_mam, getskilllv("MC_MAMMONITE");
 		if(@chk_mam > 3 && @chk_mam < 10){
 			mes "Ah, I see that you've already tried this skill. How much money have you wasted using Mammonite? Not too much, I hope.";
 			next;
@@ -543,7 +543,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 		mes "like I asked?";
 		next;
 		mes "[Guarnien]";
-		set @chk_soji, getskilllv(36);
+		set @chk_soji, getskilllv("MC_INCCARRY");
 		if(@chk_soji > 3 && @chk_soji < 10){
 			mes "Ah. I can tell that you have. Not bad! By now you should be able to learn the ^871F78Discount^000000 skill, but I'll teach you about that later.";
 			next;
@@ -556,7 +556,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "[Guarnien]";
 			mes "This skill works exactly like a ^871F78Magnifier^000000, so you won't have to spend any Zeny on them. Also, this skill is mastered at ^871F78Level 1^000000.";
 			next;
-			if(getskilllv(40)){
+			if(getskilllv("MC_IDENTIFY")){
 				mes "[Guarnien]";
 				mes "I see in your eyes that you've already learned to appraise items. Haha, although having that knowledge is reward in itself, let me give you something extra!";
 				set tu_merchant, 2;
@@ -584,7 +584,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 	next;
 	if(select("Sure!:I'll make it on my own!")==1){
 		set tu_merchant, 1;
-		if(getskilllv(36) < 4){
+		if(getskilllv("MC_INCCARRY") < 4){
 			mes "[Guarnien]";
 			if(Sex == 1){
 				mes "Atta boy~!";
@@ -622,7 +622,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			next;
 			mes "[Guarnien]";
 			set tu_merchant, 2;
-			if(getskilllv(40)){
+			if(getskilllv("MC_IDENTIFY")){
 				mes "I see in your eyes that you've already learned to appraise items. Haha, although having that knowledge is reward in itself, let me give you something extra!";
 				//misceffect EF_HIT5;
 				getexp 585,43;
diff --git a/npc/quests/first_class/tu_sword.txt b/npc/quests/first_class/tu_sword.txt
index 8b1f306d0..f31a6a6b0 100644
--- a/npc/quests/first_class/tu_sword.txt
+++ b/npc/quests/first_class/tu_sword.txt
@@ -98,7 +98,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 		mes "Magnum Break is ideal for use";
 		mes "when surrounded by foes, but also keep in mind that it also inflicts a little damage on its caster.";
 		next;
-		set @chk_magnum, getskilllv(7);
+		set @chk_magnum, getskilllv("SM_MAGNUM");
 		if(@chk_magnum > 5){
 			mes "[Shurank]";
 			mes "I see that you've been training in the use of Magnum Break. Although it is an awesome skill, it's not for every Swordman. Still, there's no harm in learning it.";
@@ -182,8 +182,8 @@ izlude_in,82,163,3	script	Shurank	733,{
 		mes "One Handed Sword Mastery";
 		mes "increases the damage of Daggers and One Handed Swords while Two Handed Sword Mastery increases the damage of Two Handed Swords.";
 		next;
-		set @chk_hanson, getskilllv(2);
-		set @chk_yangson, getskilllv(3);
+		set @chk_hanson, getskilllv("SM_SWORD");
+		set @chk_yangson, getskilllv("SM_TWOHAND");
 		if((@chk_hanson > 9) || (@chk_yangson > 9)){
 			mes "[Shurank]";
 			mes "Ah, from the way you handle your Sword, I see that you have mastered a Sword Mastery. I'm thoroughly impressed.";
@@ -216,7 +216,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 		mes "training for the Endure";
 		mes "skill coming along?";
 		next;
-		set @chk_endure, getskilllv(8);
+		set @chk_endure, getskilllv("SM_ENDURE");
 		if(@chk_endure > 1){
 			mes "[Shurank]";
 			mes "From that gleen of toughness upon your skin, I see now that I was foolish to ask. Well done~";
@@ -246,7 +246,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 		mes "learned how to use";
 		mes "the Endure skill yet?";
 		next;
-		set @chk_endure, getskilllv(8);
+		set @chk_endure, getskilllv("SM_ENDURE");
 		if((@chk_endure > 0) && (@chk_endure < 2)){
 			mes "[Shurank]";
 			mes "I see that you";
@@ -303,7 +303,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 		mes "all I know about";
 		mes "the Endure skill.";
 		next;
-		set @chk_endure, getskilllv(8);
+		set @chk_endure, getskilllv("SM_ENDURE");
 		if(@chk_endure == 0){
 			mes "[Shurank]";
 			mes "As you've noticed, receiving any damage causes you to reel in pain, stunning you for an instant. Thus, rapidly attacking enemies are dangerous since it's difficult to counter or escape them.";
@@ -370,7 +370,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 		mes "learning more about";
 		mes "the use of the Provoke skill?";
 		next;
-		set @chk_provoke, getskilllv(6);
+		set @chk_provoke, getskilllv("SM_PROVOKE");
 		if((@chk_provoke > 4) && (@chk_provoke < 10)){
 			mes "[Shurank]";
 			mes "Ah, I see that you have a fairly good understanding of the Provoke skill. Let me reward you in this small way for your efforts.";
@@ -408,7 +408,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 		mes "in the use of the Provoke";
 		mes "skill been progressing?";
 		next;
-		set @chk_provoke, getskilllv(6);
+		set @chk_provoke, getskilllv("SM_PROVOKE");
 		if((@chk_provoke > 0) && (@chk_provoke < 5)){
 			mes "[Shurank]";
 			mes "Ah, now I can see that you";
@@ -473,7 +473,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 		mes "Well, now that we taken care";
 		mes "of that, let me continue your instruction on Swordman skills. This time, we'll cover Provoke.";
 		next;
-		set @chk_provoke, getskilllv(6);
+		set @chk_provoke, getskilllv("SM_PROVOKE");
 		if(@chk_provoke == 0){
 			mes "[Shurank]";
 			mes "You haven't";
@@ -613,7 +613,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 		mes "it comes to damage, you must be";
 		mes "able to both take it and dish it out.";
 		next;
-		set @chk_hp, getskilllv(4);
+		set @chk_hp, getskilllv("SM_RECOVERY");
 		if(@chk_hp == 0){
 			mes "[Shurank]";
 			mes "But judging from that";
@@ -669,7 +669,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 		mes "if you want me to acknowledge";
 		mes "you as a fellow Swordman.";
 		next;
-		set @chk_bash, getskilllv(5);
+		set @chk_bash, getskilllv("SM_BASH");
 		if(@chk_bash == 10){
 			mes "[Shurank]";
 			mes "Those calluses...!";
@@ -695,7 +695,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 		mes "Bash. If you want to grow as a Swordman, you will have great";
 		mes "need to master this skill.";
 		next;
-		set @chk_bash, getskilllv(5);
+		set @chk_bash, getskilllv("SM_BASH");
 		if((@chk_bash > 4) && (@chk_bash < 10)){
 			mes "[Shurank]";
 			mes "Hm. It doesn't look like you've gained mastery of Bash, but it seems like you're trying hard.";
@@ -740,7 +740,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 		mes "Have you been learning";
 		mes "the art of using Bash? I fervently believe that the Bash skill is the essense of Swordmanship!";
 		next;
-		set @chk_bash, getskilllv(5);
+		set @chk_bash, getskilllv("SM_BASH");
 		if((@chk_bash > 0) && (@chk_bash < 5)){
 			mes "[Shurank]";
 			mes "I see that you understand";
@@ -830,7 +830,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 		mes "fundamentals, the first of";
 		mes "which is the ^5D478BBash^000000 skill.";
 		next;
-		set @chk_bash, getskilllv(5);
+		set @chk_bash, getskilllv("SM_BASH");
 		if(@chk_bash == 0){
 			mes "[Shurank]";
 			mes "^333333*Gasp*^000000";
diff --git a/npc/quests/first_class/tu_thief01.txt b/npc/quests/first_class/tu_thief01.txt
index 6290cce8c..080b23f5d 100644
--- a/npc/quests/first_class/tu_thief01.txt
+++ b/npc/quests/first_class/tu_thief01.txt
@@ -136,12 +136,12 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 		} else if(tu_thief01 == 2){
 			mes "Okay, let me see your skills. You know you gotta change your battle strategy depending on what skills you have, right? Skills are just as important as stats!";
 			next;
-			set @chk_th_skill1, getskilllv(48);
-			set @chk_th_skill2, getskilllv(49);
-			set @chk_th_skill3, getskilllv(50);
-			set @chk_th_skill4, getskilllv(51);
-			set @chk_th_skill5, getskilllv(52);
-			set @chk_th_skill6, getskilllv(53);
+			set @chk_th_skill1, getskilllv("TF_DOUBLE");
+			set @chk_th_skill2, getskilllv("TF_MISS");
+			set @chk_th_skill3, getskilllv("TF_STEAL");
+			set @chk_th_skill4, getskilllv("TF_HIDING");
+			set @chk_th_skill5, getskilllv("TF_POISON");
+			set @chk_th_skill6, getskilllv("TF_DETOXIFY");
 
 			if(@chk_th_skill1 == 0 && @chk_th_skill2 == 0 && @chk_th_skill3 == 0 && @chk_th_skill4 == 0 && @chk_th_skill5 == 0 && @chk_th_skill6 == 0){
 				mes "[Yierhan]";