From 1aea178ef7cdb76eda5600540b5fbd29fd54ff88 Mon Sep 17 00:00:00 2001 From: Haru Date: Fri, 18 Sep 2015 13:09:16 +0200 Subject: More aggressive whitespace cleanup. Follow up to 51329e6 Signed-off-by: Haru --- npc/re/merchants/coin_exchange.txt | 7 +++---- npc/re/merchants/diamond.txt | 27 +++------------------------ npc/re/merchants/ninja_craftsman.txt | 22 ++++++++++------------ npc/re/merchants/shadow_refiner.txt | 14 +++++++------- 4 files changed, 23 insertions(+), 47 deletions(-) (limited to 'npc/re/merchants') diff --git a/npc/re/merchants/coin_exchange.txt b/npc/re/merchants/coin_exchange.txt index cabd9753b..7b553e0bd 100644 --- a/npc/re/merchants/coin_exchange.txt +++ b/npc/re/merchants/coin_exchange.txt @@ -1006,7 +1006,7 @@ ecl_in01,33,98,5 script Herb Merchant Plafina#e 4_M_FAIRYKID2,{ delitem Splendide_Coin,.cost[.@item]*.@buy; //Splendide_Coin getitem .items[.@item],.@buy; close; - + OnInit: setarray .items[0],Snow_Flip,Peony_Mommy,Slapping_Herb,Yggdrasil_Dust; setarray .cost[0],5,5,1,1; //Splendide Coins @@ -1028,7 +1028,6 @@ ecl_in01,67,39,4 script Replication Expert Paltu 4_M_FAIRYKID4,{ mes "[Paltu]"; mes "Really? Hmm?"; close; - case 2: mes "[Paltu]"; mes "One can say that there's no one better in Eclage than I at utilizing magic resistance."; @@ -1124,7 +1123,7 @@ ecl_in01,67,39,4 script Replication Expert Paltu 4_M_FAIRYKID4,{ C_Boy's_Cap; if ((countitem(Splendide_Coin) >= 50) && (countitem(Crystal_Mirror) >= 4) && countitem(Angel_Magic_Power) && (countitem(Azure_Jewel) >= 10) && (countitem(Cardinal_Jewel) >= 10) && (countitem(Blue_Jewel) >= 10) && (countitem(Golden_Jewel) >= 10) && (countitem(Bluish_Green_Jewel) >= 10)) .@item_check =1; - + for(.@i = 0; .@i= 501000000) { mes .@npc$; mes ". . . . . ."; next; - mes .@npc$; mes "Calculating the price and service fee.."; mes "501,000,000 zeny."; @@ -143,7 +130,6 @@ Zeny -= 501000000; getitem 6024, 1; next; - mes .@npc$; mes "You may exchange the diamond back for zeny at any time."; mes "However, there will be a 1,000,000z service fee."; @@ -180,32 +166,26 @@ emotion e_dots; close; } - mes .@npc$; mes "I see. After I receive your signature, "; mes "You must offer your ^FF82FF'17 Carat Diamond'^000000."; mes "Also don't forget there is a 1,000,000z service fee!"; next; - mes .@npc$; mes "What is your name?"; next; - mes "[" + strcharinfo(0) + "]"; mes "My name is " + strcharinfo(0) + "."; next; - mes .@npc$; mes "Alright then, please sign here."; next; - while (1) { if (select("Sign:Don't Sign") == 2) { mes .@npc$; mes "The trade cannot be completed without your signature."; close; } - input .@charname$; if (.@charname$ == strcharinfo(0)) { mes .@npc$; @@ -213,7 +193,6 @@ mes "I will now take your ^FF82FF'17 Carat Diamond'^000000.."; mes "You will receive ^0000FF499,000,000z^000000 afterwards."; next; - mes .@npc$; mes "Thank you for your business."; mes "Whenever you need a ^FF82FF'17 Carat Diamond'^000000,"; diff --git a/npc/re/merchants/ninja_craftsman.txt b/npc/re/merchants/ninja_craftsman.txt index a88069e99..cb6d47cd9 100644 --- a/npc/re/merchants/ninja_craftsman.txt +++ b/npc/re/merchants/ninja_craftsman.txt @@ -1,14 +1,14 @@ -//===== Hercules Script ====================================== +//===== Hercules Script ====================================== //= Ninja Weapon and Armor -//===== By: ================================================== +//===== By: ================================================== //= Dastgir -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0 -//===== Description: ========================================= +//===== Description: ========================================= //= Ninja Armor and Weapon Craftsman -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Official Conversion. [Dastgir] -//============================================================ +//============================================================ que_ng,21,72,6 script Master Craftsman Gyo#arm 4_M_RASWORD,{ mes "[Gyo]"; mes "How would you define victory?"; @@ -55,7 +55,7 @@ que_ng,21,72,6 script Master Craftsman Gyo#arm 4_M_RASWORD,{ mes "Looks like you need more time to decide."; close; } - + L_Menu: .@item_make = getarg(0); while(1){ @@ -177,7 +177,7 @@ L_Menu: } next; } - + L_Ingredients: switch(getarg(0)){ case 2172: //Wolf_Armguard @@ -190,7 +190,6 @@ L_Ingredients: return "you'll need a Special Ninja Suit with a slot and 10 Dark Pieces"; } end; - } que_ng,23,70,6 script Master Craftsman Ki#weap 4_DST_SOLDIER,{ @@ -231,7 +230,7 @@ que_ng,23,70,6 script Master Craftsman Ki#weap 4_DST_SOLDIER,{ mes "Think carefully~~"; close; } - + L_Menu: .@item_make = getarg(0); while(1){ @@ -336,7 +335,7 @@ L_Menu: } next; } - + L_Ingredients: switch(getarg(0)){ case 13076: //Raksasa_Dagger @@ -347,5 +346,4 @@ L_Ingredients: return "you need one Huuma Calm Mind Shuriken and 100 Broken Shurikens"; } end; - } diff --git a/npc/re/merchants/shadow_refiner.txt b/npc/re/merchants/shadow_refiner.txt index 33d23450c..d184af61d 100644 --- a/npc/re/merchants/shadow_refiner.txt +++ b/npc/re/merchants/shadow_refiner.txt @@ -1,14 +1,14 @@ -//===== Hercules Script ====================================== +//===== Hercules Script ====================================== //= Shadow Refiner -//===== By: ================================================== +//===== By: ================================================== //= Dastgir -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0 -//===== Description: ========================================= +//===== Description: ========================================= //= [Aegis Conversion] -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version [Dastgir] -//============================================================ +//============================================================ itemmall,31,76,3 script Shadow Blacksmith#nomal 4_F_JOB_BLACKSMITH,{ disable_items; @@ -61,7 +61,7 @@ itemmall,31,76,3 script Shadow Blacksmith#nomal 4_F_JOB_BLACKSMITH,{ .@mate$[1] = "^8C8C8C"+ getitemname(.@s_weapon2[.@index]) +"^000000"; .@miss[1] = 1; } - if (getequiprefinerycnt(.@SelectedPart) > 6 && countitem(.@s_weapon3[.@index])) + if (getequiprefinerycnt(.@SelectedPart) > 6 && countitem(.@s_weapon3[.@index])) .@mate$[2] = getitemname(.@s_weapon3[.@index]); else { .@mate$[2] = "^8C8C8C"+ getitemname(.@s_weapon3[.@index]) +"^000000"; -- cgit v1.2.3-60-g2f50