diff options
| author | Haru <haru@dotalux.com> | 2014-05-13 18:15:14 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2014-05-13 18:15:14 +0200 |
| commit | c03094034f5338016221775bce4b39a0e9b75ee6 (patch) | |
| tree | 559e52c5207911190ea336eb82a933ce37305065 /npc | |
| parent | 3bd57cf4858696b2586543098bc9eeac70a1854e (diff) | |
| download | hercules-c03094034f5338016221775bce4b39a0e9b75ee6.tar.gz hercules-c03094034f5338016221775bce4b39a0e9b75ee6.tar.bz2 hercules-c03094034f5338016221775bce4b39a0e9b75ee6.tar.xz hercules-c03094034f5338016221775bce4b39a0e9b75ee6.zip | |
Removed trailing whitespace (scripts)
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc')
199 files changed, 761 insertions, 812 deletions
diff --git a/npc/MOTD.txt b/npc/MOTD.txt index 5e00f85b7..ceb3f4cda 100644 --- a/npc/MOTD.txt +++ b/npc/MOTD.txt @@ -1,15 +1,15 @@ -//==================================================== -//= _ _ _ -//= | | | | | | -//= | |_| | ___ _ __ ___ _ _| | ___ ___ -//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| -//= | | | | __/ | | (__| |_| | | __/\__ \ -//= \_| |_/\___|_| \___|\__,_|_|\___||___/ -//= -//= http://hercules.ws/board/ +//======= Hercules Script =========================== +//= _ _ _ = +//= | | | | | | = +//= | |_| | ___ _ __ ___ _ _| | ___ ___ = +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| = +//= | | | | __/ | | (__| |_| | | __/\__ \ = +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ = +//= = +//= http://hercules.ws/board/ = //==================================================== // run when any character logs in, attached to them. - script HerculesMOTD -1,{ -message strcharinfo(0),"Welcome to Hercules! Enjoy! Please report any bugs you find."; -end; + message strcharinfo(0),"Welcome to Hercules! Enjoy! Please report any bugs you find."; + end; } diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt index a4048cd5f..389e3c1ac 100644 --- a/npc/airports/airships.txt +++ b/npc/airports/airships.txt @@ -654,7 +654,7 @@ airplane_01,243,73,0 script #AirshipWarp-3 WARPNPC,1,1,{ OnTouch: switch ($@airplanelocation2) { case 0: warp "ra_fild12",292,204; end; - case 1: + case 1: if(checkre(0)) warp "izlude",200,73; else diff --git a/npc/battleground/kvm/kvm01.txt b/npc/battleground/kvm/kvm01.txt index f70b3b3fa..b4888be88 100644 --- a/npc/battleground/kvm/kvm01.txt +++ b/npc/battleground/kvm/kvm01.txt @@ -52,11 +52,11 @@ bat_room,169,211,0 warp #kvm802 2,2,bat_room,154,150 - script KVM01::CellEffect -1,{ end; -OnKvM01One: +OnKvM01One: specialeffect EF_CHANGECOLD; end; -OnKvM01Two: +OnKvM01Two: specialeffect EF_CHANGEPOISON; end; } @@ -380,9 +380,7 @@ bat_c01,51,130,5 script KVM Officer#KVM01A 4_M_KY_HEAD,{ mes "May the glory of KVM be with you."; mes "You aquire the winning points: 5"; close2; - } - else - { // + } else { set kvm_point,kvm_point + 1; mes "[KVM Officer]"; mes "I am so sorry."; @@ -409,9 +407,7 @@ bat_c01,148,53,1 script KVM Officer#KVM01B 4_M_CRU_HEAD,{ mes "May the glory of KVM be with you."; mes "You aquire the winning points: 5"; close2; - } - else - { // + } else { set kvm_point,kvm_point + 1; mes "[KVM Officer]"; mes "I am so sorry."; diff --git a/npc/battleground/kvm/kvm02.txt b/npc/battleground/kvm/kvm02.txt index d2a5c38c2..06f3a2dcf 100644 --- a/npc/battleground/kvm/kvm02.txt +++ b/npc/battleground/kvm/kvm02.txt @@ -54,11 +54,11 @@ bat_room,197,211,0 warp #kvm602 2,2,bat_room,154,150 - script KVM02::CellEffect2 -1,{ end; -OnKvM02One: +OnKvM02One: specialeffect EF_CHANGECOLD; end; -OnKvM02Two: +OnKvM02Two: specialeffect EF_CHANGEPOISON; end; } @@ -382,9 +382,7 @@ bat_c02,51,130,5 script KVM Officer#KVM02A 4_M_KY_HEAD,{ mes "May the glory of KVM be with you."; mes "You aquire the winning points: 1"; close2; - } - else - { // + } else { mes "[KVM Officer]"; mes "I am so sorry."; mes "I wish you better luck next time."; @@ -410,9 +408,7 @@ bat_c02,148,53,1 script KVM Officer#KVM02B 4_M_CRU_HEAD,{ mes "May the glory of KVM be with you."; mes "You aquire the winning points: 1"; close2; - } - else - { // + } else { mes "[KVM Officer]"; mes "I am so sorry."; mes "I wish you better luck next time."; diff --git a/npc/battleground/kvm/kvm03.txt b/npc/battleground/kvm/kvm03.txt index c821a7db3..ea7dc3d47 100644 --- a/npc/battleground/kvm/kvm03.txt +++ b/npc/battleground/kvm/kvm03.txt @@ -53,11 +53,11 @@ bat_room,225,211,0 warp #kvm702 2,2,bat_room,154,150 - script KVM03::CellEffect3 -1,{ end; -OnKvM03One: +OnKvM03One: specialeffect EF_CHANGECOLD; end; -OnKvM03Two: +OnKvM03Two: specialeffect EF_CHANGEPOISON; end; } @@ -381,9 +381,7 @@ bat_c03,51,130,5 script KVM Officer#KVM03A 4_M_KY_HEAD,{ mes "May the glory of KVM be with you."; mes "You aquire the winning points: 2"; close2; - } - else - { // + } else { set kvm_point,kvm_point + 1; mes "[KVM Officer]"; mes "I am so sorry."; @@ -410,9 +408,7 @@ bat_c03,148,53,1 script KVM Officer#KVM03B 4_M_CRU_HEAD,{ mes "May the glory of KVM be with you."; mes "You aquire the winning points: 2"; close2; - } - else - { // + } else { set kvm_point,kvm_point + 1; mes "[KVM Officer]"; mes "I am so sorry."; diff --git a/npc/battleground/kvm/kvm_item_pay.txt b/npc/battleground/kvm/kvm_item_pay.txt index 92d3032e5..fa14455d6 100644 --- a/npc/battleground/kvm/kvm_item_pay.txt +++ b/npc/battleground/kvm/kvm_item_pay.txt @@ -7,7 +7,7 @@ //===== Description: ========================================= //= [Official Conversion] //= Kreiger Von Midgard Battleground Point redemption NPC -//= * NOTE * +//= * NOTE * //= KvM Does NOT use items, but a character variable to //= keep track of points. This NPC when talked to will //= convert already-given tokens and convert them to points. @@ -77,7 +77,7 @@ bat_room,151,144,3 script KVM Logistic Officer#a 4_M_JOB_KNIGHT2,{ mes "Please select a sub-category."; next; switch(select("Dagger:One-handed Sword:Two-handed Sword:One-handed Spear:Two-handed Spear")) { - case 1: callsub PurchaseItem,13042,0,1; //Krieger_Dagger1 + case 1: callsub PurchaseItem,13042,0,1; //Krieger_Dagger1 case 2: mes "[Logistics]"; mes "You have selected the 'One-handed Sword' category."; diff --git a/npc/battleground/tierra/tierra01.txt b/npc/battleground/tierra/tierra01.txt index 5daa6429f..10e2bfc85 100644 --- a/npc/battleground/tierra/tierra01.txt +++ b/npc/battleground/tierra/tierra01.txt @@ -613,7 +613,7 @@ OnTouch: bat_a01,194,265,0 script barri_warp_down#bat_a01a -1,7,0,{ OnTouch: - if (getcharid(4) == $@TierraBG1_id1) + if (getcharid(4) == $@TierraBG1_id1) warp "bat_a01",194,270; end; } diff --git a/npc/battleground/tierra/tierra02.txt b/npc/battleground/tierra/tierra02.txt index 05c6eaa0d..0e7cc773d 100644 --- a/npc/battleground/tierra/tierra02.txt +++ b/npc/battleground/tierra/tierra02.txt @@ -612,7 +612,7 @@ OnTouch: bat_a02,194,265,0 script barri_warp_down#bat_a02a -1,7,0,{ OnTouch: - if (getcharid(4) == $@TierraBG2_id1) + if (getcharid(4) == $@TierraBG2_id1) warp "bat_a02",194,270; end; } diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt index 1bc78f0fd..33acb60c2 100644 --- a/npc/cities/aldebaran.txt +++ b/npc/cities/aldebaran.txt @@ -11,7 +11,7 @@ //= 1.1 Added RS125 NPC. Added another Kafra Reserve points agent. //= The 2nd reserve points agent is not complete yet. //= 1.2 Lottery input number fix [Lupus], 1.2a - label typo fixed -//= 1.3 Gatekeeper's bug fixed (wrong check and wrong item ID +//= 1.3 Gatekeeper's bug fixed (wrong check and wrong item ID //= for underground), fixed some typos [Lupus] //= 1.4 Fixed Typos & Spellcheck [massdriller] //= 1.5 Finally added the Special Reserve 2 Lotto 8)) @@ -1250,7 +1250,7 @@ aldeba_in,88,161,3 script Kafra#05 4_F_KAFRA3,{ mes "You have the following amount of special reserve points: ^5544FF"+RESRVPTS+"^000000."; mes "Make a choice and test your luck!"; next; - menu "5000pts = 1st Lottery Chance!",sM_1st, "7000pts = 2nd Lottery Chance!",sM_2nd, "10000pts = 3rd Lottery Chance!",sM_3rd, "Cancel",M_End; + menu "5000pts = 1st Lottery Chance!",sM_1st, "7000pts = 2nd Lottery Chance!",sM_2nd, "10000pts = 3rd Lottery Chance!",sM_3rd, "Cancel",M_End; sM_1st: if(RESRVPTS < 5000) goto sL_NotEnuf; @@ -1379,12 +1379,12 @@ sF_Spin: //============================================================ c_tower3,10,249,4 script Gatekeeper#ct 4_M_02,{ //Key_Of_Clock_Tower - callfunc "F_ClockTowerGate","4th",7026,"c_tower4",185,44; + callfunc "F_ClockTowerGate","4th",7026,"c_tower4",185,44; } alde_dun03,264,16,4 script Gatekeeper#ct1 4W_F_01,{ //Underground_Key - callfunc "F_ClockTowerGate","B4th",7027,"alde_dun04",79,267; + callfunc "F_ClockTowerGate","B4th",7027,"alde_dun04",79,267; } function script F_ClockTowerGate { @@ -1463,7 +1463,7 @@ function script F_ClockTowerGate { mes "Please,You may enter."; mes "May God bless you .."; close2; - delitem getarg(1),1; + delitem getarg(1),1; warp getarg(2),getarg(3),getarg(4); end; } diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt index 86b1f3e94..a4e214582 100644 --- a/npc/cities/ayothaya.txt +++ b/npc/cities/ayothaya.txt @@ -301,8 +301,8 @@ ayothaya,241,264,5 script Young Man#5ayothaya2 4_M_THAIONGBAK,{ //============================================================ //= 0.1 Added a Sailor NPC to get back to Alberta [ZoDIaC] //= 0.2 fixed coords, dialogues -//= 0.3 Fixed Warp name, ayotaya doesn't exist, even though iRO -//= decided to call it Ayotaya, it really is Ayothaya, like +//= 0.3 Fixed Warp name, ayotaya doesn't exist, even though iRO +//= decided to call it Ayotaya, it really is Ayothaya, like //= that Yuno/Juno thing //= 0.4 Added the official warp npc for Ayothaya. [MasterOfMuppets] //= 1.0 Added most of the official npcs. The following quests were added: [MasterOfMuppets] diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt index e19384997..16702126f 100644 --- a/npc/cities/geffen.txt +++ b/npc/cities/geffen.txt @@ -77,7 +77,7 @@ geffen_in,164,109,0 script Wizard Stanza 1_M_WIZARD,{ } else if (Class == Job_Novice) mes "Although you may not be able to use magic or any other kind of powerful skills for now, this knowledge may be helpful in the future, young Novice..."; - else + else mes "Although you are not formally trained in the use of magic, you use skills which draw upon otherworldly energies, whether you know it or not..."; next; mes "[Stanza]"; @@ -1351,7 +1351,7 @@ geffen_in,109,72,2 script Monster Scholar 4_F_01,{ mes "[Estheres]"; if (BaseLevel > 40) mes "You look strong enough for that kind of challenge. But if you see anyone more reckless cross the Western bridge, you might want to give them a warning."; - else + else mes "Um, but if you're planning to go there, you better not go alone. I really recommend that you be well prepared if you're gonna fight those kinds of monsters."; break; case 2: diff --git a/npc/cities/hugel.txt b/npc/cities/hugel.txt index 3302d640c..aae031ebd 100644 --- a/npc/cities/hugel.txt +++ b/npc/cities/hugel.txt @@ -148,7 +148,7 @@ hu_in01,23,311,4 script Party Supplies Shop 4_M_HUMAN_01,{ next; switch (select("Buy:Cancel")) { case 1: - if (Zeny < 500) { + if (Zeny < 500) { mes "[Shopkeeper]"; mes "I am sorry, but you don't have"; mes "enough money~"; diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt index 1b3e5b12a..1069cf01c 100644 --- a/npc/cities/jawaii.txt +++ b/npc/cities/jawaii.txt @@ -414,7 +414,7 @@ jawaii,214,168,5 script Honeymoon Helper#Jawaii 1_F_LIBRARYGIRL,{ mes "[Helper]"; if (Zeny > 49999) { Zeny -= 50000; - getitem 681,1; //Memory_Of_Wedding + getitem 681,1; //Memory_Of_Wedding mes "Thank you very much~!"; mes "Please remember, you"; mes "should use this with your"; diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt index e6824f048..6768da33c 100644 --- a/npc/cities/lighthalzen.txt +++ b/npc/cities/lighthalzen.txt @@ -2170,7 +2170,7 @@ lhz_in02,147,222,3 script Officer Guo#06::off_guo 4_M_03,{ lhz_in02,142,222,6 duplicate(off_guo) Suspect#6 4_M_LGTPOOR -// New ----------------------------------------------------------------------- +// New ----------------------------------------------------------------------- lhz_in01,14,28,3 script Banquet Staff 4_M_MANAGER,{ mes "[Banquet Staff]"; @@ -3205,7 +3205,7 @@ lhz_in01,157,54,0,0 monster Red Mushroom 1085,1,120000,100000,0 //= 1.5 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf] //= 1.6 Massive NPC clean up, includes corrected dialogs and [L0ne_W0lf] //= added missing dialogs, fixed indentation, corrected some NPC -//= facing positions, NPC names are more unique now. Removed +//= facing positions, NPC names are more unique now. Removed //= whitespace (empty lines after header and before end curly) //= reduced usage of the command "goto", grammatical corrections. //= Added additional missing NPCs. diff --git a/npc/cities/louyang.txt b/npc/cities/louyang.txt index 0b6bbb77c..b0aa53dbc 100644 --- a/npc/cities/louyang.txt +++ b/npc/cities/louyang.txt @@ -1,5 +1,5 @@ //===== Hercules Script ====================================== -//= Louyang City NPCs +//= Louyang City NPCs //===== By: ================================================== //= Vidar (1.0) //= Mass Zero (1.1) diff --git a/npc/cities/lutie.txt b/npc/cities/lutie.txt index 49070d7d1..def5e03ab 100644 --- a/npc/cities/lutie.txt +++ b/npc/cities/lutie.txt @@ -10,7 +10,7 @@ //= 1.1 Edited some text and updated/enabled some triggers //= for the quest.[kobra_k88] //= 1.2 Fixed exploit. Checked for Bard Job Quest compatibility [Lupus] -//= 1.3 Fixed typos [Nexon] +//= 1.3 Fixed typos [Nexon] //= 1.4 Fixed exploit [Lupus] //= 1.5 Fixed a bug that could reset Lutie quest state [Lupus] //= 1.6 Heavy optimization to all the NPCs [DZeroX] diff --git a/npc/cities/niflheim.txt b/npc/cities/niflheim.txt index 0ee31c1da..4e6ba1f97 100644 --- a/npc/cities/niflheim.txt +++ b/npc/cities/niflheim.txt @@ -1,5 +1,5 @@ //===== Hercules Script ====================================== -//= Niflheim Script +//= Niflheim Script //===== By: ================================================== //= Fyrien, Dizzy, PKGINGO //= Official NPCs translated and re-edited by Celest @@ -15,7 +15,7 @@ //= fixed zeny/item, exploit in Sairin, some optimizations [Lupus] //= 1.06 some typos in some variables fixed (thx 2 Dr.Evil) [Lupus] //= 1.07 Fixed typos [Nexon] -//= 1.08 Commented "Traveler" out as it is not official & we have correct Bungee quest in. +//= 1.08 Commented "Traveler" out as it is not official & we have correct Bungee quest in. //= Also removed TODO, as they are already done. [Vicious_Pucca] //= 1.1 Replaced nif_q_done with MISC_QUEST & 32. nif_t -> @nif_t [Lupus] //= 1.2 Removed Duplicates [Silent] diff --git a/npc/cities/rachel.txt b/npc/cities/rachel.txt index edbdaa1eb..b4beb95af 100644 --- a/npc/cities/rachel.txt +++ b/npc/cities/rachel.txt @@ -9,7 +9,7 @@ //= [Partial Official Conversion] //= Arunafeltz NPCs //===== Additional Comments: ================================= -//= 0.5 Text translated from Korean > English, incomplete, +//= 0.5 Text translated from Korean > English, incomplete, //= possibly missing some NPCs and missing all quests. //= 0.6 Removed Inn Keeper (it's in inn.txt), name duplicates [Lupus] //= 0.7 Total update of most if not all NPCs. [L0ne_W0lf] diff --git a/npc/custom/battleground/bg_flavius_01.txt b/npc/custom/battleground/bg_flavius_01.txt index 5a78a7002..fd0cf9112 100644 --- a/npc/custom/battleground/bg_flavius_01.txt +++ b/npc/custom/battleground/bg_flavius_01.txt @@ -279,9 +279,7 @@ bat_b01,390,13,5 script Guillaume Vintenar#fl1 4_M_KY_HEAD,{ mes "" + strcharinfo(0) + ", its a sign reflecting victory"; close2; set .@reward, 9; - } - else - { // + } else { mes "[Swandery]"; mes "You lost, but you're dedicated to this battle."; mes "This is a reward for your great dedication by Guillaume Marollo!"; @@ -310,9 +308,7 @@ bat_b01,10,293,5 script Croix Vintenar#fl1 4_M_CRU_HEAD,{ mes "" + strcharinfo(0) + ", its a sign reflecting victory"; close2; set .@reward, 9; - } - else - { // + } else { mes "[Swandery]"; mes "Oh, " + strcharinfo(0) + ". Don't be sad."; mes "Even though we didn't win, we did our best."; diff --git a/npc/custom/battleground/bg_flavius_02.txt b/npc/custom/battleground/bg_flavius_02.txt index 1a66d39c5..f7b7756f4 100644 --- a/npc/custom/battleground/bg_flavius_02.txt +++ b/npc/custom/battleground/bg_flavius_02.txt @@ -279,9 +279,7 @@ bat_b02,390,13,5 script Guillaume Vintenar#fl2 4_M_KY_HEAD,{ mes "" + strcharinfo(0) + ", its a sign reflecting victory"; close2; set .@reward, 9; - } - else - { // + } else { mes "[Swandery]"; mes "You lost, but you're dedicated to this battle."; mes "This is a reward for your great dedication by Guillaume Marollo!"; @@ -310,9 +308,7 @@ bat_b02,10,293,5 script Croix Vintenar#fl2 4_M_CRU_HEAD,{ mes "" + strcharinfo(0) + ", its a sign reflecting victory"; close2; set .@reward, 9; - } - else - { // + } else { mes "[Swandery]"; mes "Oh, " + strcharinfo(0) + ". Don't be sad."; mes "Even though we didn't win, we did our best."; diff --git a/npc/custom/battleground/bg_kvm01.txt b/npc/custom/battleground/bg_kvm01.txt index cfa2f01d7..aa12759b9 100644 --- a/npc/custom/battleground/bg_kvm01.txt +++ b/npc/custom/battleground/bg_kvm01.txt @@ -319,9 +319,7 @@ bat_c01,51,130,5 script Guillaume Vintenar::VintenarKvM01a 4_M_KY_HEAD,{ mes "Let's enjoy our glorious victory!"; mes "" + strcharinfo(0) + ", its a sign reflecting victory"; close2; - } - else - { // + } else { set .@reward, 1; mes "[Swandery]"; mes "You lost, but you're dedicated to this battle."; @@ -357,9 +355,7 @@ bat_c01,148,53,1 script Croix Vintenar::VintenarKvM01b 4_M_CRU_HEAD,{ mes "Let's enjoy our glorious victory!"; mes "" + strcharinfo(0) + ", its a sign reflecting victory"; close2; - } - else - { // + } else { set .@reward, 1; mes "[Swandery]"; mes "Oh, " + strcharinfo(0) + ". Don't be sad."; diff --git a/npc/custom/battleground/bg_kvm02.txt b/npc/custom/battleground/bg_kvm02.txt index f759e2b9a..f2f5f7ca1 100644 --- a/npc/custom/battleground/bg_kvm02.txt +++ b/npc/custom/battleground/bg_kvm02.txt @@ -319,9 +319,7 @@ bat_c02,51,130,5 script Guillaume Vintenar::VintenarKvM02a 4_M_KY_HEAD,{ mes "Let's enjoy our glorious victory!"; mes "" + strcharinfo(0) + ", its a sign reflecting victory"; close2; - } - else - { // + } else { set .@reward, 1; mes "[Swandery]"; mes "You lost, but you're dedicated to this battle."; @@ -357,9 +355,7 @@ bat_c02,148,53,1 script Croix Vintenar::VintenarKvM02b 4_M_CRU_HEAD,{ mes "Let's enjoy our glorious victory!"; mes "" + strcharinfo(0) + ", its a sign reflecting victory"; close2; - } - else - { // + } else { set .@reward, 1; mes "[Swandery]"; mes "Oh, " + strcharinfo(0) + ". Don't be sad."; diff --git a/npc/custom/battleground/bg_kvm03.txt b/npc/custom/battleground/bg_kvm03.txt index dde4d8147..f38e81bd1 100644 --- a/npc/custom/battleground/bg_kvm03.txt +++ b/npc/custom/battleground/bg_kvm03.txt @@ -319,9 +319,7 @@ bat_c03,51,130,5 script Guillaume Vintenar::VintenarKvM03a 4_M_KY_HEAD,{ mes "Let's enjoy our glorious victory!"; mes "" + strcharinfo(0) + ", its a sign reflecting victory"; close2; - } - else - { // + } else { set .@reward, 0; mes "[Swandery]"; mes "You lost, but you're dedicated to this battle."; @@ -357,9 +355,7 @@ bat_c03,148,53,1 script Croix Vintenar::VintenarKvM03b 4_M_CRU_HEAD,{ mes "Let's enjoy our glorious victory!"; mes "" + strcharinfo(0) + ", its a sign reflecting victory"; close2; - } - else - { // + } else { set .@reward, 0; mes "[Swandery]"; mes "Oh, " + strcharinfo(0) + ". Don't be sad."; diff --git a/npc/custom/battleground/bg_tierra_01.txt b/npc/custom/battleground/bg_tierra_01.txt index 819fa9158..671c2d929 100644 --- a/npc/custom/battleground/bg_tierra_01.txt +++ b/npc/custom/battleground/bg_tierra_01.txt @@ -328,9 +328,7 @@ bat_a01,45,19,3 script Croix Vintenar#tv1 4_M_CRU_HEAD,{ mes "Let's enjoy our glorious victory!"; mes "" + strcharinfo(0) + ", its a sign reflecting victory"; close2; - } - else - { // + } else { set .@reward, 1; mes "[Swandery]"; mes "Oh, " + strcharinfo(0) + ". Don't be sad."; @@ -359,9 +357,7 @@ bat_a01,53,377,3 script Guillaume Vintenar#tv1 4_M_KY_HEAD,{ mes "Let's enjoy our glorious victory!"; mes "" + strcharinfo(0) + ", its a sign reflecting victory"; close2; - } - else - { // + } else { set .@reward, 1; mes "[Swandery]"; mes "You lost, but you're dedicated to this battle."; diff --git a/npc/custom/battleground/bg_tierra_02.txt b/npc/custom/battleground/bg_tierra_02.txt index 25796c4bc..c6cebf581 100644 --- a/npc/custom/battleground/bg_tierra_02.txt +++ b/npc/custom/battleground/bg_tierra_02.txt @@ -328,9 +328,7 @@ bat_a02,45,19,3 script Croix Vintenar#tv2 4_M_CRU_HEAD,{ mes "Let's enjoy our glorious victory!"; mes "" + strcharinfo(0) + ", its a sign reflecting victory"; close2; - } - else - { // + } else { set .@reward, 1; mes "[Swandery]"; mes "Oh, " + strcharinfo(0) + ". Don't be sad."; @@ -359,9 +357,7 @@ bat_a02,53,377,3 script Guillaume Vintenar#tv2 4_M_KY_HEAD,{ mes "Let's enjoy our glorious victory!"; mes "" + strcharinfo(0) + ", its a sign reflecting victory"; close2; - } - else - { // + } else { set .@reward, 1; mes "[Swandery]"; mes "You lost, but you're dedicated to this battle."; diff --git a/npc/custom/bgqueue/flavius.txt b/npc/custom/bgqueue/flavius.txt index 0e336ccb4..36e02e86d 100644 --- a/npc/custom/bgqueue/flavius.txt +++ b/npc/custom/bgqueue/flavius.txt @@ -86,7 +86,7 @@ OnPlayerListReady: } // Add the groups to the queues! :D - for (set .@i, 0; .@i < getarraysize(.@bg_groups); set .@i, .@i + 1){ + for (set .@i, 0; .@i < getarraysize(.@bg_groups); set .@i, .@i + 1){ if (queuesize($@Croix_QueueBG1) <= queuesize($@Guill_QueueBG1)){ // Catch'em all and add to the queue! for (set .@j, 0; .@j < getarraysize(.@bg_member); set .@j, .@j + 1) { if ( (.@bg_groups[.@i] == .@bg_member_group[.@j]) && (.@bg_types[.@i] == .@bg_member_type[.@j]) ) { @@ -177,7 +177,7 @@ OnCroixQuit: end; OnGuillaumeQuit: - queueremove($@Guill_QueueBG1,getcharid(3)); + queueremove($@Guill_QueueBG1,getcharid(3)); callsub L_OnPlayerQuit; end; diff --git a/npc/custom/card_remover.txt b/npc/custom/card_remover.txt index e1a74936b..e3aa2bb5b 100644 --- a/npc/custom/card_remover.txt +++ b/npc/custom/card_remover.txt @@ -50,7 +50,7 @@ prt_in,28,73,4 script Wise Old Woman#eAcustom 1_F_ORIENT_04,{ } set .@cardcount,getequipcardcnt(.@part); - if (!checkweight(1202,(.@cardcount+1))) { + if (!checkweight(1202,(.@cardcount+1))) { mes "^3355FFJust a minute!"; mes "I can't offer any of my"; mes "services to you because"; diff --git a/npc/custom/etc/airplane.txt b/npc/custom/etc/airplane.txt index a5796fccd..fc79584fe 100644 --- a/npc/custom/etc/airplane.txt +++ b/npc/custom/etc/airplane.txt @@ -21,101 +21,101 @@ OnInit: deletearray $locationsx[0],500; deletearray $locationsy[0],500; deletearray $alreadygoneto[0],500; - setarray $locationsname$[0],"Airport"; - setarray $locationsname$[1],"Prontera"; - setarray $locationsname$[2],"Payon"; - setarray $locationsname$[3],"Aldebaran"; - setarray $locationsname$[4],"Alberta"; - setarray $locationsname$[5],"Geffen"; - setarray $locationsname$[6],"Morocc"; - setarray $locationsname$[7],"Glast Heim"; - setarray $locationsname$[8],"Umbala"; - setarray $locationsname$[9],"Comodo"; - setarray $locationsname$[10],"Amatsu"; - setarray $locationsname$[11],"Niflheim"; - setarray $locationsname$[12],"Lutie"; - setarray $locationsname$[13],"Louyang"; - setarray $locationsname$[14],"Gonryun"; - setarray $locationsname$[15],"Yuno"; - setarray $locationsname$[16],"Ant Hell"; - setarray $locationsname$[17],"Jawaii"; - setarray $locationsname$[18],"Orc Village"; - setarray $locationsname$[19],"Mjolnir Coal Mines"; - setarray $locationsname$[20],"Gefenia Ruins"; - setarray $locationsname$[21],"Ayothaya"; - setarray $locationsname$[22],"Lighthalzen"; - setarray $locationsname$[23],"Juperos"; - setarray $locationsmap$[0],"airport"; - setarray $locationsmap$[1],"prt_fild08"; - setarray $locationsmap$[2],"pay_fild08"; - setarray $locationsmap$[3],"mjolnir_12"; - setarray $locationsmap$[4],"pay_fild03"; - setarray $locationsmap$[5],"gef_fild00"; - setarray $locationsmap$[6],"moc_fild10"; - setarray $locationsmap$[7],"glast_01"; - setarray $locationsmap$[8],"umbala"; - setarray $locationsmap$[9],"comodo"; - setarray $locationsmap$[10],"amatsu"; - setarray $locationsmap$[11],"niflheim"; - setarray $locationsmap$[12],"xmas"; - setarray $locationsmap$[13],"louyang"; - setarray $locationsmap$[14],"gonryun"; - setarray $locationsmap$[15],"yuno"; - setarray $locationsmap$[16],"moc_fild04"; - setarray $locationsmap$[17],"jawaii"; - setarray $locationsmap$[18],"gef_fild10"; - setarray $locationsmap$[19],"mjolnir_02"; - setarray $locationsmap$[20],"gefenia01"; - setarray $locationsmap$[21],"ayothaya"; + setarray $locationsname$[0],"Airport"; + setarray $locationsname$[1],"Prontera"; + setarray $locationsname$[2],"Payon"; + setarray $locationsname$[3],"Aldebaran"; + setarray $locationsname$[4],"Alberta"; + setarray $locationsname$[5],"Geffen"; + setarray $locationsname$[6],"Morocc"; + setarray $locationsname$[7],"Glast Heim"; + setarray $locationsname$[8],"Umbala"; + setarray $locationsname$[9],"Comodo"; + setarray $locationsname$[10],"Amatsu"; + setarray $locationsname$[11],"Niflheim"; + setarray $locationsname$[12],"Lutie"; + setarray $locationsname$[13],"Louyang"; + setarray $locationsname$[14],"Gonryun"; + setarray $locationsname$[15],"Yuno"; + setarray $locationsname$[16],"Ant Hell"; + setarray $locationsname$[17],"Jawaii"; + setarray $locationsname$[18],"Orc Village"; + setarray $locationsname$[19],"Mjolnir Coal Mines"; + setarray $locationsname$[20],"Gefenia Ruins"; + setarray $locationsname$[21],"Ayothaya"; + setarray $locationsname$[22],"Lighthalzen"; + setarray $locationsname$[23],"Juperos"; + setarray $locationsmap$[0],"airport"; + setarray $locationsmap$[1],"prt_fild08"; + setarray $locationsmap$[2],"pay_fild08"; + setarray $locationsmap$[3],"mjolnir_12"; + setarray $locationsmap$[4],"pay_fild03"; + setarray $locationsmap$[5],"gef_fild00"; + setarray $locationsmap$[6],"moc_fild10"; + setarray $locationsmap$[7],"glast_01"; + setarray $locationsmap$[8],"umbala"; + setarray $locationsmap$[9],"comodo"; + setarray $locationsmap$[10],"amatsu"; + setarray $locationsmap$[11],"niflheim"; + setarray $locationsmap$[12],"xmas"; + setarray $locationsmap$[13],"louyang"; + setarray $locationsmap$[14],"gonryun"; + setarray $locationsmap$[15],"yuno"; + setarray $locationsmap$[16],"moc_fild04"; + setarray $locationsmap$[17],"jawaii"; + setarray $locationsmap$[18],"gef_fild10"; + setarray $locationsmap$[19],"mjolnir_02"; + setarray $locationsmap$[20],"gefenia01"; + setarray $locationsmap$[21],"ayothaya"; setarray $locationsmap$[22],"lighthalzen"; setarray $locationsmap$[23],"jupe_gate"; - setarray $locationsx[0],148; - setarray $locationsx[1],206; - setarray $locationsx[2],159; - setarray $locationsx[3],62; - setarray $locationsx[4],194; - setarray $locationsx[5],50; - setarray $locationsx[6],163; - setarray $locationsx[7],196; + setarray $locationsx[0],148; + setarray $locationsx[1],206; + setarray $locationsx[2],159; + setarray $locationsx[3],62; + setarray $locationsx[4],194; + setarray $locationsx[5],50; + setarray $locationsx[6],163; + setarray $locationsx[7],196; setarray $locationsx[8],187; - setarray $locationsx[9],203; + setarray $locationsx[9],203; setarray $locationsx[10],115; setarray $locationsx[11],132; setarray $locationsx[12],232; - setarray $locationsx[13],36; - setarray $locationsx[14],82; + setarray $locationsx[13],36; + setarray $locationsx[14],82; setarray $locationsx[15],58; setarray $locationsx[16],209; - setarray $locationsx[17],248; + setarray $locationsx[17],248; setarray $locationsx[18],158; setarray $locationsx[19],76; - setarray $locationsx[20],98; + setarray $locationsx[20],98; setarray $locationsx[21],183; setarray $locationsx[22],99; setarray $locationsx[23],46; - setarray $locationsy[0],45; + setarray $locationsy[0],45; setarray $locationsy[1],280; - setarray $locationsy[2],92; + setarray $locationsy[2],92; setarray $locationsy[3],381; setarray $locationsy[4],182; setarray $locationsy[5],365; setarray $locationsy[6],172; setarray $locationsy[7],327; setarray $locationsy[8],98; - setarray $locationsy[9],76; + setarray $locationsy[9],76; setarray $locationsy[10],79; setarray $locationsy[11],241; setarray $locationsy[12],308; - setarray $locationsy[13],279; - setarray $locationsy[14],96; + setarray $locationsy[13],279; + setarray $locationsy[14],96; setarray $locationsy[15],194; setarray $locationsy[16],326; - setarray $locationsy[17],175; + setarray $locationsy[17],175; setarray $locationsy[18],95; setarray $locationsy[19],363; - setarray $locationsy[20],21; + setarray $locationsy[20],21; setarray $locationsy[21],104; - setarray $locationsy[22],240; + setarray $locationsy[22],240; setarray $locationsy[23],19; goto resetgoneto; end; @@ -123,7 +123,7 @@ OnInit: setrandomitin: set $@settervariable,$@settervariable + 1; setarray $locationn[$@settervariable],rand(0,getarraysize($locationsname$) - 1); - if($alreadygoneto[$locationn[$@settervariable]]==1)set $@settervariable,$@settervariable - 1; + if($alreadygoneto[$locationn[$@settervariable]]==1)set $@settervariable,$@settervariable - 1; if($alreadygoneto[$locationn[$@settervariable]]==1)goto setrandomitin; setarray $alreadygoneto[$locationn[$@settervariable]], 1; if($@settervariable<12)goto setrandomitin; diff --git a/npc/custom/etc/bank.txt b/npc/custom/etc/bank.txt index 7b569a3d5..e6e75c9f3 100644 --- a/npc/custom/etc/bank.txt +++ b/npc/custom/etc/bank.txt @@ -1,5 +1,5 @@ //===== Hercules Script ====================================== -//= Banker Script +//= Banker Script //===== By: ================================================== //= Syrus22 (1.0) //===== Current Version: ===================================== diff --git a/npc/custom/etc/blackjack.txt b/npc/custom/etc/blackjack.txt index b86316706..ee1e7904b 100644 --- a/npc/custom/etc/blackjack.txt +++ b/npc/custom/etc/blackjack.txt @@ -12,7 +12,7 @@ //= Currently does not allow for "insurance", or "splitting" //= of pairs. //===== Additional Comments: ================================= -//= +//= //============================================================ cmd_in02,188,89,1 script Black Jack Dealer 1_M_LIBRARYMASTER,{ diff --git a/npc/custom/etc/marriage.txt b/npc/custom/etc/marriage.txt index df701b05f..0d25be9d5 100644 --- a/npc/custom/etc/marriage.txt +++ b/npc/custom/etc/marriage.txt @@ -12,7 +12,7 @@ // 2.9 Somewhat iRO-official NPC names [DracoRPG] //============================================================ -// Configuration Variables: +// Configuration Variables: - script marriage_init -1,{ OnInit: set $@wed_allow, 0; //If 1, allows same sex marriages. @@ -30,7 +30,7 @@ OnInit: // Other Configuration: // Line 61,62: Priest location, sprite and name. -// Line 437,438: Registration location, sprite and name. +// Line 437,438: Registration location, sprite and name. // Line 813,814: Divorcing location, sprite and name. // Variable Notes: @@ -541,7 +541,7 @@ function SF_WedProgress { } if (strcharinfo(0) == $wed_bride$) { mes "["+@name$+"]"; - if ($wed_groom_progress > 0) + if ($wed_groom_progress > 0) mes "The Priest will handle the rest of the ceremony."; else mes "Tell your groom to register, what is taking so long? Time is running out."; @@ -556,7 +556,7 @@ function SF_WedProgress { stopnpctimer; set $wed_groom_progress,1; mes "["+@name$+"]"; - mes "Very well, now go to the Priest to reaffirm your vows and the ceremony will begin."; + mes "Very well, now go to the Priest to reaffirm your vows and the ceremony will begin."; emotion e_no1; close2; npctalk "Registration finished. "+$wed_groom$+" and "+$wed_bride$+", please reaffirm your vows with the Priest."; @@ -577,7 +577,7 @@ function SF_WedProgress { SF_TryRegister(1); stopnpctimer; mes "["+@name$+"]"; - mes "Very well, now go to the Priest to reaffirm your vows and the ceremony will begin."; + mes "Very well, now go to the Priest to reaffirm your vows and the ceremony will begin."; emotion e_no1; close2; npctalk "Registration finished. "+$wed_groom$+" and "+$wed_bride$+", please reaffirm your vows with the Priest."; @@ -707,13 +707,13 @@ function SF_TryRegister { } if (@bride) set @cost, $@wed_bride_reg; - else + else set @cost, $@wed_groom_reg; if (Zeny < @cost) { mes "["+@name$+"]"; mes "I am sorry, but you don't have enough to pay for the registration fee."; - mes "Come back once you have collected "+@cost+"z."; + mes "Come back once you have collected "+@cost+"z."; close; } Zeny -= @cost; @@ -864,7 +864,7 @@ prt_church,94,99,4 script Sister Lisa 1_F_PRIEST,{ mes "["+@name$+"]"; mes "You should think this through."; close; - } + } mes "["+@name$+"]"; set $@divorcee,getpartnerid(); set $@divorcer$,strcharinfo(0); @@ -877,7 +877,7 @@ prt_church,94,99,4 script Sister Lisa 1_F_PRIEST,{ end; function SF_InProgress { - if (strcharinfo(0) == $@divorcer$) { + if (strcharinfo(0) == $@divorcer$) { mes "["+@name$+"]"; mes "...I am still waiting for your partner to confirm the divorce procedure."; close; diff --git a/npc/custom/etc/penal_servitude.txt b/npc/custom/etc/penal_servitude.txt index 9e355e825..e78833b66 100644 --- a/npc/custom/etc/penal_servitude.txt +++ b/npc/custom/etc/penal_servitude.txt @@ -1,5 +1,5 @@ //===== Hercules Script ====================================== -//= Penal Servitude +//= Penal Servitude //===== By: ================================================== //= Lupus //===== Current Version: ===================================== @@ -14,7 +14,7 @@ // 1.2 Stricted the conditions a bit //============================================================ -sec_pri,36,58,1 script Chief Warder 8W_SOLDIER,{ +sec_pri,36,58,1 script Chief Warder 8W_SOLDIER,{ mes "[Saddeus]"; emotion 1; if(Sex) { @@ -120,14 +120,14 @@ L_W4: close; M_NO_THANKS: - mes "[Saddeus]"; + mes "[Saddeus]"; if (rand(2)) mes "Is today X-Mas time, huh?"; mes "Now shut up and back off!"; if (rand(2)) emotion 23; - close; + close; } -sec_in02,137,57,1 script Overseer 4_M_PAY_SOLDIER,{ +sec_in02,137,57,1 script Overseer 4_M_PAY_SOLDIER,{ mes "[Oliver]"; delitem 4002,countitem(4002);//Items: Fabre_Card, diff --git a/npc/custom/etc/quest_warper.txt b/npc/custom/etc/quest_warper.txt index 732dfe135..b9bfcf74f 100644 --- a/npc/custom/etc/quest_warper.txt +++ b/npc/custom/etc/quest_warper.txt @@ -1065,7 +1065,7 @@ function script QWS_Darray { QWS_Make_Dungeon_Menu 1; //----------------ANT HELL - setarray @pDmenuitems$[@Di], "Ant Hell Dungeon"; + setarray @pDmenuitems$[@Di], "Ant Hell Dungeon"; setarray @pDprice[@Di], $QW_BW_PRICE; setarray @pDfee$[@Di], "$QW_BW_FEE"; setarray @DLevels[2], 2; diff --git a/npc/custom/events/cluckers.txt b/npc/custom/events/cluckers.txt index 1db4c2251..1f32f9f25 100644 --- a/npc/custom/events/cluckers.txt +++ b/npc/custom/events/cluckers.txt @@ -5,8 +5,8 @@ //===== Current Version: ===================================== //= 1.2a //===== Description: ========================================= -//= Click the chicken and try retrieve the item at a low -//= chance. If you fail he will nuke, freeze, stone, +//= Click the chicken and try retrieve the item at a low +//= chance. If you fail he will nuke, freeze, stone, //= stun, or make you fall asleep. //= The prize is configurable and triggered by the NPC. //===== Additional Comments: ================================= diff --git a/npc/custom/events/uneasy_cemetery.txt b/npc/custom/events/uneasy_cemetery.txt index ac8124bd1..d48e5f928 100644 --- a/npc/custom/events/uneasy_cemetery.txt +++ b/npc/custom/events/uneasy_cemetery.txt @@ -9,7 +9,7 @@ //= Every day, at the midnight Prontera receive a wave of Undeads. //= They come from Uneasy Cemetery of Prontera. To protect the players //= from the undeads terror you may either kill the enemy. Or supply Mother Mathana -//= with needed amount of Holy Water. Every citizen can take his part in the +//= with needed amount of Holy Water. Every citizen can take his part in the //= saving of Prontera city. After some days of quiet life... the Cemetery strikes back. //===== Additional Comments: ================================= //= 1.1 More advanced ver. Added some bonus the the one who'd kill the last walking undead diff --git a/npc/custom/itembind.txt b/npc/custom/itembind.txt index 8462b1515..7d2c4ba62 100644 --- a/npc/custom/itembind.txt +++ b/npc/custom/itembind.txt @@ -35,7 +35,7 @@ prontera,144,174,4 script Bound Items 4_M_JP_MID,{ //Allows equipment (default) if(@inventorylist_bound[.@i]) continue; - if(((.allowbind & 1) && (getiteminfo(@inventorylist_id[.@i],2) == (4|5))) || + if(((.allowbind & 1) && (getiteminfo(@inventorylist_id[.@i],2) == (4|5))) || ((.allowbind & 2) && (getiteminfo(@inventorylist_id[.@i],2) == (0|2|11|18))) || ((.allowbind & 4) && (getiteminfo(@inventorylist_id[.@i],2) == (3|6|7|8|10))) ) { diff --git a/npc/custom/quests/bandit_beard.txt b/npc/custom/quests/bandit_beard.txt index 897464b26..68c13727b 100644 --- a/npc/custom/quests/bandit_beard.txt +++ b/npc/custom/quests/bandit_beard.txt @@ -97,7 +97,7 @@ L_NOITEMS: mes "Here is the list again:"; emotion 23; goto L_List; -} +} //Master Tailor---------- izlude_in,123,175,4 script Master Tailor#bandit 1_M_04,{ diff --git a/npc/custom/quests/dead_branch.txt b/npc/custom/quests/dead_branch.txt index bb70f6020..ef49db159 100644 --- a/npc/custom/quests/dead_branch.txt +++ b/npc/custom/quests/dead_branch.txt @@ -6,7 +6,7 @@ //= 1.1 //===== Description: ========================================= // Simple item trade-in quest, a person can get a Dead Branch -// by simply providing the items: Log x3 (7201), Wooden Heart x1 (7189), +// by simply providing the items: Log x3 (7201), Wooden Heart x1 (7189), // Trunk x5 (1019), and Wooden Gnarl x1 (7222). //===== Additional Comments: ================================= //= 1.1 Optimized, added Bloody Branch with 0.01% chance [Lupus] diff --git a/npc/custom/quests/elvenear.txt b/npc/custom/quests/elvenear.txt index 25eb12080..eb2d1ba4c 100644 --- a/npc/custom/quests/elvenear.txt +++ b/npc/custom/quests/elvenear.txt @@ -12,16 +12,16 @@ //============================================================ geffen,127,49,5 script Elven Ears Quest 4_M_02,{ - mes "[Elven Ears Quest]"; - mes "Hi, today's quest is...."; - mes "Ah, the ^61B031Elven Ears ^000000Quest!"; - next; + mes "[Elven Ears Quest]"; + mes "Hi, today's quest is...."; + mes "Ah, the ^61B031Elven Ears ^000000Quest!"; + next; menu "Requirements",L_Bl, "Make Item",-,"Cancel",L_Cancel; mes "[Elven Ears quest]"; - mes "Good good, let me just check"; + mes "Good good, let me just check"; next; - if(countitem(2213)<1 || countitem(1040)<20 || countitem(919)<20) goto L_NoMake; + if(countitem(2213)<1 || countitem(1040)<20 || countitem(919)<20) goto L_NoMake; delitem 2213,1; delitem 1040,20; delitem 919,20; @@ -39,11 +39,11 @@ L_NoMake: mes "Please come back another time..."; close; -L_Bl: +L_Bl: mes "[Elven Ears Quest]"; - mes "Ok all you have to do is collect:"; - mes "^362ED61 Kitty Band^000000"; - mes "^362ED620 Elder Pixie Mustaches^000000"; + mes "Ok all you have to do is collect:"; + mes "^362ED61 Kitty Band^000000"; + mes "^362ED620 Elder Pixie Mustaches^000000"; mes "and ^362ED620 Animal Skin^000000"; next; menu "Accept",-, "Leave",L_Leave; diff --git a/npc/custom/quests/event_6_new_hats.txt b/npc/custom/quests/event_6_new_hats.txt index 7352beef1..497fae849 100644 --- a/npc/custom/quests/event_6_new_hats.txt +++ b/npc/custom/quests/event_6_new_hats.txt @@ -13,13 +13,13 @@ //= -Kafra Band, Panda Hat //= -Crescent Hairpin //===== Additional Comments: ================================= -//= Event New Hats by RedxSwordxHero +//= Event New Hats by RedxSwordxHero //= Ported and improved with timers [Lupus] //= Thanks to x[tsk],fixed all item requirements to iRO specs exept //= for hats which cannot be made on the real server. [Lupus] //= 1.2 removed already existing official hat quests [Lupus] //= 1.3 Spiffed up the NPC coords and their appearance [Lupus] -//= 1.4 Fixed exploits. 1.4a fixed wrong item ID [Lupus] +//= 1.4 Fixed exploits. 1.4a fixed wrong item ID [Lupus] //============================================================ prt_in,130,66,5 script Zac 4_M_BIBI,{ diff --git a/npc/custom/quests/kahohorn.txt b/npc/custom/quests/kahohorn.txt index 840cb4e12..8c5c4d8cf 100644 --- a/npc/custom/quests/kahohorn.txt +++ b/npc/custom/quests/kahohorn.txt @@ -1,7 +1,7 @@ //===== Hercules Script ====================================== //= Lord Kaho's Horns Quest //===== By: ================================================== -//= +//= //===== Current Version: ===================================== //= 1.1 //===== Description: ========================================= @@ -40,7 +40,7 @@ geffen,115,107,5 script Lord Kaho's Servant 1_M_PUBMASTER,{ next; mes .@n$; mes "Finally, I've worked hard to make these horns for my master with all the items mentioned above..."; - mes "Please include ^0055FF5 million Zeny^000000 for my efforts."; + mes "Please include ^0055FF5 million Zeny^000000 for my efforts."; next; mes .@n$; mes "Are you ready for me to make this special item?"; diff --git a/npc/custom/quests/kings_items.txt b/npc/custom/quests/kings_items.txt index 345f8b051..055315810 100644 --- a/npc/custom/quests/kings_items.txt +++ b/npc/custom/quests/kings_items.txt @@ -44,7 +44,7 @@ prt_castle,80,170,4 script King of Prontera 1_M_PRON_KING,{ for(set .@j,1; .@j<getarraysize(getd(".@items"+.@i)); set .@j,.@j+2) if (countitem(getd(".@items"+.@i+"["+.@j+"]")) < getd(".@items"+.@i+"["+(.@j+1)+"]")) set .@nr,1; mes "[King of Prontera]"; - if (.@nr) { + if (.@nr) { mes "You're missing something."; mes "Come back after you get ALL the items."; close; } diff --git a/npc/custom/quests/may_hats.txt b/npc/custom/quests/may_hats.txt index 789fc364f..ce2c09764 100644 --- a/npc/custom/quests/may_hats.txt +++ b/npc/custom/quests/may_hats.txt @@ -6,7 +6,7 @@ //===== Current Version: ===================================== //= 1.01 //===== Description: ========================================= -//= Custom quest for some RO mobile game bonus items +//= Custom quest for some RO mobile game bonus items //===== Additional Comments: ================================= //= 1 May, 2006 //= 1.01 translated the rest of dialogues diff --git a/npc/custom/quests/quest_shop.txt b/npc/custom/quests/quest_shop.txt index ff383717c..fb5b7993d 100644 --- a/npc/custom/quests/quest_shop.txt +++ b/npc/custom/quests/quest_shop.txt @@ -26,7 +26,7 @@ prontera,164,203,6 script Quest Shop#1 4_M_MOCASS2,{ callfunc "qshop"; } // Script Core //============================================================ -- script quest_shop -1,{ +- script quest_shop -1,{ function Add; function Chk; function Slot; function A_An; OnInit: freeloop(1); @@ -128,7 +128,7 @@ OnBuyItem: while(1) { switch(select(" ~ Purchase ^0055FF"+getitemname(.@q[0])+"^000000:"+((.@preview && !@qe[7])?" ~ Preview...":"")+": ~ ^777777Cancel^000000")) { case 1: - if (@qe[0]) { + if (@qe[0]) { mes "[Quest Shop]"; mes "You're missing one or more quest requirements."; close; diff --git a/npc/custom/quests/questboard.txt b/npc/custom/quests/questboard.txt index b4a53d816..3e7a90d9d 100644 --- a/npc/custom/quests/questboard.txt +++ b/npc/custom/quests/questboard.txt @@ -286,12 +286,12 @@ function AddCollection { setd ("." +.collectionquestcount+"_collectionzeny", getarg(5)); set .@argcount, 6; set .@size, getarraysize(getd("."+ .collectionquestcount + "_collectionexp")); - setd ("." +.collectionquestcount+"_collectionexp["+.@size+"]",getarg(.@argcount)); - setd ("." +.collectionquestcount+"_collectionexp["+(.@size+1)+"]",getarg(.@argcount+1)); + setd ("." +.collectionquestcount+"_collectionexp["+.@size+"]",getarg(.@argcount)); + setd ("." +.collectionquestcount+"_collectionexp["+(.@size+1)+"]",getarg(.@argcount+1)); set .@argcount, .@argcount+2; while(getarg(.@argcount,-1)!=-1 && getarg(.@argcount+1,-1)!=-1) { set .@size, getarraysize(getd("."+ .collectionquestcount + "_collectionitem")); - setd ("."+.collectionquestcount+"_collectionitem["+.@size+"]",getarg(.@argcount)); + setd ("."+.collectionquestcount+"_collectionitem["+.@size+"]",getarg(.@argcount)); setd ("."+.collectionquestcount+"_collectionitem["+(.@size+1)+"]",getarg(.@argcount+1)); set .@argcount,.@argcount+2; } @@ -309,11 +309,11 @@ function AddHunting { set .@size, getarraysize(getd("."+ .huntingquestcount + "_huntingexp")); set .@argcount, 6; setd ("." +.huntingquestcount+"_huntingexp["+.@size+"]",getarg(.@argcount)); - setd ("." +.huntingquestcount+"_huntingexp["+(.@size+1)+"]",getarg(.@argcount+1)); + setd ("." +.huntingquestcount+"_huntingexp["+(.@size+1)+"]",getarg(.@argcount+1)); set .@argcount, .@argcount+2; while(getarg(.@argcount,-1)!=-1 && getarg(.@argcount+1,-1)!=-1) { set .@size, getarraysize(getd("."+ .huntingquestcount + "_huntingmob")); - setd ("."+.huntingquestcount+"_huntingmob["+.@size+"]",getarg(.@argcount)); + setd ("."+.huntingquestcount+"_huntingmob["+.@size+"]",getarg(.@argcount)); setd ("."+.huntingquestcount+"_huntingmob["+(.@size+1)+"]",getarg(.@argcount+1)); set .@argcount, .@argcount+2; } diff --git a/npc/custom/quests/tha_statues.txt b/npc/custom/quests/tha_statues.txt index 283615be9..c4787fcd3 100644 --- a/npc/custom/quests/tha_statues.txt +++ b/npc/custom/quests/tha_statues.txt @@ -47,7 +47,7 @@ tha_t09,84,99,4 script Mediane HIDDEN_NPC,{ mes "Okay, i am warping you to the next floor now."; next; set TSQ_CHK,0; - warp "tha_t10", 165, 138; + warp "tha_t10", 165, 138; close; nook: mes "[Mediane]"; diff --git a/npc/custom/warper.txt b/npc/custom/warper.txt index b2cabd1fc..0b66c6a03 100644 --- a/npc/custom/warper.txt +++ b/npc/custom/warper.txt @@ -111,7 +111,7 @@ function Restrict { Towns: // -------------------------------------------------- menu "Prontera",T1, "Alberta",T2, "Aldebaran",T3, "Amatsu",T4, "Ayothaya",T5, - "Brasilis",T6, "Comodo",T7, "Dewata",T8, "Eclage",T9, "Einbech",T10, + "Brasilis",T6, "Comodo",T7, "Dewata",T8, "Eclage",T9, "Einbech",T10, "Einbroch",T11, "El Dicastes",T12, "Geffen",T13, "Gonryun",T14, "Hugel",T15, "Izlude",T16, "Jawaii",T17, "Lighthalzen",T18, "Louyang",T19, "Lutie",T20, "Malangdo",T21, "Malaya",T22, "Manuk",T23, "Midgarts Expedition Camp",T24, diff --git a/npc/custom/woe_controller.txt b/npc/custom/woe_controller.txt index c21018d60..824fa4a4f 100644 --- a/npc/custom/woe_controller.txt +++ b/npc/custom/woe_controller.txt @@ -273,7 +273,7 @@ while(1) { for(set .@i,0; .@i<6; set .@i,.@i+1) { set .@k, .@i*5; mes "> ^FF0000"+.Regions$[.@i]+"^000000"; - for(set .@j,.@k; .@j<(.@k+5); set .@j,.@j+1) { + for(set .@j,.@k; .@j<(.@k+5); set .@j,.@j+1) { set .@t, getcastledata(.Castles$[.@j],1); mes " ~ "+getcastlename(.Castles$[.@j])+": "+((.@t)?"^0055FF"+getguildname(.@t):"^777777unoccupied")+"^000000"; } diff --git a/npc/events/MemorialDay_2008.txt b/npc/events/MemorialDay_2008.txt index 2b60a8a82..2c64c5b75 100644 --- a/npc/events/MemorialDay_2008.txt +++ b/npc/events/MemorialDay_2008.txt @@ -232,7 +232,7 @@ prontera,153,286,4 script Memorial Plaque#Memorial 4_BOARD3,{ mes "-I may not have gone where I intended to go,-"; mes "-but I think I have ended up where I needed to be.-"; mes "- Douglas Adams.-"; - if (Memorial08 == 9) { + if (Memorial08 == 9) { getexp 93750,43750; } next; @@ -242,7 +242,7 @@ prontera,153,286,4 script Memorial Plaque#Memorial 4_BOARD3,{ mes "-It is not the urge to surpass all others at whatever cost,-"; mes "- but the urge to serve others at whatever cost. -"; mes "- Arthur Ashe -"; - if (Memorial08 == 9) { + if (Memorial08 == 9) { getexp 93750,43750; set Memorial08,10; } diff --git a/npc/events/StPatrick_2008.txt b/npc/events/StPatrick_2008.txt index 92408c54a..c1816374f 100644 --- a/npc/events/StPatrick_2008.txt +++ b/npc/events/StPatrick_2008.txt @@ -13,7 +13,7 @@ //= you must use the mob edits provided for this quest. //= Enable in mob_db2.txt //= -//= The item 12715 Black_Treasure_Chest contains a script +//= The item 12715 Black_Treasure_Chest contains a script //= that relies explicitly on this script being loaded. //= Remove the "end" from the item script to enable. //= In addition to that, you must enable the item_avail @@ -170,7 +170,7 @@ prt_fild05,170,286,4 script Anxious Leprechaun#8pday 4_M_PATRICK,{ mes "[O'Riley the Leprechaun]"; mes "Thank you. Here's your ale~"; if (countitem(7915) >= 10) { - getitem 12135,1; + getitem 12135,1; delitem 7915,10; } close; @@ -178,7 +178,7 @@ prt_fild05,170,286,4 script Anxious Leprechaun#8pday 4_M_PATRICK,{ mes "[O'Riley the Leprechaun]"; mes "Thank you. Here's your ale~"; if (countitem(7916) >= 5) { - getitem 12135,1; + getitem 12135,1; delitem 7916,5; } close; @@ -186,7 +186,7 @@ prt_fild05,170,286,4 script Anxious Leprechaun#8pday 4_M_PATRICK,{ mes "[O'Riley the Leprechaun]"; mes "Thank you. Here's your ale~"; if (countitem(7720) >= 1) { - getitem 12135,1; + getitem 12135,1; delitem 7720,1; } close; diff --git a/npc/events/event_skill_reset.txt b/npc/events/event_skill_reset.txt index af1b387f2..718fe2e0e 100644 --- a/npc/events/event_skill_reset.txt +++ b/npc/events/event_skill_reset.txt @@ -58,7 +58,7 @@ yuno,138,187,4 script Hypnotist Teacher 4_F_TELEPORTER,{ mes @npcname$; mes "You know where to find me,"; - mes "if you ever want a reset!!"; + mes "if you ever want a reset!!"; close; L_Info: @@ -80,10 +80,10 @@ L_Info: L_Reset: mes @npcname$; mes "Before skill reset in starting."; - mes "You shall have to first tell me your Base Level."; + mes "You shall have to first tell me your Base Level."; next; mes "^D5A500[" + strcharinfo(0) + "]^000000"; - mes "My Base level is ^AA00AALevel " + BaseLevel + "BaseLv.^000000"; + mes "My Base level is ^AA00AALevel " + BaseLevel + "BaseLv.^000000"; next; set @zeny,BaseLevel*20000; mes @npcname$; diff --git a/npc/events/god_se_festival.txt b/npc/events/god_se_festival.txt index 4712d6fd7..54bf2b6d3 100644 --- a/npc/events/god_se_festival.txt +++ b/npc/events/god_se_festival.txt @@ -6,7 +6,7 @@ //= 1.1 //===== Description: ========================================= //= [Official Conversion] -//= Post-God Item SE Creation Summoning Event +//= Post-God Item SE Creation Summoning Event //= Second Sister is a custom translation. //===== Additional Comments: ================================= //= 1.0 First version. [L0ne_W0lf] diff --git a/npc/events/idul_fitri.txt b/npc/events/idul_fitri.txt index 65964234a..97d018f0a 100644 --- a/npc/events/idul_fitri.txt +++ b/npc/events/idul_fitri.txt @@ -39,7 +39,7 @@ prontera,146,92,3 script Cellerb 1_M_MERCHANT,{ mes "^000088~2 Green Herb, 5 Stem~.^000000"; next; mes "[Staff Idul Fitri]"; - if ( (countitem(552)<5 || countitem(515)<5 ||countitem(516)<5 || countitem(517)<10 || countitem(511)<2 || countitem(905)<5) ) { + if ( (countitem(552)<5 || countitem(515)<5 ||countitem(516)<5 || countitem(517)<10 || countitem(511)<2 || countitem(905)<5) ) { mes "You don't have enough items."; mes "Come back when you have them all."; close; diff --git a/npc/events/nguild/nguild_guardians.txt b/npc/events/nguild/nguild_guardians.txt index 3a34259c2..3b2a7088b 100644 --- a/npc/events/nguild/nguild_guardians.txt +++ b/npc/events/nguild/nguild_guardians.txt @@ -53,7 +53,7 @@ OnGuardianDied: nguild_pay,139,139,0 script Guardian_N03 -1,{ OnAgitInit: if (getcastledata("nguild_pay",10) == 1) guardian "nguild_pay",210,120,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",0; - if (getcastledata("nguild_pay",11) == 1) guardian "nguild_pay",69,26,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",1; + if (getcastledata("nguild_pay",11) == 1) guardian "nguild_pay",69,26,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",1; if (getcastledata("nguild_pay",12) == 1) guardian "nguild_pay",23,141,"Soldier Guardian",1287,"Guardian_N03::OnGuardianDied",2; if (getcastledata("nguild_pay",13) == 1) guardian "nguild_pay",224,87,"Archer Guardian",1285,"Guardian_N03::OnGuardianDied",3; if (getcastledata("nguild_pay",14) == 1) guardian "nguild_pay",81,45,"Archer Guardian",1285,"Guardian_N03::OnGuardianDied",4; diff --git a/npc/events/nguild/nguild_treas.txt b/npc/events/nguild/nguild_treas.txt index fe5512835..750eab88a 100644 --- a/npc/events/nguild/nguild_treas.txt +++ b/npc/events/nguild/nguild_treas.txt @@ -48,7 +48,7 @@ function script F_GldTreas { } //============================================================== -// Treasure Room Switch +// Treasure Room Switch //=============================================================== function script F_GldTreasSw { mes " "; diff --git a/npc/events/nguild/nguild_warper.txt b/npc/events/nguild/nguild_warper.txt index 61541d096..6ad9d02ab 100644 --- a/npc/events/nguild/nguild_warper.txt +++ b/npc/events/nguild/nguild_warper.txt @@ -11,10 +11,10 @@ //= dungeons. And 2nd Classes can't seize these Castles. //= These new castles need a new strategy. It would bring some //= fun and live to your game. -//= NOTE: If your Guild Master is 2nd class, then he could +//= NOTE: If your Guild Master is 2nd class, then he could //= rule the Castles and gather Treasure Boxes after WoE //= 1.1 Now 2nd classes can't enter NC place at all -//= 1.2 Restricted access of SG/SL. On warp clear some +//= 1.2 Restricted access of SG/SL. On warp clear some //= unallowed buffs [Lupus] //= 1.3 Restricted TK,High classes >=90 BaseLevel, //= updated list of unallowed buffs [Lupus] @@ -30,7 +30,7 @@ prontera,146,163,6 script Novice Castles 4_F_NOVICE,{ mes "[Cita]"; if (!getcharid(2)) { mes "^FF0000You have to enter a guild to be able to hit Emperium!^000000"; - } else if (getgdskilllv(getcharid(2),10013) || + } else if (getgdskilllv(getcharid(2),10013) || (getgdskilllv(getcharid(2),10000) + getgdskilllv(getcharid(2),10001) + getgdskilllv(getcharid(2),10002) + diff --git a/npc/events/twintowers.txt b/npc/events/twintowers.txt index 7745adb9b..524351661 100644 --- a/npc/events/twintowers.txt +++ b/npc/events/twintowers.txt @@ -32,7 +32,7 @@ prontera,146,92,4 script Twin Towers#tt1::Twin-Towers TW_TOWER,{ menu "I shall accept your offer.",YES,"I'll ask for your service next time.",NO; NO: - mes "[Twin Towers]"; + mes "[Twin Towers]"; mes "Er, what a pity. Traveling by yourself is still the best evidence of adventure."; mes "Isn't this proving that you are still young?"; mes "We respect brave hearts like this"; diff --git a/npc/events/valentinesday_2012.txt b/npc/events/valentinesday_2012.txt index fc328712d..2d74cb1a5 100644 --- a/npc/events/valentinesday_2012.txt +++ b/npc/events/valentinesday_2012.txt @@ -114,7 +114,7 @@ mosk_in,21,244,3 script Baker Extraordinaire 4_M_NOVELIST,{ mes .@n$; mes "Bring 15 Love Flowers to Pinkamenia!"; close; - } else if(#V_QUE12==1) { + } else if(#V_QUE12==1) { mes .@n$; if (getequipid(1) == 5024 && getequiprefinerycnt(1) >= 8) { mes "Ah, so Pinkamenia told you"; diff --git a/npc/events/whiteday.txt b/npc/events/whiteday.txt index 4cb6a3815..ac76c52a5 100644 --- a/npc/events/whiteday.txt +++ b/npc/events/whiteday.txt @@ -59,7 +59,7 @@ L0_2: goto L_INPUT; L0_3: set @maplePrice,2000; - set @mapleItemID,538; + set @mapleItemID,538; mes "[Sugar]"; mes "It is a well baked cookie, and the price is"; mes "2000 Zeny each."; diff --git a/npc/guild/agit_controller.txt b/npc/guild/agit_controller.txt index 4db4a3c5e..de55029fc 100644 --- a/npc/guild/agit_controller.txt +++ b/npc/guild/agit_controller.txt @@ -57,7 +57,7 @@ OnAgitInit: // end time checks if ((gettime(4)==2) && (gettime(3)==23) || (gettime(4)==4) && (gettime(3)==23) || - (gettime(4)==6) && (gettime(3)==18)) { + (gettime(4)==6) && (gettime(3)==18)) { if (agitcheck()) { agitend; callsub S_DisplayOwners; diff --git a/npc/guild/agit_main.txt b/npc/guild/agit_main.txt index 7bc672ee5..730740087 100644 --- a/npc/guild/agit_main.txt +++ b/npc/guild/agit_main.txt @@ -474,7 +474,7 @@ OnRecvCastle: // .@guardianposy = Define the y spawn point for each guardian. // [0] = 1st guardian's y spawn point. // .@masterroom = Defines the coordinates of the Treasure Room. - if (strnpcinfo(2) == "aldeg_cas01") { + if (strnpcinfo(2) == "aldeg_cas01") { setarray .@guardiantype[0],1,2,2,2,2,3,3,3; setarray .@guardianposx[0],17,39,38,45,21,218,213,73; setarray .@guardianposy[0],218,208,196,228,194,24,24,70; @@ -995,7 +995,7 @@ OnSpawnGuardians: // Define the y spawn point for each uardian. // [0] = 1st guardian's y spawn point. // Aldebaran (Luina) Castles - if (strnpcinfo(2) == "aldeg_cas01") { + if (strnpcinfo(2) == "aldeg_cas01") { setarray .@guardiantype[0],1,2,2,2,2,3,3,3; setarray .@guardianposx[0],17,39,38,45,21,218,213,73; setarray .@guardianposy[0],218,208,196,228,194,24,24,70; @@ -1140,102 +1140,102 @@ OnClock0001: set .@Treasure,getcastledata(strnpcinfo(2),2)/5+4; // Set information - if (strnpcinfo(2) == "aldeg_cas01") { + if (strnpcinfo(2) == "aldeg_cas01") { set .@treasurebox,1324; setarray .@treasurex[0],115,122,115,122,116,117,118,119,120,121,121,121,121,121,121,120,119,118,117,116,116,116,116,116; setarray .@treasurey[0],226,226,219,219,225,225,225,225,225,225,224,223,222,221,220,220,220,220,220,220,221,222,223,224; } - else if (strnpcinfo(2) == "aldeg_cas02") { + else if (strnpcinfo(2) == "aldeg_cas02") { set .@treasurebox,1326; setarray .@treasurex[0],134,135,135,134,132,133,134,135,136,137,137,137,137,137,137,136,135,134,133,132,132,132,132,132; setarray .@treasurey[0],231,231,230,230,233,233,233,233,233,233,232,231,230,229,228,228,228,228,228,228,229,230,231,232; } - else if (strnpcinfo(2) == "aldeg_cas03") { + else if (strnpcinfo(2) == "aldeg_cas03") { set .@treasurebox,1328; setarray .@treasurex[0],224,225,225,224,222,223,224,225,226,227,227,227,227,227,227,226,225,224,223,222,222,222,222,222; setarray .@treasurey[0],269,269,268,268,271,271,271,271,271,271,270,269,268,267,266,266,266,266,266,266,267,268,269,270; } - else if (strnpcinfo(2) == "aldeg_cas04") { + else if (strnpcinfo(2) == "aldeg_cas04") { set .@treasurebox,1330; setarray .@treasurex[0],84,85,85,84,82,83,84,85,86,87,87,87,87,87,87,86,85,84,83,82,82,82,82,82; setarray .@treasurey[0],13,13,12,12,15,15,15,15,15,15,14,13,12,11,10,10,10,10,10,10,11,12,13,14; } - else if (strnpcinfo(2) == "aldeg_cas05") { + else if (strnpcinfo(2) == "aldeg_cas05") { set .@treasurebox,1332; setarray .@treasurex[0],61,62,62,61,59,60,61,62,63,64,64,64,64,64,64,63,62,61,60,59,59,59,59,59; setarray .@treasurey[0],12,12,11,11,14,14,14,14,14,14,13,12,11,10,9,9,9,9,9,9,10,11,12,13; } - else if (strnpcinfo(2) == "gefg_cas01") { + else if (strnpcinfo(2) == "gefg_cas01") { set .@treasurebox,1334; setarray .@treasurex[0],153,154,154,153,151,152,153,154,155,156,156,156,156,156,156,155,154,153,152,151,151,151,151,151; setarray .@treasurey[0],113,113,112,112,115,115,115,115,115,115,114,113,112,111,110,110,110,110,110,110,111,112,113,114; } - else if (strnpcinfo(2) == "gefg_cas02") { + else if (strnpcinfo(2) == "gefg_cas02") { set .@treasurebox,1336; setarray .@treasurex[0],139,140,140,139,137,138,139,140,141,142,142,142,142,142,142,141,140,139,138,137,137,137,137,137; setarray .@treasurey[0],115,115,114,114,117,117,117,117,117,117,116,115,114,113,112,112,112,112,112,112,113,114,115,116; } - else if (strnpcinfo(2) == "gefg_cas03") { + else if (strnpcinfo(2) == "gefg_cas03") { set .@treasurebox,1338; setarray .@treasurex[0],269,270,270,269,267,268,269,270,271,272,272,272,272,272,272,271,270,269,268,267,267,267,267,267; setarray .@treasurey[0],291,291,290,290,293,293,293,293,293,293,292,291,290,289,288,288,288,288,288,288,289,290,291,292; } - else if (strnpcinfo(2) == "gefg_cas04") { + else if (strnpcinfo(2) == "gefg_cas04") { set .@treasurebox,1340; setarray .@treasurex[0],115,116,116,115,113,114,115,116,117,118,118,118,118,118,118,117,116,115,114,113,113,113,113,113; setarray .@treasurey[0],119,119,118,118,121,121,121,121,121,121,120,119,118,117,116,116,116,116,116,116,117,118,119,120; } - else if (strnpcinfo(2) == "gefg_cas05") { + else if (strnpcinfo(2) == "gefg_cas05") { set .@treasurebox,1342; setarray .@treasurex[0],143,144,144,143,141,142,143,144,145,146,146,146,146,146,146,145,144,143,142,141,141,141,141,141; setarray .@treasurey[0],110,110,109,109,112,112,112,112,112,112,111,110,109,108,107,107,107,107,107,107,108,109,110,111; } - else if (strnpcinfo(2) == "payg_cas01") { + else if (strnpcinfo(2) == "payg_cas01") { set .@treasurebox,1344; setarray .@treasurex[0],289,292,292,289,288,289,290,291,292,293,293,293,293,293,293,292,291,290,289,288,288,288,288,288; setarray .@treasurey[0],10,10,7,7,11,11,11,11,11,11,10,9,8,7,6,6,6,6,6,6,7,8,9,10; } - else if (strnpcinfo(2) == "payg_cas02") { + else if (strnpcinfo(2) == "payg_cas02") { set .@treasurebox,1346; setarray .@treasurex[0],143,146,146,143,142,143,144,145,146,147,147,147,147,147,147,146,145,144,143,142,142,142,142,142; setarray .@treasurey[0],146,146,143,143,147,147,147,147,147,147,146,145,144,143,142,142,142,142,142,142,143,144,145,146; } - else if (strnpcinfo(2) == "payg_cas03") { + else if (strnpcinfo(2) == "payg_cas03") { set .@treasurebox,1348; setarray .@treasurex[0],158,159,159,158,156,157,158,159,160,161,161,161,161,161,161,160,159,158,157,156,156,156,156,156; setarray .@treasurey[0],169,169,168,168,171,171,171,171,171,171,170,169,168,167,166,166,166,166,166,166,167,168,169,170; } - else if (strnpcinfo(2) == "payg_cas04") { + else if (strnpcinfo(2) == "payg_cas04") { set .@treasurebox,1350; setarray .@treasurex[0],146,147,147,146,144,145,146,147,148,149,149,149,149,149,149,148,147,146,145,144,144,144,144,144; setarray .@treasurey[0],48,48,47,47,50,50,50,50,50,50,49,48,47,46,45,45,45,45,45,45,46,47,48,49; } - else if (strnpcinfo(2) == "payg_cas05") { + else if (strnpcinfo(2) == "payg_cas05") { set .@treasurebox,1352; setarray .@treasurex[0],155,158,158,155,154,155,156,157,158,159,159,159,159,159,159,158,157,156,155,154,154,154,154,154; setarray .@treasurey[0],134,134,131,131,135,135,135,135,135,135,134,133,132,131,130,130,130,130,130,130,131,132,133,134; } - else if (strnpcinfo(2) == "prtg_cas01") { + else if (strnpcinfo(2) == "prtg_cas01") { set .@treasurebox,1354; setarray .@treasurex[0],10,11,11,10,8,9,10,11,12,13,13,13,13,13,13,12,11,10,9,8,8,8,8,8; setarray .@treasurey[0],209,209,208,208,211,211,211,211,211,211,210,209,208,207,206,206,206,206,206,206,207,208,209,210; } - else if (strnpcinfo(2) == "prtg_cas02") { + else if (strnpcinfo(2) == "prtg_cas02") { set .@treasurebox,1356; setarray .@treasurex[0],201,202,202,201,199,200,201,202,203,204,204,204,204,204,204,203,202,201,200,199,199,199,199,199; setarray .@treasurey[0],228,228,227,227,230,230,230,230,230,230,229,228,227,226,225,225,225,225,225,225,226,227,228,229; } - else if (strnpcinfo(2) == "prtg_cas03") { + else if (strnpcinfo(2) == "prtg_cas03") { set .@treasurebox,1358; setarray .@treasurex[0],187,188,188,187,185,186,187,188,189,190,190,190,190,190,190,189,188,187,186,185,185,185,185,185; setarray .@treasurey[0],132,132,131,131,134,134,134,134,134,134,133,132,131,130,129,129,129,129,129,129,130,131,132,133; } - else if (strnpcinfo(2) == "prtg_cas04") { + else if (strnpcinfo(2) == "prtg_cas04") { set .@treasurebox,1360; setarray .@treasurex[0],269,270,270,269,267,268,269,270,271,272,272,272,272,272,272,271,270,269,268,267,267,267,267,267; setarray .@treasurey[0],162,162,161,161,164,164,164,164,164,164,163,162,161,160,159,159,159,159,159,159,160,161,162,163; } - else if (strnpcinfo(2) == "prtg_cas05") { + else if (strnpcinfo(2) == "prtg_cas05") { set .@treasurebox,1362; setarray .@treasurex[0],275,276,276,275,273,274,275,276,277,278,278,278,278,278,278,277,276,275,274,273,273,273,273,273; setarray .@treasurey[0],178,178,177,177,180,180,180,180,180,180,179,178,177,176,175,175,175,175,175,175,176,177,178,179; diff --git a/npc/guild2/agit_main_se.txt b/npc/guild2/agit_main_se.txt index d5c2eaddd..77e8cdd7c 100644 --- a/npc/guild2/agit_main_se.txt +++ b/npc/guild2/agit_main_se.txt @@ -152,12 +152,12 @@ OnClock0001: if (!.@Treasure) end; freeloop(1); if (compare(strnpcinfo(2),"arug")) { - if (strnpcinfo(2) == "arug_cas01") { + if (strnpcinfo(2) == "arug_cas01") { set .@treasurebox,1943; setarray .@treasurex[0],251,252,253,254,255,256,257,258,251,252,253,254,255,256,257,258,251,252,253,254,255,256,257,258; setarray .@treasurey[0],369,369,369,369,368,368,368,368,367,367,367,367,366,366,366,366,365,365,365,365,364,364,364,364; } - else if (strnpcinfo(2) == "arug_cas02") { + else if (strnpcinfo(2) == "arug_cas02") { set .@treasurebox,1944; setarray .@treasurex[0],382,383,384,385,386,387,384,385,386,387,388,389,382,383,384,385,386,387,384,385,386,387,388,389; setarray .@treasurey[0],231,231,231,231,231,231,230,230,230,230,230,230,225,225,225,225,225,225,224,224,224,224,224,224; @@ -169,12 +169,12 @@ OnClock0001: } } else { - if (strnpcinfo(2) == "schg_cas02") { + if (strnpcinfo(2) == "schg_cas02") { set .@treasurebox,1939; setarray .@treasurex[0],249,250,251,252,253,246,247,248,249,250,250,251,252,253,246,247,248,249,250,249,250,251,252,253; setarray .@treasurey[0],378,378,378,378,378,376,376,376,376,376,374,374,374,374,372,372,372,372,372,370,370,370,370,370; } - else if (strnpcinfo(2) == "schg_cas03") { + else if (strnpcinfo(2) == "schg_cas03") { set .@treasurebox,1940; setarray .@treasurex[0],189,190,191,192,193,194,189,190,191,192,193,194,189,190,191,192,193,194,189,190,191,192,193,194; setarray .@treasurey[0], 21, 21, 21, 21, 21, 21, 19, 19, 19, 19, 19, 19, 17, 17, 17, 17, 17, 17, 15, 15, 15, 15, 15, 15; diff --git a/npc/guild2/agit_start_se.txt b/npc/guild2/agit_start_se.txt index 39c3ae1ea..74f03cb28 100644 --- a/npc/guild2/agit_start_se.txt +++ b/npc/guild2/agit_start_se.txt @@ -39,7 +39,7 @@ OnAgitInit2: // end time checks if ((gettime(4)==2) && (gettime(3)==21) || (gettime(4)==4) && (gettime(3)==21) || - (gettime(4)==6) && (gettime(3)==23)) { + (gettime(4)==6) && (gettime(3)==23)) { if (agitcheck2()) { agitend2; } diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt index 456bf590f..2da7c8719 100644 --- a/npc/instances/EndlessTower.txt +++ b/npc/instances/EndlessTower.txt @@ -25,7 +25,7 @@ //= warps between floors. (bugreport:4623) //= Added missing end's to prevent infinite mobspawn (bugreport:4540) //= Commented out remaining GM-only NPCs. [Gepard] -//= 1.8 Adjusted Instance Attach Map to Validate ALL Maps, instead of +//= 1.8 Adjusted Instance Attach Map to Validate ALL Maps, instead of //= only 1@tower -> 5@tower (bugreport:4983) //= 1.9 Added 'instance_check_party' command to the script for proper checking if //= the invoking party meets the requirements to join the Memorial Dungeon. @@ -1020,65 +1020,65 @@ function script F_Tower_Monster { case 99: for(set .@i,1; .@i<=7; set .@i,.@i+1) { set .@mob_ran,rand(1,30); - if (.@mob_ran == 1) + if (.@mob_ran == 1) areamonster .@map$,267,9,277,45,"Kathryne Keyron",1639,2,.@label$; - else if (.@mob_ran == 2) + else if (.@mob_ran == 2) areamonster .@map$,267,9,277,45,"Seyren Windsor",1634,2,.@label$; - else if (.@mob_ran == 3) + else if (.@mob_ran == 3) areamonster .@map$,267,9,277,45,"Margaretha Sorin",1637,2,.@label$; - else if (.@mob_ran == 4) + else if (.@mob_ran == 4) areamonster .@map$,267,9,277,45,"Eremes Guile",1635,2,.@label$; - else if (.@mob_ran == 5) + else if (.@mob_ran == 5) areamonster .@map$,267,9,277,45,"Howard Alt-Eisen",1636,2,.@label$; - else if (.@mob_ran == 6) + else if (.@mob_ran == 6) areamonster .@map$,267,9,277,45,"Cecil Damon",1638,2,.@label$; - else if (.@mob_ran == 7) + else if (.@mob_ran == 7) areamonster .@map$,267,9,277,45,"Incarnation of Morroc",1918,5,.@label$; - else if (.@mob_ran == 8) + else if (.@mob_ran == 8) areamonster .@map$,267,9,277,45,"Incarnation of Morroc",1919,5,.@label$; - else if (.@mob_ran == 9) + else if (.@mob_ran == 9) areamonster .@map$,267,9,277,45,"Incarnation of Morroc",1920,5,.@label$; - else if (.@mob_ran == 10) + else if (.@mob_ran == 10) areamonster .@map$,267,9,277,45,"Incarnation of Morroc",1921,5,.@label$; - else if (.@mob_ran == 11) + else if (.@mob_ran == 11) areamonster .@map$,267,9,277,45,"Valkyrie",1765,5,.@label$; - else if (.@mob_ran == 12) + else if (.@mob_ran == 12) areamonster .@map$,267,9,277,45,"Skeggiold",1755,10,.@label$; - else if (.@mob_ran == 13) + else if (.@mob_ran == 13) areamonster .@map$,267,9,277,45,"Skeggiold",1754,10,.@label$; - else if (.@mob_ran == 14) + else if (.@mob_ran == 14) areamonster .@map$,267,9,277,45,"Seyren Windsor",1634,15,.@label$; - else if (.@mob_ran == 15) + else if (.@mob_ran == 15) areamonster .@map$,267,9,277,45,"Bloody Knight",1268,10,.@label$; - else if (.@mob_ran == 16) + else if (.@mob_ran == 16) areamonster .@map$,267,9,277,45,"Abysmal Knight",1219,10,.@label$; - else if (.@mob_ran == 17) + else if (.@mob_ran == 17) areamonster .@map$,267,9,277,45,"Wanderer",1208,10,.@label$; - else if (.@mob_ran == 18) + else if (.@mob_ran == 18) areamonster .@map$,267,9,277,45,"Sword Master",1829,15,.@label$; - else if (.@mob_ran == 19) + else if (.@mob_ran == 19) areamonster .@map$,267,9,277,45,"Bow Master",1830,15,.@label$; - else if (.@mob_ran == 20) + else if (.@mob_ran == 20) areamonster .@map$,267,9,277,45,"Kathryne Keyron",1639,15,.@label$; - else if (.@mob_ran == 21) + else if (.@mob_ran == 21) areamonster .@map$,267,9,277,45,"Elder",1377,10,.@label$; - else if (.@mob_ran == 22) + else if (.@mob_ran == 22) areamonster .@map$,267,9,277,45,"Laurell Weinder",1657,10,.@label$; - else if (.@mob_ran == 23) + else if (.@mob_ran == 23) areamonster .@map$,267,9,277,45,"Wind Ghost",1263,10,.@label$; - else if (.@mob_ran == 24) + else if (.@mob_ran == 24) areamonster .@map$,267,9,277,45,"Marduk",1140,10,.@label$; - else if (.@mob_ran == 25) + else if (.@mob_ran == 25) areamonster .@map$,267,9,277,45,"Cecil Damon",1638,10,.@label$; - else if (.@mob_ran == 26) + else if (.@mob_ran == 26) areamonster .@map$,267,9,277,45,"Bow Master",1830,10,.@label$; - else if (.@mob_ran == 27) + else if (.@mob_ran == 27) areamonster .@map$,267,9,277,45,"Kavach Icarus",1656,30,.@label$; - else if (.@mob_ran == 28) + else if (.@mob_ran == 28) areamonster .@map$,267,9,277,45,"Baroness of Retribution",1702,10,.@label$; - else if (.@mob_ran == 29) + else if (.@mob_ran == 29) areamonster .@map$,267,9,277,45,"Lady Solace",1703,10,.@label$; - else + else areamonster .@map$,267,9,277,45,"False Angel",1371,10,.@label$; } break; diff --git a/npc/instances/OrcsMemory.txt b/npc/instances/OrcsMemory.txt index 8eaac7c8a..55f88f99d 100644 --- a/npc/instances/OrcsMemory.txt +++ b/npc/instances/OrcsMemory.txt @@ -13,7 +13,7 @@ //===== Additional Comments: ================================= //= 1.0 First version. [L0ne_W0lf] //= 1.1 First round of bugfixes. (bugreport:3928) [L0ne_W0lf] -//= Fixed some npcs calling wrong events. +//= Fixed some npcs calling wrong events. //= Fixed Depraved Orc Spirit spawn point //= Fixed an NPC that was never being enabled. //= 1.1a Second round from bugreport. (bugreport:3928) [L0ne_W0lf] diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt index 8713dc0e5..215ceffeb 100644 --- a/npc/instances/SealedShrine.txt +++ b/npc/instances/SealedShrine.txt @@ -237,7 +237,7 @@ monk_test,306,151,3 script Grave of Baphomet#edq HIDDEN_NPC,{ setquest 3040; warp "1@cata",100,224; end; - } + } } else if (.@ins_bapho_check == 0 || .@ins_bapho_check == 1) { mes "[Friar Patrick]"; mes "It seems you have entered this shrine recently... You cannot reenter because the curse of Baphomet still remains."; diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt index 896a19e4e..d778d789a 100644 --- a/npc/jobs/2-1/assassin.txt +++ b/npc/jobs/2-1/assassin.txt @@ -26,7 +26,7 @@ //= 2.0 Changed numbers to constants. [Vicious] //= 2.1 Removed Duplicates [Silent] //= 2.2 Merged back JFunc. Fixed missing dialogue [Lupus] -//= 2.3 Fixed typo and change Nameless addtimer to 100 (with 700ms I +//= 2.3 Fixed typo and change Nameless addtimer to 100 (with 700ms I //= was still able to bypass it) [Toms] //= 2.4 Fixed skipping of Nameless NPC [Lupus] //= 2.5 Fixed a Rogue exploit [Lupus] @@ -981,12 +981,12 @@ OnTouch: mes "[The Anonymous One]"; mes "7. Choose the maximum AGI bonus an Assassin can get at job level 50."; next; - if (select("7:8:9:10") == 4) + if (select("7:8:9:10") == 4) set .@assassin_t,.@assassin_t+10; mes "[The Anonymous One]"; mes "8. Choose the item that an Assassin cannot equip."; next; - if (select("Dagger:Helm:Boots:Brooch") == 2) + if (select("Dagger:Helm:Boots:Brooch") == 2) set .@assassin_t,.@assassin_t+10; mes "[The Anonymous One]"; mes "9. Choose the job change item for Thief."; diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt index 48cf68150..c466925e1 100644 --- a/npc/jobs/2-1/blacksmith.txt +++ b/npc/jobs/2-1/blacksmith.txt @@ -269,7 +269,7 @@ ein_in01,18,28,4 script Guildsman#BLS 4_M_JOB_BLACKSMITH,{ mes "Congratulations!!!"; if (.@joblvl > 48) getitem 999,30; //Steel - else + else getitem 999,5; //Steel close; } diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt index 368cbca45..da1d8a8e4 100644 --- a/npc/jobs/2-1/knight.txt +++ b/npc/jobs/2-1/knight.txt @@ -1117,7 +1117,7 @@ prt_in,79,94,4 script Sir Windsor#knt 4_M_JOB_KNIGHT1,{ mes "......"; next; mes "[Sir Windsor]"; - if (KNIGHT_Q == 6) + if (KNIGHT_Q == 6) mes "...Follow me."; else { mes "...Fine."; diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt index 735bb0d54..57f6a2647 100644 --- a/npc/jobs/2-1/priest.txt +++ b/npc/jobs/2-1/priest.txt @@ -1708,7 +1708,7 @@ job_prist,98,105,4 script prst3_1 WARPNPC,3,3,{ OnTouch: if (BaseJob == Job_Priest) { warp "prt_church",15,36; - end; + end; } else if (BaseClass == Job_Acolyte) { set PRIEST_Q,7; diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt index 1bb03d812..6f0cea599 100644 --- a/npc/jobs/2-2/alchemist.txt +++ b/npc/jobs/2-2/alchemist.txt @@ -1983,7 +1983,7 @@ alde_alche,145,19,1 script Chief Researcher#am 1_M_LIBRARYMASTER,{ //= 1.0 Working. //= npc/quests/counteragent_mixture.txt Also Needed //= npc/quests/quests_yuno.txt Also Needed [Darkchild] -//= 1.1 Fixed some minor bugs. Optimized some lines. Re-organized the script a bit. +//= 1.1 Fixed some minor bugs. Optimized some lines. Re-organized the script a bit. //= Giving Parmry NPC, Hammer and Old Book now waves the 50000 fee. (based of mRO website) //= Having a joblvl of 50 allows you to skip Rasputin's test. (based of mRO website) [kobra_k88] //= 1.2 fixed a few typos (have to hunt more) [Lupus] diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt index 6bb4945a6..24d49cbce 100644 --- a/npc/jobs/2-2/bard.txt +++ b/npc/jobs/2-2/bard.txt @@ -485,7 +485,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "Turned into a dragon and ate him."; next; input .@Song$; - if (.@Song$ != "There was a man") + if (.@Song$ != "There was a man") set .@w_point,.@w_point+1; mes "^3377FFThere was a man"; @@ -940,7 +940,7 @@ S_ChangeJob: //============================================================ //= 07/06/05 : Added 1st Version. [Muad_Dib] //= Converted to rAthena format by Dr.Evil -//= Info about gifts and other info --> http://www.ragnainfo.net/forums/viewtopic.php?t=51467&start=0 +//= Info about gifts and other info --> http://www.ragnainfo.net/forums/viewtopic.php?t=51467&start=0 //= 1.1 Optimized, changed some stuff, fixed some bugs [Lupus] //= 1.1a minor song test fix [Lupus] //= 1.2 Fixed wrong item ID, added missing commands [Lupus] diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt index e7d938a4a..d5bcd70ea 100644 --- a/npc/jobs/2-2/crusader.txt +++ b/npc/jobs/2-2/crusader.txt @@ -43,7 +43,7 @@ prt_castle,45,169,5 script Senior Crusader 4_M_CRU_OLD,{ mes "You don't belong here, my friend."; mes "Be advised to continue practicing yourself."; close; - } + } else if(BaseJob != Job_Swordman) { if(BaseJob == Job_Crusader) { mes "Go and train yourself in preparation for the holy war that is coming. Victory will be in the hands of those who are most ready to receive it."; @@ -68,7 +68,7 @@ prt_castle,45,169,5 script Senior Crusader 4_M_CRU_OLD,{ mes "[Michael Halig]"; mes "As it happened one thousand years ago, evil forces will one day attack in droves in an attempt to take over the world once again."; close; - } + } else if(CRUS_Q <= 3 && countitem(1004) && countitem(1009)) { mes "Ah..."; mes "I see that you have been called to become a Crusader. We are assured of your will, but now we must test your capabilities."; @@ -124,7 +124,7 @@ prt_castle,45,169,5 script Senior Crusader 4_M_CRU_OLD,{ mes "[Michael Halig]"; mes "Train yourself more as a Swordsman and wait for your calling. I understand your intent, but as of now, you cannot join us."; close; - } + } if (SkillPoint) { mes "[Michael Halig]"; mes "You haven't finished learning everything as a Swordsman. Use all of your remaining skill points, and then return to me."; @@ -550,7 +550,7 @@ prt_church,95,127,3 script Crusader 4_F_CRU,{ mes "4. Which Undead monster"; mes "has the highest HP?"; next; - if (select("Ghoul:Skeleton Prisoner:Wraith:Zombie Prisoner") == 4) + if (select("Ghoul:Skeleton Prisoner:Wraith:Zombie Prisoner") == 4) set .@cru_t,.@cru_t+10; mes "[Gabriel Valentine]"; @@ -769,7 +769,7 @@ prt_church,95,127,3 script Crusader 4_F_CRU,{ mes "[Gabriel Valentine]"; mes "Don't stress, you need to know a lot in order to pass this test. In any case, I'll be waiting right here. When you think you're ready, come back, alright?"; close; - } + } else if(CRUS_Q == 8 || CRUS_Q == 9) { mes "Like I mentioned before, you should go to Prontera Castle and meet with Bliant Piyord to take your next test. Good luck, and become a Crusder soon, alright?"; close; @@ -938,7 +938,7 @@ prt_castle,35,151,5 script Patron Knight 4_M_CRU,{ mes "I shall be"; mes "waiting."; close; - } + } else if(CRUS_Q == 10) { mes "Congratulations."; mes "You have completed"; diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt index e0b59c71d..6b4ddf5b0 100644 --- a/npc/jobs/2-2/dancer.txt +++ b/npc/jobs/2-2/dancer.txt @@ -286,15 +286,15 @@ job_duncer,43,93,4 script Aile#da 4_F_07,{ } else if (DANC_Q >= 2 && DANC_Q <= 4) { switch(DANC_Q) { - case 2: + case 2: setarray .@item[0], 938,909,501,2403; setarray .@count[0], 20,3,5,1; break; - case 3: + case 3: setarray .@item[0], 1055,2405; setarray .@count[0], 5,1; break; - case 4: + case 4: setarray .@item[0], 965,503,909,1020,2401; setarray .@count[0], 2,5,20,10,1; break; @@ -889,7 +889,7 @@ job_duncer,95,93,4 script Bijou#da 4W_F_01,{ getitem 1950,1; //Rope close; } -} +} // Waiting Room //============================================================ @@ -1379,7 +1379,7 @@ OnOmg: //============================================================ // Old changelog //============================================================ -//= 1.1 Removed the warp I left here my accident, added a check for using +//= 1.1 Removed the warp I left here my accident, added a check for using //= Improved Concentration and arrow shower, people could get away with it //= [Fredzilla] //= 1.0 I tried to keep as much the same from the Jap version as possible diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt index 221828908..90fccf68c 100644 --- a/npc/jobs/2-2/monk.txt +++ b/npc/jobs/2-2/monk.txt @@ -395,13 +395,13 @@ monk_in,99,58,1 script Sensei Moohae#mk 1_M_PASTOR,{ next; mes "[Sensei Moohae]"; switch (.@items[6]) { - case 3: mes "Why the face? This is a test of your abilities."; break; - case 4: mes "What's wrong? This is a test of your abilities."; break; - case 5: mes "You do understand don't you? This is a test of your abilities."; break; - case 6: mes "Don't look at me like that. This is a test of your abilities."; break; - case 7: mes "You don't seem concerned, this is a test of your abilities You should take this seriously."; break; - case 8: mes "It is a test of your abilities so make sure you acquire these on your own."; break; - case 9: mes "Don't be concerned, I believe you can do it. This is only to test your abilities."; break; + case 3: mes "Why the face? This is a test of your abilities."; break; + case 4: mes "What's wrong? This is a test of your abilities."; break; + case 5: mes "You do understand don't you? This is a test of your abilities."; break; + case 6: mes "Don't look at me like that. This is a test of your abilities."; break; + case 7: mes "You don't seem concerned, this is a test of your abilities You should take this seriously."; break; + case 8: mes "It is a test of your abilities so make sure you acquire these on your own."; break; + case 9: mes "Don't be concerned, I believe you can do it. This is only to test your abilities."; break; } next; mes "[Sensei Moohae]"; diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt index 52baaf58d..cf20d5203 100644 --- a/npc/jobs/2-2/rogue.txt +++ b/npc/jobs/2-2/rogue.txt @@ -11,7 +11,7 @@ //= 2.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] //= No longer uses function "F_BlockHigh" //= 2.4a Deleted unused variables. [Samuray22] -//= 2.4b Changed a Problem with JobLevel what made +//= 2.4b Changed a Problem with JobLevel what made //= impossible get a Gladius [3]. (bugreport:481) [Samuray22] //= 2.4c Corrected a Typo error ";;" and a typo error with "rouge". (bugreport:909) [Samuray22] //= 2.5 Added dummy "OnMyMobDead" labels. (bugreport:1100) [L0ne_W0lf] @@ -1172,7 +1172,7 @@ OnTouch: break; case 4: mes "[" + strcharinfo(0) + "]"; - mes "Hollgrehenn"; + mes "Hollgrehenn"; break; } switch(select("enjoys:doesn't enjoy:likes:doesn't like")) { @@ -1277,7 +1277,7 @@ OnTouch: if (.@input < 1 || .@input > 10000) { if (ROGUE_Q == 12) mes "^3355FFIt didn't work. Please re-enter the four number combination.^000000"; - else + else mes "^3355FFPlease enter a combination of four numbers.^000000"; close; } diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt index 46973a538..72bacfaf1 100644 --- a/npc/jobs/2-2/sage.txt +++ b/npc/jobs/2-2/sage.txt @@ -19,7 +19,7 @@ //= 2.4a Deleted unused variables. [Samuray22] //= 2.5 Updated waiting room. (Removes global var) [L0ne_W0lf] //= 2.5a Corrected some "mes"s without the getitemname. (bugreport:1564) [Samuray22] -//= -Changed an incorrect "!=" to "==". (bugreport:1572) +//= -Changed an incorrect "!=" to "==". (bugreport:1572) //= -And Small Typo Error //= 2.6 Fixed Kayron Grik cutin not being removed as reported by jc1991, bugreport:1825 [Brainstorm] //= 2.6a Fixed a Little Bug with Whispers Summoned in the Last Test. (bugreport:2253) [Samuray22] @@ -525,8 +525,8 @@ yuno_in03,154,35,4 script Staff of the Academy#a 2_M_SAGE_B,{ switch (SAGE_Q) { case 1: //Feather_Of_Bird, Fluff, Iron_Ore - setarray .@item[0], 916,914,1002; - setarray .@count[0], 50,50,25; + setarray .@item[0], 916,914,1002; + setarray .@count[0], 50,50,25; break; case 2: //Clover, Feather, Chinese_Ink @@ -539,12 +539,12 @@ yuno_in03,154,35,4 script Staff of the Academy#a 2_M_SAGE_B,{ setarray .@count[0], 50,50,50,50; break; } - set .@size, (getarraysize(.@item)-1); + set .@size, (getarraysize(.@item)-1); for( set .@i,0 ; .@i < .@size && countitem(.@item[.@i]) >= .@count[.@i] ; set .@i,.@i+1 ); - if(.@i == .@size) { + if(.@i == .@size) { if (Zeny > 29999) { for (set .@i, 0; .@i < .@size ; set .@i, .@i+1) - delitem .@item[.@i], .@count[.@i]; + delitem .@item[.@i], .@count[.@i]; Zeny -= 30000; mes "[Metheus Sylphe]"; mes "Well done. Let me proceed with your application request."; diff --git a/npc/jobs/2-2e/SoulLinker.txt b/npc/jobs/2-2e/SoulLinker.txt index 225b4ee7b..38fb47131 100644 --- a/npc/jobs/2-2e/SoulLinker.txt +++ b/npc/jobs/2-2e/SoulLinker.txt @@ -13,7 +13,7 @@ //= 1.2 Rescripted to Aegis 10.3 standards. [Samuray22] //= 1.3 Slight updates and fixes to the script. [L0ne_W0lf] //= Removes the use of labels, and corrects other errors. -//= Removed the GM-use only NPC from the sec_in map. +//= Removed the GM-use only NPC from the sec_in map. //= No longer used a global var, uses an NPC var instead. //= 1.3a Deleted Empty Color Tag. (bugreport:1572) [Samuray22] //= 1.4 Replaced effect numerics with constants. [L0ne_W0lf] diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index 11d411e9d..dfce182d2 100644 --- a/npc/kafras/functions_kafras.txt +++ b/npc/kafras/functions_kafras.txt @@ -37,7 +37,7 @@ //= 5.1a Temporary? Added F_ClearGarbage to clear unused/outdated variables [Lupus] //= 5.2 By default commented out custom Guilds Kafra's "Guild Storage". [Lupus] //= 5.3 uncommented Guild Storage. Confirmed kRO feature. [Lupus] -//= 5.4 added -Guide option (Kafra shows you nearest Guide) Work in progress. +//= 5.4 added -Guide option (Kafra shows you nearest Guide) Work in progress. //= Need all coords for all guides.. and somehow pass their coords to kafra. //= Removed universal Kafra Pass, added 3 new Kafra Tickets [Lupus] //= 5.4b temporary moved "-Guide" from the 1st menu punct [Lupus] @@ -45,7 +45,7 @@ //= Cleaned up the menus a bit. Got rid of the proceeding "-" prefix. //= 5.5b Missed a preceeding hyphen, which was screwing up teleporting. [L0ne_W0lf] //= 5.6 Further dialog updates, added dynamic costs for cart and storage use. [L0ne_W0lf] -//= Updated some functions to handle Guild Kafras the way they should. +//= Updated some functions to handle Guild Kafras the way they should. //= 5.6a Corrected a few wrong names in the teleport function. [L0ne_W0lf] //= 5.7 Correced end message no longer displaying, and the duplicate names [L0ne_W0lf] //= Thanks to Barron-Monster for pointing out the issues. @@ -104,14 +104,14 @@ function script F_Kafra { mes "In either case, why not stay awhile?"; mes "The air is eternally heavy with the"; mes "scent of pleasant wildflowers."; - break; + break; case 4: // Louyang and Ayothaya specific message (obsolete) mes "[Kafra Employee]"; mes "With our many Kafra"; mes "service locations, you're never"; mes "far from home."; - break; + break; case 5: // NPC has it's own welcome message. (Display nothing) break; @@ -149,15 +149,15 @@ function script F_Kafra { } set .@menu$,""; for (set .@i, 0; .@i < getarraysize(@K_Menu0$); set .@i, .@i + 1) - set .@menu$, .@menu$ + @K_Menu0$[.@i] + ":"; + set .@menu$, .@menu$ + @K_Menu0$[.@i] + ":"; set .@j, select (.@menu$) - 1; if (@K_Menu0$[.@j] == "Save") { return; } else if (@K_Menu0$[.@j] == "Use Storage") { // Do not charge for Guild Storage - if(getarg(0) == 2) + if(getarg(0) == 2) callfunc "F_KafStor",2,0,0; - else + else callfunc "F_KafStor",0,getarg(3),getarg(0); next; } else if (@K_Menu0$[.@j] == "Use Teleport Service") { @@ -179,7 +179,7 @@ function script F_Kafra { } next; } else if (@K_Menu0$[.@j] == "Rent a Pushcart") { - if(callfunc("F_KafCart",getarg(0),getarg(4)) == 1) + if(callfunc("F_KafCart",getarg(0),getarg(4)) == 1) next; } else if (@K_Menu0$[.@j] == "Check Other Information") { callfunc "F_KafInfo",getarg(2); @@ -424,14 +424,14 @@ function script F_KafInfo { //=================================================================== function script F_KafEnd { mes "[Kafra Employee]"; - if(getarg(1)==1) { + if(getarg(1)==1) { // Save mes "Your Respawn Point"; mes "has been saved here"; mes getarg(2)+"."; mes "Thank you for using"; mes "the Kafra Services."; - } else if(getarg(0)==0 || getarg(0)==5) { + } else if(getarg(0)==0 || getarg(0)==5) { // Generic End 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."; @@ -525,7 +525,7 @@ function script F_SetKafCode { next; switch (select("Set new password -> 5000z:Cancel")) { case 1: callsub S_SET,getarg(0),getarg(1); break; - case 2: break; + case 2: break; } } close2; diff --git a/npc/kafras/kafras.txt b/npc/kafras/kafras.txt index 55187e37b..e52d195ce 100644 --- a/npc/kafras/kafras.txt +++ b/npc/kafras/kafras.txt @@ -9,12 +9,12 @@ //= arg(0): 0 - Default Kafra message //= 1 - Niflhiem Kafra message //= 2 - Guild Kafra message -//= arg(1): 1 - Disable teleport menu +//= arg(1): 1 - Disable teleport menu //= arg(2): 1 - Disable info menu //= arg(3): Cost of Storage service //= arg(4): Cost of Rent a Pushcart service //===== Additional Comments: ================================= -//= 0.x Previous Authors: +//= 0.x Previous Authors: //= - L0ne_W0lf, kobra_k88, Samuray22, Evera, Lupus //= 1.0 Merged and cleaned up Kafras. [Joseph] //= 1.1 Added Izlude RE coordinates. [Euphy] diff --git a/npc/mapflag/skillduration.txt b/npc/mapflag/skillduration.txt index d3d96cae3..2140896a4 100644 --- a/npc/mapflag/skillduration.txt +++ b/npc/mapflag/skillduration.txt @@ -15,7 +15,7 @@ //= prontera mapflag adjust_unit_duration WZ_QUAGMIRE 250 //= Increases duration of Quagmire by 2.5 times in Prontera. //===== Disclaimer: ========================================== -//= Be aware that some skill units have their visual effect +//= Be aware that some skill units have their visual effect //= durations not controlled by the server (e.g. Storm Gust). //===== Additional Comments: ================================= //= 1.0 - Initial script. diff --git a/npc/mapflag/skillmodifier.txt b/npc/mapflag/skillmodifier.txt index 60c623a36..0006066bb 100644 --- a/npc/mapflag/skillmodifier.txt +++ b/npc/mapflag/skillmodifier.txt @@ -5,7 +5,7 @@ //===== Current Version: ===================================== //= 1.0 //===== Description: ========================================= -//= This mapflag allows you to modify the damage of any skill +//= This mapflag allows you to modify the damage of any skill //= in any map. //= Example (1): //= prontera mapflag adjust_skill_damage MG_FIREBOLT 50 diff --git a/npc/merchants/clothes_dyer.txt b/npc/merchants/clothes_dyer.txt index 0251d7884..94fab1d5c 100644 --- a/npc/merchants/clothes_dyer.txt +++ b/npc/merchants/clothes_dyer.txt @@ -105,7 +105,7 @@ function Dyes; if (Sex) Dyes(6,1); else Dyes(4,1,8,2,7,3); case Job_SuperNovice: if (Sex) Dyes(2,1,6,2,5,3,4,4); else Dyes(6,1,3,2,5,3,4,4); - default: + default: mes "Wow, I've never seen clothes like that before! I'm sorry, but I don't think I can paint it."; close; } diff --git a/npc/merchants/coin_exchange.txt b/npc/merchants/coin_exchange.txt index 1e929bf86..160a7e5bc 100644 --- a/npc/merchants/coin_exchange.txt +++ b/npc/merchants/coin_exchange.txt @@ -8,7 +8,7 @@ //= [Official Conversion] //= Coin redemption NPCs. //===== Additional Comments: ================================= -//= 1.0 First version +//= 1.0 First version //= 1.1 Fixed checkweight. [Gepard] //= 1.2 Optimized and merged into one file. [Euphy] //============================================================ diff --git a/npc/merchants/dye_maker.txt b/npc/merchants/dye_maker.txt index 4434c5c39..b8ca80d06 100644 --- a/npc/merchants/dye_maker.txt +++ b/npc/merchants/dye_maker.txt @@ -9,7 +9,7 @@ //= Quests to create the eight colored Dyestuffs. //===== Additional Comments: ================================= //= 1.0 Fully working [kobra_k88] -//= 1.1 Spell Checked [Nexon] +//= 1.1 Spell Checked [Nexon] //= 1.2 Rescripted to Aegis 10.3 standard. [L0ne_W0lf] //= 1.2b Fixed typos in variable names [ultramage] //= 1.3 Made the checks more dynamic [ultramage] @@ -146,7 +146,7 @@ S_MakeDye: case 7: mes "Mmm... I need 30 White Herbs, 1 Counteragent, and 1 Empty bottle to make White Dyestuffs. The fee will be 3000 zeny."; setarray .@item[0], 509, 973, 713; - setarray .@count[0], 30, 1, 1; + setarray .@count[0], 30, 1, 1; set .@cost,3000; set .@dyestuff,982; break; diff --git a/npc/merchants/gemstone.txt b/npc/merchants/gemstone.txt index 1d8837f28..126dbeba4 100644 --- a/npc/merchants/gemstone.txt +++ b/npc/merchants/gemstone.txt @@ -13,7 +13,7 @@ //= in the cities/payon.txt //= 1.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //= 1.2 Updated input with min/max values. [L0ne_W0lf] -//= Added a checkweight. +//= Added a checkweight. //= 1.3 Fixed checks. [Euphy] //============================================================ diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt index 56d8533cf..8b3a34420 100644 --- a/npc/merchants/inn.txt +++ b/npc/merchants/inn.txt @@ -17,7 +17,7 @@ //===== Additional Comments: ================================= //= 1.1 Blind Effect By Kobra_k88 (Taken from his old script) //= I added it to all of them though [Darkchild] -//= 1.1a Minor bug fixes and optimizations. Switched from @variables +//= 1.1a Minor bug fixes and optimizations. Switched from @variables //= to arguments.[kobra_k88] //= 1.2 Rewrote inn script [Playtester] //= 1.3 Added (finally) Rachel Inn Maid. Official warp @@ -28,8 +28,8 @@ //= - Removed the Cancel dialog. //= 1.6 More fixes, changed progression of "Rest"ing. //= - Corrected Morroc NPCs. [L0ne_W0lf] -//= 1.7 Corrected Payon NPC. [L0ne_W0lf] -//= 1.8 Corrected Geffen NPC. [L0ne_W0lf] +//= 1.7 Corrected Payon NPC. [L0ne_W0lf] +//= 1.8 Corrected Geffen NPC. [L0ne_W0lf] //= 1.9 Added the Inn for Al De baran. [L0ne_W0lf] //= 2.0 Added Inn for the Town of Veins. [L0ne_W0lf] //= 2.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] diff --git a/npc/merchants/kunai_maker.txt b/npc/merchants/kunai_maker.txt index b2c624bb0..d3b70f35b 100644 --- a/npc/merchants/kunai_maker.txt +++ b/npc/merchants/kunai_maker.txt @@ -7,7 +7,7 @@ //===== Description: ========================================= //= Trades a few shurikens + ninja stones for elemental kunai. //===== Additional Comments: ================================= -//= 1.0 Added the npc. It uses a function that sends the item +//= 1.0 Added the npc. It uses a function that sends the item //= id of the 2 required items plus the amount. Can trade //= up to 500 units (5,000 kunais) at once. [erKURITA] //= 1.1 Officialized script [Playtester] diff --git a/npc/merchants/old_pharmacist.txt b/npc/merchants/old_pharmacist.txt index b866aa0db..d74b3287d 100644 --- a/npc/merchants/old_pharmacist.txt +++ b/npc/merchants/old_pharmacist.txt @@ -212,7 +212,7 @@ L_Making: Zeny -= (.@max*getarg(1)); delitem getarg(0),.@max*2; delitem 713,.@max; //Empty_Bottle - getitem getarg(2),.@max; + getitem getarg(2),.@max; break; case 2: next; @@ -238,7 +238,7 @@ L_Making: Zeny -= (.@amount*getarg(1)); delitem getarg(0),.@amount*2; delitem 713,.@amount; //Empty_Bottle - getitem getarg(2),.@amount; + getitem getarg(2),.@amount; break; case 3: next; diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt index d417c6ba1..823fbea66 100644 --- a/npc/merchants/refine.txt +++ b/npc/merchants/refine.txt @@ -24,9 +24,9 @@ //= hacker that can change item [dafide18] //= 1.5 Fixed crashing due to badly used callfunc's [Skotlex] //= Lupus, don't rollback this important fix again! >.< -//= 1.5a Corrected an unneeded callfunc, fixed the anti-bot +//= 1.5a Corrected an unneeded callfunc, fixed the anti-bot //= exploit ruining the safe refine loop. [Skotlex] -//= 1.5b Fixed Spelling mistakes. [Nexon] +//= 1.5b Fixed Spelling mistakes. [Nexon] //= 1.6 Replaced all breaks for ends as per the new script engine [Skotlex] //= 1.7 Added Einbroch Refiners (Custom names ^^;) and a duplicated BS Shop. [Poki#3] //= 1.8 Added Lighthalzen Refiners (Custom names again ^^;) [Poki#3] @@ -661,27 +661,27 @@ function script refinemain { case 1: //Refine Level 1 Weapon set .@price,50; set .@material,1010; - set .@safe,7; + set .@safe,7; break; case 2: //Refine Level 2 Weapon set .@price,200; set .@material,1011; - set .@safe,6; + set .@safe,6; break; case 3: //Refine Level 3 Weapon set .@price,5000; set .@material,984; - set .@safe,5; + set .@safe,5; break; case 4: //Refine Level 4 Weapon set .@price,20000; set .@material,984; - set .@safe,4; + set .@safe,4; break; case 5: //Refine other stuff? set .@price,2000; set .@material,985; - set .@safe,4; + set .@safe,4; break; } if(.@features != 1) { @@ -809,7 +809,7 @@ function script refinemain { } else set .@menu2,2; switch(.@menu2){ - case 1: + case 1: set .@refinecnt,.@safe - getequiprefinerycnt(.@part); break; case 2: @@ -870,7 +870,7 @@ function script refinemain { mes "You changed it..."; mes "Get out before I stun you with my Hammer!!"; close; - } + } mes "Clang, clang!!!"; if(.@menu2 == 2 && getequippercentrefinery(.@part) <= rand(100)) { failedrefitem .@part; diff --git a/npc/merchants/wander_pet_food.txt b/npc/merchants/wander_pet_food.txt index 6fb0b41f7..42aba081d 100644 --- a/npc/merchants/wander_pet_food.txt +++ b/npc/merchants/wander_pet_food.txt @@ -9,7 +9,7 @@ //= Trade Broken Liquor Jars and alcohol for wanderer //= pet food, 'Spirit Liquor' //===== Additional Comments: ================================= -//= 1.0 First version +//= 1.0 First version //============================================================ prontera,218,218,3 script Pet Enthusiast 4W_KID,{ diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt index 3f7d1d20a..559ba151f 100644 --- a/npc/other/Global_Functions.txt +++ b/npc/other/Global_Functions.txt @@ -215,7 +215,7 @@ function script F_ItemName { } ////////////////////////////////////////////////////////////////////////////////// -// *** Function "F_SaveQuestSkills": Store learnt quest skills +// *** Function "F_SaveQuestSkills": Store learnt quest skills ////////////////////////////////////////////////////////////////////////////////// function script F_SaveQuestSkills { set ADV_QSK,0; set ADV_QSK2,0; diff --git a/npc/other/arena/arena_lvl60.txt b/npc/other/arena/arena_lvl60.txt index 8ccd45cf0..c3d33f333 100644 --- a/npc/other/arena/arena_lvl60.txt +++ b/npc/other/arena/arena_lvl60.txt @@ -947,7 +947,7 @@ OnTimer4000: end; OnTimer60000: - donpcevent "cast#60::OnTimeOver2"; + donpcevent "cast#60::OnTimeOver2"; donpcevent "arn_warp_60::OnOut"; donpcevent "#arn_timer_60::OnStop"; donpcevent "alloff#60::OnEnable"; @@ -956,7 +956,7 @@ OnTimer60000: OnStop: stopnpctimer; - end; + end; } - script arn_warp_60 -1,{ diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt index 0f4e53ca5..218a6de90 100644 --- a/npc/other/arena/arena_party.txt +++ b/npc/other/arena/arena_party.txt @@ -1,5 +1,5 @@ //===== Hercules Script ====================================== -//= Izlude Party Arena +//= Izlude Party Arena //===== By: ================================================== //= SinSloth //===== Current Version: ===================================== @@ -1139,7 +1139,7 @@ OnTimer4000: end; OnTimer60000: - donpcevent "cast#pt::OnTimeOver2"; + donpcevent "cast#pt::OnTimeOver2"; donpcevent "arn_warp_pt::OnOut"; donpcevent "#arn_timer_pt::OnStop"; donpcevent "alloff#pt::OnEnable"; @@ -1148,7 +1148,7 @@ OnTimer60000: OnStop: stopnpctimer; - end; + end; } - script arn_warp_pt -1,{ diff --git a/npc/other/bulletin_boards.txt b/npc/other/bulletin_boards.txt index 7c1d4d0e3..66e14c577 100644 --- a/npc/other/bulletin_boards.txt +++ b/npc/other/bulletin_boards.txt @@ -44,7 +44,7 @@ alberta,111,59,5 script Bulletin Board#1 2_BULLETIN_BOARD,{ next; mes "[Alberta: The Port City]"; mes "From Alberta, ^1F3A11Payon^000000 is located to the Northwest. You can board passenger ships at the dock to travel to ^5E5C69Izlude^000000."; - mes "Enjoy your travels."; + mes "Enjoy your travels."; close; } @@ -113,12 +113,12 @@ payon,178,108,5 script Bulletin Board#06 2_BULLETIN_BOARD,{ next; mes "[Payon: The Mountain City]"; mes "From Payon, ^123972Alberta^000000 is located to the Southeast, and ^866C4BMorroc^000000 is to the West. ^5E5C69Izlude^000000 and ^6D6FE0Prontera^000000 are North of Payon."; - mes "Enjoy your travels."; + mes "Enjoy your travels."; close; } pay_arche,79,31,5 script Bulletin Board#07 2_BULLETIN_BOARD,{ - mes "[Archer Village]"; + mes "[Archer Village]"; mes "Welcome to the Payon Archer Village where Novices can change their jobs to Archer."; next; mes "[Archer Village]"; @@ -451,7 +451,7 @@ moc_fild19,107,101,5 script Bulletin Board#20 2_BULLETIN_BOARD,{ gef_tower,55,142,5 script Bulletin Board#21 2_BULLETIN_BOARD,{ mes "[Geffen Dungeon]"; - mes "^6B1312Caution!^000000"; + mes "^6B1312Caution!^000000"; mes "Geffen dungeon is consisted of 3 levels"; mes "is too difficult for new adventurers to venture."; mes "As main monsters constantly appear,"; diff --git a/npc/other/divorce.txt b/npc/other/divorce.txt index ce497018b..c95589d74 100644 --- a/npc/other/divorce.txt +++ b/npc/other/divorce.txt @@ -38,8 +38,8 @@ nif_in,190,112,5 script Deviruchi#divorce 4_DEVIRUCHI,{ // mes "popular nowadays, heh heh~"; // close; // } -// else - if (!getpartnerid()) { +// else + if (!getpartnerid()) { mes "Bwah hah hah~!"; mes "That look in your eyes~!"; if (Sex) { diff --git a/npc/other/hugel_bingo.txt b/npc/other/hugel_bingo.txt index 0a47b4f00..2b1e8f410 100644 --- a/npc/other/hugel_bingo.txt +++ b/npc/other/hugel_bingo.txt @@ -449,7 +449,7 @@ OnTouch: if($@bingoresult == 1 || $@bingoresult == 21) mes "[ "+$@bingoresult+"st Number - "+$bingo[$@bingoresult -1]+" ]"; else if($@bingoresult == 2 || $@bingoresult == 22) mes "[ "+$@bingoresult+"nd Number - "+$bingo[$@bingoresult -1]+" ]"; else if($@bingoresult == 3 || $@bingoresult == 23) mes "[ "+$@bingoresult+"rd Number - "+$bingo[$@bingoresult -1]+" ]"; - else mes "[ "+$@bingoresult+"th Number - "+$bingo[$@bingoresult -1]+" ]"; + else mes "[ "+$@bingoresult+"th Number - "+$bingo[$@bingoresult -1]+" ]"; mes "["+@bingo_a1$+"] ["+@bingo_a2$+"] ["+@bingo_a3$+"] ["+@bingo_a4$+"] ["+@bingo_a5$+"]"; mes "["+@bingo_b1$+"] ["+@bingo_b2$+"] ["+@bingo_b3$+"] ["+@bingo_b4$+"] ["+@bingo_b5$+"]"; mes "["+@bingo_c1$+"] ["+@bingo_c2$+"] ["+@bingo_c3$+"] ["+@bingo_c4$+"] ["+@bingo_c5$+"]"; diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt index 5cb1946d6..be909a207 100644 --- a/npc/other/marriage.txt +++ b/npc/other/marriage.txt @@ -11,7 +11,7 @@ //= Currently does not support same-Sex marriages. //= Old script located in: npc/custom/marriage.txt //= - Variable in use: wedding_sign (max 1) -//= - Variable in use: $@wedding (max 1) +//= - Variable in use: $@wedding (max 1) //= - Variable in use: $@wed_groom$ $@wed_bride$ //===== Additional Comments: ================================= //= 1.0 First version. [L0ne_W0lf] @@ -315,17 +315,15 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ next; while(1) { input .@name$; - if (.@name$ != strcharinfo(0)) { - mes "[Marry Happy]"; - mes "Hmmm, you have to write"; - mes "down your name exactly as"; - mes "it is displayed. Maybe you"; - mes "need to copy and paste it?"; - mes "Anyway, let's try it again."; - next; - } - else + if (.@name$ == strcharinfo(0)) break; + mes "[Marry Happy]"; + mes "Hmmm, you have to write"; + mes "down your name exactly as"; + mes "it is displayed. Maybe you"; + mes "need to copy and paste it?"; + mes "Anyway, let's try it again."; + next; } mes "[Marry Happy]"; mes "Great, it looks like we"; diff --git a/npc/other/mercenary_rent.txt b/npc/other/mercenary_rent.txt index 7b2a47d0a..422a5ac5b 100644 --- a/npc/other/mercenary_rent.txt +++ b/npc/other/mercenary_rent.txt @@ -271,7 +271,7 @@ pay_arche,99,167,4 duplicate(Mercenary Manager#main) Mercenary Manager#Bow 4_M_J close; } mes "[Mercenary Goods Merchant]"; - if (.@input == 1) + if (.@input == 1) mes "Here's your " + getitemname(.@item[.@m]) + "."; else { mes "Here you are, this is exactly"; diff --git a/npc/other/monster_museum.txt b/npc/other/monster_museum.txt index 6917a9f93..fae93fd3e 100644 --- a/npc/other/monster_museum.txt +++ b/npc/other/monster_museum.txt @@ -11,7 +11,7 @@ //= - Information about various monsters //===== Additional Comments: ================================= // 07/06/05 : Added 1st Version. [Muad_Dib] -//= Adapted to rAthena Scripting Language by [Lance] +//= Adapted to rAthena Scripting Language by [Lance] //= 1.1a Fixed typos [Haplo] //= 1.2 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //= 1.3 Added a Missing "case 1:". [Samuray22] diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt index 3b2dd618b..c3c54a426 100644 --- a/npc/other/monster_race.txt +++ b/npc/other/monster_race.txt @@ -19,7 +19,7 @@ //= 1.6 Updated experience rewards. [L0ne_W0lf] //= 1.7 Optimization, -4000 lines (more can still be done). [Euphy] //= 1.8 Optimized. -//= Fixed Medal Distributor (Dual Race) disappears accordingly. [Joseph] +//= Fixed Medal Distributor (Dual Race) disappears accordingly. [Joseph] //= 1.9 Updated RE/Pre-RE EXP. [Euphy] //= 2.0 Added GM management NPC. [Euphy] //============================================================ @@ -293,7 +293,7 @@ OnTimer9000: function WN { set .@n, charat(strnpcinfo(0),getstrlen(strnpcinfo(0))-1); if (!getarg(0)) return .@n; - return ((.@n <= 3)?((.@n == 1)?"1st":((.@n == 2)?"2nd":"3rd")):.@n+"th"); + return ((.@n <= 3)?((.@n == 1)?"1st":((.@n == 2)?"2nd":"3rd")):.@n+"th"); } OnInit: @@ -334,7 +334,7 @@ p_track01,67,45,5 script Medal Distributor#single 4_F_RACING,{ mes "after the race finishes. Prize"; mes "Medals may be given to Wayne"; mes "in Hugel in exchange for items."; - next; + next; if ($@monster_race) { if (monster_race_1 == $@monster_race) { mes "[Medal Distributor]"; @@ -670,7 +670,7 @@ hugel,58,72,6 script Eckar Ellebird#single 4_M_NFMAN,{ mes "we ask that you please"; mes "wait a little while longer."; close; - } + } } else { if ($@mon_time_1_1 == 1) { mes "[Eckar Ellebird]"; @@ -1437,7 +1437,7 @@ p_track02,73,22,1 script Ticket Helper#2 4_M_HUMAN_02,{ mes "^0000FFMonster "+.@m+"^000000, "+.@w$[0]; mes .@w$[1]+"."; mes "Are you sure you want"; - mes "to choose this monster?"; + mes "to choose this monster?"; if (select("Yes:No") == 2) { mes "[Ticket Helper]"; mes "You have canceled"; @@ -1445,7 +1445,7 @@ p_track02,73,22,1 script Ticket Helper#2 4_M_HUMAN_02,{ mes "I understand. Perhaps"; mes "you'd feel more comfortable"; mes "checking the monsters first?"; - close; + close; } next; if (!.@m1) { @@ -1542,7 +1542,7 @@ p_track02,73,22,1 script Ticket Helper#2 4_M_HUMAN_02,{ mes "^0000FFMonster " + monster_race_2_1 + "^000000 and ^0000FFMonster " + monster_race_2_2 + "^000000"; mes "for this Dual Monster Race."; next; - } + } mes "[Ticket Helper]"; mes "The start of the race will be"; mes "announced through a broadcast."; @@ -1551,7 +1551,7 @@ p_track02,73,22,1 script Ticket Helper#2 4_M_HUMAN_02,{ mes "positions. Thank you, and"; mes "have a good time!"; viewpoint 1,43,35,0,0xFF0000; - close; + close; } OnInit: @@ -1841,10 +1841,10 @@ OnMyMobDead: function MN { setarray .@n$[1], "poring","lunatic","savagebebe","desertwolf","deviruchi","baphomet"; for (set .@i, 1; .@i <= getarraysize(.@n$); set .@i, .@i + 1) { - if (compare(strnpcinfo(0),.@n$[.@i])) + if (compare(strnpcinfo(0),.@n$[.@i])) break; } - return .@i; + return .@i; } OnInit: @@ -2302,7 +2302,7 @@ ein_in01,85,208,5 script Ei'felle#repay01 4_M_EINMAN2,{ setarray .@mw$, "Nagan:Immaterial Sword:Mysteltainn:Byeollungum:Star Dust Blade:Caesar's Sword:Ice Falchion:Excalibur:Edge:Cutlus:Solar Sword:Tirfing:Fireblend"; setarray .@mw, 1130,1141,1138,1140,1148,1134,1131,1137,1132,1135,1136,1139,1133; break; - case 2: + case 2: setarray .@mw$, "Dragon Slayer:Masamune:Muramasa:Schweizersabel:Executioner:Zweihander:Katzbalger"; setarray .@mw, 1166,1165,1164,1167,1169,1168,1170; break; @@ -2344,7 +2344,7 @@ ein_in01,85,208,5 script Ei'felle#repay01 4_M_EINMAN2,{ case 12: setarray .@mw$, "Oriental Lute:Electric Guitar"; setarray .@mw, 1918,1913; - break; + break; } set .@j, select (.@mw$+":Cancel") - 1; explode(.@mw$,.@mw$,":"); @@ -2804,7 +2804,7 @@ hugel,71,83,4 script Wayne 4_M_HUMERCHANT,{ set .@m$, .@m$ + .@pm[.@i] + " Prize medal:"; set .@m, select (.@m$) - 1; switch (.@m) { - case 0: + case 0: setarray .@mr$, "2 Hinale Leaflets:2 Aloe Leaflets:1 Mastela Fruit:5 Witch Starsands:4 Condensed Red Potions"; setarray .@mr, 520,2,521,2,522,1,1061,5,545,4; break; @@ -2862,7 +2862,7 @@ hugel,71,83,4 script Wayne 4_M_HUMERCHANT,{ mes "races, fair adventurer~"; delitem 7515,.@pm[.@m]; getitem .@mr[.@m2*2],.@mr[((.@m2*2)+1)]; - close; + close; } } @@ -2968,7 +2968,7 @@ p_track02,69,31,1 script Blacksmith Guildsman#dou 4_F_JOB_BLACKSMITH,{ mes "It's too hard for me to win~!"; emotion e_swt2; close; - } + } mes "[Blacksmith Guildsman]"; mes "Run! Go go go!"; mes "I need to win some"; diff --git a/npc/other/turbo_track.txt b/npc/other/turbo_track.txt index 21aaa24d7..2d9b967d8 100644 --- a/npc/other/turbo_track.txt +++ b/npc/other/turbo_track.txt @@ -6,7 +6,7 @@ //= 1.2 //===== Description: ========================================= //= [Official Conversion] -//= Turbo Track Course: +//= Turbo Track Course: //= - Solo Mode/Time Attack //= - Normal (Non-PVP) - 4/8/16 Person //= - Expert (PVP) - 4/8/16 Person @@ -1216,14 +1216,14 @@ OnTouch: mes "I wouldn't be able to do business without the Kafra Services. Thank you, Kafra!"; mes " "; mes "[Chief Mahnsoo]"; - mes "I looove you Kafra!^000000"; + mes "I looove you Kafra!^000000"; } else { mes "^4d4dff[Karkatan]"; mes "My land suffered from poor customer service...until Kafra came along!"; mes " "; mes "[Curator Guiss]"; mes "Oh, Kafra is simply the best!^000000"; - } + } next; mes "^ff0000Turbo Track"; mes "^ff0000Traps in the Cursed Desert!"; @@ -1730,7 +1730,7 @@ OnTouch: case 2: mapannounce strnpcinfo(4),strcharinfo(0) +" has just passed the Cube Hills course!",bc_map,"0x70DBDB"; warp strnpcinfo(4),316,365; - end; + end; case 3: mapannounce strnpcinfo(4),strcharinfo(0) +" has just passed the Cursed Desert!",bc_map,"0x70DBDB"; switch (rand(1,4)) { @@ -1951,9 +1951,9 @@ OnTouch: function GetNumber { setarray .@w_n$[1], "n4","n8","n16","e4","e8","e16"; for (set .@i, 1; .@i <= getarraysize(.@w_n$); set .@i, .@i + 1) { - if (getarg(0) == .@w_n$[.@i]) + if (getarg(0) == .@w_n$[.@i]) return .@i; - } + } } OnInit: @@ -2089,7 +2089,7 @@ turbo_n_1,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#n1 WARPNPC,1,1 mes "However, you cannot receive"; mes "any points if you exceed the"; mes "point limit. You now have a total of " + my_point + " Turbo Track points."; - } + } set tt_rank,tt_rank+1; next; if (tt_rank > $ttranks[1]) { @@ -2300,7 +2300,7 @@ turbo_n_1,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#n1 WARPNPC,1,1 mes "you any Turbo Track Points"; mes "since you would exceed the"; mes "maximum limit. Sorry..."; - } + } } else { mes "Oh right, your current"; set my_point,tt_point; @@ -2430,7 +2430,7 @@ OnTimer36000: OnTimer40000: set .@w$,callfunc("F_tt"); - if (compare(.@w$,"4")) + if (compare(.@w$,"4")) mapannounce strnpcinfo(4),"[Blacksmith Union]",bc_map,"0x33FF66"; else mapannounce strnpcinfo(4),"[Al De Baran Kafra Corporation Headquarters]",bc_map,"0x33FF66"; diff --git a/npc/pre-re/guides/guides_payon.txt b/npc/pre-re/guides/guides_payon.txt index 4efc96737..9f8e4a776 100644 --- a/npc/pre-re/guides/guides_payon.txt +++ b/npc/pre-re/guides/guides_payon.txt @@ -14,7 +14,7 @@ //= to Muad_Dib //= 1.3a Fixed some problems with duplicated text, thanks to muad_dib [MasterOfMuppets] //= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA] -//= 1.4a Tixed Archer Village Guide [Lupus] +//= 1.4a Tixed Archer Village Guide [Lupus] //= 1.5 Removed Duplicates [Silent] //= 1.6 Rescripted to official 10.3 standards. [L0ne_W0lf] //============================================================ diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt index 59b612e5b..934dc0300 100644 --- a/npc/pre-re/jobs/1-1/merchant.txt +++ b/npc/pre-re/jobs/1-1/merchant.txt @@ -710,9 +710,9 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{ mes "[Union Staff Kay]"; mes "Hey hey. That number's not valid! Enter a value from 1000000 to 5000000. got it?"; next; - } - else + } else { break; + } } mes "[Union Staff Kay]"; if (.@where_village == 1) diff --git a/npc/pre-re/jobs/novice/novice.txt b/npc/pre-re/jobs/novice/novice.txt index 2f15fa995..a57bf5190 100644 --- a/npc/pre-re/jobs/novice/novice.txt +++ b/npc/pre-re/jobs/novice/novice.txt @@ -175,7 +175,7 @@ new_1-2,100,29,4 script Receptionist#nv1 4_M_04,{ close; } } -} +} new_1-1,53,114,4 script Shion#nv1 4_F_JOB_HUNTER,{ if (nov_get_item04 > 9 || nov_get_item05 > 9) { @@ -2654,7 +2654,7 @@ new_1-3,95,30,4 script Trainer#nv1::NovHoffman 4_M_02,{ } else { warp "new_1-3",96,21; - } + } end; case 2: mes "[Hoffman]"; @@ -3859,7 +3859,7 @@ S_UserJobchoice: mes "[Hanson]"; mes "The Mage Academy is located in the NorthWest in town. Please remember this."; } - else if (@menu == 3) { + else if (@menu == 3) { mes "to become a Merchant."; mes "You will be sent to"; mes "the town of Alberta."; diff --git a/npc/pre-re/kafras/kafras.txt b/npc/pre-re/kafras/kafras.txt index e900a0fa6..85d2ae49e 100644 --- a/npc/pre-re/kafras/kafras.txt +++ b/npc/pre-re/kafras/kafras.txt @@ -9,7 +9,7 @@ //= arg(0): 0 - Default Kafra message //= 1 - Niflhiem Kafra message //= 2 - Guild Kafra message -//= arg(1): 1 - Disable teleport menu +//= arg(1): 1 - Disable teleport menu //= arg(2): 1 - Disable info menu //= arg(3): Cost of Storage service //= arg(4): Cost of Rent a Pushcart service diff --git a/npc/pre-re/mobs/fields/veins.txt b/npc/pre-re/mobs/fields/veins.txt index 73577013a..5a9a221bc 100644 --- a/npc/pre-re/mobs/fields/veins.txt +++ b/npc/pre-re/mobs/fields/veins.txt @@ -70,7 +70,7 @@ ve_fild05,123,65,50,21 monster Sleeper 1386,5,120000,0,0 ve_fild05,152,139,15,17 monster White Plant 1082,5,1800000,0,0 ve_fild05,152,139,5,5 monster Shining Plant 1083,1,2400000,0,0 -//======== [Veins Field-06] =================================== +//======== [Veins Field-06] =================================== ve_fild06,0,0,0,0 monster Stapo 1784,2,300000,0,0 ve_fild06,0,0,0,0 monster Stapo 1784,1,1800000,0,0 ve_fild06,0,0,0,0 monster Shining Plant 1083,1,1020000,0,0 diff --git a/npc/pre-re/scripts_main.conf b/npc/pre-re/scripts_main.conf index a2c1fcc1c..8e75dd332 100644 --- a/npc/pre-re/scripts_main.conf +++ b/npc/pre-re/scripts_main.conf @@ -4,7 +4,7 @@ // The idea of this new system is to make scripts more organized // since the old system was rather messy with all the NPCs in one // file. Now scripts are organized in to files arraged by type. -// Custom scripts are now in scripts_custom.conf, all other +// Custom scripts are now in scripts_custom.conf, all other // scripts are deemed as 'official'. You should place your NPCs // in to scripts_custom.conf to follow the trend. // diff --git a/npc/pre-re/warps/cities/rachel.txt b/npc/pre-re/warps/cities/rachel.txt index df2821535..2f16964c3 100644 --- a/npc/pre-re/warps/cities/rachel.txt +++ b/npc/pre-re/warps/cities/rachel.txt @@ -7,14 +7,14 @@ //===== Description: ========================================= //= Warp Points for Rachel City, shops & other locations //===== Additional Comments: ================================= -//= 1.0 Added the official warps and commented out the +//= 1.0 Added the official warps and commented out the //= "custom duplicates" for future checkout. Special thanks //= to RockmanEXE who provided all the info. [erKURITA] //= 1.1 Added warp to Veins Field [Playtester] //= 1.2 Fully official rachel warps [Playtester] //= 1.2a Added missing warp (Pope's office entryway -> temple) [L0ne_W0lf] //= 1.3 Updated Rachel -> Veins Field warp. [L0ne_W0lf] -//= 1.4 Disabled rachel33, moved to quest_rachel.txt [L0ne_W0lf] +//= 1.4 Disabled rachel33, moved to quest_rachel.txt [L0ne_W0lf] //============================================================ rachel,150,249,0 warp rachel01 1,1,ra_temple,120,30 diff --git a/npc/quests/bard_quest.txt b/npc/quests/bard_quest.txt index 9b365d0e2..508284350 100644 --- a/npc/quests/bard_quest.txt +++ b/npc/quests/bard_quest.txt @@ -16,8 +16,8 @@ //= 1.1 Fixed bug, optimized. Not yet final version [Lupus] //= //= Variables: -//= .@random : temp var -//= .@inputstr$ : temp var +//= .@random : temp var +//= .@inputstr$ : temp var //= //= This Quest has relation with brisingamen_seal.txt (Seals) //= 1.2 Changed variable to "gef_bards_q" to avoid job quest conflict. [L0ne_W0lf] diff --git a/npc/quests/cooking_quest.txt b/npc/quests/cooking_quest.txt index 4c2a84ea7..b3f381451 100644 --- a/npc/quests/cooking_quest.txt +++ b/npc/quests/cooking_quest.txt @@ -18,7 +18,7 @@ //= fixed bugs. Tested, fully working [Lupus] //= 1.5 More fixes [Lupus] //= 1.6 Quest is now up to iRO 10.3 standards. [L0ne_W0lf] -//= - Not sure what the EnableItemMove is for, as there is no +//= - Not sure what the EnableItemMove is for, as there is no //= command to disable being able to move items. //= 1.6a Corrected a bad cutin, a Typo error ";;" and a bad delitem (bugreport:911) [Samuray22] //= 1.6b Corrected a "donpcevent" missing a ":". (bugreport:962) [Samuray22] diff --git a/npc/quests/eye_of_hellion.txt b/npc/quests/eye_of_hellion.txt index 6feb07f81..0acbf6c05 100644 --- a/npc/quests/eye_of_hellion.txt +++ b/npc/quests/eye_of_hellion.txt @@ -661,7 +661,7 @@ morocc_in,116,101,3 script Old Scholar Tyus#hellion 4_M_JOB_WIZARD,3,3,{ OnTouch: if (HELLIONQ == 57 && countitem(7334) > 0) { - specialeffect2 EF_HEAL2; + specialeffect2 EF_HEAL2; specialeffect EF_HEAL2; mes "^3355FFOne of the Tablet Pieces"; mes "that you have is beginning to"; diff --git a/npc/quests/first_class/tu_acolyte.txt b/npc/quests/first_class/tu_acolyte.txt index c788462bd..854b0a26a 100644 --- a/npc/quests/first_class/tu_acolyte.txt +++ b/npc/quests/first_class/tu_acolyte.txt @@ -247,7 +247,7 @@ prt_monk,230,106,3 script Asthe#tu 1_F_PRIEST,{ mes "is the most necessary"; mes "skill for an Acolyte?"; next; - switch(select("Heal:Aqua Benedicta:Teleport")){ + switch(select("Heal:Aqua Benedicta:Teleport")){ case 1: mes "[Asthe]"; mes "Ah, yes."; @@ -399,7 +399,7 @@ prt_monk,230,106,3 script Asthe#tu 1_F_PRIEST,{ next; mes "[Asthe]"; mes "But you must have forgotten the Mace I've lent you. Would you bring it back so that I can return it to the church?"; - close; + close; } } mes "Are you having"; @@ -1110,7 +1110,7 @@ prt_monk,226,257,6 script Ill Girl#tu 4_F_04,{ mes "^3355FFNothing happened."; mes "It doesn't look like"; mes "that skill will work.^000000"; - close; + close; break; case 2: if(getskilllv("AL_BLESSING") > 0){ @@ -1422,7 +1422,7 @@ prt_monk,153,210,3 script Cleope Verce 4_F_SISTER,{ if(BaseJob != Job_Acolyte){ if (JobLevel < 40) { if (BaseLevel < 26) { - mes "Oh my.. "; + mes "Oh my.. "; mes "A newbie Acolyte?"; mes "It doesn't even seem"; mes "like you've learned"; @@ -1464,7 +1464,7 @@ prt_monk,153,210,3 script Cleope Verce 4_F_SISTER,{ mes "Rookie."; close; } else if(BaseLevel < 36){ - mes "Oh my.. "; + mes "Oh my.. "; mes "A young Acolyte?"; mes "You seem to have just"; mes "started learning your skills?"; @@ -1515,7 +1515,7 @@ prt_monk,153,210,3 script Cleope Verce 4_F_SISTER,{ mes "young friend."; close; } else if(BaseLevel < 46){ - mes "Well, well, well~"; + mes "Well, well, well~"; mes "Hello, young Acolyte."; mes "You're still kind of"; mes "green, but I guess you're"; diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt index 09f758959..5e5344271 100644 --- a/npc/quests/first_class/tu_archer.txt +++ b/npc/quests/first_class/tu_archer.txt @@ -1242,7 +1242,7 @@ pay_arche,84,139,3 script Seisner 4_F_JOB_HUNTER,{ mes "[Seisner]"; mes "Hunters can ultimately transcend into ^3131FFSnipers^000000, Bards into ^3131FFMinstrels^000000, and Dancers into ^3131FFGypsies^000000. I know that's pretty complex."; if(tu_archer01 == 1) set tu_archer01, 2; - next; + next; break; case 2: mes "[Seisner]"; @@ -1911,7 +1911,7 @@ prt_castle,76,165,6 script Minister#tu 1_M_JOBTESTER,{ next; mes "[Minister]"; mes "As a holy servant, I'm sure that you'll find plenty of other people who have need of your help and abilities outside of the palace."; - } + } close; } diff --git a/npc/quests/first_class/tu_magician01.txt b/npc/quests/first_class/tu_magician01.txt index dc43a7852..01df38855 100644 --- a/npc/quests/first_class/tu_magician01.txt +++ b/npc/quests/first_class/tu_magician01.txt @@ -701,7 +701,7 @@ geffen,67,180,4 script New Mage Manager#M 8_F,{ if(.@skill_e6) getexp 300,100; if(.@skill_e7) getexp 300,100; close; - default: + default: break; } } diff --git a/npc/quests/first_class/tu_merchant.txt b/npc/quests/first_class/tu_merchant.txt index b760831df..3acd91860 100644 --- a/npc/quests/first_class/tu_merchant.txt +++ b/npc/quests/first_class/tu_merchant.txt @@ -579,7 +579,7 @@ alberta_in,70,51,5 script Guarnien 4W_M_02,{ mes "I'll talk about the Mammonite skill. For now, let me take a little bit of a break from all of this arduous lecture. ^666666*Whew!*^000000"; close; } - } else { + } else { mes "No? That's fine."; mes "But I can't teach you"; mes "much more if you can't grasp these simple basics, so hurry and learn those skills, okay?"; @@ -861,7 +861,7 @@ prontera,93,330,3 script Kellion 4W_M_01,{ mes "...Huh?"; mes "You better put some of your stuff in Kafra Storage, you can't carry much else!"; close; - } else { + } else { Zeny -= 340; set tu_merchant, 10; getitem 569,10; //Novice_Potion @@ -900,7 +900,7 @@ prontera,93,330,3 script Kellion 4W_M_01,{ mes "...Huh?"; mes "You better put some of your stuff in Kafra Storage, you can't carry much else!"; close; - } else { + } else { Zeny -= 390; set tu_merchant, 9; getitem 501,10; //Red_Potion @@ -939,7 +939,7 @@ prontera,93,330,3 script Kellion 4W_M_01,{ mes "...Huh?"; mes "You better put some of your stuff in Kafra Storage, you can't carry much else!"; close; - } else { + } else { Zeny -= 400; set tu_merchant, 10; getitem 501,10; //Red_Potion diff --git a/npc/quests/kiel_hyre_quest.txt b/npc/quests/kiel_hyre_quest.txt index 3083436cc..29ea57cf8 100644 --- a/npc/quests/kiel_hyre_quest.txt +++ b/npc/quests/kiel_hyre_quest.txt @@ -42,7 +42,7 @@ //---------------------------------------------------------------------------- // [Notes] // - Let it be noted that ALL DIALOG IS OFFICIAL TO IRO UNLESS SPECIFIED. -// - I've fixed a few of iRO's mistakes, but I'm sure I made some of my own. +// - I've fixed a few of iRO's mistakes, but I'm sure I made some of my own. // - Will probably require a major optimizing. // - Not going to list ALL of the more usless NPCs. (Doors + Empty "Beautiful Ladies") // - Parties are *NOT REQUIRED* as per Doddler's Wiki information. @@ -63,9 +63,9 @@ // [Variables in Use] // KielHyreQuest - Main quest tracking variable (Quest finished at 106) // -// KHToastGirlEnd - Pick up delivery if set to 1, +// KHToastGirlEnd - Pick up delivery if set to 1, // - picked up delivery if set to 2 -// - finished if set to 3 +// - finished if set to 3 // - Deleted once no longer needed. // // KHCottagePoem1 - Tracks Poem 1 quest in cottage. (finished = 5) @@ -447,14 +447,14 @@ OnTouch: mes "What am I suposed to do?"; set KielHyreQuest,1; close; - } + } } //---------------------------------------------------------------------------- // Juno Toast Sales Girl. //---------------------------------------------------------------------------- yuno,217,114,6 script Little Kid#kh 4W_KID,{ - mes "[Cezu]"; + mes "[Cezu]"; if (KielHyreQuest < 6) { mes "Fresh, crunchy toast!"; mes "If you want some, come"; @@ -471,7 +471,7 @@ yuno,217,114,6 script Little Kid#kh 4W_KID,{ next; switch(select("I'm here for Elly:No, thanks")) { case 1: - mes "[Cezu]"; + mes "[Cezu]"; mes "Oh, I see. Elly must have"; mes "wasted another batch of"; mes "ingredients again. Well,"; @@ -479,7 +479,7 @@ yuno,217,114,6 script Little Kid#kh 4W_KID,{ mes "so I really want to help, but"; mes "I can't really do anything."; next; - mes "[Cezu]"; + mes "[Cezu]"; mes "You see, I just ran"; mes "out of ingredients too!"; mes "But I can't really leave"; @@ -487,7 +487,7 @@ yuno,217,114,6 script Little Kid#kh 4W_KID,{ mes "people need to buy toast?"; mes "Listen, can you help me out?"; next; - mes "[Cezu]"; + mes "[Cezu]"; mes "Would you please go get"; mes "some flour and eggs for me"; mes "from the ^3355FFLighthalzen Windmill^000000"; @@ -495,7 +495,7 @@ yuno,217,114,6 script Little Kid#kh 4W_KID,{ mes "divide the ingredients, and you"; mes "can deliver some to Elly."; next; - mes "[Cezu]"; + mes "[Cezu]"; mes "I know that I'm basically"; mes "making you do everything"; mes "on your own, but please try"; @@ -684,7 +684,7 @@ yuno_fild08,196,196,5 script Hanie#kh1 8_F,{ // Academy Security Guards //---------------------------------------------------------------------------- yuno_fild08,158,194,6 script Security Guard#1::KHAGuard 4_M_EIN_SOLDIER,{ - if ((KielHyreQuest < 2) || (KielHyreQuest > 31)) { + if ((KielHyreQuest < 2) || (KielHyreQuest > 31)) { mes "[Security Guard]"; mes "I'm sorry, but if you aren't"; mes "associated with this institution,"; @@ -694,7 +694,7 @@ yuno_fild08,158,194,6 script Security Guard#1::KHAGuard 4_M_EIN_SOLDIER,{ mes "an appointment with the staff."; close; } - else if (KielHyreQuest == 2) { + else if (KielHyreQuest == 2) { mes "[Security Guard]"; mes "I'm sorry, but if you aren't"; mes "associated with this institution,"; @@ -779,7 +779,7 @@ yuno_fild08,158,194,6 script Security Guard#1::KHAGuard 4_M_EIN_SOLDIER,{ close; } } - else if (KielHyreQuest < 32) { + else if (KielHyreQuest < 32) { mes "[Security Guard]"; mes "Oh, did you have"; mes "other business inside"; @@ -855,7 +855,7 @@ kh_school,176,60,4 script Lady#kh 4W_F_01,{ mes "in here, please leave."; close; } - else if (KielHyreQuest == 2) { + else if (KielHyreQuest == 2) { mes "[Mrs. Lecollane]"; mes "Oh, hello. Ah!"; mes "have you come to"; @@ -940,7 +940,7 @@ kh_school,179,39,0 script Cute Student#kh 4_F_KHELLY,{ close; } cutin "kh_elly01",2; - if (KielHyreQuest < 4) { + if (KielHyreQuest < 4) { cutin "kh_elly03",2; mes "[Elly]"; mes "W-wah! Oh...!"; @@ -949,7 +949,7 @@ kh_school,179,39,0 script Cute Student#kh 4_F_KHELLY,{ mes "again! Why do I have so much"; mes "trouble handling ingredients?"; } - else if (KielHyreQuest == 4) { + else if (KielHyreQuest == 4) { cutin "kh_elly03",2; mes "[Elly]"; mes "Oh no, what should"; @@ -1473,7 +1473,7 @@ kh_school,179,39,0 script Cute Student#kh 4_F_KHELLY,{ } //---------------------------------------------------------------------------- -// Elly's Window +// Elly's Window //---------------------------------------------------------------------------- yuno_fild08,69,185,0 script Window#kh HIDDEN_NPC,{ if (KielHyreQuest < 29) { @@ -2184,12 +2184,11 @@ OnTouch: getitem 7490,1; //Kyll_Hire_Letter set KielHyreQuest,20; close; - } - else{ + } else { mes "^3355FFYou entered the room.^000000"; close; } - end; + end; } //---------------------------------------------------------------------------- @@ -2258,7 +2257,7 @@ kh_vila,30,184,0 script Apple Box#khp1 HIDDEN_NPC,{ mes "prevented you from"; mes "taking the box.^000000"; close; - case 2: + case 2: mes "^3355FFSomething is wrong"; mes "with this box of apples.^000000"; close; @@ -4247,7 +4246,7 @@ kh_mansion,22,28,4 script Kiel Hyre#kh 4_M_KHKYEL,{ mes "the Rekenber Corporation, I'd"; mes "say it was entirely possible!"; next; - cutin "kh_Kyel03",2; + cutin "kh_Kyel03",2; mes "[Kiel Hyre]"; mes "Well played, adventurer."; mes "Well played. I don't regret"; @@ -5238,28 +5237,23 @@ yuno,257,140,4 script Odd Grandma 4_F_EINOLD,{ mes "you go? You were"; mes "supposed to come"; mes "home a while ago!"; - if (countitem(7500) < 1) { + if (countitem(7500) < 1) close; - } - else { - next; - switch(select("Allysia? Isn't she...")) { - case 1: - cutin "kh_ellisia_port",1; - mes "^3355FFYou show Allysia's"; - mes "portrait to the old woman.^000000"; - next; - cutin "",255; - mes "[Grandma]"; - mes "Oh, do you know"; - mes "Allysia? She's been"; - mes "missing! She left home"; - mes "yesterday and hasn't"; - mes "come back! C-can you"; - mes "tell me where she is?!"; - close; - } - } + next; + select("Allysia? Isn't she..."); + cutin "kh_ellisia_port",1; + mes "^3355FFYou show Allysia's"; + mes "portrait to the old woman.^000000"; + next; + cutin "",255; + mes "[Grandma]"; + mes "Oh, do you know"; + mes "Allysia? She's been"; + mes "missing! She left home"; + mes "yesterday and hasn't"; + mes "come back! C-can you"; + mes "tell me where she is?!"; + close; } else if (KielHyreQuest >= 60) { mes "[Grandma]"; @@ -5371,9 +5365,9 @@ yuno,250,132,0 script Old Lady#kh 4_F_05,{ } else if ((KielHyreQuest == 58) && - (countitem(7499) < 1) || - (countitem(7500) < 1) || - (countitem(7501) < 1) || + (countitem(7499) < 1) || + (countitem(7500) < 1) || + (countitem(7501) < 1) || (countitem(7502) < 1)) { mes "[Old Lady]"; mes "Please hurry and find"; @@ -5386,9 +5380,9 @@ yuno,250,132,0 script Old Lady#kh 4_F_05,{ } else if ((KielHyreQuest == 58) && - (countitem(7499) == 1) && - (countitem(7500) == 1) && - (countitem(7501) == 1) && + (countitem(7499) == 1) && + (countitem(7500) == 1) && + (countitem(7501) == 1) && (countitem(7502) == 1)) { mes "[Old Lady]"; mes "Oh, you're finished"; @@ -5426,7 +5420,7 @@ yuno,250,132,0 script Old Lady#kh 4_F_05,{ mes "Allysia's body in the river,"; mes "so he might have a better"; mes "idea of what had happened."; - delitem 7498,1; //Rosimier_Key + delitem 7498,1; //Rosimier_Key set KielHyreQuest,60; close; } @@ -5913,7 +5907,7 @@ kh_kiehl01,17,39,0 script Receiver#kh HIDDEN_NPC,{ } OnMyMobDead: - if (mobcount("kh_kiehl01","Receiver#kh::OnMyMobDead") <1) { + if (mobcount("kh_kiehl01","Receiver#kh::OnMyMobDead") <1) { makeitem 7506,1,"this",19,36; } end; @@ -6292,9 +6286,9 @@ kh_kiehl01,15,179,0 script Robots#kh1 HIDDEN_NPC,{ } OnMyMobDead: - if (mobcount("kh_kiehl01","Robots#kh1::OnMyMobDead") < 1) { + if (mobcount("kh_kiehl01","Robots#kh1::OnMyMobDead") < 1) { makeitem 7506,1,"this",18,180; - } + } end; } @@ -6338,8 +6332,8 @@ kh_kiehl01,166,187,0 script Big Door#BigDoorKHQ5 HIDDEN_NPC,{ monster "kh_kiehl01",163,179,"Aliot",1740,1; monster "kh_kiehl01",169,183,"Alicel",1739,1; monster "kh_kiehl01",169,179,"Aliot",1740,1; - if (@KHDoorPushAttempt >= 3) { - set KielHyreQuest,86; + if (@KHDoorPushAttempt >= 3) { + set KielHyreQuest,86; } end; } @@ -7035,8 +7029,8 @@ kh_kiehl02,1,1,0 script KiehlRoom -1,{ OnKiehlMobDead: set .KHKilled,.KHKilled+1; - if (.KHKilled == 5) { - hideoffnpc "Kiehl#Original"; + if (.KHKilled == 5) { + hideoffnpc "Kiehl#Original"; } end; @@ -7057,7 +7051,7 @@ OnReset: hideonnpc "Agent#KHAgent3"; hideonnpc "Agent#KHAgent4"; hideonnpc "Kiehl#Copy"; - hideoffnpc "Kiehl#Original"; + hideoffnpc "Kiehl#Original"; set .KHKilledBoss,0; set .KHKilled,0; set getvariableofnpc(.KHTrapSprung,"Kiehl_Room_Trap"),0; @@ -7114,7 +7108,7 @@ OnInit: //============================================================ //= 1.0 First version, needs testing [Playtester] //= 1.1 Copied over some changes made by -Tsuyuki- [L0ne_W0lf] -//= Reworked variables slightly so that the permenents ones aside from the +//= Reworked variables slightly so that the permenents ones aside from the //= main tracking variable, are deleted when no longer needed. Renamed //= several variables that handle strings to @KHInput$. [L0ne_W0lf] //= 1.2 Removed duplicate NPCs. [Toms] @@ -7135,7 +7129,7 @@ OnInit: //= Corrected not deleting Allysia's Ring from inventory. //= 1.9 Exit will now enable if you are just retrieving the Ring, keeps you from getting stuck. [L0ne_W0lf] //= Corrected "KH_Kielh02", was setting off a debug, invalid map index. Should have been "kh_Kiehl02" -//= Made .KHQuestBusy$ into a temp global variable. $@KHQuestBusy$. +//= Made .KHQuestBusy$ into a temp global variable. $@KHQuestBusy$. //= 2.0 Changed the labels on the "Big Doors" to "Identifier Names" to prevent an error with using getvariableofnpc [L0ne_W0lf] //= 2.1 Fifth door now checks for a variable HIGHER or EQUAL to 74 not 84, as pointed out by Stollen. [L0ne_W0lf] //= 2.2 Another fix for Elly, no longer RESETS to 26 when you talk to her. [L0ne_W0lf] @@ -7151,7 +7145,7 @@ OnInit: //= Fixed typo in the second NPC that gives Black Keycards. //= Added Monster Warps. (Keeps monsters from being in dungeon quest area.) [Non-functional] //= 2.6 Stupid mistake, accidentally had 4 copies of the same script in 1... [L0ne_W0lf the bonehead] -//= 2.7 Fixed the wrong name being displayed for Kiel Hyre in one dialog. +//= 2.7 Fixed the wrong name being displayed for Kiel Hyre in one dialog. //= Removed $@KH_DoorInvoker entirely. The quest is now working like it should according to iRO. //= Fixed up a few more NPC headers. Facing direction fixes mostly this time. //= More progression changes to Kiehl Hyre. He no longer stops dialog after the agents appear. diff --git a/npc/quests/lvl4_weapon_quest.txt b/npc/quests/lvl4_weapon_quest.txt index 7736c28f4..91a1cea91 100644 --- a/npc/quests/lvl4_weapon_quest.txt +++ b/npc/quests/lvl4_weapon_quest.txt @@ -9,7 +9,7 @@ //= Grade A and Grade S weapon quests //===== Additional Comments: ================================= //= 1.0 First Version, Credits goes to Vicious_Pucca for converting [MasterOfMuppets] -//= the quest from aegis format to eA format. Also thanks to +//= the quest from aegis format to eA format. Also thanks to //= reddozen for fixing bugs. //= 1.1 Many fixes to spelling, grammar, and sentence order. [Silent] //= 1.2 A small fix, thanks to vicious_pucca [MasterOfMuppets] diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt index 4ee75a969..d2cbe4c8c 100644 --- a/npc/quests/newgears/2004_headgears.txt +++ b/npc/quests/newgears/2004_headgears.txt @@ -19,7 +19,7 @@ //= 10) Model Training Hat (payon_in03 8 193) //= 11) Tulip Haipin (geffen 83 189) //= 12) Party Hat, Straw Hat, Cowboy Hat, (xmas_in 35 30) -//= Sombrero, Beanie +//= Sombrero, Beanie //= 13) Decorative Golden Bell, (yuno_in03 20 18) //= Crown of Ancient Queen, Crown of Mistress //= 14) Alarm Mask (alde_alche 88 180) diff --git a/npc/quests/newgears/2005_headgears.txt b/npc/quests/newgears/2005_headgears.txt index c18b0e441..b31e07bd8 100644 --- a/npc/quests/newgears/2005_headgears.txt +++ b/npc/quests/newgears/2005_headgears.txt @@ -1624,13 +1624,13 @@ gl_prison1,97,104,1 script Phendark#LhzHat PHENDARK,{ emotion e_sob; if(!( - countitem(1950) || countitem(1951) || countitem(1952) || - countitem(1953) || countitem(1954) || countitem(1955) || - countitem(1956) || countitem(1957) || countitem(1958) || - countitem(1959) || countitem(1960) || countitem(1961) || - countitem(1962) || countitem(1963) || countitem(1964) || - countitem(1965) || countitem(1966) || countitem(1967) || - countitem(1968) || countitem(1969) || countitem(1970) || + countitem(1950) || countitem(1951) || countitem(1952) || + countitem(1953) || countitem(1954) || countitem(1955) || + countitem(1956) || countitem(1957) || countitem(1958) || + countitem(1959) || countitem(1960) || countitem(1961) || + countitem(1962) || countitem(1963) || countitem(1964) || + countitem(1965) || countitem(1966) || countitem(1967) || + countitem(1968) || countitem(1969) || countitem(1970) || countitem(1971) )) close; // no whip equipped or in inventory diff --git a/npc/quests/newgears/2006_headgears.txt b/npc/quests/newgears/2006_headgears.txt index c77dba022..a777db3f3 100644 --- a/npc/quests/newgears/2006_headgears.txt +++ b/npc/quests/newgears/2006_headgears.txt @@ -49,7 +49,7 @@ rachel,91,273,8 script ? 4_M_RACHMAN2,{ next; delitem 983,1; //Black_Dyestuffs delitem 7111,100; //Smooth_Paper - delitem 938,99; //Sticky_Mucus + delitem 938,99; //Sticky_Mucus Zeny -= 100000; getitem 5175,1; //Anonimity_Request mes "[?]"; @@ -124,8 +124,8 @@ rachel,152,131,3 script Sakjul 4_M_MIDDLE1,{ next; set .@result,rand(1,10); if (.@result == 4) { - delitem 5172,1; //Beret - delitem 7063,100; //Soft_Feather + delitem 5172,1; //Beret + delitem 7063,100; //Soft_Feather delitem 982,1; //White_Dyestuffs mes "[Sakjul]"; mes "I did succeed in making the hat,"; @@ -148,10 +148,10 @@ rachel,152,131,3 script Sakjul 4_M_MIDDLE1,{ mes "If you understood, now, go, go gather the materials again!"; close; } - delitem 5172,1; //Beret - delitem 7063,100; //Soft_Feather + delitem 5172,1; //Beret + delitem 7063,100; //Soft_Feather delitem 982,1; //White_Dyestuffs - getitem 5170,1; //Feather_Beret + getitem 5170,1; //Feather_Beret mes "[Sakjul]"; mes "Great, I have made it! Look at this beautiful coordination"; mes "between the feather and the beret,"; @@ -784,7 +784,7 @@ S_MakeMask: delitem getarg(1),getarg(2); delitem getarg(3),getarg(4); delitem getarg(5),getarg(6); - if (getarg(0) == 5169) + if (getarg(0) == 5169) delitem getarg(7),getarg(8); getitem getarg(0),1; set moza_tal,0; diff --git a/npc/quests/obb_quest.txt b/npc/quests/obb_quest.txt index 927bcd8ba..09a37eca7 100644 --- a/npc/quests/obb_quest.txt +++ b/npc/quests/obb_quest.txt @@ -9,7 +9,7 @@ //= Old Blue Box quest (?) //= Officially this quest gave an OBB in exhange for a the //= required items unlimitedly, however this was changed by -//= Gravity, who claimed this behavior as a bug. +//= Gravity, who claimed this behavior as a bug. //= The exact purpose of this quest is undetermined, but //= Gravity claimed that another quest would eventually //= branch from this one. diff --git a/npc/quests/okolnir.txt b/npc/quests/okolnir.txt index 4dea1dc69..ff6f6af85 100644 --- a/npc/quests/okolnir.txt +++ b/npc/quests/okolnir.txt @@ -298,7 +298,7 @@ que_qsch05,345,23,0 warp Gate02#gq_sch05 1,1,schg_cas05,369,306 next; mes "[Wish Maiden]"; mes "You must bring those six things, 10 Gold, and 20 Elunium."; - mes "Many Valhala's Flowers are also required as an offering."; + mes "Many Valhala's Flowers are also required as an offering."; } next; mes "[Wish Maiden]"; @@ -1283,8 +1283,8 @@ OnTouch: case 2: setarray .@n$, "113","111","3","Piamette : One bird has died trapped in it's cage."; break; case 3: setarray .@n$, "161","105","4","Piamette : One bird was poisoned to death."; break; case 4: setarray .@n$, "168","135","5","Piamette : One bird vomited blood while singing seven days and seven nights."; break; - case 5: - setarray .@n$, "150","159","6","Piamette : The last one broke her neck wriggling to get out of from it's eggshell!"; + case 5: + setarray .@n$, "150","159","6","Piamette : The last one broke her neck wriggling to get out of from it's eggshell!"; donpcevent "#gdtimer02_"+.@sub$+"::OnEnable"; donpcevent "#gdtimer01_"+.@sub$+"::OnStop"; break; @@ -1297,7 +1297,7 @@ OnTouch: OnInit: set .@sub$,callfunc("F_Okolnir"); - for (set .@i, 1; .@i <= 8; set .@i, .@i + 1) + for (set .@i, 1; .@i <= 8; set .@i, .@i + 1) disablenpc "#getspell0"+.@i+"_"+.@sub$; end; } @@ -1646,7 +1646,7 @@ OnTimer120000: set .@sub$,callfunc("F_Okolnir"); setarray .@xy2, 226,294,227,294,228,294,229,294,230,295,231,296,231,297,231,298,231,299,230,300,229,301,228,301,227,301,226,301,225,300,224,299,224,298,224,297,224,296,225,295; for (set .@i, 0; .@i < getarraysize(.@xy2); set .@i, .@i + 2) - monster "que_q"+.@sub$,.@xy2[.@i],.@xy2[.@i+1],"Guard of Shadow",1752,1,"#nmsom"+.@sub$+"_jin01::OnMyMobDead"; + monster "que_q"+.@sub$,.@xy2[.@i],.@xy2[.@i+1],"Guard of Shadow",1752,1,"#nmsom"+.@sub$+"_jin01::OnMyMobDead"; end; OnTimer180000: @@ -1730,7 +1730,7 @@ OnTimer120000: set .@sub$,callfunc("F_Okolnir"); setarray .@xy2, 274,301,275,301,276,301,277,301,278,300,279,299,279,298,279,297,279,296,278,295,277,294,276,294,275,294,274,294,273,295,272,296,272,297,272,298,272,299,273,300; for (set .@i, 0; .@i < getarraysize(.@xy2); set .@i, .@i + 2) - monster "que_q"+.@sub$,.@xy2[.@i],.@xy2[.@i+1],"Bloody Hunter",1753,1,"#nmsom"+.@sub$+"_jin02::OnMyMobDead"; + monster "que_q"+.@sub$,.@xy2[.@i],.@xy2[.@i+1],"Bloody Hunter",1753,1,"#nmsom"+.@sub$+"_jin02::OnMyMobDead"; end; OnTimer180000: @@ -1910,7 +1910,7 @@ OnMyMobDead: OnInit: set .@sub$,callfunc("F_Okolnir"); - for (set .@i, 1; .@i <= 4; set .@i, .@i + 1) + for (set .@i, 1; .@i <= 4; set .@i, .@i + 1) disablenpc "Guard of Shadow#"+.@sub$+"_0"+.@i; end; } @@ -1984,7 +1984,7 @@ OnMyMobDead: OnInit: set .@sub$,callfunc("F_Okolnir"); - for (set .@i, 1; .@i <= 4; set .@i, .@i + 1) + for (set .@i, 1; .@i <= 4; set .@i, .@i + 1) disablenpc "Bloody Hunter#"+.@sub$+"_ac0"+.@i; end; } @@ -2125,7 +2125,7 @@ OnMyMobDead: OnInit: set .@sub$,callfunc("F_Okolnir"); - hideonnpc "Wish Maiden#"+.@sub$+"_boss"; + hideonnpc "Wish Maiden#"+.@sub$+"_boss"; end; } que_qaru01,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#aru01_boss WISH_MAIDEN diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index 446e31ffd..16860ddf2 100644 --- a/npc/quests/quests_13_1.txt +++ b/npc/quests/quests_13_1.txt @@ -1728,8 +1728,8 @@ moc_fild22b,230,197,5 script Munkenro#2 4_M_RUSMAN1,{ mes "Ok, just have a good adventure."; next; set ep13_ryu,22; - changequest 10077,10078; - donpcevent "Head of the Alliance#moo::OnEnable"; + changequest 10077,10078; + donpcevent "Head of the Alliance#moo::OnEnable"; mes "[Munkenro]"; mes "If you are too late,"; mes "it will be considered as a failure, so come back soon."; diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt index 0767775be..f024c5285 100644 --- a/npc/quests/quests_13_2.txt +++ b/npc/quests/quests_13_2.txt @@ -31,7 +31,7 @@ //= 1.7 Added daily quest 'Dragon Egg collection.' //= 1.7a Fixed a translation typo. Tabb -> Taab. //= 1.8 Added a missing " in the GM only NPC. -//= 1.9 Added Monster Suppression, Bradium Collection, and +//= 1.9 Added Monster Suppression, Bradium Collection, and //= Laphine Craftsman quests. //= 2.0 Added missing global var check in Yggdrasil Dungeon //= floor 2 puzzle. Fixed a typo. Commented out untranslated diff --git a/npc/quests/quests_airship.txt b/npc/quests/quests_airship.txt index f018327d1..afee6ab57 100644 --- a/npc/quests/quests_airship.txt +++ b/npc/quests/quests_airship.txt @@ -795,7 +795,7 @@ function script F_Cherno { next; specialeffect EF_POISONATTACK,AREA,"#exp_ein"; mes "^33355F*Crash!*^000000"; - mes "....."; + mes "....."; emotion e_swt,0,"Theo Cherno"; emotion e_swt,0,"Tarsha Cherno"; next; diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt index 560160c3f..1d2e61da3 100644 --- a/npc/quests/quests_alberta.txt +++ b/npc/quests/quests_alberta.txt @@ -17,13 +17,13 @@ //= 1.1 Fixed Spore Doll exploit, Gramp's Tiger skin label bug //= 1.3 Fixed item ID 7031 -> 7013 //= 1.4 Fixed a bug, Fixed Exploits, Optimized [Lupus] -//= 1.6 TEMPESTRA quest uses common quests variable MISC_QUEST +//= 1.6 TEMPESTRA quest uses common quests variable MISC_QUEST //= Condition if done: (MISC_QUEST & 2) [Lupus] //= 1.7 Moved quest from cities/albera.txt [Evera] //= 1.8 Re-made the Doll Quest, now with official dialogs. [DZeroX] //= 1.8a Removed .GATs [Lupus] //= 1.9 Updated Turtle Quest to official. [L0ne_W0lf] -//= 2.0 Turtle Island quest now clears TURTLE var and set +//= 2.0 Turtle Island quest now clears TURTLE var and set //= MISC_QUEST bit (MISC_QUEST & 65536) [Lupus] //= 2.1 Added missing close. [L0ne_W0lf] //= 2.2 Updated Gotan to be compliant with misc_quiest var. [L0ne_W0lf] @@ -430,8 +430,7 @@ alberta_in,28,145,4 script Grampa 2_M_PHARMACIST,{ mes "He...Hey, kid !! W-Wait !"; close; } - } - else { + } else { switch(select("Talk:Cancel")) { case 1: mes "[Grampa]"; diff --git a/npc/quests/quests_aldebaran.txt b/npc/quests/quests_aldebaran.txt index 86c0eef18..01ef38537 100644 --- a/npc/quests/quests_aldebaran.txt +++ b/npc/quests/quests_aldebaran.txt @@ -1,5 +1,5 @@ //===== Hercules Script ====================================== -//= Quest NPCs related to Aldebaran +//= Quest NPCs related to Aldebaran //===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== @@ -74,7 +74,7 @@ aldeba_in,152,166,4 script Trader#01 4_M_04,{ close; } case 3: - if ((countitem(998) > 19) && (countitem(707) > 0) && (Zeny > 4999)){ //Iron Singing_Plant + if ((countitem(998) > 19) && (countitem(707) > 0) && (Zeny > 4999)){ //Iron Singing_Plant delitem 998,20; //Iron delitem 707,1; //Singing_Plant Zeny -= 5000; @@ -89,7 +89,7 @@ aldeba_in,152,166,4 script Trader#01 4_M_04,{ close; } case 4: - if ((countitem(1019) > 119) && (Zeny > 9999)){ //Wooden_Block + if ((countitem(1019) > 119) && (Zeny > 9999)){ //Wooden_Block delitem 1019,120; //Wooden_Block Zeny -= 10000; mes "[Trader]"; diff --git a/npc/quests/quests_gonryun.txt b/npc/quests/quests_gonryun.txt index 78b94c410..f5c1fe522 100644 --- a/npc/quests/quests_gonryun.txt +++ b/npc/quests/quests_gonryun.txt @@ -3107,7 +3107,7 @@ geffen_in,106,106,7 script Girl#gnbs2 4_M_KID2,{ mes "Heehehe..."; if (Sex == 0) mes "Thank you my pretty sister."; - else + else mes "Thank you handsome brother~"; mes "I'll get my health back"; mes "and be a strong girl!"; diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt index 313b999b4..453a0e8fc 100644 --- a/npc/quests/quests_hugel.txt +++ b/npc/quests/quests_hugel.txt @@ -5524,7 +5524,7 @@ hu_in01,15,372,3 script Cellette Lavit 1_F_MERCHANT_02,{ mes "since I helped him start his^FFFFFF ^000000 business. Nice of him, isn't it?"; set hg_odeng,2; setquest 8065; - getitem 584,1; //Fish_Ball_Soup + getitem 584,1; //Fish_Ball_Soup close; case 3: mes "[Cellette]"; @@ -5536,7 +5536,7 @@ hu_in01,15,372,3 script Cellette Lavit 1_F_MERCHANT_02,{ mes "Just try not to be late..."; set hg_odeng,3; setquest 8066; - getitem 584,1; //Fish_Ball_Soup + getitem 584,1; //Fish_Ball_Soup close; case 4: mes "[Cellette]"; @@ -5548,7 +5548,7 @@ hu_in01,15,372,3 script Cellette Lavit 1_F_MERCHANT_02,{ mes "and such and order..."; set hg_odeng,4; setquest 8067; - getitem 584,1; //Fish_Ball_Soup + getitem 584,1; //Fish_Ball_Soup close; } case 2: @@ -5568,7 +5568,7 @@ hu_in01,15,372,3 script Cellette Lavit 1_F_MERCHANT_02,{ mes "I hope you come and "; mes "visit me again, okay?"; Zeny -= 100; - getitem 584,1; //Fish_Ball_Soup + getitem 584,1; //Fish_Ball_Soup close; } else { mes "[Cellette]"; @@ -5626,7 +5626,7 @@ hu_in01,15,372,3 script Cellette Lavit 1_F_MERCHANT_02,{ mes "from you. That's fair, so"; mes "please don't lose it this time."; Zeny -= 100; - getitem 584,1; //Fish_Ball_Soup + getitem 584,1; //Fish_Ball_Soup close; } else { mes "[Cellette]"; @@ -5667,7 +5667,7 @@ hu_in01,15,372,3 script Cellette Lavit 1_F_MERCHANT_02,{ mes "from you. That's fair, so"; mes "please don't lose it this time."; Zeny -= 100; - getitem 584,1; //Fish_Ball_Soup + getitem 584,1; //Fish_Ball_Soup close; } else { mes "[Cellette]"; @@ -5709,7 +5709,7 @@ hu_in01,15,372,3 script Cellette Lavit 1_F_MERCHANT_02,{ mes "from you. That's fair, so"; mes "please don't lose it this time."; Zeny -= 100; - getitem 584,1; //Fish_Ball_Soup + getitem 584,1; //Fish_Ball_Soup close; } else { mes "[Cellette]"; diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt index 3c51ead24..e842882fe 100644 --- a/npc/quests/quests_juperos.txt +++ b/npc/quests/quests_juperos.txt @@ -1305,7 +1305,7 @@ juperos_01,99,112,4 script Bronze Statue#1 CLEAR_NPC,{ mes "Juno, could make sense"; mes "of what this stuff says."; close; - case 2: + case 2: close; } } @@ -1529,7 +1529,7 @@ yuno_in04,118,116,4 script Paper HIDDEN_NPC,{ mes "Please..."; mes "Come back to me."; mes " "; - mes " "; + mes " "; mes "Love,"; mes "Fayruz^000000"; close; @@ -1688,7 +1688,7 @@ OnTimer2000: } //============================================================ -// 2nd Floor +// 2nd Floor //============================================================ juperos_02,97,70,0 script 3F Gate Switch#jupe -1,{ diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt index 3b0520c66..d928aefd6 100644 --- a/npc/quests/quests_louyang.txt +++ b/npc/quests/quests_louyang.txt @@ -10,7 +10,7 @@ //= - Variable in use: che_tre (max 5) //= Doctor Quest //= - Variable in use: che_par (max 18) -//= Poison King Quest +//= Poison King Quest //= - Variable in use: ch_poison (max 20) //= Revolution Quest //= - Variable in use: QL_REVO (max 9) @@ -442,7 +442,7 @@ lou_fild01,195,177,5 script Jiu Lian Bu#1-1 4_M_CHN8GUEK,{ if (QL_GOTFAKESOUP) set ch_tre,3; if (QL_SOUPQUEST) set ch_tre,4; if (QL_SOUP2) set ch_tre,5; - set QL_ACCEPTSOUP,0; set QL_GOTDRAGONSOUP,0; set QL_GOTFAKESOUP,0; set QL_SOUPQUEST,0; set QL_SOUP2,0; + set QL_ACCEPTSOUP,0; set QL_GOTDRAGONSOUP,0; set QL_GOTFAKESOUP,0; set QL_SOUPQUEST,0; set QL_SOUP2,0; if (ch_tre == 0) { mes "[Jiu Lian Bu]"; @@ -874,7 +874,7 @@ lou_in02,58,183,5 script Chef Assistant#lou1 4_M_CHNMONK,5,5,{ mes "[Jin Wei Ling]"; mes "Waaa-!!!!"; next; - specialeffect EF_ENDURE; + specialeffect EF_ENDURE; mes "[Jin Wei Ling]"; mes "Waaa Taaah-!!!!!"; next; @@ -3823,7 +3823,7 @@ lou_in02,253,45,0 script Employee#poison 4_M_CHNMAN,{ mes "Did I make it?"; next; specialeffect EF_PATTACK; - specialeffect EF_POISONHIT; + specialeffect EF_POISONHIT; emotion e_omg; mes "[Song Zhi Du]"; mes "Hahaha~!"; diff --git a/npc/quests/quests_lutie.txt b/npc/quests/quests_lutie.txt index 9fe31ec59..f0db564be 100644 --- a/npc/quests/quests_lutie.txt +++ b/npc/quests/quests_lutie.txt @@ -227,7 +227,7 @@ xmas,115,297,4 script Vending Machine HIDDEN_NPC,{ } break; case 5: - if ((countitem(5015) > 0) && (countitem(978) > 0) && (countitem(7030) > 49)){ + if ((countitem(5015) > 0) && (countitem(978) > 0) && (countitem(7030) > 49)){ mes "^3355FFYou gingerly place the items into the snowman's mouth.^000000"; next; delitem 5015,1; //Egg_Shell @@ -315,7 +315,7 @@ xmas,115,297,4 script Vending Machine HIDDEN_NPC,{ } break; case 9: - if ((countitem(529) > 9) && (countitem(530) > 4) && (countitem(538) > 14) && (countitem(539) > 19) && (countitem(999) > 9)) { + if ((countitem(529) > 9) && (countitem(530) > 4) && (countitem(538) > 14) && (countitem(539) > 19) && (countitem(999) > 9)) { mes "^3355FFYou gingerly place the items into the snowman's mouth.^000000"; next; delitem 529,10; //Candy diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt index 398aa9a97..45ed535f8 100644 --- a/npc/quests/quests_morocc.txt +++ b/npc/quests/quests_morocc.txt @@ -34,7 +34,7 @@ //= Added support NPCs required to finish Gaebolg quest. //= 2.5 Fixed Group of Evil never re-enabling. [L0ne_W0lf] //= 2.6 Added quest log commands for Resurrection of Satan Morroc. [L0ne_W0lf] -//= Added the two remaining episode 12.1 quests. +//= Added the two remaining episode 12.1 quests. //= Updated Satan Morroc Quest to allow peopel who have //= finished it to return to the previous map. //= 2.7 Corrected weight checks, they only check for inventory slots. [L0ne_W0lf] diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt index 508a14580..685010f1a 100644 --- a/npc/quests/quests_moscovia.txt +++ b/npc/quests/quests_moscovia.txt @@ -1148,9 +1148,9 @@ S_Rud1: set $@mos1_edq,$@mos1_edq+1; donpcevent "Baehideun3#ship::OnEnable"; } - set mos_whale_edq,(getarg(1) == 2)?((mos_whale_edq >= 241)?((.@r != 3)?26:25):((.@r != 3)?10:11)):mos_whale_edq + 1; + set mos_whale_edq,(getarg(1) == 2)?((mos_whale_edq >= 241)?((.@r != 3)?26:25):((.@r != 3)?10:11)):mos_whale_edq + 1; close; - } + } mes "[Mr. Ibanoff]"; mes "I said that we should go "+.@d$[getarg(0)]+"!"; mes "You should sail in the right"; @@ -1166,7 +1166,7 @@ S_Rud1: donpcevent "Baehideun1#ship::OnEnable"; } } - close; + close; } //---------------------------------------------------------------------------- @@ -1538,7 +1538,7 @@ mosk_fild01,86,104,3 script Aged Stranger#npc 4_M_GUSLIMAN,{ mes "[Aged Stranger]"; mes "Okay, it's time for your turn. Play it. Play the song that I played."; next; - callsub S_AS_1; + callsub S_AS_1; } mes "[Aged Stranger]"; mes "Um... Your preparations are not"; @@ -1757,7 +1757,7 @@ S_AS_2: mes "Okay. If you are ready to play the"; mes "Gusli, let me know."; set mos_whale_edq,36; - close; + close; case 3: mes "[Aged Stranger]"; mes "I see. Okay, let's go."; @@ -2962,7 +2962,7 @@ mosk_in,136,279,3 script Bed#mos1 HIDDEN_NPC,{ mes "- You come near the bed to look it over. -"; next; while (.@c < 2) { - for (set .@i, 0; .@i < 4; set .@i, .@i + 1) + for (set .@i, 0; .@i < 4; set .@i, .@i + 1) mes " .............. "; set .@c, .@c + 1; next; @@ -3001,7 +3001,7 @@ mosk_in,205,268,3 script Fire pot#mos HIDDEN_NPC,{ mes "- You come near the pot to look it over. -"; next; while (.@c < 2) { - for (set .@i, 0; .@i < 4; set .@i, .@i + 1) + for (set .@i, 0; .@i < 4; set .@i, .@i + 1) mes " .............. "; set .@c, .@c + 1; next; @@ -4080,9 +4080,9 @@ OnTouch: if (.@stworld > 0 && .@stworld < 90) callsub S_BS_1,.@stworld; else if (.@stworld > 89 && .@stworld < 100) getitem 732,1; else getitem 7297,1; - } else if (.@cyworld == 1000) getitem 727,1; + } else if (.@cyworld == 1000) getitem 727,1; else if (.@cyworld > 100 && .@cyworld < 500) getitem 733,1; - else if (.@cyworld > 500 && .@cyworld < 900) getitem 724,1; + else if (.@cyworld > 500 && .@cyworld < 900) getitem 724,1; else getitem 724,1; close; case 2: @@ -4523,7 +4523,7 @@ mosk_in,215,46,5 script Baba Yaga, the Horrible 4_F_BABAYAGA,{ set .@f, 1; break; } - } + } if (!.@f && (countitem(730) || countitem(731) || countitem(732))) { for (set .@i, 0; .@i < getarraysize(.@n); set .@i, .@i + 2) delitem .@n[.@i],.@n[.@i+1]; @@ -5281,7 +5281,7 @@ mosk_in,221,43,0 script #bowl HIDDEN_NPC,{ next; switch(select("Put the materials in it.:Pour water in it.:Stir it up.:It is over!")) { case 1: - set .@m, select (implode(.@m$,":")) - 1; + set .@m, select (implode(.@m$,":")) - 1; if (.@m >= 3) { if (.@nankai == 5 || .@nankai == 6) { if ((.@m == 3 && .@star) || (.@m == 4 && .@sand)) specialeffect EF_POISONHIT; @@ -5409,8 +5409,8 @@ mosk_in,221,43,0 script #bowl HIDDEN_NPC,{ set .@m, select (implode(.@m3$,":")) - 1; if (.@m != 5) specialeffect EF_POISONHIT; else { - set .@maho,.@maho+1; - specialeffect EF_SMOKE; + set .@maho,.@maho+1; + specialeffect EF_SMOKE; } set .@nankai,.@nankai+1; mes "-I put "+((.@m == 5)?"a":"the")+" "+.@m3$[.@m]+" in the pot."; @@ -8111,7 +8111,7 @@ moscovia,213,216,3 script Ryubaba#rus08 4_F_RUSWOMAN2,{ mes "[Ryubaba]"; mes "A Red Ring?!"; next; - } else { + } else { mes "[Ryubaba]"; mes "Heh, what are you talking about? What is that?"; close; @@ -9288,7 +9288,7 @@ moc_pryd04,126,120,0 script Soldier#rus26 4_M_RUSMAN1,{ mes "[A gloomy looking soldier]"; mes "Before the full moon, I will be back to Moscovia and meet her. I will come back so strong and happy that when I go to see her she will not suffer anymore."; close; - } + } } mes "[A gloomy looking soldier]"; mes "... I feel like I lost something precious."; @@ -9586,7 +9586,7 @@ mosk_fild02,243,270,0 script Marozka#rus31 4_M_LGTGRAND,{ mes "[Marozka]"; mes "What is deaf, dumb, and blind and always tells the truth?"; next; - set .@j,select("A Poring:A Picky:A Mirror:A Tree"); + set .@j,select("A Poring:A Picky:A Mirror:A Tree"); set .@rus_quiz01,(.@j==3)?.@rus_quiz01+1:.@rus_quiz01; mes "[Marozka]"; mes "If 4 cats can catch 4 mice every 4 minutes, what is the minimum number of cats needed to get 10 mice in 10 minutes?"; @@ -10543,7 +10543,7 @@ OnTouch: mes "Akkkk?! Eh!? The s-spell..."; next; mes "- You hesitate, the cow, seems to gibe at you, passes by you and runs to bushes !! -"; - if (rand(1,2) == 1) { + if (rand(1,2) == 1) { donpcevent "Cow#rus34::OnDisable"; donpcevent "Cow#rus34::OnEnable"; } else { diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt index f38398b40..109a97f7e 100644 --- a/npc/quests/quests_nameless.txt +++ b/npc/quests/quests_nameless.txt @@ -25,7 +25,7 @@ //- - Help to aprehend the infamous Z-Gang. //= - Variable in use: zdan_edq (Max: 19) //= Unlucky Emerald: -//- - Help a treasure hunter from Prontera get home, and +//- - Help a treasure hunter from Prontera get home, and //= learn the origins of the Unlucky Emerald. //= - Variable in use: treasure_nd (Max: 12) //= - Variable in use: jewel_nd (Max: 31) @@ -973,7 +973,7 @@ OnTouch: } nameless_i,127,207,0 script Dead Crow#Aru HIDDEN_NPC,{ - if (aru_monas < 17) { + if (aru_monas < 17) { mes "^3355FFThere is a dead crow on the ground."; close; } @@ -13067,10 +13067,10 @@ comodo,233,199,5 script Rogue Guild Agent#nd3 1_M_SIGNROGUE,{ mes "[Agent]"; mes "Okay, let me check."; next; - if ((countitem(2278) > 0) || (countitem(2281) > 0) || (countitem(5043) > 0) || (countitem(2288) > 0) || - (countitem(2292) > 0) || (countitem(2297) > 0) || (countitem(5005) > 0) || (countitem(5086) > 0) || - (countitem(5087) > 0) || (countitem(5088) > 0) || (countitem(5089) > 0) || (countitem(5090) > 0) || - (countitem(5176) > 0) || (countitem(5203) > 0) || (countitem(5098) > 0) || (countitem(5121) > 0) || + if ((countitem(2278) > 0) || (countitem(2281) > 0) || (countitem(5043) > 0) || (countitem(2288) > 0) || + (countitem(2292) > 0) || (countitem(2297) > 0) || (countitem(5005) > 0) || (countitem(5086) > 0) || + (countitem(5087) > 0) || (countitem(5088) > 0) || (countitem(5089) > 0) || (countitem(5090) > 0) || + (countitem(5176) > 0) || (countitem(5203) > 0) || (countitem(5098) > 0) || (countitem(5121) > 0) || (countitem(5130) > 0) || (countitem(5177) > 0) || (countitem(5169) > 0) || (countitem(5143) > 0)) { mes "[Agent]"; mes "Excellent!"; diff --git a/npc/quests/quests_niflheim.txt b/npc/quests/quests_niflheim.txt index 6bb2c08ba..b2cda90e8 100644 --- a/npc/quests/quests_niflheim.txt +++ b/npc/quests/quests_niflheim.txt @@ -23,7 +23,7 @@ //= Rescripted Piano Quest. Prior quest progress will be lost. //= 1.4 Fixed NPCs using ID 111 when it shoudl have been 139. [L0ne_W0lf] //= 1.5 Swapped NPC IDs back from last change (139 back to 111). [L0ne_W0lf] -//= Clicking will do nothing, you have to still "touch" the npc. +//= Clicking will do nothing, you have to still "touch" the npc. //= 1.6 Added questlog support. [Euphy] //============================================================ diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt index a39d3de41..a450ee8b0 100644 --- a/npc/quests/quests_rachel.txt +++ b/npc/quests/quests_rachel.txt @@ -5,7 +5,7 @@ //===== Current Version: ===================================== //= 3.6 //===== Description: ========================================= -//= Collection of Rachel Quests +//= Collection of Rachel Quests //= Lost Child Quest: //= - End of quest coincides with opening the Sanctuary. //= - Variable in use: lost_boy (max 13) @@ -3200,7 +3200,7 @@ ice_dun02,120,105,3 script Man Stuck in Ice#cave 4_M_FROZEN1,5,5,{ OnTouch: end; -OnTouchNPC: +OnTouchNPC: emotion e_an; //emotion e_gg,1; //Emote on monster - unsupported end; @@ -3300,7 +3300,7 @@ rachel,265,98,3 script Hamion#aru 4_M_RACHMAN2,{ close; } else if (ice_necklace_q == 3) { - if ((countitem(996) < 5) || (countitem(1354) < 1) || (countitem(7433) < 1)) { + if ((countitem(996) < 5) || (countitem(1354) < 1) || (countitem(7433) < 1)) { mes "[Hamion]"; mes "I need to create"; mes "a magical artifact"; diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt index 16537c2e9..e160e84a8 100644 --- a/npc/quests/quests_umbala.txt +++ b/npc/quests/quests_umbala.txt @@ -513,22 +513,22 @@ um_in,44,71,2 script Utan Shaman 4_F_UMOLDWOMAN,{ switch (select("Earth:Water:Fire:Wind")) { case 1: set .@consume,947; //Horn - set .@amount,15; + set .@amount,15; set .@success,993; //Yellow_Live break; case 2: set .@consume,946; //Snail's_Shell - set .@amount,20; + set .@amount,20; set .@success,991; //Crystal_Blue break; case 3: set .@consume,904; //Scorpion's_Tail - set .@amount,20; + set .@amount,20; set .@success,990; //Boody_Red break; case 4: set .@consume,1013; //Colorful_Shell - set .@amount,25; + set .@amount,25; set .@success,992; //Wind_Of_Verdure break; } @@ -770,7 +770,7 @@ um_in,44,71,2 script Utan Shaman 4_F_UMOLDWOMAN,{ case 996: getitem 992,.@shaman_max; //Wind_Of_Verdure break; - case 997: + case 997: getitem 993,.@shaman_max; //Yellow_Live } delitem .@divide,.@input; @@ -792,7 +792,7 @@ um_in,44,71,2 script Utan Shaman 4_F_UMOLDWOMAN,{ mes "wind stones? Then I will need"; mes "you to bring "+input_want+" pure wind stone."; break; - case 997: + case 997: mes "earth stones? Then I'll need"; mes "you to bring "+.@input+" pure earth stone."; break; diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt index 7c23f30a3..cd57c9945 100644 --- a/npc/quests/quests_veins.txt +++ b/npc/quests/quests_veins.txt @@ -6,7 +6,7 @@ //= 2.5 //===== Description: ========================================= //= [Official Conversion] -//= Collection of Veins Quests +//= Collection of Veins Quests //= Stone Quest: //= - Help an Old Man with his job. //= - Dialog obtained from iRO. diff --git a/npc/quests/quests_yuno.txt b/npc/quests/quests_yuno.txt index f4d42aae1..d0544a5b7 100644 --- a/npc/quests/quests_yuno.txt +++ b/npc/quests/quests_yuno.txt @@ -536,7 +536,7 @@ S_DelItems: mes "I don't know if we can do anything else,"; if (getarg(2) == 1) mes "but this time we have created "+getarg(1); - else + else mes "but this time we have created"; mes "^FF0000"+getitemname(getarg(0))+"^000000 !"; next; @@ -664,7 +664,7 @@ S_DelItems: mes "I don't know if we can do anything else,"; if (getarg(2) == 1) mes "but this time we have created "+getarg(1); - else + else mes "but this time we have created"; mes "^FF0000"+getitemname(getarg(0))+"^000000 !"; next; diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt index 58e208c07..a519a5e62 100644 --- a/npc/quests/seals/brisingamen_seal.txt +++ b/npc/quests/seals/brisingamen_seal.txt @@ -2067,8 +2067,7 @@ prt_church,113,103,1 script Praying Man 4_M_NFMAN,{ close; } } - } - else { + } else { mes "[Sad-looking Man]"; mes "..."; mes "^333333*Sob...*"; @@ -2438,7 +2437,7 @@ prt_castle,84,51,5 script Librarian#2 8W_SOLDIER,{ } prontera,260,354,4 script Woman#Rosa Ellenen 4W_F_01,{ - if ($God2 < $@god_check1){ + if ($God2 < $@god_check1){ mes "[Woman]"; mes "Hm?"; mes "What brings"; @@ -2649,8 +2648,7 @@ gef_dun01,89,192,0 script #lowentrace HIDDEN_NPC,3,3,{ mes "This place is too dangerous.^000000"; close; } - } - else { + } else { close; } case 2: diff --git a/npc/quests/seals/god_weapon_creation.txt b/npc/quests/seals/god_weapon_creation.txt index a367de1ad..16494cd5f 100644 --- a/npc/quests/seals/god_weapon_creation.txt +++ b/npc/quests/seals/god_weapon_creation.txt @@ -138,7 +138,7 @@ gld_dun01,28,85,0 script Grunburti#1::GodDwarf 4_M_DWARF,{ mes "But I can't even create a replica of Mjolnir if the seals are still in place. Until they're released, you'll just have to wait. Bwahaha!"; close; } - } + } mes "[Dwarf Grunburti]"; mes "We Dwarves have too much pride to demonstrate our skills in front of a lowly human!"; next; @@ -176,7 +176,7 @@ gld_dun01,28,85,0 script Grunburti#1::GodDwarf 4_M_DWARF,{ mes "^0000FFBrisingamen^000000!"; next; } - else if ((countitem(7058) > 0) && (countitem(969) > 19) && (countitem(726) > 9) && (countitem(984) > 9) && (countitem(2627) > 0)){ //Gullraifnir Gold Blue_Jewel Oridecon Belt + else if ((countitem(7058) > 0) && (countitem(969) > 19) && (countitem(726) > 9) && (countitem(984) > 9) && (countitem(2627) > 0)){ //Gullraifnir Gold Blue_Jewel Oridecon Belt mes "[Dwarf Grunburti]"; mes "Hmm..."; mes "I guess you"; @@ -457,7 +457,7 @@ que_god01,154,112,4 script Grunburti#god 4_M_DWARF,{ next; switch(select("Make Brisingamen.:Cancel.")) { case 1: - if ((countitem(7073) > 3) && (countitem(7077) > 3) && (countitem(7088) > 2) && (countitem(7090) > 2) && (countitem(7092) > 2) && (countitem(726) > 1) && (countitem(722) > 2) && (countitem(727) > 9) && (countitem(724) > 4) && (countitem(969) > 19) && (countitem(2603) > 0)){ //Jewel_Of_Prayer Silver_Fancy Crystal_Of_Snow Slilince_Wave Air_Stream Blue_Jewel Scarlet_Jewel White_Jewel Cardinal_Jewel_ Gold Necklace + if ((countitem(7073) > 3) && (countitem(7077) > 3) && (countitem(7088) > 2) && (countitem(7090) > 2) && (countitem(7092) > 2) && (countitem(726) > 1) && (countitem(722) > 2) && (countitem(727) > 9) && (countitem(724) > 4) && (countitem(969) > 19) && (countitem(2603) > 0)){ //Jewel_Of_Prayer Silver_Fancy Crystal_Of_Snow Slilince_Wave Air_Stream Blue_Jewel Scarlet_Jewel White_Jewel Cardinal_Jewel_ Gold Necklace mes "[Dwarf Grunburti]"; mes "Never in my wildest"; mes "imaginings have I thought that I'd be crafting this masterpiece for a mere human. Give me a moment."; diff --git a/npc/quests/seals/mjolnir_seal.txt b/npc/quests/seals/mjolnir_seal.txt index 08cb2e030..edaf442d7 100644 --- a/npc/quests/seals/mjolnir_seal.txt +++ b/npc/quests/seals/mjolnir_seal.txt @@ -492,7 +492,7 @@ mjolnir_11,149,247,5 script Dwarf Blacksmith#east 4_M_DWARF,{ mes "..."; close; case 2: - if (countitem(1005) > 0) { //Hammer_Of_Blacksmith + if (countitem(1005) > 0) { //Hammer_Of_Blacksmith mes "[Austri]"; mes "Ah, I see that the entire human race is not worthy of scorn. Unlike many of your kind, I see that you respect your elders."; next; diff --git a/npc/quests/skills/alchemist_skills.txt b/npc/quests/skills/alchemist_skills.txt index d735220b3..2add112c4 100644 --- a/npc/quests/skills/alchemist_skills.txt +++ b/npc/quests/skills/alchemist_skills.txt @@ -2205,7 +2205,7 @@ lhz_in01,218,141,7 script Alchemist#qsk_al 4W_M_02,{ //= Somehow eA engine doesn't let you keep learn't skill V_V' //= 1.2 Added to correct locations, correct NPC's, fixed //= some of the items required and made them into real -//= quests. [Reddozen] +//= quests. [Reddozen] //= 1.3 Fixed bugs and minor typos. Optimized [Lupus] //= 1.3a fixed an item ID typo, thx 2Spiritual Kid //= 1.3b Splitted into different files [DracoRPG] diff --git a/npc/quests/skills/assassin_skills.txt b/npc/quests/skills/assassin_skills.txt index 674090afa..d551b83bb 100644 --- a/npc/quests/skills/assassin_skills.txt +++ b/npc/quests/skills/assassin_skills.txt @@ -996,7 +996,7 @@ OnTouch: //= Somehow eA engine doesn't let you keep learn't skill V_V' //= 1.2 Added to correct locations, correct NPC's, fixed //= some of the items required and made them into real -//= quests. [Reddozen] +//= quests. [Reddozen] //= 1.3 Fixed bugs and minor typos. Optimized [Lupus] //= 1.3a fixed an item ID typo, thx 2Spiritual Kid //= 1.3b Splitted into different files [DracoRPG] diff --git a/npc/quests/skills/blacksmith_skills.txt b/npc/quests/skills/blacksmith_skills.txt index 42c7cd65b..4ec509b3b 100644 --- a/npc/quests/skills/blacksmith_skills.txt +++ b/npc/quests/skills/blacksmith_skills.txt @@ -657,7 +657,7 @@ geffen,172,52,1 script Goodman#qsk_bs 4_M_DWARF,{ //= Somehow eA engine doesn't let you keep learn't skill V_V' //= 1.2 Added to correct locations, correct NPC's, fixed //= some of the items required and made them into real -//= quests. [Reddozen] +//= quests. [Reddozen] //= 1.3 Fixed bugs and minor typos. Optimized [Lupus] //= 1.3a fixed an item ID typo, thx 2Spiritual Kid //= 1.3b Splitted into different files [DracoRPG] diff --git a/npc/quests/skills/crusader_skills.txt b/npc/quests/skills/crusader_skills.txt index 46e294197..8b15136fe 100644 --- a/npc/quests/skills/crusader_skills.txt +++ b/npc/quests/skills/crusader_skills.txt @@ -817,7 +817,7 @@ prt_church,87,127,3 script Pastor#1011 4_M_SAGE_C,{ //= Somehow eA engine doesn't let you keep learn't skill V_V' //= 1.2 Added to correct locations, correct NPC's, fixed //= some of the items required and made them into real -//= quests. [Reddozen] +//= quests. [Reddozen] //= 1.3 Fixed bugs and minor typos. Optimized [Lupus] //= 1.3a fixed an item ID typo, thx 2Spiritual Kid //= 1.3b Splitted into different files [DracoRPG] diff --git a/npc/quests/skills/dancer_skills.txt b/npc/quests/skills/dancer_skills.txt index 6a6c802f6..de72a6fe7 100644 --- a/npc/quests/skills/dancer_skills.txt +++ b/npc/quests/skills/dancer_skills.txt @@ -729,7 +729,7 @@ prontera,183,333,1 script Aelle#qsk_dan02 1_F_PRIEST,{ //= Somehow eA engine doesn't let you keep learn't skill V_V' //= 1.2 Added to correct locations, correct NPC's, fixed //= some of the items required and made them into real -//= quests. [Reddozen] +//= quests. [Reddozen] //= 1.3 Fixed bugs and minor typos. Optimized [Lupus] //= 1.3a fixed an item ID typo, thx 2Spiritual Kid //= 1.3b Splitted into different files [DracoRPG] diff --git a/npc/quests/skills/hunter_skills.txt b/npc/quests/skills/hunter_skills.txt index eca408915..d2c1a1204 100644 --- a/npc/quests/skills/hunter_skills.txt +++ b/npc/quests/skills/hunter_skills.txt @@ -13,7 +13,7 @@ //= Somehow eA engine doesn't let you keep learn't skill V_V' //= 1.2 Added to correct locations, correct NPC's, fixed //= some of the items required and made them into real -//= quests. [Reddozen] +//= quests. [Reddozen] //= 1.3 Fixed bugs and minor typos. Optimized [Lupus] //= 1.3a fixed an item ID typo, thx 2Spiritual Kid //= 1.3b Splitted into different files [DracoRPG] diff --git a/npc/quests/skills/knight_skills.txt b/npc/quests/skills/knight_skills.txt index 818303c68..aca35e860 100644 --- a/npc/quests/skills/knight_skills.txt +++ b/npc/quests/skills/knight_skills.txt @@ -519,7 +519,7 @@ prontera,66,358,5 script Knight#gattack 4_M_JOB_KNIGHT1,{ //= Somehow eA engine doesn't let you keep learn't skill V_V' //= 1.2 Added to correct locations, correct NPC's, fixed //= some of the items required and made them into real -//= quests. [Reddozen] +//= quests. [Reddozen] //= 1.3 Fixed bugs and minor typos. Optimized [Lupus] //= 1.3a fixed an item ID typo, thx 2Spiritual Kid //= 1.3b Splitted into different files [DracoRPG] diff --git a/npc/quests/skills/monk_skills.txt b/npc/quests/skills/monk_skills.txt index 1522dec86..f4788e12d 100644 --- a/npc/quests/skills/monk_skills.txt +++ b/npc/quests/skills/monk_skills.txt @@ -439,7 +439,7 @@ monk_test,316,69,5 script Monk#qsk_mo 4_M_CHNMONK,{ //= Somehow eA engine doesn't let you keep learn't skill V_V' //= 1.2 Added to correct locations, correct NPC's, fixed //= some of the items required and made them into real -//= quests. [Reddozen] +//= quests. [Reddozen] //= 1.3 Fixed bugs and minor typos. Optimized [Lupus] //= 1.3a fixed an item ID typo, thx 2Spiritual Kid //= 1.3b Splitted into different files [DracoRPG] diff --git a/npc/quests/skills/priest_skills.txt b/npc/quests/skills/priest_skills.txt index ebed55087..68da2767e 100644 --- a/npc/quests/skills/priest_skills.txt +++ b/npc/quests/skills/priest_skills.txt @@ -369,7 +369,7 @@ prt_church,111,112,1 script Sister Linus 1_F_PRIEST,{ //= Somehow eA engine doesn't let you keep learn't skill V_V' //= 1.2 Added to correct locations, correct NPC's, fixed //= some of the items required and made them into real -//= quests. [Reddozen] +//= quests. [Reddozen] //= 1.3 Fixed bugs and minor typos. Optimized [Lupus] //= 1.3a fixed an item ID typo, thx 2Spiritual Kid //= 1.3b Splitted into different files [DracoRPG] diff --git a/npc/quests/skills/rogue_skills.txt b/npc/quests/skills/rogue_skills.txt index 7f12d3d2e..cde8fc2d9 100644 --- a/npc/quests/skills/rogue_skills.txt +++ b/npc/quests/skills/rogue_skills.txt @@ -1199,7 +1199,7 @@ function script F_Kienna { mes "[Kienna]"; mes "Alright, we're done"; mes "here. You earned a"; - switch(.@suc_1) { + switch(.@suc_1) { case 10: mes "training grade of ''^0000FFS^000000.''"; mes "That's a perfect score!"; @@ -1361,7 +1361,7 @@ OnStartArena: //= Somehow eA engine doesn't let you keep learn't skill V_V' //= 1.2 Added to correct locations, correct NPC's, fixed //= some of the items required and made them into real -//= quests. [Reddozen] +//= quests. [Reddozen] //= 1.3 Fixed bugs and minor typos. Optimized [Lupus] //= 1.3a fixed an item ID typo, thx 2Spiritual Kid //= 1.3b Splitted into different files [DracoRPG] diff --git a/npc/quests/skills/sage_skills.txt b/npc/quests/skills/sage_skills.txt index 2bcda5082..5f065a892 100644 --- a/npc/quests/skills/sage_skills.txt +++ b/npc/quests/skills/sage_skills.txt @@ -488,7 +488,7 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{ //= Somehow eA engine doesn't let you keep learn't skill V_V' //= 1.2 Added to correct locations, correct NPC's, fixed //= some of the items required and made them into real -//= quests. [Reddozen] +//= quests. [Reddozen] //= 1.3 Fixed bugs and minor typos. Optimized [Lupus] //= 1.3a fixed an item ID typo, thx 2Spiritual Kid //= 1.3b Splitted into different files [DracoRPG] diff --git a/npc/quests/skills/thief_skills.txt b/npc/quests/skills/thief_skills.txt index c0f97859b..0f31c7c5e 100644 --- a/npc/quests/skills/thief_skills.txt +++ b/npc/quests/skills/thief_skills.txt @@ -5,7 +5,7 @@ //===== Current Version: ===================================== //= 1.8 //===== Description: ========================================= -//= Quests for skills: Sand Attack, Back Slide, Find Stone, +//= Quests for skills: Sand Attack, Back Slide, Find Stone, //= Stone Fling. //===== Additional Comments: ================================= //= 1.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf] diff --git a/npc/quests/skills/wizard_skills.txt b/npc/quests/skills/wizard_skills.txt index 4cab1ffe6..9947c3ad0 100644 --- a/npc/quests/skills/wizard_skills.txt +++ b/npc/quests/skills/wizard_skills.txt @@ -440,7 +440,7 @@ prt_in,82,98,3 script Simon Mayace#q_wiz 1_ETC_01,{ //= Somehow eA engine doesn't let you keep learn't skill V_V' //= 1.2 Added to correct locations, correct NPC's, fixed //= some of the items required and made them into real -//= quests. [Reddozen] +//= quests. [Reddozen] //= 1.3 Fixed bugs and minor typos. Optimized [Lupus] //= 1.3a fixed an item ID typo, thx 2Spiritual Kid //= 1.3b Splitted into different files [DracoRPG] diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt index 83704c8e5..f58fd574d 100644 --- a/npc/quests/the_sign_quest.txt +++ b/npc/quests/the_sign_quest.txt @@ -12555,7 +12555,7 @@ function script F_UpdateSignVars { // Because of the horrible way this was scripted, it's incompatable // With the new script, So I am resetting the quest to the start // of this step. - if (signlaichin >= 1) { + if (signlaichin >= 1) { mes "^FF0000You stumble and drop the your^000000"; if (countitem(7306)) { mes "^FF0000"+getitemname(7306)+"^000000"; @@ -12569,11 +12569,11 @@ function script F_UpdateSignVars { mes "^FF0000pieces on the ground and they vanish! Perhaps you should talk to Lachin.^000000"; delitem 7306,countitem(7306); //Fragment_Of_Soul delitem 7307,countitem(7307); //Whisper_Of_Soul - set sign_q,rand(97,100); + set sign_q,rand(97,100); } // Same BS as above, unable to save pickup time for 'The Sign' from Engel. - if (signengelhour) { + if (signengelhour) { mes "^FF0000You see that Engel has forgotten to look at 'The Sign', how you got it back is a mystery too you, but you should remind Engel that he needs to look at it.^000000"; getitem 7314,1; //The_Sign set sign_q,139; @@ -12598,7 +12598,7 @@ function script F_UpdateSignVars { } // Unable to save when the Sign should be picked up from Metz - if (signmetzhour) { + if (signmetzhour) { mes "^FF0000You see that Metz has forgotten to look at 'The Sign', how you got it back is a mystery too you, but you should remind Metz that he needs to look at it.^000000"; getitem 7314,1; //The_Sign set sign_q,138; diff --git a/npc/re/cities/dicastes.txt b/npc/re/cities/dicastes.txt index efd1c6efc..90130c3ab 100644 --- a/npc/re/cities/dicastes.txt +++ b/npc/re/cities/dicastes.txt @@ -26,7 +26,7 @@ dicastes01,194,159,5 script Excited Galten#a 4_MAN_GALTUN1,{ mes "As long as we have him,"; mes "it will only be a matter of time before Sapha"; mes "will rule this land."; - close; + close; } mes "¡ø¢²¢£ ¡Ð ¡ò¡ð¡ð"; mes "¡÷¡ø¡ñ ¡ü ¡ü"; @@ -49,7 +49,7 @@ dicastes01,202,86,3 script Sentinel#a 4_MAN_GALTUN1,{ next; mes "[Sentinel]"; mes "Hey, you are an outsider!"; - close; + close; } mes "¡ô¢±¢± ¡û ¡ó¡Ð¡ñ ¢£ ¢¤¡ú"; mes "¡ø¡ó¢² ¢¤ "; @@ -60,7 +60,7 @@ dicastes01,202,86,3 script Sentinel#a 4_MAN_GALTUN1,{ next; mes "[Sentinel]"; mes "¡ñ¡ö¡ï ¡ú ¡ó¢³¡ô"; - close; + close; } dicastes01,194,95,5 script Sentinel#b 4_MAN_GALTUN,{ @@ -69,7 +69,7 @@ dicastes01,194,95,5 script Sentinel#b 4_MAN_GALTUN,{ mes "I permit your entry."; mes "But if you dare to cause trouble"; mes "you won't know what hit you. Beware!"; - close; + close; } mes "¡ø¡ô¡ü ¡ø ¡ó"; mes "¡ø¡ï¡û ¡ó ¡û¢¤¢² ¡÷ ¢£"; @@ -96,7 +96,7 @@ dicastes01,244,166,0 script Training Galten#b 4_MAN_GALTUN,{ if (isequipped(2782)) { mes "I wonder if Ahat knows how"; mes "hard I am training."; - close; + close; } mes "¡ø¡ô¡ü ¡ø"; mes "¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü ¡ø"; @@ -127,7 +127,7 @@ dicastes01,248,129,0 script Training Galten#d 4_MAN_GALTUN,{ mes "I heard this isn't training"; mes "equipment but a massager"; mes "for trainees like me."; - close; + close; } mes "¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü"; mes "¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü ¡ø"; @@ -155,7 +155,7 @@ dic_in01,349,282,4 script Waiting Galten#in_1 4_MAN_GALTUN1,{ mes "[Waiting Galten]"; mes "Here is the Battle Station."; mes "We are all tensed up to be ready for action."; - close; + close; } mes "[¢²¡Ð¡û ¡ù ¡Ð]"; mes "¡ñ¡õ¡ü ¢£ ¡ó"; @@ -167,7 +167,7 @@ dic_in01,370,261,1 script Waiting Galten#in_2 4_MAN_GALTUN1,{ if (isequipped(2782)) { mes "[Waiting Galten]"; mes "Boring."; - close; + close; } mes "[¢²¡Ð¡û ¡ù ¡Ð]"; mes "¡ù¢¤¢±"; @@ -178,7 +178,7 @@ dic_in01,381,261,1 script Waiting Galten#in_3 4_MAN_GALTUN1,{ if (isequipped(2782)) { mes "[Waiting Galten]"; mes "Zzzzz..."; - close; + close; } mes "[¢²¡Ð¡û ¡ù ¡Ð]"; mes "¡ú¡ô"; @@ -189,7 +189,7 @@ dic_in01,370,282,4 script Waiting Galten#in_4 4_MAN_GALTUN1,{ if (isequipped(2782)) { mes "[Waiting Galten]"; mes "El Dicastes is the most peaceful place in this world as long as I am here."; - close; + close; } mes "[¢²¡Ð¡û ¡ù ¡Ð]"; mes "¡ï¡ï¢³ ¡þ ¡ö¢³¢£ ¢± ¢³¡û¡õ ¡ø ¡þ¡ï¡ï ¡ø ¡û"; @@ -200,7 +200,7 @@ dic_in01,354,219,4 script Resting Galten#in_5 4_MAN_GALTUN1,{ if (isequipped(2782)) { mes "[Resting Galten]"; mes "Resting is always so sweet."; - close; + close; } mes "[¡õ¡ø¡ò ¡ü ¢¤]"; mes "¡ï¡õ¡ù ¡ö ¡ò¡ð¢² ¢³ ¡ö"; @@ -214,7 +214,7 @@ dic_in01,365,197,1 script Resting Galten#in_6 4_MAN_GALTUN1,{ next; mes "[Resting Galten]"; mes "You say I don't look like I'm resting? But I'm already used to this."; - close; + close; } mes "[¡õ¡ø¡ò ¡ü ¢¤]"; mes "¡ô¡ï¢¤ ¡ö ¡ù¡ð¡ñ ¡ü ¡ó¡û¡û"; @@ -230,7 +230,7 @@ dic_in01,29,119,4 script Resting Piom#04 4_MAN_PIOM6,{ if (isequipped(2782)) { mes "[Resting Piom]"; mes "Why is it so noisy when I'm trying to get rest?"; - close; + close; } mes "[¢£¡ù¡ò ¢¤ ¡ù]"; mes "¡ü¢²¡ð ¡Ð ¡ò¡ø¢² ¡ô ¢²¡õ"; @@ -246,7 +246,7 @@ dic_in01,91,113,5 script Suspicious Piom#a 4_MAN_PIOM6,{ if(select("Nope!:You first.") == 1) { mes "[Suspicious Piom]"; mes "Never mind."; - close; + close; } mes "[Suspicious Piom]"; mes "Oh, you do seem to know?"; @@ -258,11 +258,11 @@ dic_in01,91,113,5 script Suspicious Piom#a 4_MAN_PIOM6,{ mes "[Suspicious Piom]"; mes "I'm only a very curious"; mes "ordinary Piom."; - close; + close; } mes "[Suspicious Piom]"; mes "I am not going to say anything, either!"; - close; + close; } mes "¡ó¢³¡ó ¡ó ¡ó¡þ¡ö"; mes "¡õ ¢³¢²¡÷ ¡ó¡ó"; @@ -270,7 +270,7 @@ dic_in01,91,113,5 script Suspicious Piom#a 4_MAN_PIOM6,{ if(select("Can't tell what it means:Is it a curse??") == 2) { mes "[Suspicious Piom]"; mes "Too bad."; - close; + close; } mes "[Suspicious Piom]"; mes "Be on your"; @@ -285,7 +285,7 @@ dic_in01,168,116,5 script Tired Piom#c 4_MAN_PIOM5,{ mes "information, you'd have better"; mes "luck with the Cat Merchant than wandering around here."; mes "But of course you'll have to pay the price."; - close; + close; } mes "¡þ¡õ¡ð ¢³ ¢³¡þ"; mes "¡þ¡ø¡ð ¡ö ¡ñ¡ú¡ð ¡ò"; @@ -302,7 +302,7 @@ dic_in01,149,104,5 script Tired Piom#b 4_MAN_PIOM2,{ mes "I think the effects are weaker than before,"; mes "or is it just me?"; emotion e_what; - close; + close; } mes "¡ð¡Ð¡ú ¡ø ¢²"; mes "¡ö¡õ¡ó ¢¤ ¡ò¡ò¢³ ¡ô ¡ô¡ó¡ñ"; @@ -327,7 +327,7 @@ dic_in01,341,113,3 script Tired Piom#a 4_MAN_PIOM5,{ emotion e_swt; mes "[Tired Piom]"; mes "I'll be rejected again, right?"; - close; + close; } mes "¡÷¡ò¡û ¡ó ¡ó¡Ð¢±"; mes "¡ó¡õ¡ù ¡þ ¡ò¢±¡ñ ¡õ ¢£"; @@ -364,7 +364,7 @@ dic_in01,32,54,5 script Venknick#el_01 4_MAN_BENKUNI,{ mes "[Venknick]"; mes "Oh feels so refreshed."; mes "The refined Bradium was the best ever. Do you want to try some?"; - close; + close; } mes "[¡ó¡ò¡ð]"; mes "¡ù¡ó¢¤ ¢± ¢£"; @@ -408,7 +408,7 @@ dic_in01,360,125,5 script Serious Venknicka 4_MAN_BENKUNI,{ mes "A sudden increase in Bradium production."; mes "Why?"; mes "I will have to get more factory lines running."; - close; + close; } mes "¡û¡õ¡ñ ¢² ¢²¢¤¡Ð ¢² ¡ü¡ñ¡õ"; mes "¡þ¡ó¡ö ¢²"; @@ -418,7 +418,7 @@ dic_in01,360,125,5 script Serious Venknicka 4_MAN_BENKUNI,{ dic_in01,42,250,5 script Guide#diel_1 4_MAN_PIOM6,{ if (isequipped(2782)) { - if (ep13_3_invite > 5) { + if (ep13_3_invite > 5) { mes "[Guide]"; mes "I'm Dior, your kind guide for El Dicastes."; mes "How can I help you?"; @@ -437,7 +437,7 @@ dic_in01,42,250,5 script Guide#diel_1 4_MAN_PIOM6,{ mes "[Guide]"; mes "Oh, you didn't ask?"; mes "But since I'm Dior, the kind guide. He he."; - close; + close; } mes "- The guide looks at you with an alert expression. -"; close; @@ -465,14 +465,14 @@ dic_in01,42,250,5 script Guide#diel_1 4_MAN_PIOM6,{ dic_in01,335,34,5 script Talkative Piom#a 4_MAN_PIOM4,{ mes "[Talkative Piom]"; - if (isequipped(2782)) { + if (isequipped(2782)) { mes "At my factory"; mes "we not only refine Bradium,"; mes "but we also produce various"; mes "tools for daily use."; mes "We manufacture war supplies"; mes "here too."; - close; + close; } mes "¡ü¡ù¢± ¢³"; mes "¡÷¡ø¡ï ¡þ ¡ó¡ó"; @@ -488,7 +488,7 @@ dic_in01,387,30,1 script Manuk Piom#a 4_MAN_PIOM,{ if (isequipped(2782)) { mes "You! We met in Manuk, didn't we?"; mes "I've come to pick up the weapon I ordered."; - close; + close; } mes "¡ü¡ó¡þ ¡ó ¡ï¡ð¢¤ ¡ü ¡ð¢±"; mes "¡ù¡ô¡ï ¡ú ¡ñ¡ù¢³ ¡ó ¡ò¡ö¡ó ¡ô¡ô"; @@ -503,7 +503,7 @@ dicastes01,282,210,4 script Free Knit#a 4_MAN_NITT,{ mes "Saphas can live forever."; mes "Our childhood lasts 10 years,"; mes "which is short."; - close; + close; } mes "¡ñ¡þ¡ð ¡ó ¡ü¡ò¡ö ¡÷"; mes "¢³¡ð¡ï ¢£ ¡ù¡ô¡ò ¡ô ¡ó¡þ¡ñ ¢² ¡ñ¡û¢£ ¢²"; @@ -527,7 +527,7 @@ dicastes01,246,210,3 script Free Venknick#a 4_MAN_BENKUNI,{ mes "[Free Venknick]"; mes "The thing rolling around is a gem,"; mes "but why are you interested in it?"; - close; + close; } mes "¡ô¡ï¢£ ¢¤ ¡÷¡õ¢± ¡ü ¡ñ¡õ"; mes "¡ü¢³"; @@ -549,7 +549,7 @@ dicastes01,235,245,4 script Excited Piom#a 4_MAN_PIOM4,{ mes "Have you seen Ahat?"; emotion e_ho; mes "His popularity here in El Discastes is phenomenal!"; - close; + close; } mes "[Excited Piom]"; mes "¡ú¡þ¡ó ¢³ ¡ü¢²¡ñ ¢±"; @@ -566,7 +566,7 @@ dicastes01,284,262,3 script Favorable Knit#a 4_MAN_NITT,{ mes "We start by living together in common facilities after we are born."; mes "That is why all Saphas are like family."; mes "We never have any quarrels between classes."; - close; + close; } mes "¡ô¢±¡ó ¡õ ¡ú¡÷¡Ð ¡õ"; mes "¡ü¡ï¡Ð ¡õ ¡ô¡ó¡ü ¡ó ¢³"; @@ -585,7 +585,7 @@ dicastes01,164,180,4 script Limpy Piom#a 4_MAN_PIOM6,{ mes "I hope it doesn't come all"; mes "the way to the capital city here."; emotion e_dots; - close; + close; } mes "¢²¡ô¡þ ¡ù ¡õ¡Ð"; mes "¢³¡ô¡û ¡ú ¡ø"; @@ -610,7 +610,7 @@ dicastes01,191,202,4 script Complaining Galten#fihs 4_MAN_GALTUN,{ mes "[Complaining Galten]"; mes "Then you don't know about the legend behind the statue?"; mes "Then, I don't know what to talk about with you."; - close; + close; } emotion e_gg,0,"Crazy Venknick#fihsing1"; mes "[Complaining Galten]"; @@ -645,7 +645,7 @@ dicastes01,202,197,4 script Crazy Venknick#fihsing1 4_MAN_BENKUNI,{ if(select("Give 5000 Zeny.:Don't give 5000 Zeny.") == 2) { mes "[Crazy Venknick]"; mes "Don't come back with regrets."; - close; + close; } if (Zeny < 5000) { mes "[Crazy Venknick]"; @@ -653,7 +653,6 @@ dicastes01,202,197,4 script Crazy Venknick#fihsing1 4_MAN_BENKUNI,{ mes "no legend to share with"; mes "the poor."; close; - close; } Zeny -= 5000; mes "[Crazy Venknick]"; @@ -676,7 +675,7 @@ dicastes01,202,197,4 script Crazy Venknick#fihsing1 4_MAN_BENKUNI,{ sc_start SC_BLIND,20000,0; next; mes "You feel outraged at being tricked."; - close; + close; } mes "[¡ö¡ú¡ù ¢³ ]"; mes "¢²¡û¡ó ¡ó ¡ù¢¤¡ø"; diff --git a/npc/re/cities/malangdo.txt b/npc/re/cities/malangdo.txt index ae5d8b48c..e8cfdb615 100644 --- a/npc/re/cities/malangdo.txt +++ b/npc/re/cities/malangdo.txt @@ -359,7 +359,7 @@ OnTouch: case 3: soundeffect "assassin_of_sunset.wav",0; break; - case 4: + case 4: emotion e_ho; emotion e_ho,0,"Wandering Minstrel#mal"; break; diff --git a/npc/re/guides/guides_dicastes.txt b/npc/re/guides/guides_dicastes.txt index e5b6f4133..9feca9df7 100644 --- a/npc/re/guides/guides_dicastes.txt +++ b/npc/re/guides/guides_dicastes.txt @@ -84,7 +84,7 @@ dicastes01,181,191,5 script Traveler Ichack#info 4_M_SHADOWCHASER,2,2,{ close; } OnTouch: - if (ep13_3_invite == 6) + if (ep13_3_invite == 6) emotion e_gasp,0; end; } diff --git a/npc/re/instances/BangungotHospital.txt b/npc/re/instances/BangungotHospital.txt index de076489e..b995092a1 100644 --- a/npc/re/instances/BangungotHospital.txt +++ b/npc/re/instances/BangungotHospital.txt @@ -392,7 +392,7 @@ OnInstanceInit: disablenpc instance_npcname("#Memorial Start_time"); end; OnEnable: - specialeffect EF_BAT2,AREA,instance_npcname("#Memorial Start"); + specialeffect EF_BAT2,AREA,instance_npcname("#Memorial Start"); initnpctimer; end; OnDisable: diff --git a/npc/re/instances/BuwayaCave.txt b/npc/re/instances/BuwayaCave.txt index f20a7e3b5..0a26dab9c 100644 --- a/npc/re/instances/BuwayaCave.txt +++ b/npc/re/instances/BuwayaCave.txt @@ -142,7 +142,7 @@ OnTouch: setquest 4229; warp "1@ma_c",35,57; end; - } + } case 2: mes "[Guard]"; mes "You must value your life."; diff --git a/npc/re/instances/HazyForest.txt b/npc/re/instances/HazyForest.txt index c76fe2c46..0c32c73c6 100644 --- a/npc/re/instances/HazyForest.txt +++ b/npc/re/instances/HazyForest.txt @@ -111,8 +111,9 @@ bif_fild01,158,340,5 script Laphine Soldier#mist 4_M_FAIRYSOLDIER,{ mes "but maybe you humans can."; mes "Good luck!"; close; - } else + } else { instance_destroy(.@instance); + } case 2: mes "[Laphine Soldier]"; mes "Well, you've made the right decision."; @@ -156,13 +157,13 @@ bif_fild01,161,355,0 script Log Tunnel CLEAR_NPC,{ mes "The world beyond the log tunnel looks dark and suffocating."; mes "Your instinct is screaming that this forest is dangerous."; close; - } else { + } else { if (checkquest(7211,PLAYTIME) == 2) erasequest 7211; if (checkquest(7211,PLAYTIME) == -1) setquest 7211; mapannounce "bif_fild01",getpartyname(getcharid(1))+" party's "+strcharinfo(0)+" member is entering the Mistwood Maze.",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0 warp "1@mist",89,29; close; - } + } } // Instance Scripts diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt index 33027e830..4be3133bc 100644 --- a/npc/re/instances/OldGlastHeim.txt +++ b/npc/re/instances/OldGlastHeim.txt @@ -480,7 +480,7 @@ OnTimer35000: end; OnTimer45000: donpcevent instance_npcname("Himmelmez#ghinstance1")+"::OnTalk4"; - end; + end; OnTimer50000: donpcevent instance_npcname("Himmelmez#ghinstance1")+"::OnTalk5"; end; @@ -517,7 +517,7 @@ OnTimer85000: hideonnpc instance_npcname("Khalitzburg Crusader#22"); set .@map$, instance_mapname("1@gl_k"); - set .@label$, instance_npcname("#talkinstance1")+"::OnMyMobDead"; + set .@label$, instance_npcname("#talkinstance1")+"::OnMyMobDead"; monster .@map$,145,59,"Abyss Knight",2470,1,.@label$; monster .@map$,154,59,"Abyss Knight",2470,1,.@label$; monster .@map$,145,69,"Abyss Knight",2470,1,.@label$; @@ -558,7 +558,7 @@ OnTimer88000: hideonnpc instance_npcname(".#ghinstance22"); set .@map$, instance_mapname("1@gl_k"); - set .@label$, instance_npcname("#talkinstance1")+"::OnMyMobDead"; + set .@label$, instance_npcname("#talkinstance1")+"::OnMyMobDead"; monster .@map$,145,54,"Khalitzburg",2471,1,.@label$; monster .@map$,154,54,"Khalitzburg",2471,1,.@label$; monster .@map$,145,64,"Khalitzburg",2471,1,.@label$; @@ -1771,7 +1771,7 @@ OnTalk1: } 2@gl_k,158,252,3 script Himmelmez#ghinstance4 4_F_HIMEL,4,4,{ - end; + end; OnInstanceInit: donpcevent instance_npcname("Himmelmez#ghinstance4")+"::OnDisable"; end; diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt index 114555547..8faa15cf2 100644 --- a/npc/re/instances/WolfchevLaboratory.txt +++ b/npc/re/instances/WolfchevLaboratory.txt @@ -434,13 +434,13 @@ lighthalzen,342,291,4 script Weird old man#Bio4Reward 4_M_EINOLD,{ mes "These are the armors I have."; next; for(.@i = 1; .@i < 8; .@i++) { - if(((.@i == 1 || .@i == 5) && (countitem(Will_Of_Warrior) >= 100) && (countitem(Blood_Thirst) >= 50) && - (countitem(Goast_Chill) >= 35)) || - ((.@i == 2 || .@i == 3) && (countitem(Will_Of_Warrior) >= 100) && (countitem(Blood_Thirst) >= 50) && + if(((.@i == 1 || .@i == 5) && (countitem(Will_Of_Warrior) >= 100) && (countitem(Blood_Thirst) >= 50) && + (countitem(Goast_Chill) >= 35)) || + ((.@i == 2 || .@i == 3) && (countitem(Will_Of_Warrior) >= 100) && (countitem(Blood_Thirst) >= 50) && (countitem(Goast_Chill) >= 22)) || - ((.@i == 4 || .@i == 7) && (countitem(Will_Of_Warrior) >= 300) && (countitem(Blood_Thirst) >= 300) && + ((.@i == 4 || .@i == 7) && (countitem(Will_Of_Warrior) >= 300) && (countitem(Blood_Thirst) >= 300) && (countitem(Goast_Chill) >= 400)) || - ((.@i == 6) && (countitem(Will_Of_Warrior) >= 100) && (countitem(Blood_Thirst) >= 50) && + ((.@i == 6) && (countitem(Will_Of_Warrior) >= 100) && (countitem(Blood_Thirst) >= 50) && (countitem(Goast_Chill) >= 30))) { .@armor$[.@i] = "^0000FF"; } else { @@ -465,8 +465,8 @@ lighthalzen,342,291,4 script Weird old man#Bio4Reward 4_M_EINOLD,{ break; case 2: mes "<<Giant Shield[1]>>"; - mes "Decrease 5% of Damage from Large Monsters, if Refine Lv is 9, decrease 5% more of the Damage."; - mes "Shield / Def 130 / Weight 280 / Required Lv 100 / Socket 1 / for 3rd Swordman Classes"; + mes "Decrease 5% of Damage from Large Monsters, if Refine Lv is 9, decrease 5% more of the Damage."; + mes "Shield / Def 130 / Weight 280 / Required Lv 100 / Socket 1 / for 3rd Swordman Classes"; callsub L_Reward, Giant_Shield, 100, 50, 35; break; case 3: @@ -516,15 +516,15 @@ lighthalzen,342,291,4 script Weird old man#Bio4Reward 4_M_EINOLD,{ mes "These are the Weapons I got."; next; for(.@i = 1; .@i < 15; .@i++) { - if(((.@i == 1) && (countitem(Will_Of_Warrior) >= 50) && (countitem(Blood_Thirst) >= 100) && + if(((.@i == 1) && (countitem(Will_Of_Warrior) >= 50) && (countitem(Blood_Thirst) >= 100) && (countitem(Goast_Chill) >= 10)) || - ((.@i == 2) && (countitem(Will_Of_Warrior) >= 50) && (countitem(Blood_Thirst) >= 100) && + ((.@i == 2) && (countitem(Will_Of_Warrior) >= 50) && (countitem(Blood_Thirst) >= 100) && (countitem(Goast_Chill) >= 85)) || - ((.@i == 3 || .@i == 4 || (.@i >= 8 && .@i < 11) || .@i >= 12) && (countitem(Will_Of_Warrior) >= 50) && + ((.@i == 3 || .@i == 4 || (.@i >= 8 && .@i < 11) || .@i >= 12) && (countitem(Will_Of_Warrior) >= 50) && (countitem(Blood_Thirst) >= 100) && (countitem(Goast_Chill) >= 35)) || ((.@i == 5 || .@i == 7 || .@i == 11) && (countitem(Will_Of_Warrior) >= 50) && (countitem(Blood_Thirst) >= 100) && (countitem(Goast_Chill) >= 40)) || - ((.@i == 6) && (countitem(Will_Of_Warrior) >= 300) && (countitem(Blood_Thirst) >= 300) && + ((.@i == 6) && (countitem(Will_Of_Warrior) >= 300) && (countitem(Blood_Thirst) >= 300) && (countitem(Goast_Chill) >= 400))) { .@weapon$[.@i] = "^0000FF"; } else { @@ -865,7 +865,7 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{ .@equipped$[.@i] = getequipname(.@parts[.@i]); } } - switch(select("I changed my mind.", .@equipped$[0], .@equipped$[1], .@equipped$[2], .@equipped$[3], .@equipped$[4], + switch(select("I changed my mind.", .@equipped$[0], .@equipped$[1], .@equipped$[2], .@equipped$[3], .@equipped$[4], .@equipped$[5], .@equipped$[6])) { case 1: mes "[Pudding]"; @@ -947,8 +947,8 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{ .@refine_count = getequiprefinerycnt(.@position); .@equip_item = getequipid(.@position); .@lhz_max_num = 4000; - if(.@equip_item == Agent_Katar || .@equip_item == Guillotine_Katar || .@equip_item == Ygnus_Stale || - .@equip_item == End_Sektura || .@equip_item = Cannon_Spear || .@equip_item == Giant_Lance || + if(.@equip_item == Agent_Katar || .@equip_item == Guillotine_Katar || .@equip_item == Ygnus_Stale || + .@equip_item == End_Sektura || .@equip_item = Cannon_Spear || .@equip_item == Giant_Lance || .@equip_item == Aztoe_Nail || .@equip_item == Scarletto_Nail || .@equip_item == Bloody_Cross) { .@type = 1; if(.@equip_item == Giant_Lance) @@ -958,7 +958,7 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{ } else if(.@equip_item == Chilly_Spell_Book || .@equip_item == Recovery_Light) { .@type = 3; } else if(.@equip_item== Giant_Shield || .@equip_item == Geffenia_Book_Water || .@equip_item == Bible_Of_Promise2 || - .@equip_item == Salvage_Cape || .@equip_item == Assassin_Handcuffs || .@equip_item == Green_Operation_Coat || + .@equip_item == Salvage_Cape || .@equip_item == Assassin_Handcuffs || .@equip_item == Green_Operation_Coat || .@equip_item == Ancient_Gold_Deco) { if(.@equip_item == Salvage_Cape || .@equip_item == Ancient_Gold_Deco) .@lhz_max_num = 4200; @@ -2020,7 +2020,7 @@ lhz_dun04,151,276,3 script Researcher#memo 4_LGTSCIENCE,{ mes "Now, your party is free to pass the entrance."; } else { instance_destroy(.@instance); - } + } } close; } else { @@ -2249,7 +2249,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ OnEnable: specialeffect EF_LIGHTSPHERE; enablenpc instance_npcname("Manual Sheet#1_1"); - end; + end; } // Left Valve @@ -2865,7 +2865,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ monster .@map$,85,58,"Starving Lab animal",MD_DESERT_WOLF,1,.@label$; monster .@map$,82,60,"Starving Lab animal",MD_DESERT_WOLF_B,1,.@label$; monster .@map$,83,58,"Starving Lab animal",MD_DESERT_WOLF_B,1,.@label$; - monster .@map$,85,56,"Starving Lab animal",MD_DESERT_WOLF_B,1,.@label$; + monster .@map$,85,56,"Starving Lab animal",MD_DESERT_WOLF_B,1,.@label$; monster .@map$,86,60,"Starving Lab animal",MD_DESERT_WOLF_B,1,.@label$; monster .@map$,87,58,"Starving Lab animal",MD_DESERT_WOLF_B,1,.@label$; end; @@ -3135,7 +3135,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ end; case 13: donpcevent instance_npcname("Howard Alt-Eisen#boss13")+"::OnEnable"; - end; + end; } OnDisable: diff --git a/npc/re/jobs/novice/supernovice_ex.txt b/npc/re/jobs/novice/supernovice_ex.txt index 05d98dc96..044e386fe 100644 --- a/npc/re/jobs/novice/supernovice_ex.txt +++ b/npc/re/jobs/novice/supernovice_ex.txt @@ -477,7 +477,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 4_M_SIT_NOVICE,{ nude; callfunc "F_ClearJobVar"; // -- Clears all job variables for the current player jobchange roclass(eaclass()|EAJL_THIRD); - set EXSUPNOV_Q,5; + set EXSUPNOV_Q,5; emotion e_heh; mes "[Nodor]"; mes "Puhahahahahahahahahahah!!"; diff --git a/npc/re/kafras/kafras.txt b/npc/re/kafras/kafras.txt index 448bbc8c4..3e94f180d 100644 --- a/npc/re/kafras/kafras.txt +++ b/npc/re/kafras/kafras.txt @@ -9,12 +9,12 @@ //= arg(0): 0 - Default Kafra message //= 1 - Niflhiem Kafra message //= 2 - Guild Kafra message -//= arg(1): 1 - Disable teleport menu +//= arg(1): 1 - Disable teleport menu //= arg(2): 1 - Disable info menu //= arg(3): Cost of Storage service //= arg(4): Cost of Rent a Pushcart service //===== Additional Comments: ================================= -//= 0.x Previous Authors: +//= 0.x Previous Authors: //= - L0ne_W0lf, Daegaladh //= 1.0 Merged and cleaned up Kafras. [Euphy] //= 1.1 Added Dewata Kafra. [Lemongrass] diff --git a/npc/re/merchants/refine.txt b/npc/re/merchants/refine.txt index 4905feb4a..db57a1d5d 100644 --- a/npc/re/merchants/refine.txt +++ b/npc/re/merchants/refine.txt @@ -226,7 +226,7 @@ function script refinenew { } else set .@menu2,2; switch(.@menu2){ - case 1: + case 1: set .@refinecnt,.@safe - getequiprefinerycnt(.@part); break; case 2: diff --git a/npc/re/mobs/dungeons/alde_dun.txt b/npc/re/mobs/dungeons/alde_dun.txt index 5f1570b49..56ed111e7 100644 --- a/npc/re/mobs/dungeons/alde_dun.txt +++ b/npc/re/mobs/dungeons/alde_dun.txt @@ -11,13 +11,13 @@ //============================================================ //================================================== -// alde_dun01 - Clock Tower B1f +// alde_dun01 - Clock Tower B1f //================================================== alde_dun01,0,0,0,0 monster Arclouze 1194,50,5000,0,0 alde_dun01,0,0,0,0 monster Drainliar 1111,40,5000,0,0 //================================================== -// alde_dun02 - Clock Tower B2f +// alde_dun02 - Clock Tower B2f //================================================== alde_dun02,0,0,0,0 monster High Orc 1213,50,5000,0,0 alde_dun02,0,0,0,0 monster Brilight 1211,20,5000,0,0 @@ -25,7 +25,7 @@ alde_dun02,0,0,0,0 monster Arclouze 1194,20,5000,0,0 alde_dun02,0,0,0,0 monster Orc Archer 1189,20,5000,0,0 //================================================== -// alde_dun03 - Clock Tower B3f +// alde_dun03 - Clock Tower B3f //================================================== alde_dun03,0,0,0,0 monster Penomena 1216,85,5000,0,0 alde_dun03,0,0,0,0 monster Cramp 1209,56,5000,0,0 diff --git a/npc/re/mobs/dungeons/beach_dun.txt b/npc/re/mobs/dungeons/beach_dun.txt index 658444a76..0e4d2ee26 100644 --- a/npc/re/mobs/dungeons/beach_dun.txt +++ b/npc/re/mobs/dungeons/beach_dun.txt @@ -12,7 +12,7 @@ //============================================================ //================================================== -// beach_dun - Karu, the West cave +// beach_dun - Karu, the West cave //================================================== beach_dun,0,0,0,0 monster Medusa 1148,60,5000,0,0 beach_dun,0,0,0,0 monster Nereid 1255,20,5000,0,0 @@ -21,7 +21,7 @@ beach_dun,0,0,0,0 monster Merman 1264,3,5000,0,0 beach_dun,0,0,0,0 boss_monster Tao Gunka 1583,1,18000000,600000,0 //================================================== -// beach_dun2 - Ruande the northern cave +// beach_dun2 - Ruande the northern cave //================================================== beach_dun2,0,0,0,0 monster Stalactic Golem 1278,65,5000,0,0 beach_dun2,0,0,0,0 monster Tri Joint 1279,20,5000,0,0 @@ -30,7 +30,7 @@ beach_dun2,0,0,0,0 monster Hydra 1068,10,5000,0,0 beach_dun2,0,0,0,0 monster Nereid 1255,3,5000,0,0 //================================================== -// beach_dun3 - Mao, the East Cave +// beach_dun3 - Mao, the East Cave //================================================== beach_dun3,0,0,0,0 monster Thara Frog 1034,50,5000,0,0 beach_dun3,0,0,0,0 monster Megalodon 1064,30,5000,0,0 diff --git a/npc/re/mobs/dungeons/glastheim.txt b/npc/re/mobs/dungeons/glastheim.txt index 267541aa5..fa746ef29 100644 --- a/npc/re/mobs/dungeons/glastheim.txt +++ b/npc/re/mobs/dungeons/glastheim.txt @@ -35,7 +35,7 @@ gl_cas01,0,0,0,0 monster Owl Baron 1295,6,5000,0,0 gl_cas01,0,0,0,0 monster Alice 1275,1,5000,0,0 //================================================== -// gl_cas02 - Glast Heim 2f +// gl_cas02 - Glast Heim 2f //================================================== gl_cas02,0,0,0,0 monster Wanderer 1208,41,5000,0,0 gl_cas02,0,0,0,0 monster Raydric 1163,36,5000,0,0 diff --git a/npc/re/mobs/dungeons/kh_dun.txt b/npc/re/mobs/dungeons/kh_dun.txt index b4c700534..4e9d1fbf7 100644 --- a/npc/re/mobs/dungeons/kh_dun.txt +++ b/npc/re/mobs/dungeons/kh_dun.txt @@ -12,7 +12,7 @@ //============================================================ //================================================== -// kh_dun01 - Robot Factory level 1 +// kh_dun01 - Robot Factory level 1 //================================================== kh_dun01,0,0,0,0 monster Aliza 1737,45,5000,0,0 kh_dun01,0,0,0,0 monster Alice 1275,25,5000,0,0 @@ -32,7 +32,7 @@ kh_dun02,0,0,0,0 monster Constant 1745,5,5000,0,0 kh_dun02,0,0,0,0 boss_monster Kiel D-01 1734,1,7200000,600000,0 //================================================== -// kh_kiehl01 - Kiehl's Room +// kh_kiehl01 - Kiehl's Room //================================================== kh_kiehl01,0,0,0,0 monster Constant 1745,10,5000,0,0 kh_kiehl01,67,171,5,5 monster Aliot 1740,1,180000,120000,0 diff --git a/npc/re/mobs/dungeons/lou_dun.txt b/npc/re/mobs/dungeons/lou_dun.txt index 1c6637712..6f50cebad 100644 --- a/npc/re/mobs/dungeons/lou_dun.txt +++ b/npc/re/mobs/dungeons/lou_dun.txt @@ -11,7 +11,7 @@ //============================================================ //================================================== -// lou_dun01 - The Royal Tomb +// lou_dun01 - The Royal Tomb //================================================== lou_dun01,0,0,0,0 monster Jing Guai 1517,45,5000,0,0 lou_dun01,0,0,0,0 monster Grizzly 1381,15,5000,0,0 @@ -31,7 +31,7 @@ lou_dun02,0,0,0,0 monster Mimic 1191,5,5000,0,0 lou_dun02,0,0,0,0 monster Zhu Po Long 1514,5,5000,0,0 //================================================== -// lou_dun03 - Suei Long Gon +// lou_dun03 - Suei Long Gon //================================================== lou_dun03,0,0,0,0 monster Zhu Po Long 1514,25,5000,0,0 lou_dun03,0,0,0,0 monster Yao Jun 1512,25,5000,0,0 diff --git a/npc/re/mobs/dungeons/prt_sew.txt b/npc/re/mobs/dungeons/prt_sew.txt index a7608aa7c..0ec2fe5dd 100644 --- a/npc/re/mobs/dungeons/prt_sew.txt +++ b/npc/re/mobs/dungeons/prt_sew.txt @@ -10,7 +10,7 @@ //============================================================ //================================================== -// prt_sewb1 - Prontera Culvert +// prt_sewb1 - Prontera Culvert //================================================== prt_sewb1,0,0,0,0 monster Thief Bug 1051,30,5000,0,0 prt_sewb1,0,0,0,0 monster Thief Bug Egg 1048,80,5000,0,0 diff --git a/npc/re/mobs/dungeons/ra_san.txt b/npc/re/mobs/dungeons/ra_san.txt index 51f7c42fd..eea77aa0f 100644 --- a/npc/re/mobs/dungeons/ra_san.txt +++ b/npc/re/mobs/dungeons/ra_san.txt @@ -20,7 +20,7 @@ ra_san01,0,0,0,0 monster Beholder 1633,6,5000,0,0 ra_san01,0,0,0,0 monster Hodremlin 1773,6,5000,0,0 //================================================== -// ra_san02 - Holy Ground +// ra_san02 - Holy Ground //================================================== ra_san02,0,0,0,0 monster Isilla 1772,85,5000,0,0 ra_san02,0,0,0,0 monster Vanberk 1771,30,5000,0,0 diff --git a/npc/re/mobs/dungeons/tha_t.txt b/npc/re/mobs/dungeons/tha_t.txt index eb84e8975..efa7cca38 100644 --- a/npc/re/mobs/dungeons/tha_t.txt +++ b/npc/re/mobs/dungeons/tha_t.txt @@ -85,7 +85,7 @@ tha_t06,0,0,0,0 monster Plasma 1694,10,5000,0,0 tha_t06,0,0,0,0 monster Maero of Thanatos 1706,2,5000,0,0 //================================================== -// tha_t07 - Thanatos Tower - Upper Level +// tha_t07 - Thanatos Tower - Upper Level //================================================== tha_t07,0,0,0,0 monster Baroness of Retribution 1702,15,5000,0,0 tha_t07,0,0,0,0 monster Death Word 1698,10,5000,0,0 diff --git a/npc/re/mobs/fields/comodo.txt b/npc/re/mobs/fields/comodo.txt index 45a39f7bb..d2d4ef236 100644 --- a/npc/re/mobs/fields/comodo.txt +++ b/npc/re/mobs/fields/comodo.txt @@ -65,7 +65,7 @@ cmd_fild06,293,235,5,5 monster Yellow Plant 1081,2,1800000,900000,1 cmd_fild06,84,375,10,10 monster Yellow Plant 1081,3,1800000,900000,1 //================================================== -// cmd_fild07 - Beacon Island, Pharos +// cmd_fild07 - Beacon Island, Pharos //================================================== cmd_fild07,0,0,0,0 monster Raggler 1254,100,5000,0,0 cmd_fild07,0,0,0,0 monster Aster 1266,30,5000,0,0 diff --git a/npc/re/mobs/fields/mjolnir.txt b/npc/re/mobs/fields/mjolnir.txt index 78e39d96b..fddd95c6b 100644 --- a/npc/re/mobs/fields/mjolnir.txt +++ b/npc/re/mobs/fields/mjolnir.txt @@ -159,7 +159,7 @@ mjolnir_07,97,210,0,0 monster Green Plant 1080,1,180000,90000,1 mjolnir_07,249,214,0,0 monster Blue Plant 1079,2,360000,180000,1 //================================================== -// mjolnir_08 - Mt.Mjolnir +// mjolnir_08 - Mt.Mjolnir //================================================== mjolnir_08,0,0,0,0 monster Beetle King 1494,140,5000,0,0 mjolnir_08,0,0,0,0 monster Savage 1166,30,5000,0,0 @@ -200,7 +200,7 @@ mjolnir_10,123,331,10,10 monster Shining Plant 1083,1,1800000,900000,1 mjolnir_10,0,0,0,0 monster Green Plant 1080,10,180000,90000,1 //================================================== -// mjolnir_11 - Mt.Mjolnir +// mjolnir_11 - Mt.Mjolnir //================================================== mjolnir_11,0,0,0,0 monster Argiope 1099,130,5000,0,0 mjolnir_11,0,0,0,0 monster Argos 1100,35,5000,0,0 @@ -220,7 +220,7 @@ mjolnir_11,282,300,0,0 monster Green Plant 1080,1,180000,90000,1 mjolnir_11,295,271,0,0 monster Green Plant 1080,1,180000,90000,1 //================================================== -// mjolnir_12 - Mt.Mjolnir +// mjolnir_12 - Mt.Mjolnir //================================================== mjolnir_12,0,0,0,0 monster Dustiness 1114,130,5000,0,0 mjolnir_12,0,0,0,0 monster Hunter Fly 1035,35,5000,0,0 diff --git a/npc/re/mobs/fields/morocc.txt b/npc/re/mobs/fields/morocc.txt index 663f46134..048dda6ba 100644 --- a/npc/re/mobs/fields/morocc.txt +++ b/npc/re/mobs/fields/morocc.txt @@ -17,7 +17,7 @@ //============================================================ //================================================== -// moc_fild01 - Sograt Desert +// moc_fild01 - Sograt Desert //================================================== moc_fild01,0,0,0,0 monster Peco Peco 1019,130,5000,0,0 moc_fild01,0,0,0,0 monster Muka 1055,50,5000,0,0 @@ -25,7 +25,7 @@ moc_fild01,0,0,0,0 monster Peco Peco Egg 1047,20,5000,0,0 moc_fild01,194,51,10,10 monster Yellow Plant 1081,10,900000,450000,1 //================================================== -// moc_fild02 - Sograt Desert +// moc_fild02 - Sograt Desert //================================================== moc_fild02,0,0,0,0 monster Muka 1055,130,5000,0,0 moc_fild02,0,0,0,0 monster Peco Peco 1019,60,5000,0,0 @@ -46,7 +46,7 @@ moc_fild02,353,103,0,0 monster Green Plant 1080,1,180000,90000,1 moc_fild02,337,35,0,0 monster Green Plant 1080,1,180000,90000,1 //================================================== -// moc_fild03 - Sograt Desert +// moc_fild03 - Sograt Desert //================================================== moc_fild03,0,0,0,0 monster Wolf 1013,140,5000,0,0 moc_fild03,0,0,0,0 monster Argos 1100,20,5000,0,0 @@ -72,7 +72,7 @@ moc_fild03,200,263,5,5 monster Green Plant 1080,2,180000,90000,1 //================================================== //================================================== -// moc_fild07 - Sograt Desert +// moc_fild07 - Sograt Desert //================================================== moc_fild07,0,0,0,0 monster Drops 1113,140,5000,0,0 moc_fild07,0,0,0,0 monster Chonchon 1011,30,5000,0,0 @@ -101,7 +101,7 @@ moc_fild11,0,0,0,0 monster Condor 1009,30,5000,0,0 moc_fild11,0,0,0,0 monster Scorpion 1001,30,5000,0,0 //================================================== -// moc_fild12 - Sograt Desert +// moc_fild12 - Sograt Desert //================================================== moc_fild12,0,0,0,0 monster Picky 1049,50,5000,0,0 moc_fild12,0,0,0,0 monster Picky 1050,50,5000,0,0 @@ -111,7 +111,7 @@ moc_fild12,0,0,0,0 monster Condor 1009,30,5000,0,0 moc_fild12,181,336,40,20 monster Yellow Plant 1081,10,180000,90000,1 //================================================== -// moc_fild13 - Sograt Desert +// moc_fild13 - Sograt Desert //================================================== moc_fild13,0,0,0,0 monster Steel Chonchon 1042,140,5000,0,0 moc_fild13,0,0,0,0 monster Wolf 1013,15,5000,0,0 @@ -157,7 +157,7 @@ moc_fild16,0,0,0,0 monster Hode 1127,30,5000,0,0 moc_fild16,0,0,0,0 monster Frilldora 1119,10,5000,0,0 //================================================== -// moc_fild17 - Sograt Desert +// moc_fild17 - Sograt Desert //================================================== moc_fild17,0,0,0,0 monster Hode 1127,130,5000,0,0 moc_fild17,0,0,0,0 monster Sandman 1165,30,5000,0,0 @@ -192,7 +192,7 @@ moc_fild18,325,272,0,0 monster Yellow Plant 1081,1,180000,90000,1 //================================================== //================================================== -// moc_fild20 - Sograt Desert - Continental Guard Quarantine +// moc_fild20 - Sograt Desert - Continental Guard Quarantine //================================================== moc_fild20,0,0,0,0 monster Incarnation of Morroc 1918,1,30000,0,0 moc_fild20,0,0,0,0 monster Incarnation of Morroc 1919,1,30000,0,0 @@ -200,7 +200,7 @@ moc_fild20,0,0,0,0 monster Incarnation of Morroc 1920,1,30000,0,0 moc_fild20,0,0,0,0 monster Incarnation of Morroc 1921,1,30000,0,0 //================================================== -// moc_fild21 - Dimensional Gorge +// moc_fild21 - Dimensional Gorge //================================================== moc_fild21,0,0,0,0 monster Incarnation of Morroc 1918,46,30000,0,0 moc_fild21,0,0,0,0 monster Incarnation of Morroc 1919,46,30000,0,0 @@ -208,7 +208,7 @@ moc_fild21,0,0,0,0 monster Incarnation of Morroc 1920,46,30000,0,0 moc_fild21,0,0,0,0 monster Incarnation of Morroc 1921,34,30000,0,0 //================================================== -// moc_fild22 - Dimensional Gorge +// moc_fild22 - Dimensional Gorge //================================================== moc_fild22,0,0,0,0 monster Incarnation of Morroc 1918,60,30000,0,0 moc_fild22,0,0,0,0 monster Incarnation of Morroc 1919,60,30000,0,0 diff --git a/npc/re/mobs/fields/payon.txt b/npc/re/mobs/fields/payon.txt index 0d2f13874..473bd2bfd 100644 --- a/npc/re/mobs/fields/payon.txt +++ b/npc/re/mobs/fields/payon.txt @@ -36,7 +36,7 @@ pay_fild01,70,246,0,0 monster Black Mushroom 1084,1,180000,90000,1 pay_fild01,0,0,0,0 monster Green Plant 1080,5,180000,90000,1 //================================================== -// pay_fild02 - Payon Forest +// pay_fild02 - Payon Forest //================================================== pay_fild02,0,0,0,0 monster Boa 1025,140,5000,0,0 pay_fild02,0,0,0,0 monster Wormtail 1024,30,5000,0,0 diff --git a/npc/re/mobs/fields/prontera.txt b/npc/re/mobs/fields/prontera.txt index ec7091e0b..7968cbdc0 100644 --- a/npc/re/mobs/fields/prontera.txt +++ b/npc/re/mobs/fields/prontera.txt @@ -13,7 +13,7 @@ //============================================================ //================================================== -// prt_fild00 - Prontera Field +// prt_fild00 - Prontera Field //================================================== prt_fild00,0,0,0,0 monster Roda Frog 1012,130,5000,0,0 prt_fild00,0,0,0,0 monster Ambernite 1094,50,5000,0,0 @@ -22,7 +22,7 @@ prt_fild00,227,212,0,0 monster Shining Plant 1083,1,1800000,900000,1 prt_fild00,285,138,10,10 monster Green Plant 1080,5,360000,180000,1 //================================================== -// prt_fild01 - Prontera Field +// prt_fild01 - Prontera Field //================================================== prt_fild01,0,0,0,0 monster Lunatic 1063,140,5000,0,0 prt_fild01,0,0,0,0 monster Poring 1002,30,5000,0,0 @@ -31,7 +31,7 @@ prt_fild01,199,266,3,3 monster Green Plant 1080,3,360000,180000,1 prt_fild01,199,266,3,3 monster Blue Plant 1079,1,900000,450000,1 //================================================== -// prt_fild02 - Prontera Field +// prt_fild02 - Prontera Field //================================================== prt_fild02,0,0,0,0 monster Stainer 1174,140,5000,0,0 prt_fild02,0,0,0,0 monster Creamy 1018,30,5000,0,0 @@ -41,7 +41,7 @@ prt_fild02,339,309,3,3 monster Shining Plant 1083,1,1800000,900000,1 prt_fild02,0,0,0,0 monster Shining Plant 1083,2,1800000,900000,1 //================================================== -// prt_fild03 - Prontera Field +// prt_fild03 - Prontera Field //================================================== prt_fild03,0,0,0,0 monster Yoyo 1057,100,5000,0,0 prt_fild03,0,0,0,0 monster Poporing 1031,30,5000,0,0 @@ -54,7 +54,7 @@ prt_fild03,147,219,5,5 monster Green Plant 1080,5,360000,180000,1 prt_fild03,148,107,5,5 monster Green Plant 1080,5,360000,180000,1 //================================================== -// prt_fild04 - Prontera Field +// prt_fild04 - Prontera Field //================================================== prt_fild04,0,0,0,0 monster Ambernite 1094,80,5000,0,0 prt_fild04,0,0,0,0 monster Roda Frog 1012,20,5000,0,0 @@ -62,7 +62,7 @@ prt_fild04,0,0,0,0 monster Vocal 1088,1,1800000,1200000,0 prt_fild04,350,114,10,10 monster Green Plant 1080,5,900000,450000,1 //================================================== -// prt_fild05 - Prontera Field +// prt_fild05 - Prontera Field //================================================== prt_fild05,0,0,0,0 monster Hornet 1004,140,5000,0,0 prt_fild05,0,0,0,0 monster Thief Bug Egg 1048,30,5000,0,0 @@ -71,7 +71,7 @@ prt_fild05,208,37,10,10 monster Green Plant 1080,6,900000,450000,1 prt_fild05,208,37,10,10 monster Blue Plant 1079,1,900000,450000,1 //================================================== -// prt_fild06 - Prontera Field +// prt_fild06 - Prontera Field //================================================== prt_fild06,0,0,0,0 monster Fabre 1007,140,5000,0,0 prt_fild06,0,0,0,0 monster Poring 1002,30,5000,0,0 @@ -79,7 +79,7 @@ prt_fild06,0,0,0,0 monster Lunatic 1063,30,5000,0,0 prt_fild06,222,30,40,10 monster Green Plant 1080,15,900000,450000,1 //================================================== -// prt_fild07 - Prontera Field +// prt_fild07 - Prontera Field //================================================== prt_fild07,0,0,0,0 monster Rocker 1052,150,5000,0,0 prt_fild07,0,0,0,0 monster Savage Babe 1167,50,5000,0,0 @@ -87,14 +87,14 @@ prt_fild07,0,0,0,0 monster Vocal 1088,1,1800000,1200000,0 prt_fild07,225,110,5,5 monster Black Mushroom 1084,3,360000,180000,1 //================================================== -// prt_fild08 - Prontera Field +// prt_fild08 - Prontera Field //================================================== prt_fild08,0,0,0,0 monster Poring 1002,140,5000,0,0 prt_fild08,0,0,0,0 monster Lunatic 1063,40,5000,0,0 prt_fild08,0,0,0,0 monster Fabre 1007,40,5000,0,0 //================================================== -// prt_fild08 - Duplicates +// prt_fild08 - Duplicates //================================================== prt_fild08a,0,0,0,0 monster Poring 1002,140,5000,0,0 prt_fild08b,0,0,0,0 monster Poring 1002,140,5000,0,0 @@ -110,14 +110,14 @@ prt_fild08c,0,0,0,0 monster Fabre 1007,40,5000,0,0 prt_fild08d,0,0,0,0 monster Fabre 1007,40,5000,0,0 //================================================== -// prt_fild09 - Prontera Field +// prt_fild09 - Prontera Field //================================================== prt_fild09,0,0,0,0 monster Magnolia 1138,140,5000,0,0 prt_fild09,0,0,0,0 monster Metaller 1058,60,5000,0,0 prt_fild09,237,115,5,5 monster Yellow Plant 1081,3,360000,180000,1 //================================================== -// prt_fild10 - Prontera Field +// prt_fild10 - Prontera Field //================================================== prt_fild10,0,0,0,0 monster Elder Willow 1033,140,5000,0,0 prt_fild10,0,0,0,0 monster Poporing 1031,20,5000,0,0 diff --git a/npc/re/mobs/fields/umbala.txt b/npc/re/mobs/fields/umbala.txt index 34e9d10de..24e93dfd2 100644 --- a/npc/re/mobs/fields/umbala.txt +++ b/npc/re/mobs/fields/umbala.txt @@ -11,7 +11,7 @@ //============================================================ //================================================== -// um_fild01 - Luluka Forest +// um_fild01 - Luluka Forest //================================================== um_fild01,0,0,0,0 monster Dryad 1493,70,5000,0,0 um_fild01,0,0,0,0 monster Stone Shooter 1495,15,5000,0,0 @@ -23,7 +23,7 @@ um_fild01,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1 um_fild01,0,0,0,0 monster Shining Plant 1083,5,180000,90000,1 //================================================== -// um_fild02 - Hoomga Forest +// um_fild02 - Hoomga Forest //================================================== um_fild02,0,0,0,0 monster Wootan Fighter 1499,40,5000,0,0 um_fild02,0,0,0,0 monster Stone Shooter 1495,15,5000,0,0 @@ -33,7 +33,7 @@ um_fild02,0,0,0,0 monster Red Plant 1078,5,180000,90000,1 um_fild02,0,0,0,0 monster Yellow Plant 1081,5,180000,90000,1 //================================================== -// um_fild03 - Kalala Swamp +// um_fild03 - Kalala Swamp //================================================== um_fild03,0,0,0,0 monster Parasite 1500,60,5000,0,0 um_fild03,0,0,0,0 monster Stone Shooter 1495,15,5000,0,0 @@ -44,7 +44,7 @@ um_fild03,0,0,0,0 monster Green Plant 1080,10,180000,90000,1 um_fild03,0,0,0,0 monster Shining Plant 1083,2,180000,90000,1 //================================================== -// um_fild04 - Hoomga Jungle +// um_fild04 - Hoomga Jungle //================================================== um_fild04,0,0,0,0 monster Wild Rose 1261,30,5000,0,0 um_fild04,0,0,0,0 monster Stone Shooter 1495,10,5000,0,0 diff --git a/npc/re/mobs/fields/veins.txt b/npc/re/mobs/fields/veins.txt index dd52b4257..54261c8d6 100644 --- a/npc/re/mobs/fields/veins.txt +++ b/npc/re/mobs/fields/veins.txt @@ -50,7 +50,7 @@ ve_fild03,200,212,114,60 monster Red Plant 1078,10,10000,0,1 ve_fild03,0,0,0,0 monster Yellow Plant 1081,10,10000,0,1 //================================================== -// ve_fild04 - Veins Field +// ve_fild04 - Veins Field //================================================== ve_fild04,0,0,0,0 monster Muscipular 1780,100,5000,0,0 ve_fild04,0,0,0,0 monster Drosera 1781,50,5000,0,0 diff --git a/npc/re/mobs/fields/yuno.txt b/npc/re/mobs/fields/yuno.txt index 40641ff5c..3916884ca 100644 --- a/npc/re/mobs/fields/yuno.txt +++ b/npc/re/mobs/fields/yuno.txt @@ -23,7 +23,7 @@ //============================================================ //================================================== -// yuno_fild01 - Border Posts +// yuno_fild01 - Border Posts //================================================== yuno_fild01,0,0,0,0 monster Geographer 1368,50,5000,0,0 yuno_fild01,0,0,0,0 monster Dustiness 1114,35,5000,0,0 @@ -112,7 +112,7 @@ yuno_fild08,0,0,0,0 monster Green Plant 1080,10,180000,90000,1 yuno_fild08,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1 //================================================== -// yuno_fild09 - Schwaltzvalt Guards Camp +// yuno_fild09 - Schwaltzvalt Guards Camp //================================================== yuno_fild09,0,0,0,0 monster Grand Peco 1369,130,5000,0,0 yuno_fild09,0,0,0,0 monster Sleeper 1386,30,5000,0,0 diff --git a/npc/re/quests/cupet.txt b/npc/re/quests/cupet.txt index 182214064..829ec2dae 100644 --- a/npc/re/quests/cupet.txt +++ b/npc/re/quests/cupet.txt @@ -158,7 +158,7 @@ function script cute_pet_manager { next; // Create Menu System - for (set .@a, 0; .@a < getarraysize(getarg(0)); set .@a, .@a + 1) { + for (set .@a, 0; .@a < getarraysize(getarg(0)); set .@a, .@a + 1) { set .@menu$, .@menu$ + (.@menu$ == "" ? "" : ":") + getitemname(getelementofarray(getarg(0), .@a)); } @@ -193,7 +193,7 @@ function script cute_pet_manager { mes "Do you want to exchange with me?"; next; - if (select("Exchange:Don't Exchange") == 2) { + if (select("Exchange:Don't Exchange") == 2) { mes "[Cute Pet Manager]"; mes "You don't? You will come back again."; close; diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt index f7481d04d..78107cc46 100644 --- a/npc/re/quests/eden/eden_iro.txt +++ b/npc/re/quests/eden/eden_iro.txt @@ -340,7 +340,7 @@ moc_para01,50,39,4 script Eve Natalia 4_F_SITDOWN,{ moc_para01,48,184,2 script Gum & Manual Exchanger 2_DROP_MACHINE,{ if (Weight < MaxWeight / 2) { mes "You're carrying too many items right now."; - close; + close; } mes "[Trader Machine]"; mes "Insert Bubble Gums and/or Battle Manuals to trade for higher efficiency Gums and Manuals."; diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt index cebd70b87..f1b54a9e7 100644 --- a/npc/re/quests/eden/eden_quests.txt +++ b/npc/re/quests/eden/eden_quests.txt @@ -4562,7 +4562,7 @@ moc_para01,111,83,3 script Toren 2_M_OLDBLSMITH,{ if (para_suv02 == 14) { setarray .@check[0],18514,2571,2473,15031; setarray .@item$[0],"Hat","Mantle","Boots","Uniform"; - for(set .@i,0; .@i<4; set .@i,.@i+1) + for(set .@i,0; .@i<4; set .@i,.@i+1) if (countitem(.@check[.@i]) < 1) { mes "[Toren]"; mes "Where is the Paradise "+.@item$[.@i]+" I gave you?"; diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt index 9478ba1c9..d17b63267 100644 --- a/npc/re/quests/quests_dicastes.txt +++ b/npc/re/quests/quests_dicastes.txt @@ -52,13 +52,13 @@ manuk,321,182,5 script Entrance Manager#ep133 4_MAN_GALTUN,{ if(select("Yes.:No.") == 2) { mes "[Entrance Manager]"; mes "Then use the tunnel next time."; - close; + close; } mes "[Entrance Manager]"; mes "Be careful."; close2; - warp "dic_dun01",33,212; - end; + warp "dic_dun01",33,212; + end; } mes "[Entrance Manager]"; mes "Sorry."; @@ -124,12 +124,12 @@ dic_dun01,266,113,5 script Curious Sapha#ep13_3_ 4_MAN_BENKUNI,{ if (.@deal == 0) { mes "[Curious Sapha]"; mes "You changed your mind?"; - close; + close; } if (Zeny < .@deal) { mes "[Curious Sapha]"; mes "You don't have enough money."; - close; + close; } mes "[Curious Sapha]"; mes "Will you buy "+.@input+"?"; @@ -354,7 +354,7 @@ OnEnable: mes "¡ð¡ú¢± ¡ô ¡ò¡õ¡ú ¡õ..!"; next; mes "- Cannot communicate with him. -"; - close; + close; } if (ep13_3_invite < 4) { mes "[Capital City Guard]"; @@ -426,11 +426,11 @@ dic_in01,254,119,0 script Item Storage#01 CLEAR_NPC,{ if(select("Use safe:No way.")==2) { mes "["+strcharinfo(0)+"]"; mes "I will use it later."; - close; + close; } if (Zeny < 500) { mes "Not enough Zeny."; - close; + close; } Zeny -= 500; close2; @@ -456,17 +456,17 @@ sec_in02,10,42,1 script 13.3 Related Reset 4_MAN_BENKUNI,{ function script que_dic { if (!getarg(0)) { if (checkquest(getarg(1),HUNTING) != 2) return; - mes getarg(3); + mes getarg(3); } else if (getarg(0) == 1) { if (checkquest(getarg(1)) == -1) return; if (countitem(getarg(3)) < getarg(4)) { mes "It looks like you are short on the amount."; - close; + close; } - mes getarg(5); + mes getarg(5); mes getarg(6,""); - delitem getarg(3), getarg(4); + delitem getarg(3), getarg(4); } else if (getarg(0) == 2) { for(set .@i,1; .@i<getargcount(); set .@i,.@i+1) { @@ -1044,7 +1044,7 @@ dic_in01,40,193,1 script Papyrus#0001 4_MAN_NITT,{ } else if (.@doc > 60 && .@doc <= 70) { mes "You suddenly feel nauseated. You feel like this won't go away any time soon. Finding the documents will have to wait."; setquest 12165; - close; + close; } else if (.@doc == 1) eldicastes_dp(12209,"Horn","Hard wedge-like horn from some insects. Doesn't have much practical use.",""); else if (.@doc == 2) eldicastes_dp(12195,"Horrendous Mouth","Tooth from a dead body.","Important material for research on time of death and health conditions. Useful in discovering human ecology."); @@ -1109,7 +1109,7 @@ dic_in01,40,193,1 script Papyrus#0001 4_MAN_NITT,{ mes "You've found a document about ^990099"+getarg(1)+"^000000. Check for details in the ^800080Quest Window^000000."; specialeffect2 EF_STEAL; setquest getarg(0); - close; + close; } } dic_in01,31,192,0 duplicate(Document Package#main) Document Package#0001 CLEAR_NPC @@ -1806,7 +1806,7 @@ OnTouch: mes "Just a moment."; } close2; - warp "dic_in01",155,188; + warp "dic_in01",155,188; } end; } @@ -3693,7 +3693,7 @@ dic_in01,245,119,4 script Shay#ep133_13 4_M_ACROSS,{ mes "What will it be?"; mes "I have Tropical Sograt and Vermilion on the Beach flown in from Morroc."; mes "A bit on the expensive side though."; - next; + next; if (select("Tropical Sorgrat - 2000z:Vermilion on the Beach - 2000z:Anything else?") == 3) { mes "[Shay]"; mes "Here.. "; @@ -3839,7 +3839,7 @@ dic_in01,245,119,4 script Shay#ep133_13 4_M_ACROSS,{ mes "What is it now?"; mes "Any luck?"; next; - setarray .@ward$, + setarray .@ward$, "7188","The Knits at the square are interested in Ahat.", "7189","I heard from Pioms that most of the Saphas are interested in the minister.", "7190","Galtens are interested in the Cat Merchant for their cat ears."; @@ -4841,7 +4841,7 @@ dic_fild01,231,174,5 script BK#ep133_18 4_M_MERCAT2,{ set ep13_3_secret, 11; getitem .@item[.@type], 1; erasequest 7193; - setquest 7194; + setquest 7194; donpcevent strnpcinfo(0)+"::OnDisable"; next; mes "[" + strcharinfo(0) + "]"; @@ -4902,7 +4902,7 @@ dic_fild01,231,174,5 script BK#ep133_18 4_M_MERCAT2,{ } if (.@npc$[.@type] == "Rock Pile") mes "You collect another stone fragment that emits a strange magical force."; else if (.@npc$[.@type] == "Dirt Pile") mes "You collect another clotted bloodstain from a dirt pile."; - else if (.@npc$[.@type] == "Split Earth") mes "You collect another piece of skin frozen in the frost in the crack of the split earth."; + else if (.@npc$[.@type] == "Split Earth") mes "You collect another piece of skin frozen in the frost in the crack of the split earth."; getitem .@item[.@type], 1; donpcevent strnpcinfo(0)+"::OnDisable"; close; @@ -4979,7 +4979,7 @@ dic_fild02,207,94,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef6 CLEAR_NPC dic_fild02,230,71,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef7 CLEAR_NPC dic_fild02,188,50,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef8 CLEAR_NPC dic_fild02,248,36,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef9 CLEAR_NPC -dic_fild02,206,115,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef10 CLEAR_NPC +dic_fild02,206,115,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef10 CLEAR_NPC dic_fild02,194,86,0 duplicate(ep133_crack#main) Split Earth#ep133_ef1 CLEAR_NPC dic_fild02,240,51,0 duplicate(ep133_crack#main) Split Earth#ep133_ef2 CLEAR_NPC dic_fild02,176,65,0 duplicate(ep133_crack#main) Split Earth#ep133_ef3 CLEAR_NPC @@ -5039,7 +5039,7 @@ dicastes01,117,262,0 script Frede#13_3 4_MAN_PIOM5,2,2,{ close; } mes "[Frede]"; - mes "¢£¡ô¡ñ ¡û"; + mes "¢£¡ô¡ñ ¡û"; mes "¡ú¡ö¡ø ¢£ ¡ô"; close; OnTouch: @@ -6087,7 +6087,7 @@ dic_in01,349,129,5 script Bouy#13_3 4_MAN_BENKUNI,{ close; } mes "[Bouy]"; - mes "¡ø¡ö¡þ ¡ù ¡ú¡ð¡ï ¡ø"; + mes "¡ø¡ö¡þ ¡ù ¡ú¡ð¡ï ¡ø"; mes "¡ï¡ú¡ö ¡ù"; mes "¡õ¡ï¡õ ¡ò"; close; @@ -6101,7 +6101,7 @@ dic_in01,349,129,5 script Bouy#13_3 4_MAN_BENKUNI,{ mes "[Maha]"; mes "But I do think the Sapha race is overly kind, almost unnaturally."; mes "Guess it'll be fine."; - close; + close; } mes "[Ben]"; mes "There is nothing strange!"; @@ -6109,7 +6109,7 @@ dic_in01,349,129,5 script Bouy#13_3 4_MAN_BENKUNI,{ next; mes "[Ben]"; mes "I can also visit the Sapha if I work well here, can't I?"; - close; + close; } mes "[Ben]"; mes "Hmm. Hey, Maha,"; @@ -6398,7 +6398,7 @@ function script eldicastes_c { mes "[Vyhannus]"; mes "Amazing."; mes "Like with Hound, that ring you humans made..."; - mes "is like a ring of wisdom."; + mes "is like a ring of wisdom."; } else { mes "[Hound]"; @@ -6413,7 +6413,7 @@ function script eldicastes_c { } mes "[Vyhannus]"; mes "Shall we skip to the point?"; - mes "The reason why I am here..."; + mes "The reason why I am here..."; next; mes "[Someone's voice]"; mes "Excuse me, hold on a second."; @@ -6512,7 +6512,7 @@ mid_campin,168,128,3 script Sapha from Manuk 4_MAN_JERUTOO,{ mes "You just stand there without"; mes "knowing what he says, so the"; mes "expedition guard next to you starts to talk. -"; - next; + next; callfunc "eldicastes_c",3; } else if (ep13_3_invite == 2) { @@ -6522,7 +6522,7 @@ mid_campin,168,128,3 script Sapha from Manuk 4_MAN_JERUTOO,{ mes "He's name is Galten. He is so quick, you won't notice the weight of his armor."; next; callfunc "eldicastes_c",1; - } + } else if (ep13_3_invite == 3) { callfunc "eldicastes_c",2; } @@ -6533,7 +6533,7 @@ mid_campin,168,128,3 script Sapha from Manuk 4_MAN_JERUTOO,{ mes "The tunnel might be a little scary."; mes "But I'm sure you will reach the end of it since you are strong."; close; - } + } else if (ep13_3_invite == 5) { mes "[Vyhannus]"; mes "Oh, the tunnel?"; @@ -6546,8 +6546,8 @@ mid_campin,168,128,3 script Sapha from Manuk 4_MAN_JERUTOO,{ next; mes "[Vyhannus]"; mes "That is it."; - close; - } + close; + } else if (ep13_3_invite == 6) { mes "[Vyhannus]"; mes "You received the Light of El Dicastes."; @@ -6613,10 +6613,10 @@ mid_campin,168,125,3 script Hound#ep133_is06 4_M_MOCASS1,{ } else if (ep13_3_invite == 2) { callfunc "eldicastes_c",1; - } + } else if (ep13_3_invite == 3) { callfunc "eldicastes_c",2; - } + } else if (ep13_3_invite == 4) { mes "[Hound]"; mes "First thing you need to do when you reach Manuk is to meet General Guard Avalanche."; @@ -6629,7 +6629,7 @@ mid_campin,168,125,3 script Hound#ep133_is06 4_M_MOCASS1,{ mes "[Hound]"; mes "And don't forget what the captain said."; mes "Inspector Doha is in the next room."; - close; + close; } else if (ep13_3_invite > 4) { mes "[Hound]"; @@ -6660,7 +6660,7 @@ mid_campin,165,127,5 script Hibba Agip#ep133_is07 4_M_REDSWORD,{ close2; OnInit: disablenpc strnpcinfo(0); - end; + end; } man_in01,315,52,3 script Guard Captain Avalanche 4_MAN_GALTUN,{ @@ -6669,7 +6669,7 @@ man_in01,315,52,3 script Guard Captain Avalanche 4_MAN_GALTUN,{ mes "¢¤¡ð¡ú? ¢£ ¡ù¡ð..."; mes "¡ï¡ò¡Ð ¢¤ ?"; mes "¡ñ¡ï..?"; - close; + close; } if (ep13_3_invite == 4) { mes "[Avalanche]"; @@ -7155,12 +7155,12 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 4_MAN_NITT,{ mes .@n$; mes "When you are ready,"; mes "Please come back again"; - close; + close; } if (countitem(.@Items_) < 1) { mes .@n$; mes "Then, take the equipment off first."; - close; + close; } specialeffect2 EF_OVERTHRUST; mes .@n$; @@ -7175,7 +7175,7 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 4_MAN_NITT,{ mes .@n$; mes "But..."; mes "you don't seem to be wearing or even carrying equipment to upgrade on you."; - close; + close; } } if (getd("ep13_3_"+.@v$) == 0) { @@ -7201,7 +7201,7 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 4_MAN_NITT,{ mes .@n$; mes "Second upgrade step requires ^9900992 Exploit Certifications of Sapha^000000. Do you want to proceed?"; set .@req, 2; - } + } else if (getd("ep13_3_"+.@v$) < 69) { mes .@n$; mes "I'm preparing for the"; @@ -7263,7 +7263,7 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 4_MAN_NITT,{ mes .@n$; mes "When you are ready,"; mes "Please come back again."; - close; + close; } if (countitem(6304) < .@req) { mes .@n$; @@ -7334,7 +7334,7 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 4_MAN_NITT,{ set .@cri[5], 4764; set .@cri[7], 4765; set .@atk[2], 4766; set .@atk[3], 4767; set .@dex[1], 4720; set .@dex[2], 4721; set .@dex[3], 4722; - set .@int[1], 4710; set .@int[2], 4711; set .@int[3], 4712; + set .@int[1], 4710; set .@int[2], 4711; set .@int[3], 4712; set .@agi[1], 4730; set .@agi[2], 4731; set .@agi[3], 4732; // Enchant attribute is determined by the digit position of variable value (ep13_3_<type>). @@ -7380,7 +7380,7 @@ dic_fild01,228,159,4 script Jahbong#pa0829 4_M_MERCAT2,{ next; mes "[Jahbong]"; mes "Come back to me once you have one. I'll give you something good in exchange."; - close; + close; } set .@cattalkj,rand(1,9); if (.@cattalkj == 1) mes "Don't touch my back! I might bite you unconsciously."; diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt index 150928d49..0c9eb2a82 100644 --- a/npc/re/quests/quests_malaya.txt +++ b/npc/re/quests/quests_malaya.txt @@ -3820,7 +3820,7 @@ ma_fild01,158,243,6 script Tribe Blacksmith#malaya 4_M_MALAYA,{ delitem 6499,20; //Ancient_Grudge delequip .@part; - getitem .@newItem, 1; + getitem .@newItem, 1; mes "[Bayani]"; mes "Ha ha. Perfect."; diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt index 1c1e64046..a8697058a 100644 --- a/npc/re/quests/quests_mora.txt +++ b/npc/re/quests/quests_mora.txt @@ -4184,7 +4184,7 @@ OnTimer20000: OnTimer30000: OnTimer40000: OnTimer50000: - if (rand(2)) + if (rand(2)) donpcevent strnpcinfo(0)+"::OnEnable"; end; OnTimer60000: diff --git a/npc/re/scripts_main.conf b/npc/re/scripts_main.conf index 8ee3c45e5..28f514d19 100644 --- a/npc/re/scripts_main.conf +++ b/npc/re/scripts_main.conf @@ -4,7 +4,7 @@ // The idea of this new system is to make scripts more organized // since the old system was rather messy with all the NPCs in one // file. Now scripts are organized in to files arraged by type. -// Custom scripts are now in scripts_custom.conf, all other +// Custom scripts are now in scripts_custom.conf, all other // scripts are deemed as 'official'. You should place your NPCs // in to scripts_custom.conf to follow the trend. // diff --git a/npc/re/warps/cities/dicastes.txt b/npc/re/warps/cities/dicastes.txt index 52c641bc4..9af35d123 100644 --- a/npc/re/warps/cities/dicastes.txt +++ b/npc/re/warps/cities/dicastes.txt @@ -11,7 +11,7 @@ //===== Additional Comments: ================================= //= 1.0 First Version. //= 1.1 Added Elevators. -//= 1.2 Removed a warp. [Joseph] +//= 1.2 Removed a warp. [Joseph] //= 1.3 Updated to match official script. [Joseph] //============================================================ diff --git a/npc/re/warps/cities/rachel.txt b/npc/re/warps/cities/rachel.txt index 608e7ec2b..9ec33e229 100644 --- a/npc/re/warps/cities/rachel.txt +++ b/npc/re/warps/cities/rachel.txt @@ -7,14 +7,14 @@ //===== Description: ========================================= //= Warp Points for Rachel City, shops & other locations //===== Additional Comments: ================================= -//= 1.0 Added the official warps and commented out the +//= 1.0 Added the official warps and commented out the //= "custom duplicates" for future checkout. Special thanks //= to RockmanEXE who provided all the info. [erKURITA] //= 1.1 Added warp to Veins Field [Playtester] //= 1.2 Fully official rachel warps [Playtester] //= 1.2a Added missing warp (Pope's office entryway -> temple) [L0ne_W0lf] //= 1.3 Updated Rachel -> Veins Field warp. [L0ne_W0lf] -//= 1.4 Disabled rachel33, moved to quest_rachel.txt [L0ne_W0lf] +//= 1.4 Disabled rachel33, moved to quest_rachel.txt [L0ne_W0lf] //= 1.5 Renewal warp adjustments. //============================================================ diff --git a/npc/scripts_custom.conf b/npc/scripts_custom.conf index aeae9e22f..3ed22d749 100644 --- a/npc/scripts_custom.conf +++ b/npc/scripts_custom.conf @@ -1,7 +1,7 @@ // -------------------------------------------------------------- // - Custom Scripts - // -------------------------------------------------------------- -// All the custom scripts, remove the '//' to enable... +// All the custom scripts, remove the '//' to enable... // Place your scripts here! //npc: npc/location/to/script.txt @@ -42,7 +42,7 @@ //npc: npc/custom/etc/monster_arena.txt // -- Raceway mini-game //npc: npc/custom/etc/morroc_raceway.txt -// -- Random change of Drop/Exp rates 1x ~ 1.5x every 6 hours on your server +// -- Random change of Drop/Exp rates 1x ~ 1.5x every 6 hours on your server //npc: npc/custom/etc/floating_rates.txt // -- Wedding script that supports same-sex marriages //npc: npc/custom/etc/marriage.txt diff --git a/npc/scripts_guild.conf b/npc/scripts_guild.conf index 37c1e0f6f..90c066fcb 100644 --- a/npc/scripts_guild.conf +++ b/npc/scripts_guild.conf @@ -4,7 +4,7 @@ // ----------------------- War of Emperium ---------------------- // - Guild WoE time settings -npc: npc/guild/agit_controller.txt +npc: npc/guild/agit_controller.txt // - Guild NPC Template file npc: npc/guild/agit_main.txt // - Al De Baran diff --git a/npc/warps/cities/moscovia.txt b/npc/warps/cities/moscovia.txt index deae51982..c292ccde1 100644 --- a/npc/warps/cities/moscovia.txt +++ b/npc/warps/cities/moscovia.txt @@ -13,30 +13,30 @@ //= 1.2 Updated from jA //============================================================ -// ---[ Mansion ]--- +// ---[ Mansion ]--- moscovia,256,138,0 warp moskwarp1001 1,1,mosk_in,96,61 mosk_in,93,61,0 warp moskwarp1002 1,1,moscovia,255,140 mosk_in,99,126,0 warp moskwarp1003 1,1,mosk_in,21,116 mosk_in,21,113,0 warp moskwarp1004 1,1,mosk_in,99,123 -// ---[ Weapon House ]--- +// ---[ Weapon House ]--- moscovia,185,188,0 warp moskwarp1005 1,1,mosk_in,15,179 mosk_in,12,179,0 warp moskwarp1006 1,1,moscovia,186,191 moscovia,203,171,0 warp moskwarp1007 1,1,mosk_in,86,180 mosk_in,89,180,0 warp moskwarp1008 1,1,moscovia,204,169 -// ---[ Instrument House / Tool Dealer ]--- +// ---[ Instrument House / Tool Dealer ]--- moscovia,223,174,0 warp moskwarp1009 1,1,mosk_in,14,246 mosk_in,11,246,0 warp moskwarp1010 1,1,moscovia,222,176 -// ---[ Inn ]--- +// ---[ Inn ]--- moscovia,229,208,0 warp moskwarp1011 1,1,mosk_in,142,178 mosk_in,142,175,0 warp moskwarp1012 1,1,moscovia,227,207 mosk_in,150,192,0 warp moskwarp1013 1,1,mosk_in,204,188 mosk_in,202,188,0 warp moskwarp1014 1,1,mosk_in,148,192 -// ---[ Mansion ]--- +// ---[ Mansion ]--- moscovia,256,179,0 warp moskwarp1015 1,1,mosk_in,211,114 mosk_in,211,111,0 warp moskwarp1016 1,1,moscovia,253,179 mosk_in,222,128,0 warp moskwarp1017 1,1,mosk_in,288,118 mosk_in,288,116,0 warp moskwarp1018 1,1,mosk_in,222,126 -// ---[ Private House ]--- +// ---[ Private House ]--- moscovia,205,98,0 warp moskwarp1021 1,1,mosk_in,214,255 mosk_in,214,252,0 warp moskwarp1022 1,1,moscovia,203,96 mosk_in,220,273,0 warp moskwarp1023 1,1,mosk_in,152,275 diff --git a/npc/warps/cities/umbala.txt b/npc/warps/cities/umbala.txt index f86c90d2c..91e006133 100644 --- a/npc/warps/cities/umbala.txt +++ b/npc/warps/cities/umbala.txt @@ -1,12 +1,12 @@ //===== Hercules Script ====================================== //= Umbala Warp Script //===== By: ================================================== -//= Darkchild (1.0v A) +//= Darkchild (1.0v A) //= Athena (1.0v B) //= 1.1 (Akaru) //= Nana (1.2) //===== Current Version: ===================================== -//= 1.2 +//= 1.2 //===== Description: ========================================= //= [Official Conversion] //= Warp Points for Umbala diff --git a/npc/warps/dungeons/lhz_dun.txt b/npc/warps/dungeons/lhz_dun.txt index b0345b447..59277921d 100644 --- a/npc/warps/dungeons/lhz_dun.txt +++ b/npc/warps/dungeons/lhz_dun.txt @@ -9,7 +9,7 @@ //===== Additional Comments: ================================= //= 1.1 Added temp restriction by Azazel [Lupus] //= 1.2 Optimized [Lupus] -//= and fixed 005 and 005a warps coords, thanks to Justin84 +//= and fixed 005 and 005a warps coords, thanks to Justin84 //= 1.3 Fixed entrance condition check, thanx2Daegaladh [Lupus] //= 1.4 Added coords of secret dungeon entrance, thanks to Justin84 //= proved with screenshots [Lupus] |