From 39d776311e6cda0692503f599ce997a77dbe700d Mon Sep 17 00:00:00 2001 From: celest Date: Wed, 6 Apr 2005 11:55:55 +0000 Subject: * Fixed a crash in clif_send when checking packet version * Fixed a crash in Deluge, Volcano and Violent Gale * Allow super novices to rent carts from the Kafra git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1420 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 1 + npc/kafras/functions_kafras.txt | 5 +++-- npc/other/Global_Functions.txt | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'npc') diff --git a/npc/Changelog.txt b/npc/Changelog.txt index cfc08d961..bc5c00ecb 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -34,6 +34,7 @@ Date Added ====== 04/06 + * Allow super novices to rent carts from the Kafra, thanks to HawkMoon * Set PCLoginEvent.txt to disabled by default [celest] 04/04 * Changed "set @TEMP,rand(0);" to set "@TEMP,0;" in the Payon Fortune Teller script [DracoRPG] diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index 5e1c5b6bc..b27545388 100644 --- a/npc/kafras/functions_kafras.txt +++ b/npc/kafras/functions_kafras.txt @@ -9,7 +9,7 @@ //= Lupus //= kobra_k88 (2.0) //===== Current Version: ===================================== -//= 2.3 +//= 2.4 //===== Compatible With: ===================================== //= eAthena 1.0 //===== Description: =============================================== @@ -25,6 +25,7 @@ //= 2.2b This version uses arrays for the teleport option. //= Rearranged next statements to make menu transitions smoother. [kobra_k88] //= 2.3 Removed SAVE from Niflheim. [Lupus] +//= 2.4 Allow Super novices to rent carts, thanks to HawkMoon //============================================================ @@ -182,7 +183,7 @@ function script F_KafTele { // Cart Function ======================================================== function script F_KafCart { - if(callfunc("Is_Merc_Class") == 0) goto sL_CantRent; + if(callfunc("Is_Merc_Class") == 0 && callfunc("Is_Super_Class") == 0) goto sL_CantRent; if(getskilllv(39)==0) goto sL_NeedSkill; if(checkcart(0) == 1) goto sL_GotCart; if(getarg(0) == 2) goto L_Guild; diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt index 8a0ccba2c..d9af3143d 100644 --- a/npc/other/Global_Functions.txt +++ b/npc/other/Global_Functions.txt @@ -85,3 +85,8 @@ function script Is_Thief_Class { function script Is_Sword_Class { return ( Class==Job_Swordman || Class==Job_Knight || Class==Job_Knight2 || Class==Job_Crusader || Class==Job_Crusader2 || Class==4002 || Class==4008 || Class==4014 || Class==4015 || Class==4022 ); } +//----------------------------------------------------- +// returns 1 if the player is either Super Novice or Super Baby, 0 otherwise +function script Is_Super_Class { + return ( Class==Job_Super_Baby || Class==Job_SuperNovice ) +} \ No newline at end of file -- cgit v1.2.3-60-g2f50