From 57fbcef315050450da17f4b8abaaa7c8eb9e1837 Mon Sep 17 00:00:00 2001 From: daegaladh Date: Sun, 5 Aug 2012 14:26:10 +0000 Subject: Rescripted Moscovia Kafra to use the Kafra functions. Removed unofficial Guide option in functions_kafras.txt. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16583 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/kafras/functions_kafras.txt | 24 ++----- npc/kafras/kafras_mosk.txt | 146 +++------------------------------------- 2 files changed, 14 insertions(+), 156 deletions(-) (limited to 'npc/kafras') diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index 0a6dad7d8..f57c9c371 100644 --- a/npc/kafras/functions_kafras.txt +++ b/npc/kafras/functions_kafras.txt @@ -5,7 +5,7 @@ //= Darlskies, Darkchild, Syrus22, Lupus, kobra_k88 (2.0) //= L0ne_W0lf //===== Current Version: ===================================== -//= 6.3 +//= 6.4 //===== Compatible With: ===================================== //= rAthena 1.0 //===== Description: ========================================= @@ -58,6 +58,7 @@ //= 6.1 Added menu for Turbo Track Kafra Staff. [L0ne_W0lf] //= 6.2 Updated/Fixed warp cords. [Kisuka] //= 6.3 #kafra_code is now stored as is. [brianluau] +//= 6.4 Removed unofficial Guide function. [Daegaladh] //============================================================ @@ -138,19 +139,19 @@ function script F_Kafra { // No Teleport (Common) case 3: - setarray @K_Menu0$[0],"Save","Use Storage","Rent a Pushcart","Guide","Check Other Information","Cancel"; + setarray @K_Menu0$[0],"Save","Use Storage","Rent a Pushcart","Check Other Information","Cancel"; break; // Case 4 is Einbroch no tele message. // No save, or teleport. (Common) case 5: - setarray @K_Menu0$[0],"Use Storage","Rent a Pushcart","Check Other Information","Guide","Cancel"; + setarray @K_Menu0$[0],"Use Storage","Rent a Pushcart","Check Other Information","Cancel"; break; // Storage and Check Other Information only. case 6: - setarray @K_Menu0$[0],"Use Storage","Guide","Check Other Information","Cancel"; + setarray @K_Menu0$[0],"Use Storage","Check Other Information","Cancel"; break; // Save, Storage, and Pushcart only (Kafra Warehouse) @@ -165,7 +166,7 @@ function script F_Kafra { // Common Kafra Employee default: - setarray @K_Menu0$[0],"Save","Use Storage","Use Teleport Service","Rent a Pushcart","Guide","Check Other Information","Cancel"; + setarray @K_Menu0$[0],"Save","Use Storage","Use Teleport Service","Rent a Pushcart","Check Other Information","Cancel"; break; } @@ -234,11 +235,6 @@ function script F_Kafra { if(callfunc("F_KafCart",getarg(0),getarg(4)) == 1) next; goto M_Menu; } - if (@K_Menu0$[@num] == "Guide"){ - callfunc "F_KafGuide"; - next; - goto M_Menu; - } if (@K_Menu0$[@num] == "Check Other Information"){ callfunc "F_KafInfo",getarg(2); goto M_Menu; @@ -473,14 +469,6 @@ M_End: return 0; } - -// Pass Function =============================================================== -function script F_KafGuide { - mes "[Kafra Employee]"; - mes "WIP..."; - return; -} - // Special Reserve Points Function =========================================== function script F_KafInfo { diff --git a/npc/kafras/kafras_mosk.txt b/npc/kafras/kafras_mosk.txt index 644c56636..b49b84dd2 100644 --- a/npc/kafras/kafras_mosk.txt +++ b/npc/kafras/kafras_mosk.txt @@ -1,153 +1,23 @@ //===== rAthena Script ======================================= //= Moscovia Kafras //===== By: ================================================== -//= Kisuka +//= Kisuka, Daegaladh //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= //= Kafras for the town of Moscovia. //===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] +//= 1.1 Rescripted to use the kafra functions. [Daegaladh] //============================================================ -moscovia,223,191,4 script Kafra Staff#mosk 114,{ +moscovia,223,191,3 script Kafra Employee::kaf_mosk 114,{ cutin "kafra_04",2; - mes "[Kafra Staff]"; - mes "Welcome to the"; - mes "Kafra Corporation."; - mes "The Kafra services"; - mes "are always on your side."; - mes "How may I assist you?"; - next; - switch(select("Save:Use Storage:Rent a Pushcart:Check Other Information:Cancel")) { - case 1: - mes "[Kafra Staff]"; - mes "Your Respawn Point has"; - mes "been saved in the city of"; - mes "Moscovia. Thank you for"; - mes "using the Kafra Service."; - savepoint "moscovia",221,194; - close2; - cutin "", 255; - end; - case 2: - if(basicskillcheck() && getskilllv("NV_BASIC") < 6){ - mes "[Kafra Staff]"; - mes "I'm sorry, but you"; - mes "need the Novice's"; - mes "Basic Skill Level 6 to"; - mes "use the Storage Service."; - close2; - cutin "", 255; - end; - } - if(countitem(7059)) delitem 7059,1; - else { - if(Zeny<80){ - mes "[Kafra Staff]"; - mes "I'm sorry, but you don't"; - mes "have enough zeny to use"; - mes "the Storage Service. Our"; - mes "Storage access fee is 80 zeny."; - close2; - cutin "", 255; - end; - } - set Zeny, Zeny-80; - set RESRVPTS, RESRVPTS + (80/5); - } - mes "[Kafra Staff]"; - mes "Here, let me open"; - mes "your Storage for you."; - mes "Thank you for using"; - mes "the Kafra Service."; - - callfunc("F_CheckKafCode"); //check your storage password, if set - - close2; - openstorage; - cutin "", 255; - end; - case 3: - if(baseClass != Job_Merchant){ - mes "[Kafra Staff]"; - mes "I'm sorry, but the"; - mes "Pushcart rental service"; - mes "is only available to Merchants,"; - mes "Blacksmiths, Master Smiths,"; - mes "Alchemists and Biochemists."; - close2; - cutin "", 255; - end; - } + callfunc "F_Kafra",0,3,0,80,700; - else if(checkcart() == 1){ - mes "[Kafra Staff]"; - mes "You already have"; - mes "a Pushcart equipped."; - mes "Unfortunately, we can't"; - mes "rent more than one to"; - mes "each customer at a time."; - close2; - cutin "", 255; - end; - } - - if(countitem(7061) > 0) delitem 7061,1; - else { - mes "[Kafra Staff]"; - mes "The Pushcart rental"; - mes "fee is 700 zeny. Would"; - mes "you like to rent a Pushcart?"; - next; - if(select("Rent a Pushcart.:Cancel.") == 1) { - if(Zeny<700){ - mes "[Kafra Staff]"; - mes "I'm sorry, but you"; - mes "don't have enough"; - mes "zeny to pay the Pushcart"; - mes "rental fee of 700 zeny."; - close2; - cutin "", 255; - end; - } - set Zeny,Zeny-700; - set RESRVPTS, RESRVPTS + 48; - }else{ - close2; - cutin "", 255; - end; - } - } - setcart; - close2; - cutin "", 255; - end; - case 4: - if(select("Check Special Reserve Points.:Cancel") == 2) { - cutin "", 255; - close; - } - mes "[Kafra Staff]"; - mes strcharinfo(0) + ", you have a total of"; - mes RESRVPTS+ " Special Reserve Points."; - next; - mes "[Kafra Staff]"; - mes "You can exchange your"; - mes "Special Reserve Points for"; - mes "rewards at the Kafra Main Office in Al De Baran. Please use our"; - mes "convenient services to see the benefits of our rewards program."; - close2; - cutin "", 255; - end; - case 5: - mes "[Kafra Staff]"; - mes "We, here at Kafra Corporation,"; - mes "are always endeavoring to provide you with the best services. We hope that we meet your adventuring needs and standards of excellence."; - close2; - cutin "", 255; - end; - } + M_Save: + savepoint "moscovia",221,194;; + callfunc "F_KafEnd",0,3,"in the city of Moscovia"; } -- cgit v1.2.3-60-g2f50