From e83c320a501fb0c886cad6d08c26e5f6aeb147d1 Mon Sep 17 00:00:00 2001 From: Lemongrass3110 Date: Mon, 5 Sep 2016 19:34:39 +0200 Subject: [PATCH] Trimmed trailing whitespaces in /npc/pre-re --- npc/pre-re/airports/izlude.txt | 12 ++++----- npc/pre-re/cities/alberta.txt | 12 ++++----- npc/pre-re/cities/izlude.txt | 12 ++++----- npc/pre-re/cities/jawaii.txt | 10 ++++---- npc/pre-re/cities/yuno.txt | 14 +++++------ npc/pre-re/guides/guides_alberta.txt | 2 +- npc/pre-re/guides/guides_amatsu.txt | 2 +- npc/pre-re/guides/guides_izlude.txt | 2 +- npc/pre-re/guides/guides_morroc.txt | 2 +- npc/pre-re/guides/guides_moscovia.txt | 2 +- npc/pre-re/guides/guides_payon.txt | 2 +- npc/pre-re/jobs/1-1/acolyte.txt | 14 +++++------ npc/pre-re/jobs/1-1/archer.txt | 14 +++++------ npc/pre-re/jobs/1-1/mage.txt | 14 +++++------ npc/pre-re/jobs/1-1/merchant.txt | 16 ++++++------ npc/pre-re/jobs/1-1/swordman.txt | 28 ++++++++++----------- npc/pre-re/jobs/novice/novice.txt | 26 +++++++++---------- npc/pre-re/kafras/kafras.txt | 14 +++++------ npc/pre-re/mapflag/gvg.txt | 4 +-- npc/pre-re/merchants/shops.txt | 14 +++++------ npc/pre-re/mobs/fields/umbala.txt | 12 ++++----- npc/pre-re/mobs/fields/veins.txt | 2 +- npc/pre-re/other/bulletin_boards.txt | 4 +-- npc/pre-re/other/msg_boards.txt | 12 ++++----- npc/pre-re/other/pvp.txt | 6 ++--- npc/pre-re/other/turbo_track.txt | 2 +- npc/pre-re/quests/first_class/tu_archer.txt | 14 +++++------ npc/pre-re/quests/mrsmile.txt | 14 +++++------ npc/pre-re/quests/quests_13_1.txt | 14 +++++------ npc/pre-re/quests/quests_izlude.txt | 12 ++++----- npc/pre-re/quests/quests_lighthalzen.txt | 14 +++++------ npc/pre-re/quests/quests_nameless.txt | 14 +++++------ npc/pre-re/quests/quests_veins.txt | 14 +++++------ npc/pre-re/scripts_main.conf | 2 +- npc/pre-re/warps/cities/rachel.txt | 4 +-- npc/pre-re/warps/fields/payon_fild.txt | 14 +++++------ npc/pre-re/warps/fields/veins_fild.txt | 4 +-- 37 files changed, 187 insertions(+), 187 deletions(-) diff --git a/npc/pre-re/airports/izlude.txt b/npc/pre-re/airports/izlude.txt index 38959d1c46..129fc40a67 100644 --- a/npc/pre-re/airports/izlude.txt +++ b/npc/pre-re/airports/izlude.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Izlude Airport NPCs -//===== By: ================================================== +//===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Izlude Airport NPCs -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. -//============================================================ +//============================================================ izlude,206,55,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude 90 diff --git a/npc/pre-re/cities/alberta.txt b/npc/pre-re/cities/alberta.txt index ba0f77101d..0815091105 100644 --- a/npc/pre-re/cities/alberta.txt +++ b/npc/pre-re/cities/alberta.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Alberta Town Pre-Renewal -//===== By: ================================================== +//===== By: ================================================== //= Euphy -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Alberta town NPCs. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. //============================================================ diff --git a/npc/pre-re/cities/izlude.txt b/npc/pre-re/cities/izlude.txt index b79e20cc86..2fdc475208 100644 --- a/npc/pre-re/cities/izlude.txt +++ b/npc/pre-re/cities/izlude.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Izlude Town Pre-Renewal -//===== By: ================================================== +//===== By: ================================================== //= Daegaladh -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Izlude town NPCs. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. //============================================================ diff --git a/npc/pre-re/cities/jawaii.txt b/npc/pre-re/cities/jawaii.txt index 4a4f925bfa..e7cf6fa687 100644 --- a/npc/pre-re/cities/jawaii.txt +++ b/npc/pre-re/cities/jawaii.txt @@ -1,15 +1,15 @@ //===== rAthena Script ======================================= //= Jawaii Town Pre-Renewal -//===== By: ================================================== +//===== By: ================================================== //= Daegaladh -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Jawaii town NPCs. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. //============================================================ diff --git a/npc/pre-re/cities/yuno.txt b/npc/pre-re/cities/yuno.txt index 2e121fafcf..7078efd8fe 100644 --- a/npc/pre-re/cities/yuno.txt +++ b/npc/pre-re/cities/yuno.txt @@ -1,17 +1,17 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Juno City -//===== By: ================================================== +//===== By: ================================================== //= Euphy -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= NPCs for the City of Juno -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. -//============================================================ +//============================================================ yuno,150,283,4 duplicate(JunoSoldier1) Juno Soldier#juno 105 yuno,165,283,4 duplicate(JunoSoldier2) Juno Soldier#2juno 105 diff --git a/npc/pre-re/guides/guides_alberta.txt b/npc/pre-re/guides/guides_alberta.txt index 8ea671815c..8332689aac 100644 --- a/npc/pre-re/guides/guides_alberta.txt +++ b/npc/pre-re/guides/guides_alberta.txt @@ -50,7 +50,7 @@ alberta,23,238,4 script Guide#alb::AlbGuide 105,{ while (.@loop2) { if (.@wait_button_chk == 0) set .@wait_button_chk,1; else next; - + switch(select("^FF0000Merchant Guild^000000:Weapon Shop:Tool Shop:Inn:Forge:Cancel")) { case 1: mes "[Alberta Guide]"; diff --git a/npc/pre-re/guides/guides_amatsu.txt b/npc/pre-re/guides/guides_amatsu.txt index 05ddad86b7..afbc5bc13b 100644 --- a/npc/pre-re/guides/guides_amatsu.txt +++ b/npc/pre-re/guides/guides_amatsu.txt @@ -68,7 +68,7 @@ amatsu,207,89,3 script Amatsu Guide#ama 758,{ close; } } - + amatsu,251,283,4 script Guide Man#2ama 767,{ mes "[Guide Man]"; mes "Welcome, tourist from Rune-Midgard."; diff --git a/npc/pre-re/guides/guides_izlude.txt b/npc/pre-re/guides/guides_izlude.txt index 96e6859179..33ddbd6592 100644 --- a/npc/pre-re/guides/guides_izlude.txt +++ b/npc/pre-re/guides/guides_izlude.txt @@ -47,7 +47,7 @@ izlude,121,87,6 script Guide#iz 105,{ while(.@loop2) { if (.@wait_button_chk == 0) set .@wait_button_chk,1; else next; - + switch(select("^FF0000Swordman Association^000000:Swordman Hall:Arena:Izlude Marina:Weapon Shop:Tool Shop:Cancel")) { case 1: mes "[Izlude Guide]"; diff --git a/npc/pre-re/guides/guides_morroc.txt b/npc/pre-re/guides/guides_morroc.txt index dd78cc38a5..2aadf095b6 100644 --- a/npc/pre-re/guides/guides_morroc.txt +++ b/npc/pre-re/guides/guides_morroc.txt @@ -47,7 +47,7 @@ morocc,153,286,6 script Guide#moc::MocGuide 707,{ while(.@loop2) { if (.@wait_button_chk == 0) set .@wait_button_chk,1; else next; - + switch(select("^FF0000Thief Guild^000000:Weapon Shop:Inn:Pub:Mercenary Guild:Forge:Cancel")) { case 1: mes "[Morroc Guide]"; diff --git a/npc/pre-re/guides/guides_moscovia.txt b/npc/pre-re/guides/guides_moscovia.txt index 838c5215a4..0a13668520 100644 --- a/npc/pre-re/guides/guides_moscovia.txt +++ b/npc/pre-re/guides/guides_moscovia.txt @@ -82,7 +82,7 @@ moscovia,161,76,4 script Moscovia Guide#mosk 959,{ viewpoint 2,223,174,3,0x00FF00; viewpoint 2,229,208,4,0x3355FF; close; - + case 3: mes "[Moscovia Guide]"; mes "It'd be great to walk about alone."; diff --git a/npc/pre-re/guides/guides_payon.txt b/npc/pre-re/guides/guides_payon.txt index 329ccfe45e..9d28e192c9 100644 --- a/npc/pre-re/guides/guides_payon.txt +++ b/npc/pre-re/guides/guides_payon.txt @@ -16,7 +16,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/acolyte.txt b/npc/pre-re/jobs/1-1/acolyte.txt index 73dfc3ad06..d365eb8fe5 100644 --- a/npc/pre-re/jobs/1-1/acolyte.txt +++ b/npc/pre-re/jobs/1-1/acolyte.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Acolyte Job Quest -//===== By: ================================================== +//===== By: ================================================== //= kobra_k88; L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 2.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job quest for Acolyte classes -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Fully working. //= 1.1 Added function calls for Priest Quest. //= 1.2 Fixed Marthilda, Yosuke bugs. [Lupus] @@ -28,7 +28,7 @@ //= 2.0 Fixed High Acolytesnot being given holy light. [L0ne_W0lf] //= 2.1 Added Quest Log commands. [L0ne_W0lf] //= 2.2 Fixed an issue with completequest by adding checkquest. [Kisuka] -//============================================================ +//============================================================ prt_church,184,41,4 script Cleric#aco 60,{ if (Upper == 1) { diff --git a/npc/pre-re/jobs/1-1/archer.txt b/npc/pre-re/jobs/1-1/archer.txt index 08347aedba..e932fb838c 100644 --- a/npc/pre-re/jobs/1-1/archer.txt +++ b/npc/pre-re/jobs/1-1/archer.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Archer Job Quest -//===== By: ================================================== +//===== By: ================================================== //= kobra_k88; L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.9 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job quest for Archer classes -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Fully working. //= 1.1 Added instant job change for High Novice [Lupus] //= 1.3 Added Baby Class support [Lupus] @@ -22,7 +22,7 @@ //= 1.7a Fixed minor dialogue bug at Grade==25 [Lupus] //= 1.8 Fixed mistake in condition check. [L0ne_W0lf] //= 1.9 Added Quest Log commands. [L0ne_W0lf] -//============================================================ +//============================================================ payon_in02,64,71,4 script Archer Guildsman#archer 85,{ if (Upper == 1) { diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt index 2b95f3fde4..af8b36b4cf 100644 --- a/npc/pre-re/jobs/1-1/mage.txt +++ b/npc/pre-re/jobs/1-1/mage.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Mage Job Quest -//===== By: ================================================== +//===== By: ================================================== //= kobra_k88; L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 2.0 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job quest for Mage classes -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Fully working. //= 1.1 Fixed input ingridients bug [Lupus] //= 1.2 Added instant job change for High Novice [Lupus] @@ -23,7 +23,7 @@ //= 1.8 Added Quest Log commands. [L0ne_W0lf] //= 1.9 Fixed an issue with completequest by adding checkquest. [Kisuka] //= 2.0 Moved "Dollshoi" and "Ponka-Hontas" NPCs. [Euphy] -//============================================================ +//============================================================ geffen_in,164,124,4 script Mage Guildsman 123,{ if (Upper == 1) { diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt index 3a4d84c0b6..b2de2fee9c 100644 --- a/npc/pre-re/jobs/1-1/merchant.txt +++ b/npc/pre-re/jobs/1-1/merchant.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Merchant Job Quest -//===== By: ================================================== +//===== By: ================================================== //= kobra_k88; L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 2.4 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job quest for Merchant classes -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Fully working. //= 1.1 Added instant job change for High Novice [Lupus] //= 1.3 Added Baby Class support [Lupus] @@ -29,7 +29,7 @@ //= 2.2 Added Quest Log commands. [L0ne_W0lf] //= 2.3 Fixed an issue with completequest by adding checkquest. [Kisuka] //= 2.4 Quest log fixes. [Euphy] -//============================================================ +//============================================================ alberta_in,53,43,6 script Merchant#mer 86,{ if (Upper == 1) { @@ -705,7 +705,7 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 83,{ 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]"; diff --git a/npc/pre-re/jobs/1-1/swordman.txt b/npc/pre-re/jobs/1-1/swordman.txt index c5c96c9d32..9cb860702b 100644 --- a/npc/pre-re/jobs/1-1/swordman.txt +++ b/npc/pre-re/jobs/1-1/swordman.txt @@ -1,19 +1,19 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Swordsman Job Quest -//===== By: ================================================== +//===== By: ================================================== //= kobra_k88; L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 2.3 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job quest for Swordman classes //= Uses Job_sword1 as opposed to sword_1-1 -> sword_3-1. //= EXPLOITABLE in a sense because while the sword_x-1 maps //= are marked as "inside" by the client, job_sword1 is not. //= giving players FREE camera rotation while doing the job quest. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Fully working. //= 1.1 Added instant job change for High Novice [Lupus] //= 1.3 Added Baby Class support [Lupus] @@ -35,7 +35,7 @@ //= 2.1 Fixed mistake in condition check. [L0ne_W0lf] //= 2.2 Warp portals dont end with ; [Yommy] //= 2.3 Added Quest Log commands. [L0ne_W0lf] -//============================================================ +//============================================================ izlude_in,74,172,4 script Swordman#swd_1 119,{ if (Upper == 1) { @@ -296,7 +296,7 @@ izlude_in,30,163,0 script Test Hall Staff#swd_1 105,{ } // Examination Courses NPCs -//============================================================ +//============================================================ // 1-1 job_sword1,230,245,2 script Medic#swd_1 105,{ callfunc "F_JobSwdMedic","1st"; @@ -322,7 +322,7 @@ job_sword1,223,167,2 script Mae#swd_1_success 92,{ } // Examination Course Functions -//============================================================ +//============================================================ function script F_JobSwdMedic { percentheal 100,0; mes "[Medic]"; @@ -366,7 +366,7 @@ OnTouch: } // Examination Course 1 -//============================================================ +//============================================================ job_sword1,223,243,0 warp checkp1-2#swd_1 1,1,job_sword1,11,206 job_sword1,223,205,0 warp checkp2-3#swd_1 1,1,job_sword1,11,168 @@ -396,7 +396,7 @@ job_sword1,193,168,0 script Test Hall Staff#swd_9 45,1,3,{ } // Pitfalls (Set 1) -//============================================================ +//============================================================ job_sword1,65,117,0 warp pitfall01-01 1,1,job_sword1,10,245 job_sword1,98,27,0 warp pitfall02-01 1,1,job_sword1,11,207 job_sword1,161,27,0 warp pitfall02-02 1,1,job_sword1,11,207 @@ -463,7 +463,7 @@ job_sword1,181,239,0 duplicate(SwdTrap1) 1_blank_14_c -1,1,0 job_sword1,193,245,0 warp 1_rest 1,3,job_sword1,215,244 // Pitfalls (Set 2) -//============================================================ +//============================================================ job_sword1,56,212,0 script 2_blank_1_a::SwdTrap2 -1,40,0,{ OnTouch: switch(rand(1,5)) { @@ -508,7 +508,7 @@ job_sword1,155,201,0 duplicate(SwdTrap2) 2_blank_9_a -1,40,0 job_sword1,181,201,0 duplicate(SwdTrap2) 2_blank_9_b -1,2,0 // Pitfalls (Set 3) -//============================================================ +//============================================================ job_sword1,17,174,0 script 3_blank_1_a::SwdTrap3 -1,2,0,{ OnTouch: switch(rand(1,5)) { @@ -621,7 +621,7 @@ job_sword1,177,163,0 duplicate(SwdTrap3) 3_blank_30_b -1,0,2 job_sword1,181,163,0 duplicate(SwdTrap3) 3_blank_30_c -1,2,0 // Monsters (all three courses) -//============================================================ +//============================================================ job_sword1,0,0,0,0 monster Chonchon 1183,20,0,0,0 job_sword1,35,79,0,0 monster Fabre 1184,3,60000,30000,0 job_sword1,50,108,0,0 monster Fabre 1184,3,60000,30000,0 diff --git a/npc/pre-re/jobs/novice/novice.txt b/npc/pre-re/jobs/novice/novice.txt index 5ddbb76b6f..4fcdb3c525 100644 --- a/npc/pre-re/jobs/novice/novice.txt +++ b/npc/pre-re/jobs/novice/novice.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Ep 10+ Novice Training Grounds -//===== By: ================================================== +//===== By: ================================================== //= Dr.Evil & MasterOfMuppets -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 2.4 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project; SVN 3422+ -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Novice Training Grounds -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.7D Added confirm character name thing on receptionist. [Kisuka] //= 1.8 Rescripted to Aegis 10.3 standards. [L0ne_W0lf] //= NPCs are not backwards compatable, and will remove @@ -23,7 +23,7 @@ //= 2.3 Added fix to Hanson from GM-windsor- and Saithis. [L0ne_W0lf] //= 2.3a Correct a wrong variable name. (bugreport:2293) [Samuray22] //= 2.4 Corrected an error in Hanson. (bugreport:2374) [L0ne_W0lf] -//============================================================ +//============================================================ // Bulletin Board new_1-1,66,114,4 script Bulletin Board#nv 111,{ @@ -193,7 +193,7 @@ new_1-2,100,29,4 script Receptionist#nv1 86,{ close; } } -} +} new_2-2,100,29,4 duplicate(Receptionist#nv1) Receptionist#nv2 86 new_3-2,100,29,4 duplicate(Receptionist#nv1) Receptionist#nv3 86 new_4-2,100,29,4 duplicate(Receptionist#nv1) Receptionist#nv4 86 @@ -2681,7 +2681,7 @@ new_1-3,95,30,4 script Trainer#nv1::NovHoffman 84,{ } else { warp "new_1-3",96,21; - } + } end; case 2: mes "[Hoffman]"; @@ -3884,7 +3884,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."; @@ -4301,9 +4301,9 @@ new_3-3,0,0,0,0 monster Fabre 1184,5,0,0,0 new_4-3,0,0,0,0 monster Fabre 1184,5,0,0,0 new_5-3,0,0,0,0 monster Fabre 1184,5,0,0,0 -//============================================================ +//============================================================ // Old changelog -//============================================================ +//============================================================ //= 1.0 Added the New Novice Training Grounds, a big thanks [MasterOfMuppets] //= to Dr.Evil who did 90% of the work =) //= 1.0b Temp measure to stop exploits. [Vicious] @@ -4316,4 +4316,4 @@ new_5-3,0,0,0,0 monster Fabre 1184,5,0,0,0 //= 1.7a a bit of optimization [Lupus] //= 1.7b Corrected a little Typo Error. (bugreport:728) [Samuray22] //= 1.7C Corrected another Typo Error. (bugreport:740) [Samuray22] -//============================================================ +//============================================================ diff --git a/npc/pre-re/kafras/kafras.txt b/npc/pre-re/kafras/kafras.txt index 876039d878..34a704fd5c 100644 --- a/npc/pre-re/kafras/kafras.txt +++ b/npc/pre-re/kafras/kafras.txt @@ -1,23 +1,23 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Kafras (Cities/Dungeons/Fields) -//===== By: ================================================== +//===== By: ================================================== //= Daegaladh -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= //= Argument settings for callfunc "F_Kafra": //= 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: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. -//============================================================ +//============================================================ // Izlude //============================================================ diff --git a/npc/pre-re/mapflag/gvg.txt b/npc/pre-re/mapflag/gvg.txt index 39d8639e9d..4b6ad71fb9 100644 --- a/npc/pre-re/mapflag/gvg.txt +++ b/npc/pre-re/mapflag/gvg.txt @@ -6,13 +6,13 @@ //= 1.0 //===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Players can attack other guilds, and will have their guild //= icons shown. WoE damage reductions will also take place. //= gvg: Turns on GvG mode. //= gvg_castle: Describes castle maps for WoE. //= gvg_dungeon: Describes dungeon maps for WoE. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Renewal split. [Euphy] //============================================================ diff --git a/npc/pre-re/merchants/shops.txt b/npc/pre-re/merchants/shops.txt index 11b9aa2cfd..e1e6482d7a 100644 --- a/npc/pre-re/merchants/shops.txt +++ b/npc/pre-re/merchants/shops.txt @@ -1,18 +1,18 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Shops -//===== By: ================================================== +//===== By: ================================================== //= Daegaladh -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Pre-renewal-specific town shop NPCs. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. //= 1.1 Moved Izlude shops to pre-re/re paths. [Streusel] //= 1.2 Moved Ninja shops to Pre-RE/RE paths. [Euphy] -//============================================================ +//============================================================ //======================================================= // Izlude diff --git a/npc/pre-re/mobs/fields/umbala.txt b/npc/pre-re/mobs/fields/umbala.txt index 0453410982..6033fbdeee 100644 --- a/npc/pre-re/mobs/fields/umbala.txt +++ b/npc/pre-re/mobs/fields/umbala.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Umbala Fields Monster Spawn Script -//===== By: ================================================== +//===== By: ================================================== //= Darkchild (1.0) -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project; RO Episode 6+ -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.3 Official kRO 10.1 spawns [Playtester] //= 1.4 More accurate spawns [Playtester] -//============================================================ +//============================================================ //================================================== // um_fild01 - Luluka Forest diff --git a/npc/pre-re/mobs/fields/veins.txt b/npc/pre-re/mobs/fields/veins.txt index cea060ea52..153d1dd733 100644 --- a/npc/pre-re/mobs/fields/veins.txt +++ b/npc/pre-re/mobs/fields/veins.txt @@ -72,7 +72,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/other/bulletin_boards.txt b/npc/pre-re/other/bulletin_boards.txt index 96cd0d3879..9177d0ab8a 100644 --- a/npc/pre-re/other/bulletin_boards.txt +++ b/npc/pre-re/other/bulletin_boards.txt @@ -1,6 +1,6 @@ //===== rAthena Script ======================================= //= Bulletin Boards -//===== Description: ========================================= +//===== Description: ========================================= //= Bulletin Boards for beginners. //===== Changelogs: ========================================== //= 1.0 Moved Izlude NPCs to Pre-RE/RE paths. [Euphy] @@ -25,7 +25,7 @@ izlude,131,116,4 script Bulletin Board#5 837,{ gef_tower,55,142,5 script Bulletin Board#21 837,{ 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/pre-re/other/msg_boards.txt b/npc/pre-re/other/msg_boards.txt index b0d5c2b5f2..c38d72cd21 100644 --- a/npc/pre-re/other/msg_boards.txt +++ b/npc/pre-re/other/msg_boards.txt @@ -1,16 +1,16 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Misc. Message Boards -//===== By: ================================================== +//===== By: ================================================== //= Euphy -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= [Official Conversion] //= rAthena Project; 7.15 + -//===== Description: ========================================= +//===== Description: ========================================= //= Misc. Message Boards for: //= - Izlude -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Moved Izlude NPCs to Pre-RE path. //============================================================ diff --git a/npc/pre-re/other/pvp.txt b/npc/pre-re/other/pvp.txt index 0f4eb7ca23..bc233a99bb 100644 --- a/npc/pre-re/other/pvp.txt +++ b/npc/pre-re/other/pvp.txt @@ -1,4 +1,4 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= PvP NPCs //===== By: ================================================== //= Euphy @@ -9,12 +9,12 @@ //===== Description: ========================================= //= PvP NPCs that are found in the Inns in major cities. //= Includes Yoyo Mode, Nightmare Mode, and Event Mode. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version, Pre-Renewal. //============================================================ // PVP Warpers -//============================================================ +//============================================================ pvp_y_room,86,85,4 script Fight Square Reception#8 105,{ callfunc "F_PVP_FSRS"; end; diff --git a/npc/pre-re/other/turbo_track.txt b/npc/pre-re/other/turbo_track.txt index f6360621ce..4e3354c531 100644 --- a/npc/pre-re/other/turbo_track.txt +++ b/npc/pre-re/other/turbo_track.txt @@ -6,7 +6,7 @@ //= 1.0 //===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Pre-Renewal duplicates. //===== Additional Comments: ================================= diff --git a/npc/pre-re/quests/first_class/tu_archer.txt b/npc/pre-re/quests/first_class/tu_archer.txt index 6c04a09a3c..a65246511a 100644 --- a/npc/pre-re/quests/first_class/tu_archer.txt +++ b/npc/pre-re/quests/first_class/tu_archer.txt @@ -1,16 +1,16 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Archer Class Tutorial and Job Specific Quest -//===== By: ================================================== +//===== By: ================================================== //= Euphy -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Archer training quest. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. [Euphy] -//============================================================ +//============================================================ mjolnir_11,27,223,3 duplicate(Acolyte_Tu) Acolyte#tu 95 diff --git a/npc/pre-re/quests/mrsmile.txt b/npc/pre-re/quests/mrsmile.txt index e17d9f8bf1..fbf4784c57 100644 --- a/npc/pre-re/quests/mrsmile.txt +++ b/npc/pre-re/quests/mrsmile.txt @@ -1,16 +1,16 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Mr. Smile Quest -//===== By: ================================================== +//===== By: ================================================== //= Daegaladh -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Trade Clover, Fluff and Jellopy for a Mr. Smile mask. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. -//============================================================ +//============================================================ izlude,129,118,4 duplicate(SmileHelper) Smile Assistance#iz 92 diff --git a/npc/pre-re/quests/quests_13_1.txt b/npc/pre-re/quests/quests_13_1.txt index 8bb81752da..8034cbbcb4 100644 --- a/npc/pre-re/quests/quests_13_1.txt +++ b/npc/pre-re/quests/quests_13_1.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Quest NPCs related to Ash-Vacuum -//===== By: ================================================== +//===== By: ================================================== //= Euphy -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Contains duplicate NPCs from main script. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Moved Izlude NPC to pre-re/re paths. [Euphy] -//============================================================ +//============================================================ izlude,99,136,5 duplicate(PromotionalStaff_izlude) Promotional Staff#iz 100 diff --git a/npc/pre-re/quests/quests_izlude.txt b/npc/pre-re/quests/quests_izlude.txt index 6b9e2f3426..651e670d15 100644 --- a/npc/pre-re/quests/quests_izlude.txt +++ b/npc/pre-re/quests/quests_izlude.txt @@ -1,14 +1,14 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Quest NPCs related to Izlude -//===== By: ================================================== +//===== By: ================================================== //= Daegaladh -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Edgar's Offer -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. //============================================================ diff --git a/npc/pre-re/quests/quests_lighthalzen.txt b/npc/pre-re/quests/quests_lighthalzen.txt index b9c0b886f6..b6c0e8024e 100644 --- a/npc/pre-re/quests/quests_lighthalzen.txt +++ b/npc/pre-re/quests/quests_lighthalzen.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Quest NPCs located in Lighthalzen -//===== By: ================================================== +//===== By: ================================================== //= Daegaladh -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Quests related to Lighthalzen City. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. -//============================================================ +//============================================================ izlude,186,57,5 duplicate(Scamp) Scamp#iz 853 diff --git a/npc/pre-re/quests/quests_nameless.txt b/npc/pre-re/quests/quests_nameless.txt index 8a628f0fe1..4c7ba03b91 100644 --- a/npc/pre-re/quests/quests_nameless.txt +++ b/npc/pre-re/quests/quests_nameless.txt @@ -1,18 +1,18 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Nameless Island Quests -//===== By: ================================================== +//===== By: ================================================== //= Euphy -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Contains: //= - Muff's Loan -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Moved Dorian to pre-re/re paths. -//============================================================ +//============================================================ izlude_in,110,64,3 duplicate(Dorian_izlude) Dorian 878,2,2 izlude_in,113,66,0 duplicate(StrangeMachine_izlude) Strange Machine 111 diff --git a/npc/pre-re/quests/quests_veins.txt b/npc/pre-re/quests/quests_veins.txt index 9f37cc2fea..96e6a46c42 100644 --- a/npc/pre-re/quests/quests_veins.txt +++ b/npc/pre-re/quests/quests_veins.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Quest NPCs located in Veins -//===== By: ================================================== +//===== By: ================================================== //= Euphy -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Quests related to Lighthalzen City. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. -//============================================================ +//============================================================ ve_fild05,257,130,4 duplicate(WincingOldMan_veins) Wincing Old Man#ve 945 diff --git a/npc/pre-re/scripts_main.conf b/npc/pre-re/scripts_main.conf index 927a5b688e..84d86dc05b 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 3b1b72aeae..2c14731723 100644 --- a/npc/pre-re/warps/cities/rachel.txt +++ b/npc/pre-re/warps/cities/rachel.txt @@ -9,14 +9,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/pre-re/warps/fields/payon_fild.txt b/npc/pre-re/warps/fields/payon_fild.txt index b167a7b767..b7a914c6f7 100644 --- a/npc/pre-re/warps/fields/payon_fild.txt +++ b/npc/pre-re/warps/fields/payon_fild.txt @@ -1,17 +1,17 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Payon Field Warps -//===== By: ================================================== +//===== By: ================================================== //= Nana (1.0) -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Payon Field Warps -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.1 Refixed payon field08 -> payon warp //= 1.2 Changed trigger area of pay_fild08 -> payon warp. [L0ne_W0lf] -//============================================================ +//============================================================ //= Payon Field's ============================================ pay_fild01,13,152,0 warp payf001 2,7,moc_fild03,299,170 diff --git a/npc/pre-re/warps/fields/veins_fild.txt b/npc/pre-re/warps/fields/veins_fild.txt index 788ea5d491..ca3f126359 100644 --- a/npc/pre-re/warps/fields/veins_fild.txt +++ b/npc/pre-re/warps/fields/veins_fild.txt @@ -39,9 +39,9 @@ ve_fild06,81,177,0 script ve_fild6-2 45,1,1,{ } ve_fild07,147,371,0 warp ve_fild7-1 1,1,veins,146,28 -//============================================================ +//============================================================ // Old changelog -//============================================================ +//============================================================ //= 1.0 Initial version [$ephiroth] //= 1.1 Updated more warps [$ephiroth] //= 1.2 Removed some unofficial warps [Playtester]