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/jobs/1-1/acolyte.txt | 4 ++-- npc/jobs/1-1/archer.txt | 4 ++-- npc/jobs/1-1/mage.txt | 4 ++-- npc/jobs/1-1/merchant.txt | 4 ++-- npc/jobs/1-1/swordman.txt | 6 +++--- npc/jobs/1-1/thief.txt | 4 ++-- npc/jobs/1-1e/taekwon.txt | 2 +- npc/jobs/2-2a/Creator.txt | 2 +- npc/jobs/novice/supernovice.txt | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) (limited to 'npc/jobs') diff --git a/npc/jobs/1-1/acolyte.txt b/npc/jobs/1-1/acolyte.txt index e2b8917d4..92426ddf5 100644 --- a/npc/jobs/1-1/acolyte.txt +++ b/npc/jobs/1-1/acolyte.txt @@ -35,7 +35,7 @@ prt_church,184,41,4 script Cleric#aco 60,{ mes "Ah, I sense you have endured"; mes "a past life experience. You must have learned many things before entering Valhalla."; next; - if (getskilllv(1) < 9) { + if (getskilllv("NV_BASIC") < 9) { mes "[Father Mareusis]"; mes "Unfortunately, I don't think you're ready to become an Acolyte yet. Please finish learning all of the Basic Skills first."; next; @@ -131,7 +131,7 @@ prt_church,184,41,4 script Cleric#aco 60,{ mes "Oh, you've come back. Let me check and see if you are ready to serve God. Let's see..."; next; mes "[Father Mareusis]"; - if (getskilllv(1) < 9) { + if (getskilllv("NV_BASIC") < 9) { mes "Good Lord! Haven't you accomplished the Basic Training yet?! It's important that you finish that!"; next; mes "[Father Mareusis]"; diff --git a/npc/jobs/1-1/archer.txt b/npc/jobs/1-1/archer.txt index 8360b99c8..e63cbde43 100644 --- a/npc/jobs/1-1/archer.txt +++ b/npc/jobs/1-1/archer.txt @@ -35,7 +35,7 @@ payon_in02,64,71,4 script Archer Guildsman#archer 85,{ mes "to Valhalla and been reborn."; mes "Wow, that's so impressive!"; next; - if (getskilllv(1) < 9) { + if (getskilllv("NV_BASIC") < 9) { mes "[Archer Guildsman]"; mes "Err..."; mes "You'd better learn all the Basic Skills first before you can become an Archer."; @@ -122,7 +122,7 @@ payon_in02,64,71,4 script Archer Guildsman#archer 85,{ mes "[Archer Guildsman]"; mes "Are you..." + strcharinfo(0) + "?"; next; - if (getskilllv(1) < 9) { + if (getskilllv("NV_BASIC") < 9) { mes "[Archer Guildsman]"; mes "Well, you're not at the right job level. Please check the requirements again."; next; diff --git a/npc/jobs/1-1/mage.txt b/npc/jobs/1-1/mage.txt index cb901323b..ce9b1b1c9 100644 --- a/npc/jobs/1-1/mage.txt +++ b/npc/jobs/1-1/mage.txt @@ -32,7 +32,7 @@ geffen_in,164,124,4 script Mage Guildsman 123,{ mes "[Mage Guildsman]"; mes "Ah, you must have been reborn. Well, I'm glad to have you back."; next; - if (getskilllv(1) < 9) { + if (getskilllv("NV_BASIC") < 9) { mes "[Mage Guildsman]"; mes "I'm sorry, but I don't think you're ready to learn magic yet. Why don't you go finish learning the Basic Skills first?"; next; @@ -136,7 +136,7 @@ geffen_in,164,124,4 script Mage Guildsman 123,{ close; } mes "Yeah? Ready...?"; - if (getskilllv(1) < 9) { + if (getskilllv("NV_BASIC") < 9) { mes "Oh, what a bummer. You haven't met the requirements yet."; next; mes "[Mage Guildsman]"; diff --git a/npc/jobs/1-1/merchant.txt b/npc/jobs/1-1/merchant.txt index 2c0fb1284..4b2fe8218 100644 --- a/npc/jobs/1-1/merchant.txt +++ b/npc/jobs/1-1/merchant.txt @@ -40,7 +40,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{ mes "Whoa..."; mes "You've actually been to Valhalla?! Wow, you've come a long way..."; next; - if (getskilllv(1) < 9) { + if (getskilllv("NV_BASIC") < 9) { mes "[Chief Mahnsoo]"; mes "Hmmm..."; mes "It seems that you're not ready to become a Merchant again. Go finish learning the Basic Novice Skills first."; @@ -272,7 +272,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{ mes "be a Merchant?"; mes "Well..."; next; - if (getskilllv(1) < 9) { + if (getskilllv("NV_BASIC") < 9) { mes "[Chief Mahnsoo]"; mes "First, you have to be a Novice with Job Level 10. Once you do that, make sure you learn all of the Basic Skills."; next; diff --git a/npc/jobs/1-1/swordman.txt b/npc/jobs/1-1/swordman.txt index 37788cbc3..77ea8dfe2 100644 --- a/npc/jobs/1-1/swordman.txt +++ b/npc/jobs/1-1/swordman.txt @@ -46,7 +46,7 @@ izlude_in,74,172,4 script Swordman#swd_1 119,{ mes "[Swordman]"; mes "I see you're retreading the path of the Swordman! Once you've gotten used to brandishing a sword, you can never go back!!"; next; - if (getskilllv(1) < 9) { + if (getskilllv("NV_BASIC") < 9) { mes "[Swordman]"; mes "Hmm? Ah, you must first master the Basic Skills before you are ready to become a Swordman."; next; @@ -135,7 +135,7 @@ izlude_in,74,172,4 script Swordman#swd_1 119,{ } } mes "[Swordman]"; - if (getskilllv(1) < 9) { + if (getskilllv("NV_BASIC") < 9) { mes "Hm, you still haven't learned all of the Basic Skills. You need to do that before you can become a Swordman."; next; mes "[Swordman]"; @@ -209,7 +209,7 @@ izlude_in,62,170,6 script Swordman#swd_2 85,{ mes "Who the hell are you?! Nobody, other than Novices, is permitted to come in here!"; close; } - else if (getskilllv(1) < 9) { + else if (getskilllv("NV_BASIC") < 9) { mes "Stop! I can't let you in until you learn all of the Basic Skills. The Test Hall isn't for goofing off!"; close; } diff --git a/npc/jobs/1-1/thief.txt b/npc/jobs/1-1/thief.txt index 30907b926..c7d3edb5b 100644 --- a/npc/jobs/1-1/thief.txt +++ b/npc/jobs/1-1/thief.txt @@ -28,7 +28,7 @@ moc_prydb1,39,129,2 script Thief Guide 69,{ mes "[Thief Guide]"; mes "Huh? Do I know you? It's creepy that you seem so familiar. You don't have a twin, do you?"; next; - if (getskilllv(1) < 9) { + if (getskilllv("NV_BASIC") < 9) { mes "[Thief Guide]"; mes "What, do you want to be a Thief? I'm sorry, but you look like you need more training."; next; @@ -289,7 +289,7 @@ moc_prydb1,39,129,2 script Thief Guide 69,{ mes strcharinfo(0) + "? Um, where is it? Ah, here it is. Let's see..."; next; mes "[Thief Guide]"; - if (getskilllv(1) < 9) { + if (getskilllv("NV_BASIC") < 9) { mes "Isn't that cute? I can see you're ambitious, but you gotta learn all of the Basic Skills before you can become a Thief."; close; } diff --git a/npc/jobs/1-1e/taekwon.txt b/npc/jobs/1-1e/taekwon.txt index 32f2171a1..472ae13be 100644 --- a/npc/jobs/1-1e/taekwon.txt +++ b/npc/jobs/1-1e/taekwon.txt @@ -80,7 +80,7 @@ L_change: mes "art. It won't be easy, but it will lead you to great strength..."; next; if(select("Okay, I will join you.","No, thank you.") == 1) { - if(getskilllv(1) < 9) { + if(getskilllv("NV_BASIC") < 9) { mes "[Phoenix]"; mes "How unfortunate!"; mes "You're not yet ready to"; diff --git a/npc/jobs/2-2a/Creator.txt b/npc/jobs/2-2a/Creator.txt index 07c462aa2..494182792 100644 --- a/npc/jobs/2-2a/Creator.txt +++ b/npc/jobs/2-2a/Creator.txt @@ -75,7 +75,7 @@ valkyrie,53,50,3 script Biochemist#Valkyrie 122,{ close; } else { - if (Class == Job_Creator && MISC_QUEST & 64 && getskilllv(238) == 0) { + if (Class == Job_Creator && MISC_QUEST & 64 && getskilllv("AM_BIOETHICS") == 0) { mes "[Biochemist]"; mes "Ah, have you come to"; mes "retrieve the memories"; diff --git a/npc/jobs/novice/supernovice.txt b/npc/jobs/novice/supernovice.txt index f1cf0851b..287e395f6 100644 --- a/npc/jobs/novice/supernovice.txt +++ b/npc/jobs/novice/supernovice.txt @@ -137,7 +137,7 @@ aldeba_in,223,167,3 script Tzerero#sn 709,{ next; switch(select("Accept his offer.:Reject his offer.:Listen more carefully.")) { case 1: - if (getskilllv(1) < 9) { + if (getskilllv("NV_BASIC") < 9) { mes "[Tzerero]"; mes "Hmm...But do you truly"; mes "appreciate the value of"; @@ -420,7 +420,7 @@ aldebaran,54,238,5 script Kafra Employee#sn 117,{ if (Zeny >= 1899) { set RESRVPTS, RESRVPTS + 190; set zeny,zeny-1900; - if (getskilllv(39) > 0) setcart; + if (getskilllv("MC_PUSHCART") > 0) setcart; mes "[Kafra Employee]"; mes "Thank you for using my service."; mes "Although what I am doing might"; -- cgit v1.2.3-60-g2f50