diff options
| author | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-04-07 18:00:13 +0000 |
|---|---|---|
| committer | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-04-07 18:00:13 +0000 |
| commit | 1a348ede4934a1ba78f337ee1dffe11a699f4bef (patch) | |
| tree | 883d4c1ae282fb67e1720f81c20f564499298ff4 /npc/kafras | |
| parent | 7cb0d361f1b4260b47ab1da99224332947320553 (diff) | |
| parent | a6cd6538e4271ea08dc86803e8b7e8c8f235960b (diff) | |
| download | hercules-1a348ede4934a1ba78f337ee1dffe11a699f4bef.tar.gz hercules-1a348ede4934a1ba78f337ee1dffe11a699f4bef.tar.bz2 hercules-1a348ede4934a1ba78f337ee1dffe11a699f4bef.tar.xz hercules-1a348ede4934a1ba78f337ee1dffe11a699f4bef.zip | |
branch for major stability breakage
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@1440 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/kafras')
| -rw-r--r-- | npc/kafras/functions_kafras.txt | 10 | ||||
| -rw-r--r-- | npc/kafras/kafras_alde.txt | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index 0483ebafe..feeec7a35 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.2b +//= 2.3 //===== Compatible With: ===================================== //= eAthena 1.0 //===== Description: =============================================== @@ -24,7 +24,9 @@ //= 2.2a Minor changes to function calls. Using agruments. Added Guild options. [kobra_k88] //= 2.2b This version uses arrays for the teleport option. //= Rearranged next statements to make menu transitions smoother. [kobra_k88] -//= Fixed typo >_< [Aria] +//= 2.3 Removed SAVE from Niflheim. [Lupus] +//= 2.3 removed "fix" by HawkMoon RTFM and check supernovice.txt . There's a SPECIAL Kafra +//= which gives CARTS to SN for a special proce. [Lupus] //============================================================ @@ -44,8 +46,7 @@ function script F_Kafra { if(getarg(0)==2) menu "-Use Storage",M_Storage, "-Use Guild Storage",M_GStorage, "-Rent a Cart",M_Cart, "-Use Teleport Service",M_Teleport, "-Cancel",M_End; - if(getarg(1)==1) menu "-Save",M_Save, "-Use Storage",M_Storage, "-Rent a Cart",M_Cart, "-Kafra Pass",M_Pass, "-Other Information Check",M_Info, - "-Cancel",M_End; + if(getarg(1)==1) menu "-Use Storage",M_Storage, "-Cancel",M_End; menu "-Save",M_Save, "-Use Storage",M_Storage, "-Use Teleport Service",M_Teleport, "-Rent a Cart",M_Cart, "-Kafra Pass",M_Pass, "-Other Information Check",M_Info, "-Cancel",M_End; @@ -166,6 +167,7 @@ function script F_KafTele { if (@wrpD$[@num] == "Comodo Pharos Lighthouse") warp "cmd_fild07.gat", 127, 134; if (@wrpD$[@num] == "Orc Dungeon") warp "gef_fild10.gat", 52, 326; if (@wrpD$[@num] == "Umbala") warp "umbala.gat", 130, 130; + if (@wrpD$[@num] == "Yuno") warp "yuno.gat", 157, 123; close2; // this part safegaurds against errors/typos set zeny, zeny + @wrpP[@num]; cutin "", 255; diff --git a/npc/kafras/kafras_alde.txt b/npc/kafras/kafras_alde.txt index ee2c5f570..ff8a6de6e 100644 --- a/npc/kafras/kafras_alde.txt +++ b/npc/kafras/kafras_alde.txt @@ -34,8 +34,8 @@ aldeba_in.gat,96,181,4 script Kafra Leilah 113,{ // South -------------------------------------------------- aldebaran.gat,143,119,4 script Kafra 113,{ cutin "kafra_05",2; - setarray @wrpP[0], 1600, 2000, 1700, 2200; - setarray @wrpD$[0], "Geffen", "Payon", "Coal Mine(Dead Pit)", "Comodo"; + setarray @wrpP[0], 1200, 1200, 1800, 1700; + setarray @wrpD$[0], "Geffen", "Yuno" , "Payon", "Coal Mine(Dead Pit)"; set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0]; set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1]; set @wrpC$[2], @wrpD$[2]+" -> "+@wrpP[2]; |