From 9fbf9932e874845247f285e5c1c4f6c15b4cea58 Mon Sep 17 00:00:00 2001 From: brianluau Date: Mon, 30 Jan 2012 20:17:55 +0000 Subject: - Removed more trailing tabs. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15527 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/custom/banks/bank.txt | 2 +- npc/custom/eAAC_Scripts/kafraExpress/config.txt | 4 +-- .../kafraExpress/global_functionsKE.txt | 3 +- .../eAAC_Scripts/kafraExpress/ke_jobswap.txt | 2 +- npc/custom/eAAC_Scripts/kafraExpress/ke_refine.txt | 4 +-- npc/custom/eAAC_Scripts/kafraExpress/ke_shop.txt | 2 +- .../eAAC_Scripts/kafraExpress/ke_warp_dungeon.txt | 40 +++++++++++----------- npc/custom/eAAC_Scripts/kafraExpress/readme.txt | 2 +- npc/custom/jobs/jobmaster.txt | 2 +- npc/custom/marriage.txt | 2 +- 10 files changed, 31 insertions(+), 32 deletions(-) (limited to 'npc/custom') diff --git a/npc/custom/banks/bank.txt b/npc/custom/banks/bank.txt index 7c610ec13..33fc558f9 100644 --- a/npc/custom/banks/bank.txt +++ b/npc/custom/banks/bank.txt @@ -69,7 +69,7 @@ switch(select("I'd like to make a deposit.:I'd like to make a withdrawl.:What's else if (@withdrawl > #bankstorage) { mes "I show you only have ^00FF00" + #bankstorage +"^000000 zeny in your account!"; close; - } + } else if ((@cost > Zeny) && ((Zeny + @withdrawl) > @cost)) { mes "[Banker]"; mes "You don't have the Zeny for the transaction fee right now. Would you like me to take the fee directly from your withdrawl?"; diff --git a/npc/custom/eAAC_Scripts/kafraExpress/config.txt b/npc/custom/eAAC_Scripts/kafraExpress/config.txt index e3efab224..6ff968655 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/config.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/config.txt @@ -234,7 +234,7 @@ OnLoadRefine: end; //------------------------------------------------------------------------------- //Config for the Renting Module - //------------------------------------------------------------------------------- + //------------------------------------------------------------------------------- OnLoadRent: set $@kert_cartOnly, 0; //Set to 1 to enable only cart rental, 0 enables all add-ons. set $@kert_cartCost, 1000; //Cost to rent a Cart. @@ -252,7 +252,7 @@ OnLoadShop: end; //------------------------------------------------------------------------------- //Config for the Stat Market Module - //------------------------------------------------------------------------------- + //------------------------------------------------------------------------------- OnLoadStatMarket: set $@kesm_stBuyPrice,10000; //Cost of buying stat points set $@kesm_stSellPrice,0; //Return cash for selling stat points diff --git a/npc/custom/eAAC_Scripts/kafraExpress/global_functionsKE.txt b/npc/custom/eAAC_Scripts/kafraExpress/global_functionsKE.txt index 16931e5ea..d1a5d65a5 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/global_functionsKE.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/global_functionsKE.txt @@ -197,8 +197,7 @@ function script GF_getJobId { } if (@classId >= Job_Novice_High && @classId <= Job_Paladin2) set @classId, @classId -Job_Novice_High; - else - if (@classId >= Job_Baby && @classId <= Job_Super_Baby) + else if (@classId >= Job_Baby && @classId <= Job_Super_Baby) set @classId, @classId -Job_Baby; if (@type == 1) diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt index 6d10ed043..198650da5 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_jobswap.txt @@ -378,7 +378,7 @@ function SF_revertJob { if ($@kejs_announce) announce strcharinfo(0)+" has changed from "+jobname(@thisJobId)+" to "+@newjob$+"...",16; return 1; -} +} //SubFunction: SF_getJobNames(Qty) //Fills an array @names$ with the job names taken from the array "classes", diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_refine.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_refine.txt index d9ac1613b..c8a949839 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/ke_refine.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_refine.txt @@ -266,7 +266,7 @@ function SF_purify { set @rough, 990; set @qty, 10; break; - case 7: //Ice + case 7: //Ice set @item, 995; set @rough, 991; set @qty, 10; @@ -276,7 +276,7 @@ function SF_purify { set @rough, 992; set @qty, 10; break; - case 9: //Earth + case 9: //Earth set @item, 997; set @rough, 993; set @qty, 10; diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_shop.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_shop.txt index 0d103715d..e627d0c61 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/ke_shop.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_shop.txt @@ -54,7 +54,7 @@ function script F_keShop { "- Buy items", "- Sell items" ); - break; + break; } if (@kmenu == 1) return; diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_dungeon.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_dungeon.txt index 8cbf48a54..199494184 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_dungeon.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_dungeon.txt @@ -504,7 +504,7 @@ function SF_byalan { ); } switch (@submenu) { - case 2: + case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"izlu2dun",114,84; break; case 3: @@ -516,7 +516,7 @@ function SF_byalan { case 5: callfunc "F_keWarp",@cost4*100/@discountKP,$@kewd_discount,e_hmm,"iz_dun03",32,63; break; - case 6: + case 6: callfunc "F_keWarp",@cost5*100/@discountKP,$@kewd_discount,e_hmm,"iz_dun04",26,27; break; } @@ -585,7 +585,7 @@ function SF_clockTower { ); } switch (@submenu) { - case 2: + case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"aldebaran",140,130; break; case 3: @@ -633,10 +633,10 @@ function SF_coalMine { ); } switch (@submenu) { - case 2: + case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"mjolnir_02",89,358; break; - case 3: + case 3: callfunc "F_keWarp",@cost2*100/@discountKP,$@kewd_discount,e_hmm,"mjo_dun02",376,342; break; case 4: @@ -668,10 +668,10 @@ function SF_culvert { ); } switch (@submenu) { - case 2: + case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"prt_fild05",274,208; break; - case 3: + case 3: callfunc "F_keWarp",@cost2*100/@discountKP,$@kewd_discount,e_hmm,"prt_sewb2",19,19; break; case 4: @@ -772,7 +772,7 @@ function SF_gefenia { ); } switch (@submenu) { - case 2: + case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"gefenia01",60,169; break; case 3: @@ -847,7 +847,7 @@ function SF_glastHeim { "- Underground Cave Level 2 ("+@cost7+"z)" ); } - switch (@submenu) { + switch (@submenu) { case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"glast_01",206,136; break; @@ -947,7 +947,7 @@ function SF_hiddenTemple { ); } switch (@submenu) { - case 2: + case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"prt_fild01",136,361; break; case 3: @@ -980,7 +980,7 @@ function SF_juperos { ); } switch (@submenu) { - case 2: + case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"jupe_cave",55,52; break; case 3: @@ -1010,7 +1010,7 @@ function SF_kiehl { "- Level 2 ("+@cost2+"z)" ); } - switch (@submenu) { + switch (@submenu) { case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"yuno_fild08",80,179; break; @@ -1041,7 +1041,7 @@ function SF_iceCave { ); } switch (@submenu) { - case 2: + case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"ra_fild01",233,319; break; case 3: @@ -1073,7 +1073,7 @@ function SF_lightHalzen { "- Level 3 ("+@cost3+"z)" ); } - switch (@submenu) { + switch (@submenu) { case 2: //This is the Rekkenber building entrance, which officially is only a dungeon exit. callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"lighthalzen",74,72; @@ -1109,7 +1109,7 @@ function SF_louYang { ); }; switch (@submenu) { - case 2: + case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"louyang",41,267; break; case 3: @@ -1169,7 +1169,7 @@ function SF_odin { "- Level 3 ("+@cost3+"z)" ); } - switch (@submenu) { + switch (@submenu) { case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"odin_tem01",91,145; break; @@ -1232,7 +1232,7 @@ function SF_payon { "- Level 5 ("+@cost5+"z)" ); } - switch (@submenu) { + switch (@submenu) { case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"pay_arche",41,133; break; @@ -1277,7 +1277,7 @@ function SF_pyramid { "- Basement 2 ("+@cost3+"z)" ); } - switch (@submenu) { + switch (@submenu) { case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"moc_ruins",62,162; break; @@ -1457,7 +1457,7 @@ function SF_thanatosTower { ); } switch (@submenu) { - case 2: + case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"tha_scene01",139,201; break; case 3: @@ -1555,7 +1555,7 @@ function SF_turtleIsland { ); } switch (@submenu) { - case 2: + case 2: callfunc "F_keWarp",@cost*100/@discountKP,$@kewd_discount,e_hmm,"tur_dun01",153,47; break; case 3: diff --git a/npc/custom/eAAC_Scripts/kafraExpress/readme.txt b/npc/custom/eAAC_Scripts/kafraExpress/readme.txt index 8c371d458..5bce41399 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/readme.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/readme.txt @@ -183,7 +183,7 @@ For example, the renting module's configuration segment is: //------------------------------------------------------------------------------- //Config for the Renting Module - //------------------------------------------------------------------------------- + //------------------------------------------------------------------------------- OnLoadRent: set $@kert_cartOnly, 0; //Set to 1 to enable only cart rental, 0 enables all add-ons. set $@kert_cartCost, 2000; //Cost to rent a Cart. diff --git a/npc/custom/jobs/jobmaster.txt b/npc/custom/jobs/jobmaster.txt index 15c384547..ff364159a 100644 --- a/npc/custom/jobs/jobmaster.txt +++ b/npc/custom/jobs/jobmaster.txt @@ -146,7 +146,7 @@ prontera,153,193,6 script Job Master 123,{ case Job_Thief: set @job_opt[0], Job_Assassin; set @job_opt[1], Job_Rogue; - break; + break; default: set @job_opt[0], Job_Star_Gladiator; set @job_opt[1], Job_Soul_Linker; diff --git a/npc/custom/marriage.txt b/npc/custom/marriage.txt index dbfcd5794..0f21c46e7 100644 --- a/npc/custom/marriage.txt +++ b/npc/custom/marriage.txt @@ -530,7 +530,7 @@ function SF_Register { mes "Come back when you are ready."; close; } -} +} function SF_WedProgress { if (strcharinfo(0) == $wed_groom$) { -- cgit v1.2.3-60-g2f50