diff options
Diffstat (limited to 'npc/kafras/functions_kafras.txt')
| -rw-r--r-- | npc/kafras/functions_kafras.txt | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index e50264c9d..e1e547174 100644 --- a/npc/kafras/functions_kafras.txt +++ b/npc/kafras/functions_kafras.txt @@ -10,6 +10,7 @@ //= http://herc.ws - http://github.com/HerculesWS/Hercules //= //= Copyright (C) 2012-2015 Hercules Dev Team +//= Copyright (C) Dastgir //= Copyright (C) Haru //= Copyright (C) rAthena Dev Team //= Copyright (C) Euphy @@ -47,7 +48,7 @@ //= These functions handle save, storage, cart rental, teleport, and Free //= Teleport/Warp/Rent Cart options for all Kafra NPCs. //================= Current Version ======================================= -//= 6.8 +//= 6.9 //========================================================================= //== Main Function ========================================= @@ -80,7 +81,7 @@ function script F_Kafra { break; case 2: // Guild Castle Kafra message - @GID = getcharid(2); + @GID = getcharid(CHAR_ID_GUILD); mes "[Kafra Employee]"; mes "Welcome. ^ff0000" + getguildname(@GID) + "^000000 Member."; mes "The Kafra Coporation will stay with you wherever you go."; @@ -210,7 +211,7 @@ function script F_KafStor { close; } // Unable to access Normal Storage (Insufficient Basic Skills) - if (basicskillcheck() && getskilllv(NV_BASIC) < 6) { + if (basicskillcheck() && getskilllv(NV_BASIC) < 6 && getskilllv(SU_BASIC_SKILL) == 0) { mes getarg(3); // Niflheim Specific Message if (getarg(2) == 1) { @@ -388,7 +389,7 @@ function script F_KafCart { mes "fee is "+getarg(1)+" zeny. Would"; mes "you like to rent a Pushcart?"; next; - if (select("Rent a Pushcart.:Cancel") == 2) + if (select("Rent a Pushcart.", "Cancel") == 2) return 0; if (Zeny < getarg(1)) { mes getarg(2); @@ -418,7 +419,7 @@ function script F_KafInfo { if (.@m$[.@j] == "Check Special Reserve Points.") { mes "[Kafra Employee]"; mes "Let's see..."; - mes strcharinfo(0) + "..."; + mes strcharinfo(PC_NAME) + "..."; mes "Ah, you have a total of"; mes RESRVPTS+ " Special Reserve Points."; next; @@ -501,7 +502,7 @@ function script F_SetKafCode { if (#kafra_code) { mes "Your storage is protected with a password. What would you do now?"; next; - switch (select("Change old password -> 5000z:Remove storage password -> 1000z:Cancel")) { + switch (select("Change old password -> 5000z", "Remove storage password -> 1000z", "Cancel")) { case 1: mes getarg(0); mes "At first, please enter your ^0000FFold password^000000."; @@ -549,7 +550,7 @@ function script F_SetKafCode { mes getarg(1)+" proudly presents you a new service:"; mes "Additional storage protection with a password."; next; - switch (select("Set new password -> 5000z:Cancel")) { + switch (select("Set new password -> 5000z", "Cancel")) { case 1: callsub S_SET,getarg(0),getarg(1); break; case 2: break; } @@ -609,56 +610,56 @@ function script F_KafSet { deletearray @wrpP$; deletearray @viewpX; deletearray @viewpY; - if (strnpcinfo(4) == "prontera") { + if (strnpcinfo(NPC_MAP) == "prontera") { setarray @wrpD$, "Izlude", "Geffen", "Payon", "Morroc", "Orc Dungeon", "Alberta"; setarray @wrpP, 600, 1200, 1200, 1200, 1200, 1800; setarray @viewpX, 151, 29, 282, 152; setarray @viewpY, 29, 207, 200, 326; - } else if (strnpcinfo(4) == "alberta") { + } else if (strnpcinfo(NPC_MAP) == "alberta") { setarray @wrpP, 1200, 1800, 1800; setarray @wrpD$, "Payon", "Morroc", "Prontera"; setarray @viewpX, 28, 113, 0, 0; setarray @viewpY, 229, 60, 0, 0; - } else if (strnpcinfo(4) == "aldebaran") { + } else if (strnpcinfo(NPC_MAP) == "aldebaran") { setarray @wrpP, 1200, 1200, 1800, 1700; setarray @wrpD$, "Geffen", "Juno" , "Izlude", "Mjolnir Dead Pit"; - } else if (strnpcinfo(4) == "comodo" ) { + } else if (strnpcinfo(NPC_MAP) == "comodo" ) { setarray @wrpD$, "Morroc", "Comodo Pharos Beacon", "Umbala"; setarray @wrpP, 1800, 1200, 1800; - } else if (strnpcinfo(4) == "cmd_fild07") { + } else if (strnpcinfo(NPC_MAP) == "cmd_fild07") { setarray @wrpD$, "Comodo", "Morroc"; setarray @wrpP, 1200, 1200; - } else if (strnpcinfo(4) == "geffen") { + } else if (strnpcinfo(NPC_MAP) == "geffen") { setarray @wrpD$, "Prontera", "Al De Baran", "Orc Dungeon", "Mjolnir Dead Pit"; setarray @wrpP, 1200, 1200, 1200, 1700; setarray @viewpX, 120, 203; setarray @viewpY, 62, 123; - } else if (strnpcinfo(4) == "izlude") { + } else if (strnpcinfo(NPC_MAP) == "izlude") { setarray @wrpD$, "Geffen", "Payon", "Morroc", "Al De Baran"; setarray @wrpP, 1200, 1200, 1200, 1800; - } else if (strnpcinfo(4) == "morocc") { + } else if (strnpcinfo(NPC_MAP) == "morocc") { setarray @wrpD$, "Prontera", "Payon", "Alberta", "Comodo", "Comodo Pharos Beacon"; setarray @wrpP, 1200, 1200, 1800, 1800, 1200; setarray @viewpX, 156, 163, 28, 292; setarray @viewpY, 97, 260, 167, 211; - } else if (strnpcinfo(4) == "umbala") { + } else if (strnpcinfo(NPC_MAP) == "umbala") { setarray @wrpD$, "Comodo"; setarray @wrpP, 1800; - } else if (strnpcinfo(4) == "payon") { + } else if (strnpcinfo(NPC_MAP) == "payon") { setarray @wrpD$, "Prontera", "Alberta", "Morroc"; setarray @wrpP, 1200, 1200, 1200; - } else if (strnpcinfo(4) == "yuno") { + } else if (strnpcinfo(NPC_MAP) == "yuno") { setarray @wrpD$, "Al De Baran"; setarray @wrpP, 1200; setarray @viewpX, 328, 278, 153, 0; setarray @viewpY, 108, 221, 187, 0; - } else if (strnpcinfo(4) == "job3_rune01") { + } else if (strnpcinfo(NPC_MAP) == "job3_rune01") { setarray @wrpD$, "Izlude", "Geffen", "Payon", "Morroc", "Alberta"; setarray @wrpP, 600, 1200, 1200, 1200, 1800; - } else if (strnpcinfo(4) == "rachel") { + } else if (strnpcinfo(NPC_MAP) == "rachel") { setarray @wrpD$, "Veins"; setarray @wrpP, 2200; - } else if (strnpcinfo(4) == "veins") { + } else if (strnpcinfo(NPC_MAP) == "veins") { setarray @wrpD$, "Rachel"; setarray @wrpP, 2200; } |