diff options
Diffstat (limited to 'npc/kafras/functions_kafras.txt')
| -rw-r--r-- | npc/kafras/functions_kafras.txt | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index 379aabfb7..90334cc6e 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,19 +211,28 @@ 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) { mes "^666666S-s-ssoooorry,"; - mes "y-you're a-a-aaaa"; - mes "Nooviiice... N-neeeds"; - mes "B-basic sssskill l-level 6...^000000"; + if (Class == Job_Summoner) { + mes "y-you n-neeed"; + mes "N-new b-basic sssskill...^000000"; + } else { + mes "y-you're a-a-aaaa"; + mes "Nooviiice... N-neeeds"; + mes "B-basic sssskill l-level 6...^000000"; + } return; } mes "I'm sorry, but you"; - mes "need the Novice's"; - mes "Basic Skill Level 6 to"; + if (Class == Job_Summoner) { + mes "need the New Basic Skill to"; + } else { + mes "need the Novice's"; + mes "Basic Skill Level 6 to"; + } mes "use the Storage Service."; return; } |