summaryrefslogtreecommitdiff
path: root/npc/custom
diff options
context:
space:
mode:
authorshadow <shadow@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-06-13 10:13:14 +0000
committershadow <shadow@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-06-13 10:13:14 +0000
commit8605b217a7e1c6ed424a8cdf6a987502e4cd6917 (patch)
treeafc1e3f1f8262e9d7cb2d4c57221b99d7f32a65c /npc/custom
parent578d813efbb35403bc477c5b876e509715ada52e (diff)
downloadhercules-8605b217a7e1c6ed424a8cdf6a987502e4cd6917.tar.gz
hercules-8605b217a7e1c6ed424a8cdf6a987502e4cd6917.tar.bz2
hercules-8605b217a7e1c6ed424a8cdf6a987502e4cd6917.tar.xz
hercules-8605b217a7e1c6ed424a8cdf6a987502e4cd6917.zip
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
Diffstat (limited to 'npc/custom')
-rw-r--r--npc/custom/breeder.txt6
-rw-r--r--npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt4
-rw-r--r--npc/custom/eAAC_Scripts/kafraExpress/ke_main.txt4
-rw-r--r--npc/custom/eAAC_Scripts/kafraExpress/ke_rent.txt6
-rw-r--r--npc/custom/eAAC_Scripts/kafraExpress/ke_stats.txt2
-rw-r--r--npc/custom/eAAC_Scripts/quest_warper.txt2
-rw-r--r--npc/custom/events/xmas_rings_event.txt4
7 files changed, 14 insertions, 14 deletions
diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt
index 8db0ff76c..798d81585 100644
--- a/npc/custom/breeder.txt
+++ b/npc/custom/breeder.txt
@@ -33,7 +33,7 @@ L_Cart:
close;
L_Cart_Ok:
- if(getskilllv(39)<1) goto L_Need_Skill;
+ if(getskilllv("MC_PUSHCART")<1) goto L_Need_Skill;
setcart;
goto L_Quit2;
@@ -44,7 +44,7 @@ L_Need_Skill:
L_Falcon:
if(BaseJob != Job_Archer && BaseClass == Job_Archer && checkfalcon() == 0) goto L_Falc;
- if(getskilllv(127)<1) goto L_Need_Skill2;
+ if(getskilllv("HT_FALCON")<1) goto L_Need_Skill2;
mes "[Universal Rental Npc]";
mes "Sorry " + strcharinfo(0) + ", but I only rent falcons to Hunters and Snipers who the ability to handle 'em.";
@@ -61,7 +61,7 @@ L_Need_Skill2:
L_Peco:
if (BaseJob != Job_Swordman && BaseClass == Job_Swordman && checkriding() == 0) goto L_Peco_Ok;
- if(getskilllv(63)<1) goto L_Need_Skill3;
+ if(getskilllv("KN_RIDING")<1) goto L_Need_Skill3;
mes "[Universal Rental Npc]";
mes "Sorry " + strcharinfo(0) + ", but I only rent Pecopecos to Knights and Crusaders who have the ability to handle 'em.";
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;
diff --git a/npc/custom/eAAC_Scripts/quest_warper.txt b/npc/custom/eAAC_Scripts/quest_warper.txt
index 106ba7c8a..c61b46417 100644
--- a/npc/custom/eAAC_Scripts/quest_warper.txt
+++ b/npc/custom/eAAC_Scripts/quest_warper.txt
@@ -581,7 +581,7 @@ Zeny_short_SP:
L_Storage:
next;
- if(basicskillcheck() > 0 && getskilllv(1) < 6) goto L_StorageJBlow;
+ if(basicskillcheck() > 0 && getskilllv("NV_BASIC") < 6) goto L_StorageJBlow;
set @fee, $QW_S_PRICE;
if ($QW_S_PRICE == 60)&&(BaseJob == Job_Novice) set @fee, 30;
if ($QW_S_PRICE == 60)&&(BaseJob != Job_Novice) set @fee, 60;
diff --git a/npc/custom/events/xmas_rings_event.txt b/npc/custom/events/xmas_rings_event.txt
index a5d442e06..39c178096 100644
--- a/npc/custom/events/xmas_rings_event.txt
+++ b/npc/custom/events/xmas_rings_event.txt
@@ -93,9 +93,9 @@ OnInit:
//Santa's Hat
setitemscript 2236,"{ bonus bMdef,1; bonus bLuk,1; if(isequipped(2636,2637)){if(@xmr == gettime(2))end; set @xmr,gettime(2); misceffect 410; end;} if(isequipped(2636)){if(@xmr == gettime(2))end; set @xmr,gettime(2); misceffect 72;} if(isequipped(2637)){if(@xmr == gettime(2))end; set @xmr,gettime(2); misceffect 338;}}";
//Gold Xmas Ring
- setitemscript 2636,"{ bonus bLoseSPWhenUnequip,30; if(isequipped(2236)==0)end; if(getskilllv(28)){skill 51,4+isequipped(2637);}else{skill 28,1+4*isequipped(2637);} }";
+ setitemscript 2636,"{ bonus bLoseSPWhenUnequip,30; if(isequipped(2236)==0)end; if(getskilllv("AL_HEAL")){skill "TF_HIDING",4+isequipped(2637);}else{skill "AL_HEAL",1+4*isequipped(2637);} }";
//Silver Xmas Ring
- setitemscript 2637,"{ bonus bDamageWhenUnequip,40; if(isequipped(2236)==0)end; if(getskilllv(26)){skill 40,1;}else{skill 26,1+isequipped(2636);} }";
+ setitemscript 2637,"{ bonus bDamageWhenUnequip,40; if(isequipped(2236)==0)end; if(getskilllv("AL_TELEPORT")){skill "MC_IDENTIFY",1;}else{skill "AL_TELEPORT",1+isequipped(2636);} }";
end;
}