diff options
Diffstat (limited to 'npc/merchants/inn.txt')
| -rw-r--r-- | npc/merchants/inn.txt | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt index 235af3807..e6d1be86c 100644 --- a/npc/merchants/inn.txt +++ b/npc/merchants/inn.txt @@ -4,7 +4,7 @@ //= Darkchild (1.1) //= Playtester (1.2) //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= eAthena 1.0+ //===== Description: ========================================= @@ -25,6 +25,9 @@ //= 1.3 Added (finally) Rachel Inn Maid. Official warp //= and save points[erKURITA] //= 1.4 Added Hugel inn [erKurita] +//= 1.5 Added "end;" after warping the player. [L0ne_W0lf] +//= - Small corrections to the prontera Inns. +//= - Removed the Cancel dialog. //============================================================ @@ -32,14 +35,14 @@ // West Side Inn ------------------- prt_in,244,135,2 script Inn Maid::Sammy 53,{ - callfunc "F_InnMaid","[Sammy]","West Inn","prt_in",238,130; - warp "prt_in",237,102; + callfunc "F_InnMaid","[Employee Sammy]","Nenkaras","prt_in",238,130; + warp "prt_in",247,104; end; } // East Side Inn ------------------ prt_in,61,141,2 script Inn Maid::Ahlma#01 53,{ - callfunc "F_InnMaid","[Ahlma]","East Inn","prt_in",64,136; - warp "prt_in",49,173; + callfunc "F_InnMaid","[Emplyee Ahlma]","Nenkaras","prt_in",64,136; + warp "prt_in",64,136; end; } //======================== Alberta ==================================== @@ -47,27 +50,27 @@ prt_in,61,141,2 script Inn Maid::Ahlma#01 53,{ alberta_in,32,142,5 script Inn Maid::Moira 53,{ callfunc "F_InnMaid","[Moira]","North Inn","alberta_in",26,138; - warp "alberta_in",18,188; + warp "alberta_in",18,188; end; } // South ----------------------------- alberta_in,55,142,8 script Inn Maid::Tina 53,{ callfunc "F_InnMaid","[Tina]","South Inn","alberta_in",60,140; - warp "alberta_in",68,188; + warp "alberta_in",68,188; end; } //====================== Geffen ====================================== geffen_in,70,64,5 script Inn Maid::Betty 53,{ callfunc "F_InnMaid","[Betty]","Geffen Inn","geffen_in",74,60; - warp "geffen_in",106,106; + warp "geffen_in",106,106; end; } //======================= Payon ====================================== payon_in01,131,62,5 script Inn Maid::SunHee 53,{ callfunc "F_InnMaid","[Sun Hee]","Payon Inn","payon_in01",132,56; - warp "payon_in01",140,15; + warp "payon_in01",140,15; end; } //======================== Morocc ==================================== @@ -75,33 +78,34 @@ payon_in01,131,62,5 script Inn Maid::SunHee 53,{ morocc_in,147,138,5 script Inn Maid::Suzie 53,{ callfunc "F_InnMaid","[Suzie]","North East Inn","morocc_in",142,140; - warp "morocc_in",174,144; + warp "morocc_in",174,144; end; } // South -------------------------------- morocc_in,80,100,5 script Inn Maid::Shala 53,{ callfunc "F_InnMaid","[Shala]","South Inn","morocc_in",78,95; - warp "morocc_in",74,128; + warp "morocc_in",74,128; end; } //======================== Rachel ==================================== ra_in01,376,69,4 script Inn Keeper 931,{ callfunc "F_InnMaid","[Annie]","Rachel Inn","ra_in01",375,58; - warp "ra_in01",384,128; + warp "ra_in01",384,128; end; } //======================== Hugel ==================================== hu_in01,246,107,3 script Inn Maid::Receptionist 53,{ callfunc "F_InnMaid","[Receptionist]","Hugel Inn","hu_in01",263,95; - warp "hu_in01",267,5; + warp "hu_in01",267,5; end; } //======================= Inn Function ============================== function script F_InnMaid { mes getarg(0); - mes "Welcome to '" + getarg(1) + "'."; + mes "Welcome to"; + mes getarg(1) + "."; mes "How may I help you?"; next; menu "Save",Msave, "Take a Rest -> 5000 zeny",Mrent, "Cancel",Mend; @@ -132,7 +136,5 @@ function script F_InnMaid { return; Mend: - mes getarg(0); - mes "I am waiting for a job to do."; close; } |