From 9baa8fbabf43dc119e44394532505a8f0f277817 Mon Sep 17 00:00:00 2001 From: evera Date: Thu, 3 Aug 2006 01:36:02 +0000 Subject: removed kafra saves outside towns from inside towns, reenabled culvert save git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8084 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/kafras/kafras_alb.txt | 13 ++++--------- npc/kafras/kafras_dungeons.txt | 5 +++-- npc/kafras/kafras_gef.txt | 33 ++++++++------------------------- npc/kafras/kafras_mor.txt | 33 ++++++++------------------------- npc/kafras/kafras_pron.txt | 33 ++++++++------------------------- 5 files changed, 31 insertions(+), 86 deletions(-) (limited to 'npc/kafras') diff --git a/npc/kafras/kafras_alb.txt b/npc/kafras/kafras_alb.txt index cf24ef188..c6eb00b21 100644 --- a/npc/kafras/kafras_alb.txt +++ b/npc/kafras/kafras_alb.txt @@ -3,7 +3,7 @@ //===== By: ========================= //= eAthena Dev Team //===== Current Version: =================== -//= 2.2 +//= 2.3 //===== Compatible With: ===================== //= eAthena 1.0 //===== Description: ============================================ @@ -18,6 +18,7 @@ //= v2.1b Minor changes to function calls. Using arguments. //= This version uses arrays .[kobra_k88] //= 2.2 New Teleport list and prices [Lupus] +//= 2.3 Can't save outside city anymore [Evera] //===================================================================== @@ -28,14 +29,8 @@ alberta.gat,28,229,8 script Kafra::kaf_alberta 115,{ callfunc "F_Kafra",0,0,0; M_Save: - menu "-Save Outside City.",sM_Out, "-Save inside City",sM_In; - - sM_Out: - savepoint "pay_fild03.gat",386,76; - callfunc "F_KafEnd",0,1; - sM_In: - savepoint "alberta.gat",31,231; - callfunc "F_KafEnd",0,1; + savepoint "alberta.gat",31,231; + callfunc "F_KafEnd",0,1; } // South --------------------------------------------------------------------- diff --git a/npc/kafras/kafras_dungeons.txt b/npc/kafras/kafras_dungeons.txt index 4933aac84..818cda95b 100644 --- a/npc/kafras/kafras_dungeons.txt +++ b/npc/kafras/kafras_dungeons.txt @@ -3,7 +3,7 @@ //===== By: ============================ //= eAthena Dev Team //===== Current Version: ======================= -//= 2.41 +//= 2.5 //===== Compatible With: ============================ //= eAthena 1.0 //===== Description: ============================================ @@ -23,6 +23,7 @@ //= 2.3 Removed SAVE menu from dungeons Kafras [Lupus] //= 2.4 Now Baby Merchant can pass Merch Job Quest w/o probs [Lupus] //= 2.41 Removed useless warp points, already nullified by func call [Evera] +//= 2.5 Allowed Culvert save point [Evera] //=============================================================== @@ -65,7 +66,7 @@ izlu2dun.gat,106,58,8 script Kafra::kaf_izlu2dun 115,{ //<============================ Culvert Sewers ============================>\\ prt_fild05.gat,290,224,1 script Kafra::prt_fild05 114,{ cutin "kafra_04",2; - callfunc "F_Kafra",0,2,1; + callfunc "F_Kafra",0,1,1; M_Save: savepoint "prt_fild05.gat",274,243; diff --git a/npc/kafras/kafras_gef.txt b/npc/kafras/kafras_gef.txt index ebcd98f2c..96225323f 100644 --- a/npc/kafras/kafras_gef.txt +++ b/npc/kafras/kafras_gef.txt @@ -3,7 +3,7 @@ //===== By: ========================= //= eAthena Dev Team //===== Current Version: =================== -//= 2.2 +//= 2.3 //===== Compatible With: ===================== //= eAthena 1.0 //===== Description: ============================================ @@ -18,6 +18,7 @@ //= v2.1b Minor changes to function calls. Using arguments. //= This version uses arrays .[kobra_k88] //= 2.2 New warps and prices [Evera] +//= 2.3 Can't save outside city [Evera] //===================================================================== @@ -39,14 +40,8 @@ geffen.gat,203,123,3 script Kafra::geffen2 114,{ callfunc "F_Kafra",0,0,0; M_Save: - menu "-Save outside city.",sM_Out, "-Save inside city.",sM_In; - - sM_Out: - savepoint "gef_fild00.gat",51,194; - callfunc "F_KafEnd",0,1; - sM_In: - savepoint "geffen.gat",200,124; - callfunc "F_KafEnd",0,1; + savepoint "geffen.gat",200,124; + callfunc "F_KafEnd",0,1; } // North ============================================== @@ -56,14 +51,8 @@ geffen.gat,116,202,3 script Kafra::geffen3 116,{ callfunc "F_Kafra",0,0,0; M_Save: - menu "-Save outside city.",sM_Out, "-Save inside city.",sM_In; - - sM_Out: - savepoint "gef_fild04.gat",192,49; - callfunc "F_KafEnd",0,1; - sM_In: - savepoint "geffen.gat",110,199; - callfunc "F_KafEnd",0,1; + savepoint "geffen.gat",110,199; + callfunc "F_KafEnd",0,1; } // West ========================================= @@ -73,14 +62,8 @@ geffen.gat,37,116,6 script Kafra::geffen4 117,{ callfunc "F_Kafra",0,0,0; M_Save: - menu "-Save outside city.",sM_Out, "-Save inside city.",sM_In; - - sM_Out: - savepoint "gef_fild07.gat",330,192; - callfunc "F_KafEnd",0,1; - sM_In: - savepoint "geffen.gat",43,108; - callfunc "F_KafEnd",0,1; + savepoint "geffen.gat",43,108; + callfunc "F_KafEnd",0,1; } diff --git a/npc/kafras/kafras_mor.txt b/npc/kafras/kafras_mor.txt index 708913fa3..e1d22205c 100644 --- a/npc/kafras/kafras_mor.txt +++ b/npc/kafras/kafras_mor.txt @@ -3,7 +3,7 @@ //===== By: ========================= //= eAthena Dev Team //===== Current Version: =================== -//= 2.2 +//= 2.3 //===== Compatible With: ===================== //= eAthena 1.0 //===== Description: ============================================ @@ -18,6 +18,7 @@ //= v2.1b Minor changes to function calls. Using arguments. //= This version uses arrays .[kobra_k88] //= 2.2 New teleport destinations, prices [Lupus] +//= 2.3 Can't save outside city [Evera[ //===================================================================== @@ -39,14 +40,8 @@ morocc.gat,162,271,4 script Kafra::kaf_morocc2 114,{ callfunc "F_Kafra",0,0,0; M_Save: - menu "-Save outside city.",sM_Out,"-Save inside city.",sM_In; - - sM_Out: - savepoint "moc_fild07.gat",212,30; - callfunc "F_KafEnd",0,1; - sM_In: - savepoint "morocc.gat",157,272; - callfunc "F_KafEnd",0,1; + savepoint "morocc.gat",157,272; + callfunc "F_KafEnd",0,1; } // West ================================= @@ -56,14 +51,8 @@ morocc.gat,28,167,6 script Kafra::kaf_morocc3 116,{ callfunc "F_Kafra",0,0,0; M_Save: - menu "-Save outside city.",sM_Out,"-Save inside city.",sM_In; - - sM_Out: - savepoint "moc_fild19.gat",164,107; - callfunc "F_KafEnd",0,1; - sM_In: - savepoint "morocc.gat",31,164; - callfunc "F_KafEnd",0,1; + savepoint "morocc.gat",31,164; + callfunc "F_KafEnd",0,1; } // East ================================= @@ -73,14 +62,8 @@ morocc.gat,292,211,4 script Kafra::kaf_morocc4 112,{ callfunc "F_Kafra",0,0,0; M_Save: - menu "-Save outside city.",sM_Out,"-Save inside city.",sM_In; - - sM_Out: - savepoint "moc_fild10.gat",24,107; - callfunc "F_KafEnd",0,1; - sM_In: - savepoint "morocc.gat",294,207; - callfunc "F_KafEnd",0,1; + savepoint "morocc.gat",294,207; + callfunc "F_KafEnd",0,1; } // Function: Sets variables for Morroc Kafras -------------------------------- diff --git a/npc/kafras/kafras_pron.txt b/npc/kafras/kafras_pron.txt index 4648386cc..83a330b9e 100644 --- a/npc/kafras/kafras_pron.txt +++ b/npc/kafras/kafras_pron.txt @@ -3,7 +3,7 @@ //===== By: ========================= //= eAthena Dev Team //===== Current Version: =================== -//= 2.4 +//= 2.5 //===== Compatible With: ===================== //= eAthena 1.0 //===== Description: ============================================ @@ -22,6 +22,7 @@ //= 2.3b One Kafra's been moved to Prontera, thx to Vicious_Pucca [Lupus] //= 2.4 Updated Kafras locations for the mini-map [Lupus] //= 2.41 New prices [Evera] +//= 2.5 Can't save outside city [Evera] //===================================================================== @@ -42,14 +43,8 @@ prontera.gat,151,29,8 script Kafra::kaf_prontera2 116,{ callfunc "F_Kafra",0,0,0; M_Save: - menu "-Save outside city.",sM_Out,"-Save inside city.",sM_In; - - sM_Out: - savepoint "prt_fild08.gat",170,369; - callfunc "F_KafEnd",0,1; - sM_In: - savepoint "prontera.gat",150,33; - callfunc "F_KafEnd",0,1; + savepoint "prontera.gat",150,33; + callfunc "F_KafEnd",0,1; } //WEST========================================= @@ -59,14 +54,8 @@ prontera.gat,29,207,6 script Kafra::kaf_prontera3 113,{ callfunc "F_Kafra",0,0,0; M_Save: - menu "-Save outside city.",sM_Out,"-Save inside city.",sM_In; - - sM_Out: - savepoint "prt_fild05.gat",367,205; - callfunc "F_KafEnd",0,1; - sM_In: - savepoint "prontera.gat",33,208; - callfunc "F_KafEnd",0,1; + savepoint "prontera.gat",33,208; + callfunc "F_KafEnd",0,1; } // East =========================================== @@ -76,14 +65,8 @@ prontera.gat,282,200,4 script Kafra::kaf_prontera4 115,{ callfunc "F_Kafra",0,0,0; M_Save: - menu "-Save outside city.",sM_Out,"-Save inside city.",sM_In; - - sM_Out: - savepoint "prt_fild06.gat",31,192; - callfunc "F_KafEnd",0,1; - sM_In: - savepoint "prontera.gat",281,203; - callfunc "F_KafEnd",0,1; + savepoint "prontera.gat",281,203; + callfunc "F_KafEnd",0,1; } // Center =========================================== -- cgit v1.2.3-70-g09d2