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/quests/Dandelion_Request.txt | 4 ++-- npc/quests/Kiel_Hyre_Quest.txt | 6 +++--- npc/quests/Lvl4_weapon_quest.txt | 2 +- npc/quests/bunnyband.txt | 2 +- npc/quests/first_class/tu_archer.txt | 4 ++-- npc/quests/first_class/tu_merchant.txt | 6 +++--- npc/quests/first_class/tu_sword.txt | 4 ++-- npc/quests/gunslinger_quests.txt | 4 ++-- npc/quests/newgears/2005_headgears.txt | 6 +++--- npc/quests/ninja_quests.txt | 4 ++-- npc/quests/quests_comodo.txt | 2 +- npc/quests/quests_ein.txt | 6 +++--- npc/quests/quests_gonryun.txt | 2 +- npc/quests/quests_hugel.txt | 10 +++++----- npc/quests/quests_juperos.txt | 12 ++++++------ npc/quests/quests_lighthalzen.txt | 14 +++++++------- npc/quests/quests_louyang.txt | 2 +- npc/quests/quests_moscovia.txt | 8 ++++---- npc/quests/quests_nameless.txt | 4 ++-- npc/quests/quests_rachel.txt | 2 +- npc/quests/quests_umbala.txt | 6 +++--- npc/quests/quiz/quiz_qt.txt | 6 +++--- npc/quests/seals/brisingamen_seal.txt | 2 +- npc/quests/skills/crusader_skills.txt | 2 +- 24 files changed, 60 insertions(+), 60 deletions(-) (limited to 'npc/quests') diff --git a/npc/quests/Dandelion_Request.txt b/npc/quests/Dandelion_Request.txt index a1ded141d..cb2add4f9 100644 --- a/npc/quests/Dandelion_Request.txt +++ b/npc/quests/Dandelion_Request.txt @@ -2735,7 +2735,7 @@ OnTouch: donpcevent "Valdes#2::OnEnter"; donpcevent "Kidd#2::OnEnter"; donpcevent "#mao_table::OnEnter"; - } + } else if(mao_request == 123) { donpcevent "Valdes#2::OnEnter"; @@ -2862,7 +2862,7 @@ OnTouch: donpcevent "Valdes#3::OnEnter"; donpcevent "Kidd#3::OnEnter"; donpcevent "#Rabsent::OnEnter"; - } + } else if(mao_request == 122) { donpcevent "#mao_empty::OnEnter"; diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt index 5f577af9d..3248922f7 100644 --- a/npc/quests/Kiel_Hyre_Quest.txt +++ b/npc/quests/Kiel_Hyre_Quest.txt @@ -68,7 +68,7 @@ //= 3.3 Fixed the receiver log out bugs. [L0ne_W0lf] //= 3.4 Fixed bug when u can't get a Yellow Keycard if u got the Blue one at first [Lupus] //= Note: There are many condition checks that should be omitted in the future fixed item names in item_db.txt / txt resources according the quest -//= for items, should be used bitwise methods in a single variable. So let's fix the rest possible bugs (if they exist) and then optimize ^_- +//= for items, should be used bitwise methods in a single variable. So let's fix the rest possible bugs (if they exist) and then optimize ^_- //= 3.5 Changed the way the Black Keycard distibuting NPCs work slighty. [L0ne_W0lf] //= 3.6 Keil Hyre removes ALL outstanding quest items when he is talked [L0ne_W0lf] //= to after finishing the quest. @@ -1506,7 +1506,7 @@ kh_school,179,39,0 script Cute Student#kh 895,{ mes "homework before it's due!"; mes "Yeah, I've got to go see"; mes "Mrs. Lecollane now."; - next; + next; mes "[Elly]"; mes "Say, "+strcharinfo(0)+","; mes "if it's okay, would you"; @@ -7031,7 +7031,7 @@ kh_kiehl02,50,52,4 script Kiehl#Original 902,{ delitem 7504,1; //Toy_Motor set KielHyreQuest,104; hideonnpc "Kiehl#Copy"; - donpcevent "Kiehl_Room_Exit::OnEnable"; + donpcevent "Kiehl_Room_Exit::OnEnable"; enablenpc "Kiehl_Room_Exit"; initnpctimer; cutin "",255; diff --git a/npc/quests/Lvl4_weapon_quest.txt b/npc/quests/Lvl4_weapon_quest.txt index aba16eaa5..58945768a 100644 --- a/npc/quests/Lvl4_weapon_quest.txt +++ b/npc/quests/Lvl4_weapon_quest.txt @@ -1786,7 +1786,7 @@ niflheim,240,193,3 script Kayron#lv4 794,{ if (lv4_weapon == 29) { mes "this... Guillotine!"; getitem 1369,1; //Guillotine - } + } else { mes "this... Brionac!"; getitem 1470,1; //Brionac diff --git a/npc/quests/bunnyband.txt b/npc/quests/bunnyband.txt index 7d32f96a1..dbb231881 100644 --- a/npc/quests/bunnyband.txt +++ b/npc/quests/bunnyband.txt @@ -55,7 +55,7 @@ alberta,26,229,0 script Kafra Employee#bunny 83,{ mes "bring at least"; mes "1 Pearl."; close; - } + } if (countitem(2213) == 0) { mes "Ooh, I'm sorry"; mes "but you need to"; diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt index a28fb9c13..98554b615 100644 --- a/npc/quests/first_class/tu_archer.txt +++ b/npc/quests/first_class/tu_archer.txt @@ -1290,7 +1290,7 @@ pay_arche,84,139,3 script Seisner 727,{ set tu_archer01, 3; if(JobLevel == 1){ getexp 0,5; - } else if((JobLevel > 1) && (JobLevel < 11)){ + } else if((JobLevel > 1) && (JobLevel < 11)){ getexp 0,10; } else if((JobLevel > 10) && (JobLevel < 21)){ getexp 0,25; @@ -1485,7 +1485,7 @@ pay_fild08,40,83,5 script Acolyte#tu 95,{ set .@kurae_agi, rand(1,2); if(.@kurae_agi == 1){ unitskilluseid getcharid(3),29,10; - } else if(.@kurae_agi == 2){ + } else if(.@kurae_agi == 2){ unitskilluseid getcharid(3),29,5; } diff --git a/npc/quests/first_class/tu_merchant.txt b/npc/quests/first_class/tu_merchant.txt index 2941ea030..44470c483 100644 --- a/npc/quests/first_class/tu_merchant.txt +++ b/npc/quests/first_class/tu_merchant.txt @@ -818,7 +818,7 @@ prontera,66,111,3 script Sagle 82,{ mes "Zeny, alright?"; close; } - if(MaxWeight - Weight < 71){ + if(MaxWeight - Weight < 71){ next; mes "[Sagle]"; mes "Whoa, hold on!"; @@ -1041,7 +1041,7 @@ prt_in,169,11,3 script Aigie 92,{ mes "^666666*Sniff Sniff*^000000"; close; break; - } + } } if(tu_merchant == 7){ mes "[Aigie]"; @@ -1088,7 +1088,7 @@ prt_in,169,11,3 script Aigie 92,{ mes "^666666*Sniff Sniff*^000000"; close; break; - } + } } if(tu_merchant == 6){ mes "[Aigie]"; diff --git a/npc/quests/first_class/tu_sword.txt b/npc/quests/first_class/tu_sword.txt index d7ada691a..2219810b4 100644 --- a/npc/quests/first_class/tu_sword.txt +++ b/npc/quests/first_class/tu_sword.txt @@ -2002,7 +2002,7 @@ geffen,154,143,3 script Dequ'ee 734,{ mes "out who he is."; close; } - if(tu_swordman == 6){ + if(tu_swordman == 6){ mes "[Dequ'ee]"; mes "Ah...!"; mes "Are you the Swordman"; @@ -2293,7 +2293,7 @@ morocc_in,51,101,3 script Geil 89,{ close; } -//=================================================Meutro==================================================== +//=================================================Meutro==================================================== morocc,82,292,5 script Muetro 84,{ mes "[Muetro]"; if(tu_swordman == 15){ diff --git a/npc/quests/gunslinger_quests.txt b/npc/quests/gunslinger_quests.txt index ecbda0eb7..84407e5d4 100644 --- a/npc/quests/gunslinger_quests.txt +++ b/npc/quests/gunslinger_quests.txt @@ -737,7 +737,7 @@ que_ng,185,180,3 script Vanessa 726,{ next; switch( select( "Maybe next time.","Okay.") ) { - case 1: + case 1: mes "[Vanessa]"; mes "Mm~ Is that so~"; mes "It will be an opportunity for you."; @@ -746,7 +746,7 @@ que_ng,185,180,3 script Vanessa 726,{ mes "Bye~Bye~"; close; - case 2: + case 2: mes "[Vanessa]"; mes "Mm, Okay."; mes "To make a Destroyer,"; diff --git a/npc/quests/newgears/2005_headgears.txt b/npc/quests/newgears/2005_headgears.txt index ff4fee6a7..d638d777c 100644 --- a/npc/quests/newgears/2005_headgears.txt +++ b/npc/quests/newgears/2005_headgears.txt @@ -89,7 +89,7 @@ yuno,222,116,3 script Kasis#LhzHat 851,{ next; switch( select( "You can have these if you want.", "Um, why are you staring?" ) ) { - case 1: + case 1: mes "[Kasis]"; mes "Really? Is it alright"; mes "with you for me to have"; @@ -655,7 +655,7 @@ lighthalzen,143,68,0 script Strange Guy#LhzHat 47,{ mes "^0000FF1 Slotted Bucket Hat^000000"; mes "and ^0000FF1,887 zeny^000000. Okay?"; close; - case 2: + case 2: mes "[Morris]"; mes "Great!"; mes "Now let me just"; @@ -1676,7 +1676,7 @@ gl_prison1,97,104,1 script Phendark#LhzHat 1202,{ else if(ZLMASKQ == 2 || ZLMASKQ == 3) { if(countitem(7315) > 368 && ZLMASKQ == 3) - { + { mes "[Phendark]"; mes "Y-you again!"; mes "Why do you hound me?!"; diff --git a/npc/quests/ninja_quests.txt b/npc/quests/ninja_quests.txt index 9a1342042..d4e119fac 100644 --- a/npc/quests/ninja_quests.txt +++ b/npc/quests/ninja_quests.txt @@ -257,7 +257,7 @@ que_ng,28,50,3 script Boshuu 709,{ } } } - else{ + else{ set ninbo,0; mes "[Boshuu]"; mes "Oh~ You~!"; @@ -356,7 +356,7 @@ que_ng,28,50,3 script Boshuu 709,{ set Zeny,Zeny-10000; set MISC_QUEST,MISC_QUEST | 2048; getitem 2118,1; - close; + close; } } } diff --git a/npc/quests/quests_comodo.txt b/npc/quests/quests_comodo.txt index 56d85b9dd..1fc23457b 100644 --- a/npc/quests/quests_comodo.txt +++ b/npc/quests/quests_comodo.txt @@ -1099,7 +1099,7 @@ cmd_in02,32,140,4 script Chief#cmd 49,{ mes "the tourist attraction~"; close; } - } + } } comodo,88,97,4 script Toruna#cmd 109,{ diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt index 798b13bb9..a59857187 100644 --- a/npc/quests/quests_ein.txt +++ b/npc/quests/quests_ein.txt @@ -149,7 +149,7 @@ einbech,97,167,5 script Cavitar 847,{ mes "Come back"; mes "whenever you're ready."; close; - } + } } else { if (BaseLevel < 40){ @@ -423,7 +423,7 @@ einbech,97,167,5 script Cavitar 847,{ mes "But please understand"; mes "that I'm desperate..."; close; - } + } case 2: mes "[Cavitar]"; mes "You're..."; @@ -6022,7 +6022,7 @@ ein_in01,31,138,3 script Calla#ein 90,{ mes "Would you please tell"; mes "me your name again?"; close; - } + } } if (EIN_LOVERQ == 4) { mes "[Calla]"; diff --git a/npc/quests/quests_gonryun.txt b/npc/quests/quests_gonryun.txt index 398558399..ec7142c70 100644 --- a/npc/quests/quests_gonryun.txt +++ b/npc/quests/quests_gonryun.txt @@ -3700,7 +3700,7 @@ OnTouch: end; } end; -} +} // Lost Knife //============================================================ diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt index e7b8b4f8c..ff0d7f5b4 100644 --- a/npc/quests/quests_hugel.txt +++ b/npc/quests/quests_hugel.txt @@ -3063,7 +3063,7 @@ hu_in01,256,40,3 script Herico 897,{ end; } else - { + { if(countitem(7342)) { mes "[Herico]"; @@ -3073,7 +3073,7 @@ hu_in01,256,40,3 script Herico 897,{ close2; cutin "",255; end; - } + } else { mes "[Herico]"; @@ -7205,7 +7205,7 @@ OnTouch: mes "game coordinators tend"; mes "to be pretty busy..."; close; - } + } } que_bingo,53,190,7 script Eukran 778,{ @@ -7325,7 +7325,7 @@ OnInit: disablenpc "Young Man#Hu_Quest"; end; -} +} odin_tem01,130,134,4 script Young Man#Hu_Quest 774,{ @@ -9989,7 +9989,7 @@ hu_in01,16,20,4 script Ashe 95,{ mes "Oh, dear, you don't"; mes "look very well. Did"; mes "something happen?"; - close; + close; case 16: mes "[Ashe]"; diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt index 2edaee134..9a4675eef 100644 --- a/npc/quests/quests_juperos.txt +++ b/npc/quests/quests_juperos.txt @@ -285,10 +285,10 @@ yuno_in04,190,125,4 script Scholar 700,{ mes "My life is also fairly"; mes "uneventful, but somehow,"; mes "I'm don't think I'm content."; - close; + close; } - case 4: + case 4: mes "[Fayruz]"; mes "Oh hello, "+strcharinfo(0)+"."; mes "So what brings you to"; @@ -398,7 +398,7 @@ yuno_in04,190,125,4 script Scholar 700,{ next; switch( select( "Take a look at this.","Oh, I'm sorry...") ) { - case 1: + case 1: switch(jupe_hist) { case 1: @@ -1069,7 +1069,7 @@ yuno_in04,186,125,4 script Bundle of Files 111,{ mes "regarding the history"; mes "of Juperos have allowed"; mes "us to make a few conclusions.^000000"; - close; + close; case 2: if(yuno_hist < 9) @@ -1130,7 +1130,7 @@ yuno_in04,186,125,4 script Bundle of Files 111,{ mes "^8B6914..."; mes "......"; mes "..........^000000"; - next; + next; mes "["+strcharinfo(0)+"]"; mes "Huh. This writer keeps"; mes "talking about theories,"; @@ -1254,7 +1254,7 @@ yuno_in04,186,125,4 script Bundle of Files 111,{ } case 2: if(yuno_hist < 5) - { + { mes "["+strcharinfo(0)+"]"; mes "Nah..."; mes "I'm tired of reading."; diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt index 05ad3b40b..24182d46f 100644 --- a/npc/quests/quests_lighthalzen.txt +++ b/npc/quests/quests_lighthalzen.txt @@ -547,9 +547,9 @@ lighthalzen,341,224,3 script Fishbone 868,{ mes "Lab. However, I do know of"; mes "this secret maze that should"; mes "get you there. Still, if you're"; - mes "willing and ready to go..."; + mes "willing and ready to go..."; } - else { + else { mes "Okay..."; mes "Are you ready now?"; mes "I'm gonna send you"; @@ -8622,7 +8622,7 @@ L_Mission: close2; cutin "",255; end; - } + } } yuno_pre,77,68,0 script Secretary#2 862,{ @@ -11122,7 +11122,7 @@ airplane_01,96,48,3 script Man#Lyozien 868,{ mes "Do you need to take a"; mes "break or something?"; close; - } + } else if(lhz_rekenber == 20) { mes "[Lyozien]"; @@ -11166,7 +11166,7 @@ airplane_01,96,48,3 script Man#Lyozien 868,{ mes "Then, we'll be done once you"; mes "contact Mr. Ahman in Izlude."; close; - } + } else if(lhz_rekenber == 18) { mes "[Lyozien]"; @@ -11370,7 +11370,7 @@ airplane_01,96,48,3 script Man#Lyozien 868,{ mes "I'll be waiting right here."; set lhz_rekenber,11; close; - } + } else if(lhz_rekenber == 9) { mes "[Lyozien]"; @@ -11381,7 +11381,7 @@ airplane_01,96,48,3 script Man#Lyozien 868,{ mes "Let him know his order has"; mes "already arrived, okay?"; close; - } + } else if(lhz_rekenber == 8) { mes "[Lyozien]"; diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt index 1d0824732..53b1443ad 100644 --- a/npc/quests/quests_louyang.txt +++ b/npc/quests/quests_louyang.txt @@ -4805,7 +4805,7 @@ lou_in02,77,37,7 script Hermit 824,{ mes "[Sun Mao]"; switch(QL_REVOL) { - case 1: + case 1: mes "Please make sure that there is a total of two members in your party so that we can recruit your friend. I believe that will look natural."; close; diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt index d19f10405..e3b442ffa 100644 --- a/npc/quests/quests_moscovia.txt +++ b/npc/quests/quests_moscovia.txt @@ -549,7 +549,7 @@ moscovia,135,49,5 script Mr. Ibanoff#npc 964,{ warp "mosk_ship",94,110; end; } - else if (gettime(3) >= 18 && gettime(3) < 21) { + else if (gettime(3) >= 18 && gettime(3) < 21) { mes "[Mr. Ibanoff]"; mes "Hmm. It's not a bad time."; mes "We should hurry up"; @@ -632,7 +632,7 @@ moscovia,135,49,5 script Mr. Ibanoff#npc 964,{ warp "mosk_ship",94,110; end; } - else if (gettime(3) >= 18 && gettime(3) < 21) { + else if (gettime(3) >= 18 && gettime(3) < 21) { mes "[Mr. Ibanoff]"; mes "Hmm. It's not a bad time."; mes "We should hurry up"; @@ -819,7 +819,7 @@ moscovia,135,49,5 script Mr. Ibanoff#npc 964,{ warp "mosk_ship",94,110; end; } - else if (gettime(3) >= 18 && gettime(3) < 21) { + else if (gettime(3) >= 18 && gettime(3) < 21) { mes "[Mr. Ibanoff]"; mes "Hmm. It's not a bad time."; mes "We should hurry up"; @@ -898,7 +898,7 @@ moscovia,135,49,5 script Mr. Ibanoff#npc 964,{ warp "mosk_ship",94,110; end; } - else if (gettime(3) >= 18 && gettime(3) < 21) { + else if (gettime(3) >= 18 && gettime(3) < 21) { mes "[Mr. Ibanoff]"; mes "Hmm. It's not a bad time."; mes "We should hurry up"; diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt index 4aaac46e7..59d23c234 100644 --- a/npc/quests/quests_nameless.txt +++ b/npc/quests/quests_nameless.txt @@ -66,7 +66,7 @@ airplane_01,95,61,3 script QuestTrigger#Aru -1,3,3,{ end; -OnTouch: +OnTouch: if ((prt_curse == 36 || prt_curse == 45 || prt_curse == 56 || prt_curse == 61) && (aru_monas < 1)) { hideoffnpc "Agent#Aru"; mes "[????]"; @@ -474,7 +474,7 @@ ve_in,78,314,5 script Magistrate#Aru 945,{ mes "peace, and letting anyone"; mes "in here will cause trouble."; close; - } + } else if (aru_monas == 10) { mes "[Al Hamad]"; mes "I thought I told you"; diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt index 5302c9008..1a86aa3df 100644 --- a/npc/quests/quests_rachel.txt +++ b/npc/quests/quests_rachel.txt @@ -402,7 +402,7 @@ ra_in01,384,246,3 script Vincent#ra_in01 47,{ mes "Jenny about Phobe?"; mes "Sure, sure, I'll do that."; close; - } + } else if (lost_boy == 11) { mes "["+strcharinfo(0)+"]"; diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt index cb48eac42..e7b632cc2 100644 --- a/npc/quests/quests_umbala.txt +++ b/npc/quests/quests_umbala.txt @@ -375,9 +375,9 @@ um_in,44,71,2 script Utan Shaman 782,{ mes "using the Kafra Service"; mes "to store some of your items.^000000"; close; - } + } switch(event_umbala) { - default: + default: mes "[??????????]"; mes "Umbah umbah umbabah Utan umbah"; mes "Umbah mookala umbabah.."; @@ -387,7 +387,7 @@ um_in,44,71,2 script Utan Shaman 782,{ close2; warp "umbala",217,186; end; - case 3: + case 3: mes "[Puchuchartan]"; mes "I did not expect that even"; mes "more of you Rune-Midgardians"; diff --git a/npc/quests/quiz/quiz_qt.txt b/npc/quests/quiz/quiz_qt.txt index bf05fa87e..262905f40 100644 --- a/npc/quests/quiz/quiz_qt.txt +++ b/npc/quests/quiz/quiz_qt.txt @@ -966,7 +966,7 @@ if (checkweight(1201,3) == 0 ) goto L_OverWeight; next; mes "[Seeil]"; mes "So this is the last one. Show me some spirit!"; - mes "This is a present to encourage you! Take it!"; + mes "This is a present to encourage you! Take it!"; set quiz_rvl,14; getitem 503,10; //Yellow_Potion close; @@ -1631,7 +1631,7 @@ if(quiz_rvl == 18) { close; } M_MaxItem: - mes "^800000[Radeng]^000000"; + mes "^800000[Radeng]^000000"; mes "- Wait a minute !! -"; mes "- You currently have too many items that -"; mes "- you can't receive an item. -"; @@ -1872,7 +1872,7 @@ if(quiz_rvl == 20) { close; } M_MaxItem: - mes "[Kantryl]"; + mes "[Kantryl]"; mes "- Wait a minute !! -"; mes "- You currently have too many items that -"; mes "- you can't receive an item. -"; diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt index 28e0b04d8..a4e87a815 100644 --- a/npc/quests/seals/brisingamen_seal.txt +++ b/npc/quests/seals/brisingamen_seal.txt @@ -900,7 +900,7 @@ yuno_in04,47,113,1 script Studying Scholar#1 749,{ if ($God3 == 50) { announce "The 3rd Seal of [Brisingamen] has appeared.",bc_all; } - else if ($God3 == 100) { + else if ($God3 == 100) { if ($God1 == 100 && $God2 == 100 && $God3 == 100 && $God4 == 100) { announce "Four seals have been released at the same time with the seal of [Brisingamen].",bc_all; } diff --git a/npc/quests/skills/crusader_skills.txt b/npc/quests/skills/crusader_skills.txt index 65659b6d5..5608acc18 100644 --- a/npc/quests/skills/crusader_skills.txt +++ b/npc/quests/skills/crusader_skills.txt @@ -52,7 +52,7 @@ geffen,110,117,3 script Ford#11 752,{ if (Upper == 1) mes "were dressed like a Paladin..."; else - mes "were dressed like a Crusader..."; + mes "were dressed like a Crusader..."; next; mes "["+ strcharinfo(0) +"]"; mes "I'm sorry..."; -- cgit v1.2.3-60-g2f50