From 8605b217a7e1c6ed424a8cdf6a987502e4cd6917 Mon Sep 17 00:00:00 2001 From: shadow Date: Fri, 13 Jun 2008 10:13:14 +0000 Subject: 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 --- npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt | 4 ++-- npc/custom/eAAC_Scripts/kafraExpress/ke_main.txt | 4 ++-- npc/custom/eAAC_Scripts/kafraExpress/ke_rent.txt | 6 +++--- npc/custom/eAAC_Scripts/kafraExpress/ke_stats.txt | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'npc/custom/eAAC_Scripts/kafraExpress') diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt index af5ae6942..adda7149e 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt @@ -292,7 +292,7 @@ function SF_swapJob { return 0; } - set @basic, getSkilllv(1); + set @basic, getSkilllv("NV_BASIC"); set @skillpoint, skillpointcount() -JobLevel -@basic +@newjoblv; //Preserve holds the final amount of SkillPoints you should have. if (@skillpoint < 0) { @@ -349,7 +349,7 @@ function SF_revertJob { set @thisJobId, Class; set @thisJobLv, JobLevel; - set @basic, getSkilllv(1); + set @basic, getSkilllv("NV_BASIC"); resetSkill; set @skill, SkillPoint; if($@kejs_saveDye) { diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_main.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_main.txt index 79daa71d5..b8f96d09e 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/ke_main.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_main.txt @@ -300,7 +300,7 @@ L_HEAL_ALL: //Function storage: allows access to the storage facility //The sent argument is the displaying image, so we can clear it afterwards. function script F_keStorage { - if(basicskillcheck() > 0 && getskilllv(1) < 6) { + if(basicskillcheck() > 0 && getskilllv("NV_BASIC") < 6) { callfunc "F_keIntro", -1, "I am sorry, but you beed basic skill level 6 to use the storage."; return; } @@ -318,7 +318,7 @@ function script F_keStorage { //Function G Storage: Allows access to the Guild Storage function script F_keGuildStorage { - if(basicskillcheck() > 0 && getskilllv(1) < 6) { + if(basicskillcheck() > 0 && getskilllv("NV_BASIC") < 6) { callfunc "F_keIntro", -1, "I am sorry, but you beed basic skill level 6 to use the storage."; return; } diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_rent.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_rent.txt index 82085a03f..9d3b52529 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/ke_rent.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_rent.txt @@ -35,7 +35,7 @@ function script F_keRent { } switch (@kmenu) { case 2: //Cart - if (getskilllv(39)==0) { + if (getskilllv("MC_PUSHCART")==0) { callfunc "F_keIntro", -1, "Sorry, only those with the skill 'Pushcart' may rent a Cart."; } else if (checkcart()) { @@ -49,7 +49,7 @@ function script F_keRent { } break; case 3: //Falcon - if (getskilllv(127)==0) { + if (getskilllv("HT_FALCON")==0) { callfunc "F_keIntro", -1, "Sorry, only those with the skill 'Falcon Taming' may rent a Falcon."; } else if (checkfalcon()) { @@ -63,7 +63,7 @@ function script F_keRent { } break; case 4: //pecopeco - if (getskilllv(63)==0) { + if (getskilllv("KN_RIDING")==0) { callfunc "F_keIntro", -1, "Sorry, only those with the skill 'PecoPeco Riding' may rent a PecoPeco."; } else if (checkriding()) { diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_stats.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_stats.txt index 73618c9eb..064753fe7 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/ke_stats.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_stats.txt @@ -66,7 +66,7 @@ function script F_keStats { if ($@kest_resetBasic) ResetSkill; else { - set @skill1,getskilllv(1); + set @skill1,getskilllv("NV_BASIC"); ResetSkill; skill 1,@skill1,0; set SkillPoint,SkillPoint-@skill1; -- cgit v1.2.3-70-g09d2