From 72d85aa44dd5444abfbb5e923b73a2667deaf4fc Mon Sep 17 00:00:00 2001 From: Lemongrass3110 Date: Mon, 5 Sep 2016 19:34:52 +0200 Subject: [PATCH] Trimmed trailing whitespaces in /npc/re --- npc/re/airports/izlude.txt | 12 ++-- npc/re/cities/brasilis.txt | 12 ++-- npc/re/cities/dewata.txt | 16 ++--- npc/re/cities/dicastes.txt | 84 +++++++++++----------- npc/re/cities/eclage.txt | 14 ++-- npc/re/cities/izlude.txt | 12 ++-- npc/re/cities/malangdo.txt | 14 ++-- npc/re/cities/malaya.txt | 14 ++-- npc/re/cities/mora.txt | 14 ++-- npc/re/cities/yuno.txt | 14 ++-- npc/re/guides/guides_alberta.txt | 14 ++-- npc/re/guides/guides_aldebaran.txt | 14 ++-- npc/re/guides/guides_amatsu.txt | 14 ++-- npc/re/guides/guides_ayothaya.txt | 14 ++-- npc/re/guides/guides_brasilis.txt | 14 ++-- npc/re/guides/guides_comodo.txt | 14 ++-- npc/re/guides/guides_dewata.txt | 14 ++-- npc/re/guides/guides_dicastes.txt | 16 ++--- npc/re/guides/guides_eclage.txt | 14 ++-- npc/re/guides/guides_einbroch.txt | 14 ++-- npc/re/guides/guides_geffen.txt | 14 ++-- npc/re/guides/guides_gonryun.txt | 14 ++-- npc/re/guides/guides_hugel.txt | 14 ++-- npc/re/guides/guides_izlude.txt | 14 ++-- npc/re/guides/guides_juno.txt | 14 ++-- npc/re/guides/guides_lighthalzen.txt | 14 ++-- npc/re/guides/guides_louyang.txt | 14 ++-- npc/re/guides/guides_lutie.txt | 14 ++-- npc/re/guides/guides_malaya.txt | 14 ++-- npc/re/guides/guides_mora.txt | 14 ++-- npc/re/guides/guides_morroc.txt | 14 ++-- npc/re/guides/guides_moscovia.txt | 14 ++-- npc/re/guides/guides_niflheim.txt | 14 ++-- npc/re/guides/guides_payon.txt | 14 ++-- npc/re/guides/guides_prontera.txt | 14 ++-- npc/re/guides/guides_rachel.txt | 14 ++-- npc/re/guides/guides_umbala.txt | 14 ++-- npc/re/guides/guides_veins.txt | 14 ++-- npc/re/guides/navigation.txt | 14 ++-- npc/re/instances/BakonawaLake.txt | 14 ++-- npc/re/instances/BangungotHospital.txt | 16 ++--- npc/re/instances/BuwayaCave.txt | 14 ++-- npc/re/instances/EclageInterior.txt | 22 +++--- npc/re/instances/HazyForest.txt | 14 ++-- npc/re/instances/MalangdoCulvert.txt | 14 ++-- npc/re/instances/OctopusCave.txt | 14 ++-- npc/re/instances/OldGlastHeim.txt | 22 +++--- npc/re/instances/SaraMemory.txt | 16 ++--- npc/re/instances/WolfchevLaboratory.txt | 6 +- npc/re/jobs/1-1/acolyte.txt | 14 ++-- npc/re/jobs/1-1/archer.txt | 14 ++-- npc/re/jobs/1-1/mage.txt | 14 ++-- npc/re/jobs/1-1/merchant.txt | 14 ++-- npc/re/jobs/1-1/swordman.txt | 14 ++-- npc/re/jobs/1-1/thief.txt | 14 ++-- npc/re/jobs/3-1/guillotine_cross.txt | 12 ++-- npc/re/jobs/3-1/mechanic.txt | 14 ++-- npc/re/jobs/3-1/ranger.txt | 12 ++-- npc/re/jobs/3-1/warlock.txt | 12 ++-- npc/re/jobs/3-2/genetic.txt | 12 ++-- npc/re/jobs/3-2/minstrel.txt | 12 ++-- npc/re/jobs/3-2/royal_guard.txt | 12 ++-- npc/re/jobs/3-2/shadow_chaser.txt | 12 ++-- npc/re/jobs/3-2/sorcerer.txt | 12 ++-- npc/re/jobs/3-2/sura.txt | 12 ++-- npc/re/jobs/3-2/wanderer.txt | 12 ++-- npc/re/jobs/novice/academy.txt | 2 +- npc/re/jobs/novice/novice.txt | 2 +- npc/re/jobs/novice/supernovice_ex.txt | 16 ++--- npc/re/jobs/repair.txt | 12 ++-- npc/re/kafras/kafras.txt | 16 ++--- npc/re/mapflag/gvg.txt | 4 +- npc/re/mapflag/night.txt | 4 +- npc/re/mapflag/nobranch.txt | 4 +- npc/re/mapflag/noicewall.txt | 4 +- npc/re/mapflag/nomemo.txt | 4 +- npc/re/mapflag/nopenalty.txt | 4 +- npc/re/mapflag/nopvp.txt | 4 +- npc/re/mapflag/nosave.txt | 4 +- npc/re/mapflag/noteleport.txt | 4 +- npc/re/mapflag/nowarpto.txt | 4 +- npc/re/mapflag/partylock.txt | 4 +- npc/re/mapflag/reset.txt | 4 +- npc/re/mapflag/restricted.txt | 4 +- npc/re/mapflag/town.txt | 4 +- npc/re/merchants/3rd_trader.txt | 14 ++-- npc/re/merchants/alchemist.txt | 14 ++-- npc/re/merchants/bio4_reward.txt | 12 ++-- npc/re/merchants/blessed_refiner.txt | 2 +- npc/re/merchants/card_separation.txt | 14 ++-- npc/re/merchants/cash_trader-idRO.txt | 12 ++-- npc/re/merchants/catalog.txt | 2 +- npc/re/merchants/coin_exchange.txt | 4 +- npc/re/merchants/diamond.txt | 42 +++++------ npc/re/merchants/enchan_mal.txt | 14 ++-- npc/re/merchants/enchan_mora.txt | 14 ++-- npc/re/merchants/flute.txt | 14 ++-- npc/re/merchants/hd_refiner.txt | 2 +- npc/re/merchants/refine.txt | 4 +- npc/re/merchants/renters.txt | 14 ++-- npc/re/merchants/shops.txt | 14 ++-- npc/re/merchants/ticket_refiner.txt | 2 +- npc/re/mobs/academy.txt | 2 +- npc/re/mobs/dungeons/alde_dun.txt | 6 +- npc/re/mobs/dungeons/beach_dun.txt | 6 +- npc/re/mobs/dungeons/glastheim.txt | 2 +- npc/re/mobs/dungeons/kh_dun.txt | 4 +- npc/re/mobs/dungeons/lou_dun.txt | 4 +- npc/re/mobs/dungeons/prt_sew.txt | 2 +- npc/re/mobs/dungeons/ra_san.txt | 2 +- npc/re/mobs/dungeons/tha_t.txt | 2 +- npc/re/mobs/fields/comodo.txt | 2 +- npc/re/mobs/fields/mjolnir.txt | 6 +- npc/re/mobs/fields/morocc.txt | 20 +++--- npc/re/mobs/fields/niflheim.txt | 2 +- npc/re/mobs/fields/payon.txt | 2 +- npc/re/mobs/fields/umbala.txt | 20 +++--- npc/re/mobs/fields/veins.txt | 2 +- npc/re/mobs/fields/yuno.txt | 4 +- npc/re/other/adven_boards.txt | 4 +- npc/re/other/bulletin_boards.txt | 2 +- npc/re/other/mail.txt | 2 +- npc/re/other/pvp.txt | 6 +- npc/re/other/stone_change.txt | 14 ++-- npc/re/other/turbo_track.txt | 2 +- npc/re/quests/cupet.txt | 44 ++++++------ npc/re/quests/eden/eden_common.txt | 12 ++-- npc/re/quests/eden/eden_iro.txt | 4 +- npc/re/quests/eden/eden_quests.txt | 2 +- npc/re/quests/first_class/tu_archer.txt | 14 ++-- npc/re/quests/homun_s.txt | 14 ++-- npc/re/quests/magic_books.txt | 14 ++-- npc/re/quests/mrsmile.txt | 14 ++-- npc/re/quests/pile_bunker.txt | 12 ++-- npc/re/quests/quests_13_1.txt | 14 ++-- npc/re/quests/quests_dewata.txt | 2 +- npc/re/quests/quests_dicastes.txt | 96 ++++++++++++------------- npc/re/quests/quests_eclage.txt | 20 +++--- npc/re/quests/quests_izlude.txt | 12 ++-- npc/re/quests/quests_lighthalzen.txt | 14 ++-- npc/re/quests/quests_malangdo.txt | 2 +- npc/re/quests/quests_malaya.txt | 6 +- npc/re/quests/quests_mora.txt | 2 +- npc/re/quests/quests_nameless.txt | 14 ++-- npc/re/quests/quests_veins.txt | 14 ++-- npc/re/scripts_main.conf | 2 +- npc/re/warps/cities/dicastes.txt | 2 +- npc/re/warps/cities/eclage.txt | 2 +- npc/re/warps/cities/rachel.txt | 4 +- npc/re/warps/dungeons/ecl_dun.txt | 4 +- npc/re/warps/fields/payon_fild.txt | 14 ++-- npc/re/warps/fields/veins_fild.txt | 4 +- 152 files changed, 879 insertions(+), 879 deletions(-) diff --git a/npc/re/airports/izlude.txt b/npc/re/airports/izlude.txt index fd5848d6b6..fa333f86eb 100644 --- a/npc/re/airports/izlude.txt +++ b/npc/re/airports/izlude.txt @@ -1,18 +1,18 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Izlude Airport NPCs -//===== By: ================================================== +//===== By: ================================================== //= rAthena Dev Team //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Izlude Airport NPCs -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Updated to match the new Izlude Map. [Masao] //= 1.1 Added Izlude duplicates. [Euphy] -//============================================================ +//============================================================ izlude,202,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude 90 izlude_a,202,75,3 duplicate(Airship_Staff_izlude) Airship Staff#izlude_a 90 diff --git a/npc/re/cities/brasilis.txt b/npc/re/cities/brasilis.txt index 74b196e0d4..13622e9704 100644 --- a/npc/re/cities/brasilis.txt +++ b/npc/re/cities/brasilis.txt @@ -1,21 +1,21 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Brasilis Town -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Brasilis Town Script -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. Transportation and Basic NPCs. //= 1.1 Fixed Zeny not being removed for payment. [Kisuka] //= 1.2 Updated dialog, added Ice Cream Maker. [L0ne_W0lf] //= 1.3 Moved Alberta NPC to pre-re/re paths. [Euphy] //= 1.4 Added VIP features. [Euphy] -//============================================================ +//============================================================ // Brasilis Transportation :: brasilis_trans //============================================================ diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt index 1a72d62e14..48f4e71cae 100644 --- a/npc/re/cities/dewata.txt +++ b/npc/re/cities/dewata.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Dewata Town -//===== By: ================================================== +//===== By: ================================================== //= Gennosuke Kouga, Muad_Dib -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Dewata Town Script -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. //= 1.1 Standardized. [Euphy] //= 1.2 Fixed Zeny check. [Joseph] @@ -77,7 +77,7 @@ dewata,229,49,6 script Alberta Sailor#dewata 536,{ } // Generic Dewata NPCs :: dewata_npc -//============================================================ +//============================================================ dewata,221,237,5 script Young Man#dew-1 536,{ mes "[Fruit Fancier]"; mes "What's wrong with your faaaaaace? You must really be clueless!"; @@ -505,7 +505,7 @@ dewata,89,191,6 script Small Shrine#dew1 844,{ "Lover","Girl friend","Boy friend"; //128 setarray .@index[0], 1,1,2,2,2,2,4,4,8,8,8,16,16,16,16,16,32,32,32,32,32,32,64,64,64,128,128,128; - + if (.@good_luck == 7 || .@good_luck == 77 || .@good_luck == 777 || .@good_luck == 7777) set .@bonus,1; for(set .@i,0; .@i 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 489,{ 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 489,{ dic_in01,335,34,5 script Talkative Piom#a 490,{ 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 454,{ 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 453,{ 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 449,{ 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 490,{ 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 453,{ 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 489,{ 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 450,{ 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 449,{ 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,7 @@ dicastes01,202,197,4 script Crazy Venknick#fihsing1 449,{ mes "no legend to share with"; mes "the poor."; close; - close; + close; } set Zeny, Zeny-5000; mes "[Crazy Venknick]"; @@ -676,7 +676,7 @@ dicastes01,202,197,4 script Crazy Venknick#fihsing1 449,{ sc_start SC_Blind,20000,0; next; mes "You feel outraged at being tricked."; - close; + close; } mes "[¡ö¡ú¡ù ¢³ ]"; mes "¢²¡û¡ó ¡ó ¡ù¢¤¡ø"; diff --git a/npc/re/cities/eclage.txt b/npc/re/cities/eclage.txt index b48861cb4d..a9da310c69 100644 --- a/npc/re/cities/eclage.txt +++ b/npc/re/cities/eclage.txt @@ -1,17 +1,17 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= General Eclage NPC. -//===== By: ================================================== +//===== By: ================================================== //= Dastgir -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 2.0 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Eclage Town NPC -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Generic NPC place holders. [Euphy] //= 2.0 Converted from the official Aegis script. [Dastgir] -//============================================================ +//============================================================ ecl_in02,96,22,3 script sign#prison_inn 545,{ mes "[North] Prison"; diff --git a/npc/re/cities/izlude.txt b/npc/re/cities/izlude.txt index 611eb433c9..d6e8664f11 100644 --- a/npc/re/cities/izlude.txt +++ b/npc/re/cities/izlude.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Izlude Town Renewal -//===== By: ================================================== +//===== By: ================================================== //= Masao -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Izlude town NPCs. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. Still missing many new NPCs and their dialogues. [Masao] //= 1.1 Updated to match the official script. [Euphy] //= 1.2 Added Channel Warper and Izlude duplicates. [Euphy] diff --git a/npc/re/cities/malangdo.txt b/npc/re/cities/malangdo.txt index 52262b3149..b5caee37d4 100644 --- a/npc/re/cities/malangdo.txt +++ b/npc/re/cities/malangdo.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Malangdo Town -//===== By: ================================================== +//===== By: ================================================== //= Muad_Dib -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Malangdo Town Script -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. [Euphy] //= 1.1 Added entrance scripts. //= 1.2 Moved "Odgnalam" coordinates. @@ -361,7 +361,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/cities/malaya.txt b/npc/re/cities/malaya.txt index 848fc3e3e1..01ee95e658 100644 --- a/npc/re/cities/malaya.txt +++ b/npc/re/cities/malaya.txt @@ -1,20 +1,20 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Port Malaya -//===== By: ================================================== +//===== By: ================================================== //= Euphy -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Port Malaya Town Script -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 0.1 Alberta sailors only. [Euphy] //= 0.2 Adapted from Masao's conversion. //= 1.0 Added remaining NPCs. //= 1.1 Added Jeepney script. [DeadlySilence] -//============================================================ +//============================================================ // Port Malaya Transportation //============================================================ diff --git a/npc/re/cities/mora.txt b/npc/re/cities/mora.txt index 3e18d45db5..3e270cbc3b 100644 --- a/npc/re/cities/mora.txt +++ b/npc/re/cities/mora.txt @@ -1,22 +1,22 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Mora Village -//===== By: ================================================== +//===== By: ================================================== //= Euphy -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Mora Town Script -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. [SuperHulk] //= 1.1 Translations to English. [Flaid] //= 1.1a Standardized. [Euphy] //= 1.2 Added new NPCs. [Flaid] //= 1.3 Replaced with full iRO town NPCs. [Euphy] //= 1.4 Updated to match the official scripts. [Euphy] -//============================================================ +//============================================================ // Set 1 :: mora_resident //============================================================ diff --git a/npc/re/cities/yuno.txt b/npc/re/cities/yuno.txt index 10c91ba4f3..cb3a18aad6 100644 --- a/npc/re/cities/yuno.txt +++ b/npc/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 852 yuno,165,283,4 duplicate(JunoSoldier2) Juno Soldier#2juno 852 diff --git a/npc/re/guides/guides_alberta.txt b/npc/re/guides/guides_alberta.txt index 6e4eac34ea..ecd08ef3ed 100644 --- a/npc/re/guides/guides_alberta.txt +++ b/npc/re/guides/guides_alberta.txt @@ -1,18 +1,18 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Alberta Guides -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Guides for the city of Alberta -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version, Renewal guides. //= 1.1 Navigation system update. [Euphy] -//============================================================ +//============================================================ alberta,23,238,4 script Guide#01alberta::AlbertaGuide 105,{ cutin "prt_soldier",2; diff --git a/npc/re/guides/guides_aldebaran.txt b/npc/re/guides/guides_aldebaran.txt index e858bef7f3..3305e101f9 100644 --- a/npc/re/guides/guides_aldebaran.txt +++ b/npc/re/guides/guides_aldebaran.txt @@ -1,19 +1,19 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Al De Baran Guides -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Guides for the city of Al De Baran. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. //= 1.1 Navigation system update. [Euphy] //= Optimized. -//============================================================ +//============================================================ aldebaran,139,63,4 script Guide#01aldebaran::GuideAldearan 105,{ cutin "prt_soldier",2; diff --git a/npc/re/guides/guides_amatsu.txt b/npc/re/guides/guides_amatsu.txt index fb65a2b620..ca6648e308 100644 --- a/npc/re/guides/guides_amatsu.txt +++ b/npc/re/guides/guides_amatsu.txt @@ -1,19 +1,19 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Amatsu Guide -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Guide for the city of Amatsu. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. //= 1.1 Optimized. [Euphy] //= 1.2 Navigation system update. [Euphy] -//============================================================ +//============================================================ amatsu,202,91,3 script Amatsu Guide#amatsu 758,{ mes "[Amachang]"; diff --git a/npc/re/guides/guides_ayothaya.txt b/npc/re/guides/guides_ayothaya.txt index aa23cd400d..2548ef2805 100644 --- a/npc/re/guides/guides_ayothaya.txt +++ b/npc/re/guides/guides_ayothaya.txt @@ -1,19 +1,19 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Ayothaya Guide -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Guide for the city of Ayothaya. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. //= 1.1 Added missing case. [Joseph] //= 1.2 Navigation system update. [Euphy] -//============================================================ +//============================================================ ayothaya,203,169,4 script Ayothaya Guide Noi#01ay 839,{ if (strnpcinfo(0) == "Ayothaya Guide Noi#01ay") diff --git a/npc/re/guides/guides_brasilis.txt b/npc/re/guides/guides_brasilis.txt index 8f330a620e..4bac98b953 100644 --- a/npc/re/guides/guides_brasilis.txt +++ b/npc/re/guides/guides_brasilis.txt @@ -1,19 +1,19 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Brasilis Guide -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Guide for the city of Brasilis. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version, Renewal guide. //= 1.1 Added a missing close. //= 1.2 Navigation system update. [Euphy] -//============================================================ +//============================================================ brasilis,219,97,3 script Brasilis Guide 478,{ mes "[Brasilis Guide]"; diff --git a/npc/re/guides/guides_comodo.txt b/npc/re/guides/guides_comodo.txt index 35374200b0..653551c52b 100644 --- a/npc/re/guides/guides_comodo.txt +++ b/npc/re/guides/guides_comodo.txt @@ -1,19 +1,19 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Comodo Guides -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Guides for the city of Comodo. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. //= 1.1 Fixed and optimized. [Euphy] //= 1.2 Navigation system update. [Euphy] -//============================================================ +//============================================================ comodo,322,178,4 script Comodo Guide#01comodo::GuideComodo 700,{ mes "[Comodo Guide]"; diff --git a/npc/re/guides/guides_dewata.txt b/npc/re/guides/guides_dewata.txt index 7c45549cdd..5ed1ad89de 100644 --- a/npc/re/guides/guides_dewata.txt +++ b/npc/re/guides/guides_dewata.txt @@ -1,18 +1,18 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Dewata Guide -//===== By: ================================================== +//===== By: ================================================== //= Muad_Dib -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Guide for the city of Dewata. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. [Lemongrass] //= 1.1 Navigation system update. [Euphy] -//============================================================ +//============================================================ dewata,202,106,4 script Dewata Guide#dewata01 4_M_DEWWOMAN,{ mes "[Dewata Guide]"; diff --git a/npc/re/guides/guides_dicastes.txt b/npc/re/guides/guides_dicastes.txt index dacaef4b0d..e664126aff 100644 --- a/npc/re/guides/guides_dicastes.txt +++ b/npc/re/guides/guides_dicastes.txt @@ -1,19 +1,19 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= El Dicastes Guide -//===== By: ================================================== +//===== By: ================================================== //= Muad_Dib -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Guide for the city of El Dicastes. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. [Joseph] //= 1.1 Fixed viewpoint syntax. [Euphy] //= 1.2 Navigation system update. [Euphy] -//============================================================ +//============================================================ dicastes01,181,191,5 script Traveler Ichack#info 481,2,2,{ mes "[Traveler Ichack]"; @@ -86,7 +86,7 @@ dicastes01,181,191,5 script Traveler Ichack#info 481,2,2,{ close; } OnTouch: - if (ep13_3_invite == 6) + if (ep13_3_invite == 6) emotion e_gasp,0; end; } diff --git a/npc/re/guides/guides_eclage.txt b/npc/re/guides/guides_eclage.txt index 94fa36621a..d652d3abd6 100644 --- a/npc/re/guides/guides_eclage.txt +++ b/npc/re/guides/guides_eclage.txt @@ -1,16 +1,16 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Eclage Guides -//===== By: ================================================== +//===== By: ================================================== //= Euphy -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Guides for the city of Eclage. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. [Euphy] -//============================================================ +//============================================================ ecl_in01,48,60,5 script Eclage Guard#obb 447,{ mes "[Eclage Guard]"; diff --git a/npc/re/guides/guides_einbroch.txt b/npc/re/guides/guides_einbroch.txt index e2daecd982..945b51d4e1 100644 --- a/npc/re/guides/guides_einbroch.txt +++ b/npc/re/guides/guides_einbroch.txt @@ -1,18 +1,18 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Einbroch and Einbech Guides -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Guides for the cities of Einbroch and Einbech. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version, Renewal guides. //= 1.1 Navigation system update. [Euphy] -//============================================================ +//============================================================ einbroch,72,202,4 script Einbroch Guide#ein01::GuideEinbroch 852,{ cutin "ein_soldier",2; diff --git a/npc/re/guides/guides_geffen.txt b/npc/re/guides/guides_geffen.txt index 1999118fa0..5f0532deef 100644 --- a/npc/re/guides/guides_geffen.txt +++ b/npc/re/guides/guides_geffen.txt @@ -1,19 +1,19 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Geffen Guides -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Guides for the city of Geffen. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. //= 1.1 Fixed and optimized. [Euphy] //= 1.2 Navigation system update. [Euphy] -//============================================================ +//============================================================ geffen,203,116,4 script Guide#01geffen::GuideGeffen 705,{ cutin "gef_soldier",2; diff --git a/npc/re/guides/guides_gonryun.txt b/npc/re/guides/guides_gonryun.txt index e278a0e025..dd73021722 100644 --- a/npc/re/guides/guides_gonryun.txt +++ b/npc/re/guides/guides_gonryun.txt @@ -1,19 +1,19 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Kunlun Guide -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Guide for the city of Kunlun. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. //= 1.1 Optimized. [Euphy] //= 1.2 Navigation system update. [Euphy] -//============================================================ +//============================================================ gonryun,163,60,4 script Kunlun Guide#01gonryun 780,{ mes "[He Yuen Zhe]"; diff --git a/npc/re/guides/guides_hugel.txt b/npc/re/guides/guides_hugel.txt index 67ccd2d433..399291fd40 100644 --- a/npc/re/guides/guides_hugel.txt +++ b/npc/re/guides/guides_hugel.txt @@ -1,19 +1,19 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Hugel Guides -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Guides for the city of Hugel. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. //= 1.1 Optimized. [Euphy] //= 1.2 Navigation system update. [Euphy] -//============================================================ +//============================================================ hugel,98,56,3 script Hugel Guide Granny#hugel 863,{ mes "[Hugel Guide Granny]"; diff --git a/npc/re/guides/guides_izlude.txt b/npc/re/guides/guides_izlude.txt index fa1b3d0401..3832b028dd 100644 --- a/npc/re/guides/guides_izlude.txt +++ b/npc/re/guides/guides_izlude.txt @@ -1,22 +1,22 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Izlude Guides -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Guides for the city of Izlude. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. //= 1.1 Updated to match the new Izlude Map. [Masao] //= 1.2 Added Renewal Izlude viewpoint coordinates. //= 1.3 Navigation system update. [Euphy] //= Optimized. //= 1.4 Added Izlude duplicates. [Euphy] -//============================================================ +//============================================================ - script ::GuideIzlude -1,{ cutin "prt_soldier",2; diff --git a/npc/re/guides/guides_juno.txt b/npc/re/guides/guides_juno.txt index b7f6c0d4f6..7dacc61f0b 100644 --- a/npc/re/guides/guides_juno.txt +++ b/npc/re/guides/guides_juno.txt @@ -1,19 +1,19 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Juno Guides -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Guides for the city of Juno. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. //= 1.1 Fixed and optimized. [Euphy] //= 1.2 Navigation system update. [Euphy] -//============================================================ +//============================================================ yuno,59,212,4 script Juno Guide#yuno01::GuideJuno 700,{ mes "[Juno Guide]"; diff --git a/npc/re/guides/guides_lighthalzen.txt b/npc/re/guides/guides_lighthalzen.txt index a60c1a6791..534d11377d 100644 --- a/npc/re/guides/guides_lighthalzen.txt +++ b/npc/re/guides/guides_lighthalzen.txt @@ -1,19 +1,19 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Lighthalzen Guides -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Guides for the city of Lighthalzen. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. //= 1.1 Optimized. [Euphy] //= 1.2 Navigation system update. [Euphy] -//============================================================ +//============================================================ lighthalzen,207,310,5 script Lighthalzen Guide#lhz01::GuideLighthazlen 852,{ cutin "ein_soldier",2; diff --git a/npc/re/guides/guides_louyang.txt b/npc/re/guides/guides_louyang.txt index 43623280f1..4f40659af5 100644 --- a/npc/re/guides/guides_louyang.txt +++ b/npc/re/guides/guides_louyang.txt @@ -1,18 +1,18 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Louyang Guide -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Guide for the city of Louyang. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. //= 1.1 Navigation system update. [Euphy] -//============================================================ +//============================================================ louyang,224,104,4 script Louyang Guide#01louyang 818,{ mes "[Representative]"; diff --git a/npc/re/guides/guides_lutie.txt b/npc/re/guides/guides_lutie.txt index 2771e5524c..691ae4ee37 100644 --- a/npc/re/guides/guides_lutie.txt +++ b/npc/re/guides/guides_lutie.txt @@ -1,19 +1,19 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Lutie Guide -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Guide for the city of Lutie. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. //= 1.1 Fixed and optimized. [Euphy] //= 1.2 Navigation system update. [Euphy] -//============================================================ +//============================================================ xmas,140,137,3 script Lutie Guide#xmas 717,{ mes "[Lutie Guide]"; diff --git a/npc/re/guides/guides_malaya.txt b/npc/re/guides/guides_malaya.txt index 1ce5f32385..53a59d830c 100644 --- a/npc/re/guides/guides_malaya.txt +++ b/npc/re/guides/guides_malaya.txt @@ -1,17 +1,17 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Port Malaya Guides -//===== By: ================================================== +//===== By: ================================================== //= Euphy -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Guides for the city of Malaya. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. [Euphy] //= 1.1 Navigation system update. [Euphy] -//============================================================ +//============================================================ malaya,71,72,4 script Port Malaya Guide#01::GuideMalaya 579,{ mes "[Port Malaya Guide]"; diff --git a/npc/re/guides/guides_mora.txt b/npc/re/guides/guides_mora.txt index 4965d49beb..2b9ef3962f 100644 --- a/npc/re/guides/guides_mora.txt +++ b/npc/re/guides/guides_mora.txt @@ -1,17 +1,17 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Mora Guides -//===== By: ================================================== +//===== By: ================================================== //= Euphy -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Guides for the city of Mora. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. [Euphy] //= 1.1 Navigation system update. [Euphy] -//============================================================ +//============================================================ mora,25,158,5 script Raffle Guide#north 516,{ mes "[Raffoh]"; diff --git a/npc/re/guides/guides_morroc.txt b/npc/re/guides/guides_morroc.txt index 913bc6127f..39ef4de94d 100644 --- a/npc/re/guides/guides_morroc.txt +++ b/npc/re/guides/guides_morroc.txt @@ -1,19 +1,19 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Morroc Guides -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Guides for the city of Morroc and Morroc Ruins. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. //= 1.1 Fixed and optimized. [Euphy] //= 1.2 Navigation system update. [Euphy] -//============================================================ +//============================================================ morocc,153,286,6 script Guide#01morocc::GuideMorroc 707,{ cutin "moc_soldier",2; diff --git a/npc/re/guides/guides_moscovia.txt b/npc/re/guides/guides_moscovia.txt index 8ac322b763..4281fb4bc2 100644 --- a/npc/re/guides/guides_moscovia.txt +++ b/npc/re/guides/guides_moscovia.txt @@ -1,19 +1,19 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Moscovia Guide -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Guide for the city of Moscovia. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. //= 1.1 Optimized (a little bit). [Euphy] //= 1.2 Navigation system update. [Euphy] -//============================================================ +//============================================================ moscovia,161,76,3 script Moscovia Guide#01mosc 959,{ mes "[Moscovia Guide]"; diff --git a/npc/re/guides/guides_niflheim.txt b/npc/re/guides/guides_niflheim.txt index e73fc4b0cc..15d501a7cf 100644 --- a/npc/re/guides/guides_niflheim.txt +++ b/npc/re/guides/guides_niflheim.txt @@ -1,19 +1,19 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Niflheim Guide -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Guide for the city of Niflheim. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. //= 1.1 Optimized. [Euphy] //= 1.2 Navigation system update. [Euphy] -//============================================================ +//============================================================ niflheim,201,187,3 script Niflheim Guide#01nif 849,{ mes "[Niflheim Guide]"; diff --git a/npc/re/guides/guides_payon.txt b/npc/re/guides/guides_payon.txt index 6666d6d237..ac81138389 100644 --- a/npc/re/guides/guides_payon.txt +++ b/npc/re/guides/guides_payon.txt @@ -1,19 +1,19 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Payon Guides -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Guides for the city of Payon. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version, Renewal guides. //= 1.1 Fixed and optimized. [Euphy] //= 1.2 Navigation system update. [Euphy] -//============================================================ +//============================================================ payon,163,64,3 script Guide#01payon::GuidePayon 708,{ cutin "pay_soldier",2; diff --git a/npc/re/guides/guides_prontera.txt b/npc/re/guides/guides_prontera.txt index 9a8f551cc7..4bbcc05c98 100644 --- a/npc/re/guides/guides_prontera.txt +++ b/npc/re/guides/guides_prontera.txt @@ -1,19 +1,19 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Prontera Guides -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Guides for the city of Prontera. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version, Renewal guides. //= 1.1 Navigation system update. [Euphy] //= Optimized. -//============================================================ +//============================================================ prontera,154,187,4 script Guide#01prontera::GuideProntera 105,{ cutin "prt_soldier",2; diff --git a/npc/re/guides/guides_rachel.txt b/npc/re/guides/guides_rachel.txt index 90daf3eaee..4247109111 100644 --- a/npc/re/guides/guides_rachel.txt +++ b/npc/re/guides/guides_rachel.txt @@ -1,18 +1,18 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Rachel Guides -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Guide for the city of Rachel. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version, Renewal guide. //= 1.1 Navigation system update. [Euphy] -//============================================================ +//============================================================ rachel,138,146,5 script Rachel Guide#rachel 934,{ mes "[Rachel Guide]"; diff --git a/npc/re/guides/guides_umbala.txt b/npc/re/guides/guides_umbala.txt index 0c88c7f18e..b22a7cf414 100644 --- a/npc/re/guides/guides_umbala.txt +++ b/npc/re/guides/guides_umbala.txt @@ -1,18 +1,18 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Umbala Guides -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Guides for the city of Umbala. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version, Renewal guides. //= 1.1 Navigation system update. [Euphy] -//============================================================ +//============================================================ umbala,128,94,3 script Umbala Guide#01umbala::GuideUmbala 702,{ mes "[Umbala Guide]"; diff --git a/npc/re/guides/guides_veins.txt b/npc/re/guides/guides_veins.txt index e8af285cef..99b805e0b8 100644 --- a/npc/re/guides/guides_veins.txt +++ b/npc/re/guides/guides_veins.txt @@ -1,18 +1,18 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Veins Guides -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Guides for the city of Veins -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version, Renewal guides. //= 1.1 Navigation system update. [Euphy] -//============================================================ +//============================================================ veins,210,345,5 script Veins Guide#veins01::GuideVeins 934,{ mes "[Veins Guide]"; diff --git a/npc/re/guides/navigation.txt b/npc/re/guides/navigation.txt index 8ab9d833ad..c854de332e 100644 --- a/npc/re/guides/navigation.txt +++ b/npc/re/guides/navigation.txt @@ -1,19 +1,19 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Navigation Functions -//===== By: ================================================== +//===== By: ================================================== //= Euphy -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Controls the navigation system for Renewal guides. //= Clients before 2011-10-10 do not support navigation //= links, and will default to colored or plain text. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. //= 1.1 Added 'is_clientver' command. [Euphy] -//============================================================ +//============================================================ function script F_Navi { diff --git a/npc/re/instances/BakonawaLake.txt b/npc/re/instances/BakonawaLake.txt index 39ec9f5dfb..f73e2fbb33 100644 --- a/npc/re/instances/BakonawaLake.txt +++ b/npc/re/instances/BakonawaLake.txt @@ -1,20 +1,20 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Bakonawa Lake -//===== By: ================================================== +//===== By: ================================================== //= Euphy -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Defeat Bakonawa before he eats the moon. //= Part of the "Bakonawa Extermination" quest. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. [Euphy] //= 1.1 Added GM management NPC. [Euphy] //= 1.2 Added VIP features. [Euphy] -//============================================================ +//============================================================ // Instance Creation :: ma_baku //============================================================ diff --git a/npc/re/instances/BangungotHospital.txt b/npc/re/instances/BangungotHospital.txt index a9127bd417..efebaa9611 100644 --- a/npc/re/instances/BangungotHospital.txt +++ b/npc/re/instances/BangungotHospital.txt @@ -1,20 +1,20 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Bangungot Hospital 2F -//===== By: ================================================== +//===== By: ================================================== //= Euphy -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Save the hospital in Port Malaya from Bangungot. //= Part of the "Nurse in Port Malaya" quest. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. [Euphy] //= 1.1 Added GM management function. [Euphy] //= 1.2 Added VIP features. [Euphy] -//============================================================ +//============================================================ // Instance Creation :: ma_hos_enter //============================================================ @@ -406,7 +406,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 f6c3618ce4..07706f6524 100644 --- a/npc/re/instances/BuwayaCave.txt +++ b/npc/re/instances/BuwayaCave.txt @@ -1,18 +1,18 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Buwaya Cave -//===== By: ================================================== +//===== By: ================================================== //= Euphy -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Defeat Buwaya in his cave. //= Part of the "Secret in the Woods" quest. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. [Euphy] -//============================================================ +//============================================================ // Instance Creation :: buwaya_dun //============================================================ diff --git a/npc/re/instances/EclageInterior.txt b/npc/re/instances/EclageInterior.txt index 61dbc7debd..70a11b9856 100644 --- a/npc/re/instances/EclageInterior.txt +++ b/npc/re/instances/EclageInterior.txt @@ -1,18 +1,18 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Eclage Instance Script -//===== By: ================================================== +//===== By: ================================================== //= Dastgir -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Eclage Interior Instance -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Converted from the official Aegis script. [Dastgir] //= 1.1 Converted from Hercules script to rAthena script & Small bug fix. [Skorm] -//============================================================ +//============================================================ ecl_hub01,132,12,3 script Chief of Staff#tl02 435,{ .@party_id = getcharid(1); @@ -344,20 +344,20 @@ OnMyMobDead: warp "1@ecl",146,29; end; } - + 1@ecl,148,29,3 script Loki#ecl01 512,{ mes "[Loki]"; mes "It seems like this guy next to me has a lot more to say than I do."; mes "Why don't you explain to him first?"; close; -} - +} + 1@ecl,147,30,3 script Nydhog#ecl01 510,{ mes "[Guardian Nydhog]"; mes "I think you should talk to Hisie first."; close; } - + 1@ecl,144,27,5 script Hisie#ecl01 623,{ cutin "hisie01",0; mes "[Hisie]"; diff --git a/npc/re/instances/HazyForest.txt b/npc/re/instances/HazyForest.txt index a2634bd100..4d83c76027 100644 --- a/npc/re/instances/HazyForest.txt +++ b/npc/re/instances/HazyForest.txt @@ -1,19 +1,19 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Hazy Forest -//===== By: ================================================== +//===== By: ================================================== //= Euphy -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Cross through the Hazy Forest to reach the Bifrost. //= Contains the "Wandering Guardian" quest. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. [Euphy] //= 1.1 Instance system rewrite. [Euphy] -//============================================================ +//============================================================ // Instance Creation :: md_mistwoods_enter //============================================================ diff --git a/npc/re/instances/MalangdoCulvert.txt b/npc/re/instances/MalangdoCulvert.txt index 264467a951..2773c690fa 100644 --- a/npc/re/instances/MalangdoCulvert.txt +++ b/npc/re/instances/MalangdoCulvert.txt @@ -1,23 +1,23 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Malangdo Culvert -//===== By: ================================================== +//===== By: ================================================== //= Euphy -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Clean the culverts and defeat the Coelacanth. //= Daily and weekly quests are available. //= Contains a normal mode and hard mode. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. [Euphy] //= Letters "n" and "h" in NPC names indicate difficulty. //= 1.0a There is no minimum party size on official servers. //= 1.0b Fixed incorrect use of 'close'. [Joseph] //= 1.1 Instance system rewrite. [Euphy] -//============================================================ +//============================================================ // Quest NPCs :: mal_yong //============================================================ diff --git a/npc/re/instances/OctopusCave.txt b/npc/re/instances/OctopusCave.txt index affbcf639c..a71716c88a 100644 --- a/npc/re/instances/OctopusCave.txt +++ b/npc/re/instances/OctopusCave.txt @@ -1,18 +1,18 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Octopus Cave -//===== By: ================================================== +//===== By: ================================================== //= Muad_Dib -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Defeat the Disgusting Octopus. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. [Euphy] //= 1.1 Instance system rewrite. [Euphy] -//============================================================ +//============================================================ // Instance Creation :: oct //============================================================ diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt index 2cee217a34..2d2c5da02a 100644 --- a/npc/re/instances/OldGlastHeim.txt +++ b/npc/re/instances/OldGlastHeim.txt @@ -1,19 +1,19 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Old Glast Heim -//===== By: ================================================== +//===== By: ================================================== //= Ziu, Heris (translation) -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Discover the history of events that took place in the //= Glast Heim castle and how it ended up in ruins. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. [Euphy] //= This is a custom version, and may contain bugs. //= 1.1 Bug fixes; removed redundant OnInstanceInit scripts. -//============================================================ +//============================================================ glast_01,204,273,6 script Hugin#ghinstance 755,{ mes "^ff0000This isn't considered a normal progression dungeon. Please note this point.^000000"; @@ -367,7 +367,7 @@ OnTimer35000: end; OnTimer45000: npctalk "Himmelmez : Hohoho, do you have any questions? You're a really mysterious man.", instance_npcname("Himmelmez#ghinstance1"); - end; + end; OnTimer50000: npctalk "Himmelmez : Not coveting the king's throne, you're such a stupid man, only waiting for his return. Your innocence is true, I love it.", instance_npcname("Himmelmez#ghinstance1"); end; @@ -404,7 +404,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$; @@ -445,7 +445,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$; @@ -1478,7 +1478,7 @@ OnEnable: } 2@gl_k,158,252,3 script Himmelmez#ghinstance4 650,4,4,{ - end; + end; OnInstanceInit: OnDisable: hideonnpc instance_npcname("Himmelmez#ghinstance4"); diff --git a/npc/re/instances/SaraMemory.txt b/npc/re/instances/SaraMemory.txt index 1bdd26c64b..ff3fb217f9 100644 --- a/npc/re/instances/SaraMemory.txt +++ b/npc/re/instances/SaraMemory.txt @@ -784,7 +784,7 @@ OnDisable: OnEnable: enablenpc instance_npcname("Sara Irene#talk01"); end; -} +} 1@sara,128,296,6 script Sara Irene#talk02 668,5,5,{ end; @@ -808,7 +808,7 @@ OnDisable: OnEnable: enablenpc instance_npcname("Sara Irene#talk02"); end; -} +} 1@sara,124,230,6 script Sara Irene#talk03 668,5,5,{ end; @@ -832,7 +832,7 @@ OnDisable: OnEnable: enablenpc instance_npcname("Sara Irene#talk03"); end; -} +} 1@sara,174,227,6 script Sara Irene#talk04 668,5,5,{ end; @@ -856,7 +856,7 @@ OnDisable: OnEnable: enablenpc instance_npcname("Sara Irene#talk04"); end; -} +} 1@sara,203,259,6 script Sara Irene#talk05 668,5,5,{ end; @@ -880,7 +880,7 @@ OnDisable: OnEnable: enablenpc instance_npcname("Sara Irene#talk05"); end; -} +} 1@sara,256,279,4 script Sara Irene#talk06 668,5,5,{ end; @@ -904,7 +904,7 @@ OnDisable: OnEnable: enablenpc instance_npcname("Sara Irene#talk06"); end; -} +} 1@sara,228,282,6 script Sara Irene#talk07 668,5,5,{ end; @@ -1236,8 +1236,8 @@ OnEnable: monster .@map$,254,93,"Guard Dog",2545,1,instance_npcname("#MobsSara03")+"::OnMyMobDead"; monster .@map$,254,94,"Guard Dog",2545,1,instance_npcname("#MobsSara03")+"::OnMyMobDead"; - monster .@map$,228,65,"Payon Soldier",2543,1,instance_npcname("#MobsSara03")+"::OnMyMobDead"; - monster .@map$,228,64,"Payon Soldier",2543,1,instance_npcname("#MobsSara03")+"::OnMyMobDead"; + monster .@map$,228,65,"Payon Soldier",2543,1,instance_npcname("#MobsSara03")+"::OnMyMobDead"; + monster .@map$,228,64,"Payon Soldier",2543,1,instance_npcname("#MobsSara03")+"::OnMyMobDead"; monster .@map$,228,63,"Payon Soldier",2543,1,instance_npcname("#MobsSara03")+"::OnMyMobDead"; monster .@map$,228,62,"Payon Soldier",2543,1,instance_npcname("#MobsSara03")+"::OnMyMobDead"; diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt index 8e50dba827..c166564034 100644 --- a/npc/re/instances/WolfchevLaboratory.txt +++ b/npc/re/instances/WolfchevLaboratory.txt @@ -1060,7 +1060,7 @@ OnInstanceInit: OnEnable: specialeffect EF_LIGHTSPHERE; enablenpc instance_npcname("Manual Sheet#1_1"); - end; + end; } // Left Valve @@ -1666,7 +1666,7 @@ On01: monster .@map$,85,58,"Starving Lab animal",2242,1,.@label$; monster .@map$,82,60,"Starving Lab animal",2243,1,.@label$; monster .@map$,83,58,"Starving Lab animal",2243,1,.@label$; - monster .@map$,85,56,"Starving Lab animal",2243,1,.@label$; + monster .@map$,85,56,"Starving Lab animal",2243,1,.@label$; monster .@map$,86,60,"Starving Lab animal",2243,1,.@label$; monster .@map$,87,58,"Starving Lab animal",2243,1,.@label$; end; @@ -1936,7 +1936,7 @@ OnEnable: end; case 13: donpcevent instance_npcname("Howard Alt-Eisen#boss13")+"::OnEnable"; - end; + end; } OnDisable: diff --git a/npc/re/jobs/1-1/acolyte.txt b/npc/re/jobs/1-1/acolyte.txt index 294c0c8428..91263b32a0 100644 --- a/npc/re/jobs/1-1/acolyte.txt +++ b/npc/re/jobs/1-1/acolyte.txt @@ -1,18 +1,18 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Renewal Acolyte Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Kisuka -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Job Change to Acolyte Class -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] //= 1.1 Added back the npcs used for the priest quest. //= 1.2 Added support for Baby classes. [Euphy] -//============================================================ +//============================================================ prt_church,184,41,4 script Cleric#aco 60,{ if (Upper == 1) { if (ADVJOB == Job_High_Priest || ADVJOB == Job_Champion) { diff --git a/npc/re/jobs/1-1/archer.txt b/npc/re/jobs/1-1/archer.txt index 740a24be99..822376d2a6 100644 --- a/npc/re/jobs/1-1/archer.txt +++ b/npc/re/jobs/1-1/archer.txt @@ -1,17 +1,17 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Renewal Archer Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Kisuka -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Job Change to Archer Class -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] //= 1.1 Added support for Baby classes. [Euphy] -//============================================================ +//============================================================ payon_in02,64,71,4 script Archer Guildsman#archer 85,{ if (Upper == 1) { if (Class == Job_Novice_High && (ADVJOB == Job_Sniper || ADVJOB == Job_Clown || ADVJOB == Job_Gypsy)) { diff --git a/npc/re/jobs/1-1/mage.txt b/npc/re/jobs/1-1/mage.txt index 37ceebc729..94e932c788 100644 --- a/npc/re/jobs/1-1/mage.txt +++ b/npc/re/jobs/1-1/mage.txt @@ -1,17 +1,17 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Renewal Mage Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Kisuka -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Job Change to Mage Class -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] //= 1.1 Added support for Baby classes. [Euphy] -//============================================================ +//============================================================ geffen_in,164,124,4 script Mage Guildsman#mage 123,{ if (Upper == 1) { if (ADVJOB == Job_High_Wizard || ADVJOB == Job_Professor) { diff --git a/npc/re/jobs/1-1/merchant.txt b/npc/re/jobs/1-1/merchant.txt index 1debe293f4..fe6a5d61d7 100644 --- a/npc/re/jobs/1-1/merchant.txt +++ b/npc/re/jobs/1-1/merchant.txt @@ -1,17 +1,17 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Renewal Merchant Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Kisuka -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Job Change to Merchant Class -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] //= 1.1 Added support for Baby classes. [Euphy] -//============================================================ +//============================================================ alberta_in,53,43,6 script Merchant#mer 86,{ if (Upper == 1) { if (Class == Job_Novice_High && (ADVJOB == Job_Whitesmith || ADVJOB == Job_Creator)) { diff --git a/npc/re/jobs/1-1/swordman.txt b/npc/re/jobs/1-1/swordman.txt index c65bb79521..a62239558d 100644 --- a/npc/re/jobs/1-1/swordman.txt +++ b/npc/re/jobs/1-1/swordman.txt @@ -1,17 +1,17 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Renewal Swordman Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Kisuka -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Job Change to Swordman Class -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] //= 1.1 Added support for Baby classes. [Euphy] -//============================================================ +//============================================================ izlude_in,74,172,4 script Swordman#swd 119,{ if (Upper == 1) { if (Class == Job_Novice_High && (ADVJOB == Job_Lord_Knight || ADVJOB == Job_Paladin)) { diff --git a/npc/re/jobs/1-1/thief.txt b/npc/re/jobs/1-1/thief.txt index ee5b2932e2..dd05cefb91 100644 --- a/npc/re/jobs/1-1/thief.txt +++ b/npc/re/jobs/1-1/thief.txt @@ -1,17 +1,17 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Renewal Thief Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Kisuka -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Job Change to Thief Class -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] //= 1.1 Added support for Baby classes. [Euphy] -//============================================================ +//============================================================ moc_prydb1,39,129,2 script Thief Guide#thief 69,{ if (Upper == 1) { if (ADVJOB == Job_Assassin_Cross || ADVJOB == Job_Stalker) { diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt index 94e24370e5..31c487e536 100644 --- a/npc/re/jobs/3-1/guillotine_cross.txt +++ b/npc/re/jobs/3-1/guillotine_cross.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Guillotine Cross Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Muad_Dib -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.6 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project; SVN r16945+ -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job change Quest from Assassin / Assassin Cross -> Guillotine Cross. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Adapted from original script. [Euphy] //= 1.0a Added 'npcskill' command. [Euphy] //= 1.0b Moved warps to separate file. [Euphy] diff --git a/npc/re/jobs/3-1/mechanic.txt b/npc/re/jobs/3-1/mechanic.txt index 097114a97b..113d233764 100644 --- a/npc/re/jobs/3-1/mechanic.txt +++ b/npc/re/jobs/3-1/mechanic.txt @@ -1,20 +1,20 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Mechanic Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Muad_Dib -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Jobchange Quest from Blacksmith / Whitesmith -> Mechanic. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [Masao] //= 1.1 Fixed the Door NPC [JayPee]. //= 1.2 Updated script. [Euphy] //= 1.3 Added VIP features. [Euphy] -//============================================================ +//============================================================ yuno,129,156,3 script Chainheart 923,{ mes "[Chainheart]"; diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt index 5f632e537d..14a493d7c9 100644 --- a/npc/re/jobs/3-1/ranger.txt +++ b/npc/re/jobs/3-1/ranger.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Ranger Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Muad_Dib -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.7 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job change Quest from Hunter / Sniper -> Ranger. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [Masao] //= 1.1 Updated SC_STONE duration from 2 Seconds to 2 Minutes //= and fixed Mercenary check. diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt index 4c84c4164d..1dedda0a3b 100644 --- a/npc/re/jobs/3-1/warlock.txt +++ b/npc/re/jobs/3-1/warlock.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Warlock Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Muad_Dib, Gepard & L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job change Quest from Wizard / High Wizard -> Warlock. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. [Masao] //= 1.1 Fixed some conversion mistakes, replaced numbers with //= constants, added item names in comments. diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt index df1d17651d..350a7a9c7f 100644 --- a/npc/re/jobs/3-2/genetic.txt +++ b/npc/re/jobs/3-2/genetic.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Genetic Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Muad_Dib, Aeomin -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job change Quest from Alchemist / Creator -> Genetic. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [Masao] //= 1.1 Fixed Scatter Stuff NPCs [JayPee]. //= 1.2 Updated dialogue. Credits to Muad_Dib. [Joseph] diff --git a/npc/re/jobs/3-2/minstrel.txt b/npc/re/jobs/3-2/minstrel.txt index 91c5bcb780..f6adbd25e8 100644 --- a/npc/re/jobs/3-2/minstrel.txt +++ b/npc/re/jobs/3-2/minstrel.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Minstrel Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Muad_Dib -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job change Quest from Bard / Clown -> Minstrel. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [Masao] //= 1.1 Fix the checking of requirements before job change to Minstel [JayPee] //= 1.2 Optimized. [Euphy] diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt index 490662ea96..ba44033f85 100644 --- a/npc/re/jobs/3-2/royal_guard.txt +++ b/npc/re/jobs/3-2/royal_guard.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Royal Guard Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Muad_Dib -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job change Quest from Crusader / Paladin -> Royal Guard. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [brAthena] //= 1.1 Updated script. [Euphy] //= 1.2 Added GM management function. [Euphy] diff --git a/npc/re/jobs/3-2/shadow_chaser.txt b/npc/re/jobs/3-2/shadow_chaser.txt index f3b6ac92f4..d5ae8c677d 100644 --- a/npc/re/jobs/3-2/shadow_chaser.txt +++ b/npc/re/jobs/3-2/shadow_chaser.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Shadow Chaser Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Muad_Dib -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.4 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job change Quest from Rogue / Stalker -> Shadow Chaser. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [ultragunner, Oshinoke] //= 1.1 Standardized. [Euphy] //= 1.2 Updated dialogue. [Joseph] diff --git a/npc/re/jobs/3-2/sorcerer.txt b/npc/re/jobs/3-2/sorcerer.txt index 5d212b4cfb..2135f1d522 100644 --- a/npc/re/jobs/3-2/sorcerer.txt +++ b/npc/re/jobs/3-2/sorcerer.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Sorcerer Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Muad_Dib -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job change Quest from Sage / Professor -> Sorcerer. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [Masao] //= 1.1 Cleaning. [Euphy] //= 1.2 Updated script, optimized. [Euphy] diff --git a/npc/re/jobs/3-2/sura.txt b/npc/re/jobs/3-2/sura.txt index 9ca932cc67..6ec4f3b246 100644 --- a/npc/re/jobs/3-2/sura.txt +++ b/npc/re/jobs/3-2/sura.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Sura Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Muad_Dib, Gepard -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job change Quest from Monk / Champion -> Sura. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [Masao] //= 1.1 Removed disablenpc which causes players stucked in waitingroom. [Joseph] //= 1.2 Updated script, optimized. [Euphy] diff --git a/npc/re/jobs/3-2/wanderer.txt b/npc/re/jobs/3-2/wanderer.txt index ad6e562148..43636a367a 100644 --- a/npc/re/jobs/3-2/wanderer.txt +++ b/npc/re/jobs/3-2/wanderer.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Wanderer Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Muad_Dib, Meyraw -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Job change Quest from Dancer / Gypsy -> Wanderer. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. //= 1.1 Updated dialogue to be more official / accurate. Huge thanks to Muad_Dib! [Masao] //= 1.2 Fixed an endless loop in dialogue. diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt index 17a45ce55e..058acdf77f 100644 --- a/npc/re/jobs/novice/academy.txt +++ b/npc/re/jobs/novice/academy.txt @@ -12686,7 +12686,7 @@ izlude_d,153,126,1 duplicate(Refinery Owner Han#iz) Refinery Owner Han#iz_d 4_M_ enable_items; end; } - // if (!getequipisidentify(.@part)) {// getequipisidentify command removed + // if (!getequipisidentify(.@part)) {// getequipisidentify command removed // mes "[Refining Machine Wagjak]"; // mes "^FF0000- error number 5555 -^000000"; // mes "This item has not yet been identified."; diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt index 4ae426df02..c6ccb72a58 100644 --- a/npc/re/jobs/novice/novice.txt +++ b/npc/re/jobs/novice/novice.txt @@ -2271,7 +2271,7 @@ S_Warp: savepoint getarg(0),getarg(1),getarg(2); warp getarg(0),getarg(3),getarg(4); end; - + OnTouch: emotion e_gasp; end; diff --git a/npc/re/jobs/novice/supernovice_ex.txt b/npc/re/jobs/novice/supernovice_ex.txt index 030399e3c6..59d86c9440 100644 --- a/npc/re/jobs/novice/supernovice_ex.txt +++ b/npc/re/jobs/novice/supernovice_ex.txt @@ -1,19 +1,19 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Expanded Super Novice Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Euphy -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1a -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Job Change quest for Expanded Super Novice class. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 All dialogue is custom, contains some incorrect behaviors. //= 1.1 Switched to a translated copy of the official script //= by Gennosuke Kouga, but vastly edited its content. [Euphy] //= 1.1a Replaced effect numerics with constants. [Euphy] -//============================================================ +//============================================================ function script Esseray_Ex { if (BaseLevel > 98 && JobLevel > 98) { @@ -479,7 +479,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 567,{ 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/jobs/repair.txt b/npc/re/jobs/repair.txt index 0dbc85edb0..eba1eb358f 100644 --- a/npc/re/jobs/repair.txt +++ b/npc/re/jobs/repair.txt @@ -1,18 +1,18 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Job Repairs //===== By: ================================================== //= Euphy -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Removes potentially conflicting job data. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. //= 1.1 Added GM management function. [Euphy] -//============================================================ +//============================================================ // Job Variables //============================================================ diff --git a/npc/re/kafras/kafras.txt b/npc/re/kafras/kafras.txt index 911e23c279..882126d123 100644 --- a/npc/re/kafras/kafras.txt +++ b/npc/re/kafras/kafras.txt @@ -1,22 +1,22 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Kafras (Cities/Dungeons/Fields) -//===== By: ================================================== +//===== By: ================================================== //= Joseph -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.4 -//===== 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: ================================= -//= 0.x Previous Authors: +//===== Additional Comments: ================================= +//= 0.x Previous Authors: //= - L0ne_W0lf, Daegaladh //= 1.0 Merged and cleaned up Kafras. [Euphy] //= 1.1 Added Dewata Kafra. [Lemongrass] @@ -24,7 +24,7 @@ //= 1.3 Added Eden Group Kafra. [Euphy] //= 1.3a Moved Rune Knight Kafra from job file. [Euphy] //= 1.4 Added Izlude duplicates. [Euphy] -//============================================================ +//============================================================ // Brasilis //============================================================ diff --git a/npc/re/mapflag/gvg.txt b/npc/re/mapflag/gvg.txt index bd72449b39..15af10eabd 100644 --- a/npc/re/mapflag/gvg.txt +++ b/npc/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/re/mapflag/night.txt b/npc/re/mapflag/night.txt index afa678b7b2..e6cfe85997 100644 --- a/npc/re/mapflag/night.txt +++ b/npc/re/mapflag/night.txt @@ -6,9 +6,9 @@ //= 1.1 //===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Enables night mode effects. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Renewal split. [Euphy] //= 1.1 Added Izlude duplicates. [Euphy] //============================================================ diff --git a/npc/re/mapflag/nobranch.txt b/npc/re/mapflag/nobranch.txt index 8f0d8dbb07..b3ba09f50f 100644 --- a/npc/re/mapflag/nobranch.txt +++ b/npc/re/mapflag/nobranch.txt @@ -6,11 +6,11 @@ //= 1.1 //===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Disables the following items: //= Dead Branch (604), Bloody Branch (12103), //= Red Pouch (12024), Poring Box (12109) -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Renewal split. [Euphy] //= 1.1 Added Izlude duplicates. [Euphy] //= 1.2 Added Nightmare Clock Tower [Lemongrass] diff --git a/npc/re/mapflag/noicewall.txt b/npc/re/mapflag/noicewall.txt index 5dbb8310b8..590ff18a1b 100644 --- a/npc/re/mapflag/noicewall.txt +++ b/npc/re/mapflag/noicewall.txt @@ -6,9 +6,9 @@ //= 1.0 //===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Blocks usage of WZ_ICEWALL. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Renewal split. [Euphy] //============================================================ diff --git a/npc/re/mapflag/nomemo.txt b/npc/re/mapflag/nomemo.txt index aeb6bf16e1..cca27f3200 100644 --- a/npc/re/mapflag/nomemo.txt +++ b/npc/re/mapflag/nomemo.txt @@ -6,10 +6,10 @@ //= 1.1 //===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Prevents players from using /memo on a map. //= Also disables marriage warp skills. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Renewal split. [Euphy] //= 1.1 Added Nightmare Clock Tower [Secret] //============================================================ diff --git a/npc/re/mapflag/nopenalty.txt b/npc/re/mapflag/nopenalty.txt index 2a6a741d35..e3652d6c67 100644 --- a/npc/re/mapflag/nopenalty.txt +++ b/npc/re/mapflag/nopenalty.txt @@ -6,9 +6,9 @@ //= 1.1 //===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Same as 'noexppenalty' and 'nozenypenalty' combined. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Renewal split. [Euphy] //= 1.1 Added Izlude duplicates. [Euphy] //============================================================ diff --git a/npc/re/mapflag/nopvp.txt b/npc/re/mapflag/nopvp.txt index 99db0d4908..cda8fbc9cd 100644 --- a/npc/re/mapflag/nopvp.txt +++ b/npc/re/mapflag/nopvp.txt @@ -6,9 +6,9 @@ //= 1.1 //===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Prevents PvP mode on a map. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Renewal split. [Euphy] //= 1.1 Added Izlude duplicates. [Euphy] //============================================================ diff --git a/npc/re/mapflag/nosave.txt b/npc/re/mapflag/nosave.txt index 1f73ed1830..52b1d541c4 100644 --- a/npc/re/mapflag/nosave.txt +++ b/npc/re/mapflag/nosave.txt @@ -6,10 +6,10 @@ //= 1.0 //===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Characters logging out on the specified map will be warped //= to the map specified in the last field, or "SavePoint". -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Renewal split. [Euphy] //============================================================ diff --git a/npc/re/mapflag/noteleport.txt b/npc/re/mapflag/noteleport.txt index 233fbce1f2..454b2aa5e0 100644 --- a/npc/re/mapflag/noteleport.txt +++ b/npc/re/mapflag/noteleport.txt @@ -6,7 +6,7 @@ //= 1.0 //===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Disables all means of teleportation within a map. //= Script commands 'warp', 'areawarp', 'warpchar', //= 'warpparty', 'warpguild', 'warpwaitingpc' will not @@ -14,7 +14,7 @@ //= Disables skills AL_TELEPORT and TK_HIGHJUMP. //= Disables the following items: //= Fly Wing (601), Giant Fly Wing (12212) -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Renewal split. [Euphy] //============================================================ diff --git a/npc/re/mapflag/nowarpto.txt b/npc/re/mapflag/nowarpto.txt index 1181254dd3..4d7e86f24d 100644 --- a/npc/re/mapflag/nowarpto.txt +++ b/npc/re/mapflag/nowarpto.txt @@ -6,12 +6,12 @@ //= 1.0 //===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Disables warping to a map. //= Atcommands @warp, @go, @load, @jump, @partyrecall, //= @guildrecall, and @recallall are disabled. //= Command /memo is disabled. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Renewal split. [Euphy] //============================================================ diff --git a/npc/re/mapflag/partylock.txt b/npc/re/mapflag/partylock.txt index 1d521c4da8..78f27966ed 100644 --- a/npc/re/mapflag/partylock.txt +++ b/npc/re/mapflag/partylock.txt @@ -6,10 +6,10 @@ //= 1.0 //===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Blocks all party modifications on a map: //= /organize, /leave, /invite, @changeleader -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Renewal split. [Euphy] //============================================================ diff --git a/npc/re/mapflag/reset.txt b/npc/re/mapflag/reset.txt index 6b6ce125cd..2323111e0f 100644 --- a/npc/re/mapflag/reset.txt +++ b/npc/re/mapflag/reset.txt @@ -6,9 +6,9 @@ //= 1.1 //===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Maps where Neuralizer (12213) can be used. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Renewal split. [Euphy] //= 1.1 Added Izlude duplicates. [Euphy] //============================================================ diff --git a/npc/re/mapflag/restricted.txt b/npc/re/mapflag/restricted.txt index 53a2c708a7..3f4c0db869 100644 --- a/npc/re/mapflag/restricted.txt +++ b/npc/re/mapflag/restricted.txt @@ -6,10 +6,10 @@ //= 1.1 //===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Disables items configured in item_noequip.txt //= and skills configured in skill_nocast_db.txt. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Renewal split. [Euphy] //= 1.1 Copied towns into this file. [Euphy] //============================================================ diff --git a/npc/re/mapflag/town.txt b/npc/re/mapflag/town.txt index a779d2be31..b547dd85ef 100644 --- a/npc/re/mapflag/town.txt +++ b/npc/re/mapflag/town.txt @@ -6,9 +6,9 @@ //= 1.1 //===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Designates a map as a town, granting mailbox access. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Renewal split. [Euphy] //= 1.1 Added Izlude duplicates. [Euphy] //============================================================ diff --git a/npc/re/merchants/3rd_trader.txt b/npc/re/merchants/3rd_trader.txt index e889af1758..777f010154 100644 --- a/npc/re/merchants/3rd_trader.txt +++ b/npc/re/merchants/3rd_trader.txt @@ -1,16 +1,16 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= 3rd Item Seller -//===== By: ================================================== +//===== By: ================================================== //= Masao, Mercurial -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Sells some 3rd Job related items: //= - Poison Herbs, Rune Stones, Rare Herbs, Points -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. //= 1.1 Optimized Poison Herb Salesman NPC //= 1.2 Optimized and standardized. [Euphy] @@ -18,7 +18,7 @@ //= 1.4 Updated to match the official scripts. [Euphy] //= 1.5 Added Izlude duplicates. [Euphy] //= 1.5a Remove useless array & misc. [Capuche] -//============================================================ +//============================================================ // Poison Herb Merchants (Guillotine Cross) :: poison_herb_3rd_trader //============================================================ diff --git a/npc/re/merchants/alchemist.txt b/npc/re/merchants/alchemist.txt index eb36d0a311..36d0b3fc9a 100644 --- a/npc/re/merchants/alchemist.txt +++ b/npc/re/merchants/alchemist.txt @@ -1,18 +1,18 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Alchemist Shop -//===== By: ================================================== +//===== By: ================================================== //= rAthena Dev Team -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Merchants for Alchemist Materials and Manuals. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Split Geneticist shop from main file. [Euphy] //= Updated dialogue to match the official script. -//============================================================ +//============================================================ // Main NPC :: craft_book_alche_skill_npc //============================================================ diff --git a/npc/re/merchants/bio4_reward.txt b/npc/re/merchants/bio4_reward.txt index ceef2d88a1..def3b0fab7 100644 --- a/npc/re/merchants/bio4_reward.txt +++ b/npc/re/merchants/bio4_reward.txt @@ -147,7 +147,7 @@ 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(6469) >= 100) && (countitem(6470) >= 50) && (countitem(6471) >= 35)) || + if (((.@i == 1 || .@i == 5) && (countitem(6469) >= 100) && (countitem(6470) >= 50) && (countitem(6471) >= 35)) || ((.@i == 2 || .@i == 3) && (countitem(6469) >= 100) && (countitem(6470) >= 50) && (countitem(6471) >= 22)) || ((.@i == 4 || .@i == 7) && (countitem(6469) >= 300) && (countitem(6470) >= 300) && (countitem(6471) >= 400)) || ((.@i == 6) && (countitem(6469) >= 100) && (countitem(6470) >= 50) && (countitem(6471) >= 30))) { @@ -575,7 +575,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]"; @@ -641,8 +641,8 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{ .@refine_count = getequiprefinerycnt(.@part); .@equip_item = getequipid(.@part); .@lhz_max_num = 4000; - if (.@equip_item == 13069 || .@equip_item == 1291 || .@equip_item == 1392 || - .@equip_item == 1393 || .@equip_item == 1435 || .@equip_item == 1490 || + if (.@equip_item == 13069 || .@equip_item == 1291 || .@equip_item == 1392 || + .@equip_item == 1393 || .@equip_item == 1435 || .@equip_item == 1490 || .@equip_item == 13069 || .@equip_item == 13070 || .@equip_item == 16017) { .@type = 1; if (.@equip_item == 1490) @@ -652,7 +652,7 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{ } else if (.@equip_item == 1584 || .@equip_item == 1659) { .@type = 3; } else if (.@equip_item == 2160 || .@equip_item == 2161 || .@equip_item == 2162 || - .@equip_item == 2582 || .@equip_item == 2892 || .@equip_item == 15044 || + .@equip_item == 2582 || .@equip_item == 2892 || .@equip_item == 15044 || .@equip_item == 18570) { .@type = 4; if (.@equip_item == 2582 || .@equip_item == 18570) @@ -966,7 +966,7 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{ else delitem 6469, 10; //Will_Of_Warrior delequip .@part; - + if (.@enchant == 0){ specialeffect2 EF_SUI_EXPLOSION; emotion e_otl; diff --git a/npc/re/merchants/blessed_refiner.txt b/npc/re/merchants/blessed_refiner.txt index 33d15be544..3c7f78cda6 100644 --- a/npc/re/merchants/blessed_refiner.txt +++ b/npc/re/merchants/blessed_refiner.txt @@ -1,4 +1,4 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Blessed Refiner //===== By: ================================================== //= Euphy diff --git a/npc/re/merchants/card_separation.txt b/npc/re/merchants/card_separation.txt index 8118dd6644..eab5b506ce 100644 --- a/npc/re/merchants/card_separation.txt +++ b/npc/re/merchants/card_separation.txt @@ -1,18 +1,18 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Card Separation System -//===== By: ================================================== +//===== By: ================================================== //= Muad_Dib -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Separates cards from equipment. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [Euphy] //= 1.1 Added "Richard" NPC. [Euphy] -//============================================================ +//============================================================ - script ::CardSeparation_mal -1,{ disable_items; diff --git a/npc/re/merchants/cash_trader-idRO.txt b/npc/re/merchants/cash_trader-idRO.txt index 15df787b3c..1097b62d39 100644 --- a/npc/re/merchants/cash_trader-idRO.txt +++ b/npc/re/merchants/cash_trader-idRO.txt @@ -1,14 +1,14 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= idRO Cash Shop NPCs -//===== By: ================================================== +//===== By: ================================================== //= Cydh -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Sells cash shop items based on idRO's cash shop. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Initial release. 2014-Jan-13 [Cydh] //= 1.1 2014-Jan-18 [Cydh] // - Fixed the item list diff --git a/npc/re/merchants/catalog.txt b/npc/re/merchants/catalog.txt index 2a36632997..dfa0e94493 100644 --- a/npc/re/merchants/catalog.txt +++ b/npc/re/merchants/catalog.txt @@ -13,7 +13,7 @@ //===== Additional Comments: ================================= //= 1.0 Moved from root directory. [Euphy] //= 1.1 Updated dialogue. [Euphy] -//============================================================ +//============================================================ // Main NPC :: catalog_merchant //============================================================ diff --git a/npc/re/merchants/coin_exchange.txt b/npc/re/merchants/coin_exchange.txt index 5ecbe8ff4f..a601f432c5 100644 --- a/npc/re/merchants/coin_exchange.txt +++ b/npc/re/merchants/coin_exchange.txt @@ -4,7 +4,7 @@ //= rAthena Dev Team //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= //= [Official Conversion] @@ -1026,7 +1026,7 @@ ecl_in01,33,98,5 script Herb Merchant Plafina#a 443,{ delitem 6081,.cost[.@item]*.@buy; //Splendide_Coin getitem .items[.@item],.@buy; close; - + OnInit: setarray .items[0],12812,12813,12814,12815; setarray .cost[0],5,5,1,1; //Splendide Coins diff --git a/npc/re/merchants/diamond.txt b/npc/re/merchants/diamond.txt index d182ab2093..7a24f9a727 100644 --- a/npc/re/merchants/diamond.txt +++ b/npc/re/merchants/diamond.txt @@ -31,21 +31,21 @@ mes "The ^FF82FF'17 Carat Diamond'^000000 is currently on sale for a cheap price!!"; mes "If valuable diamonds interest you then listen up!"; next; - + mes .@npc$; mes "You can give the diamond as a gift to your lover."; mes "The receiver of the ^FF82FF'17 Carat Diamond'^000000 will cherish it"; mes "and treasure you in their heart."; emotion e_loud; next; - + mes .@npc$; mes "What? You don't have a lover?"; mes "You can still just hang on to it for yourself."; mes "The enchanting aura of the ^FF82FF'17 Carat Diamond'^000000 is likely"; mes "to bring love into your life."; next; - + mes .@npc$; mes "Known as the captivating diamond of diamonds..."; mes "It is the ^FF82FF'17 Carat Diamond'^000000!"; @@ -65,33 +65,33 @@ mes "dug up from Morroc is unspeakable!"; emotion e_omg; next; - + mes .@npc$; mes "Some claim that this is the very same diamond"; mes "that was seen by Kachua in Comodo!"; next; - + if (select("End Conversation:How much is it?") == 1) { mes .@npc$; mes "It's rather inexpensive!"; mes "If you're interested, talk to me any time!"; close; } - + mes .@npc$; mes "Of course! The most important thing is price!"; mes "As I've said earlier, the ^FF82FF'17 Carat Diamond'^000000 has been"; mes "appraised as a 17 carat diamond."; mes "There aren't many like it in the world."; next; - + mes .@npc$; mes "The price is a mere 500 million zeny!"; mes "There is also a 1,000,000z service fee."; mes "Compared to the quality of the diamond"; mes "this is a small price to pay."; next; - + if (select("^828282It's too expensive.^000000:I'll buy it.") == 1) { mes .@npc$; mes "To say that a diamond such as the"; @@ -99,7 +99,7 @@ mes "you leave me speechless."; close; } - + mes .@npc$; mes "OOOH! I knew from the moment I saw you that you were the rightful"; mes "owner of this wonderful diamond."; @@ -107,18 +107,18 @@ mes "I believe this diamond will suit you quite well."; mes "All I need from you is to complete this contract."; next; - + while(1) { if (select("^B9062FI will sign the contract.^000000:^828282Nevermind, I changed my mind.^000000") == 2) { mes .@npc$; mes "I see, that's too bad.."; close; } - + mes .@npc$; mes "What is your name?"; next; - + mes "[" + strcharinfo(0) + "]"; mes "My name is " + strcharinfo(0) + "."; next; @@ -126,19 +126,19 @@ mes .@npc$; mes "Alright then, please sign here."; next; - + input .@charname$; if (.@charname$ == strcharinfo(0)) { mes .@npc$; mes "Okay, good."; mes "All that is left now is payment."; next; - + if (Zeny >= 501000000) { mes .@npc$; mes ". . . . . ."; next; - + mes .@npc$; mes "Calculating the price and service fee.."; mes "501,000,000 zeny."; @@ -190,26 +190,26 @@ mes "You must offer your ^FF82FF'17 Carat Diamond'^000000."; mes "Also don't forget there is a 1,000,000z service fee!"; next; - + mes .@npc$; mes "What is your name?"; next; - + mes "[" + strcharinfo(0) + "]"; mes "My name is " + strcharinfo(0) + "."; next; - + mes .@npc$; mes "Alright then, please sign here."; next; - + while (1) { if (select("Sign:Don't Sign") == 2) { mes .@npc$; mes "The trade cannot be completed without your signature."; close; } - + input .@charname$; if (.@charname$ == strcharinfo(0)) { mes .@npc$; @@ -217,7 +217,7 @@ mes "I will now take your ^FF82FF'17 Carat Diamond'^000000.."; mes "You will receive ^0000FF499,000,000z^000000 afterwards."; next; - + mes .@npc$; mes "Thank you for your business."; mes "Whenever you need a ^FF82FF'17 Carat Diamond'^000000,"; diff --git a/npc/re/merchants/enchan_mal.txt b/npc/re/merchants/enchan_mal.txt index 899714f459..563c9b7c3d 100644 --- a/npc/re/merchants/enchan_mal.txt +++ b/npc/re/merchants/enchan_mal.txt @@ -1,21 +1,21 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Malangdo Enchants -//===== By: ================================================== +//===== By: ================================================== //= Muad_Dib -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.0.3 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Adds enchantments to many high level weapons in exchange //= for Malangdo coins. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [Euphy] //= 1.0.1 Added 'delequip' command. [Euphy] //= 1.0.2 Remove redundant usage of 'getarg' [Cydh] //= 1.0.3 Fixed typo in 1.0.2 [Dastgir] -//============================================================ +//============================================================ // Enchanter NPC :: mal_yong //============================================================ diff --git a/npc/re/merchants/enchan_mora.txt b/npc/re/merchants/enchan_mora.txt index 01b3a36612..41ed5161b4 100644 --- a/npc/re/merchants/enchan_mora.txt +++ b/npc/re/merchants/enchan_mora.txt @@ -1,21 +1,21 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Mora Enchants -//===== By: ================================================== +//===== By: ================================================== //= Euphy -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Adds enchantments to various items in exchange for //= Mora coins. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [Euphy] //= 1.1 Optimized. [Euphy] //= 1.1a Bug fixes. [Lemongrass] //= 1.2 Bug fixes (bugreport:7930) [DeadlySilence] -//============================================================ +//============================================================ // Arch Bishop Enchants :: coin_arc //============================================================ diff --git a/npc/re/merchants/flute.txt b/npc/re/merchants/flute.txt index e6514c6fda..03c46b303c 100644 --- a/npc/re/merchants/flute.txt +++ b/npc/re/merchants/flute.txt @@ -1,20 +1,20 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Falcon & Wolf Flute Trader -//===== By: ================================================== +//===== By: ================================================== //= Masao, Muad_Dib, Ziu -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2a -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Sells Falcon Flute and Wolf Flute. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [Masao] //= 1.1 Added Baby Hunter and Baby Ranger check. bugreport:5728 [Masao] //= 1.2 Added Wolf Flute trader, optimized. [Euphy] //= 1.2a Fixed some conditions. [Euphy] -//============================================================ +//============================================================ // Falcon Flute :: falcon_flute //============================================================ diff --git a/npc/re/merchants/hd_refiner.txt b/npc/re/merchants/hd_refiner.txt index 61eaa7d464..92abb038fc 100644 --- a/npc/re/merchants/hd_refiner.txt +++ b/npc/re/merchants/hd_refiner.txt @@ -1,4 +1,4 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= HD Refiners //===== By: ================================================== //= Euphy diff --git a/npc/re/merchants/refine.txt b/npc/re/merchants/refine.txt index ad38d5aab1..fdb14c8010 100644 --- a/npc/re/merchants/refine.txt +++ b/npc/re/merchants/refine.txt @@ -1,4 +1,4 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Renewal Refining NPCs //===== By: ================================================== //= rAthena Dev Team @@ -220,7 +220,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/merchants/renters.txt b/npc/re/merchants/renters.txt index 484174b691..b18df604f8 100644 --- a/npc/re/merchants/renters.txt +++ b/npc/re/merchants/renters.txt @@ -1,18 +1,18 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Renters -//===== By: ================================================== +//===== By: ================================================== //= rAthena Dev Team -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 2.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Renewal-specific breeder NPCs. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 2.1 Moved some renters to a separate renewal file. [Daegaladh] //= 2.2 Updated to match the official scripts. [Euphy] -//============================================================ +//============================================================ // Dragon Breeder :: dragon //============================================================ diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt index 4101fde834..fdedffffd1 100644 --- a/npc/re/merchants/shops.txt +++ b/npc/re/merchants/shops.txt @@ -1,14 +1,14 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Shops -//===== By: ================================================== +//===== By: ================================================== //= rAthena Dev Team -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.9 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Renewal-specific town shop NPCs. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Moved some merchants to a separate renewal file. [Kenpachi] //= 1.1 Added Dicastes merchants. [Joseph] //= 1.2 Moved more shops to Renewal file. [Euphy] @@ -19,7 +19,7 @@ //= 1.7 Added Izlude duplicates. [Euphy] //= 1.8 Added Rebellion Machines. [Rekiem] //= 1.9 Added Renewal Ninja shops. [Euphy] -//============================================================ +//============================================================ //======================================================= // Comodo diff --git a/npc/re/merchants/ticket_refiner.txt b/npc/re/merchants/ticket_refiner.txt index 73ea943f7c..92613caed9 100644 --- a/npc/re/merchants/ticket_refiner.txt +++ b/npc/re/merchants/ticket_refiner.txt @@ -1,4 +1,4 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Ticket Refiner //===== By: ================================================== //= Euphy diff --git a/npc/re/mobs/academy.txt b/npc/re/mobs/academy.txt index 101a489140..32e5598592 100644 --- a/npc/re/mobs/academy.txt +++ b/npc/re/mobs/academy.txt @@ -11,7 +11,7 @@ //============================================================ //================================================== -// prt_fild08 - Prontera Field +// prt_fild08 - Prontera Field //================================================== prt_fild08,0,0,0,0 monster Poring 1002,110,5000,0,0 prt_fild08,0,0,0,0 monster Lunatic 1063,100,5000,0,0 diff --git a/npc/re/mobs/dungeons/alde_dun.txt b/npc/re/mobs/dungeons/alde_dun.txt index 3a495016e0..4a1b03f5eb 100644 --- a/npc/re/mobs/dungeons/alde_dun.txt +++ b/npc/re/mobs/dungeons/alde_dun.txt @@ -13,13 +13,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 @@ -27,7 +27,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 1ee7173b98..0e4d47b00c 100644 --- a/npc/re/mobs/dungeons/beach_dun.txt +++ b/npc/re/mobs/dungeons/beach_dun.txt @@ -14,7 +14,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 @@ -23,7 +23,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 @@ -32,7 +32,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 d17e35e2df..281a0f13b4 100644 --- a/npc/re/mobs/dungeons/glastheim.txt +++ b/npc/re/mobs/dungeons/glastheim.txt @@ -37,7 +37,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 33aaef7800..6bb3c8d726 100644 --- a/npc/re/mobs/dungeons/kh_dun.txt +++ b/npc/re/mobs/dungeons/kh_dun.txt @@ -14,7 +14,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 @@ -34,7 +34,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 7120e4e915..9f9afeeb7b 100644 --- a/npc/re/mobs/dungeons/lou_dun.txt +++ b/npc/re/mobs/dungeons/lou_dun.txt @@ -13,7 +13,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 @@ -33,7 +33,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 1615a77c8c..fc959c623d 100644 --- a/npc/re/mobs/dungeons/prt_sew.txt +++ b/npc/re/mobs/dungeons/prt_sew.txt @@ -12,7 +12,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 03cd417568..20a6888ff2 100644 --- a/npc/re/mobs/dungeons/ra_san.txt +++ b/npc/re/mobs/dungeons/ra_san.txt @@ -22,7 +22,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 826ce87c76..1a21c29ceb 100644 --- a/npc/re/mobs/dungeons/tha_t.txt +++ b/npc/re/mobs/dungeons/tha_t.txt @@ -87,7 +87,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 20452cc8ea..a90830cacb 100644 --- a/npc/re/mobs/fields/comodo.txt +++ b/npc/re/mobs/fields/comodo.txt @@ -67,7 +67,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 9a67256cdc..2f8457c4ce 100644 --- a/npc/re/mobs/fields/mjolnir.txt +++ b/npc/re/mobs/fields/mjolnir.txt @@ -161,7 +161,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 @@ -202,7 +202,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 @@ -222,7 +222,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 a2d6b77432..f1a740a613 100644 --- a/npc/re/mobs/fields/morocc.txt +++ b/npc/re/mobs/fields/morocc.txt @@ -19,7 +19,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 @@ -27,7 +27,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 @@ -48,7 +48,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 @@ -74,7 +74,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 @@ -103,7 +103,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 @@ -113,7 +113,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 @@ -159,7 +159,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 @@ -194,7 +194,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 @@ -202,7 +202,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 @@ -210,7 +210,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/niflheim.txt b/npc/re/mobs/fields/niflheim.txt index 72c7404daf..0f8e29a418 100644 --- a/npc/re/mobs/fields/niflheim.txt +++ b/npc/re/mobs/fields/niflheim.txt @@ -127,7 +127,7 @@ OnInit: monster "niflheim",83,216,"Loli Ruri",1505,1,strnpcinfo(3)+"::OnInvasionMonsters"; break; } - + monster "niflheim",154,95,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters"; monster "niflheim",115,65,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters"; monster "niflheim",330,195,"Disguise",1506,1,strnpcinfo(3)+"::OnInvasionMonsters"; diff --git a/npc/re/mobs/fields/payon.txt b/npc/re/mobs/fields/payon.txt index 87ff074ff4..9d35475b64 100644 --- a/npc/re/mobs/fields/payon.txt +++ b/npc/re/mobs/fields/payon.txt @@ -38,7 +38,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/umbala.txt b/npc/re/mobs/fields/umbala.txt index f904cf77c6..c6d6373047 100644 --- a/npc/re/mobs/fields/umbala.txt +++ b/npc/re/mobs/fields/umbala.txt @@ -1,19 +1,19 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Umbala Fields Monster Spawn Script -//===== By: ================================================== +//===== By: ================================================== //= Darkchild (1.0) -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.5 -//===== 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] //= 1.5 Updated spawns to renewal. [L0ne_W0lf] -//============================================================ +//============================================================ //================================================== -// 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 @@ -25,7 +25,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 @@ -35,7 +35,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 @@ -46,7 +46,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 fbc6d106ec..f830f86599 100644 --- a/npc/re/mobs/fields/veins.txt +++ b/npc/re/mobs/fields/veins.txt @@ -52,7 +52,7 @@ ve_fild03,200,212,114,60 monster Red Plant 1078,10,10000,0,0 ve_fild03,0,0,0,0 monster Yellow Plant 1081,10,10000,0,0 //================================================== -// 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 f2cb3115a6..e9164a6d54 100644 --- a/npc/re/mobs/fields/yuno.txt +++ b/npc/re/mobs/fields/yuno.txt @@ -25,7 +25,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 @@ -109,7 +109,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/other/adven_boards.txt b/npc/re/other/adven_boards.txt index 79d6bb3794..b67de05a08 100644 --- a/npc/re/other/adven_boards.txt +++ b/npc/re/other/adven_boards.txt @@ -1420,7 +1420,7 @@ comodo,327,177,0 script Signposts#Comodo East 2_BULLETIN_BOARD,{ 1068,"Hydra","Anemone monster. Despite the appearance, it is rooted deep within the area, and uses the rooted tentacles to attack nearby creatures.", 1034,"Thara Frog","Frog monster that loves dark and wet places. It may be too hard of an opponent for a beginner adventurer.", 1064,"Megalodon","Fish skeleton monster revived with magic. It still acts like a fish as an Undead.", - 1255,"Nereid","Worm monster that lives inside the cave. Its eye sight is horrible, relying solely on sense of smell to detect nearby prey." ); + 1255,"Nereid","Worm monster that lives inside the cave. Its eye sight is horrible, relying solely on sense of smell to detect nearby prey." ); if (.@mo_board == 1) { mes "[Comodo East Cave, Mao]"; mes "East Cave, Mao is a tunnel that leads to Papuchicha Forest. This place is popular for highly sought after cards, Thara Frog and Hydra. Visit this place if you are in dire need of zeny."; @@ -1528,7 +1528,7 @@ pay_arche,39,134,0 script Signposts#Payon Cave 2_BULLETIN_BOARD,{ 1186,"GiantWhisper","Adventurer's tips are needed.", 1170,"Sohee","Virgin woman who've died a sad death. It can only be found near Payon area and it's passive.", 1307,"Cat O'Nine Tails","9 tailed Demon. It uses the bell to lure and attack humans.", - 1150,"Moonlight Flower","Medium rank Demon, queen of foxes. Underestimating its cute appearance will result in death." ); + 1150,"Moonlight Flower","Medium rank Demon, queen of foxes. Underestimating its cute appearance will result in death." ); if (.@mo_board == 1) { mes "[Payon Cave]"; mes "Payon Cave is comprised of 5 floors. Most monsters are Undead or Demon. Holy property weapons will prove to be useful in this dungeon."; diff --git a/npc/re/other/bulletin_boards.txt b/npc/re/other/bulletin_boards.txt index c4de012edf..d152d848a8 100644 --- a/npc/re/other/bulletin_boards.txt +++ b/npc/re/other/bulletin_boards.txt @@ -6,7 +6,7 @@ //= 1.0 //===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Bulletin Boards for beginners. //===== Additional Comments: ================================= //= 1.0 Moved Izlude NPCs to Pre-RE/RE paths. diff --git a/npc/re/other/mail.txt b/npc/re/other/mail.txt index 3f2683ae8d..6575bb865d 100644 --- a/npc/re/other/mail.txt +++ b/npc/re/other/mail.txt @@ -6,7 +6,7 @@ //= 1.0 //===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Pickup and write mail from/to players in game. //===== Additional Comments: ================================= diff --git a/npc/re/other/pvp.txt b/npc/re/other/pvp.txt index 32e35ee45e..ad5023caa9 100644 --- a/npc/re/other/pvp.txt +++ b/npc/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, Renewal. //============================================================ // PVP Warpers -//============================================================ +//============================================================ pvp_y_room,30,85,4 script Fight Square Reception#1 105,{ //5,5 callfunc "F_PVP_FSRS",50,69; end; diff --git a/npc/re/other/stone_change.txt b/npc/re/other/stone_change.txt index e1dc160621..de7e63dfd8 100644 --- a/npc/re/other/stone_change.txt +++ b/npc/re/other/stone_change.txt @@ -1,18 +1,18 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Stone Changer -//===== By: ================================================== +//===== By: ================================================== //= Euphy -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Organizes ores in a player's inventory. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. //= 1.1 Clean-up. [Capuche] -//============================================================ +//============================================================ // Main NPC :: stonechange //============================================================ diff --git a/npc/re/other/turbo_track.txt b/npc/re/other/turbo_track.txt index 3ae3de6054..85b1e025ca 100644 --- a/npc/re/other/turbo_track.txt +++ b/npc/re/other/turbo_track.txt @@ -6,7 +6,7 @@ //= 1.0 //===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Renewal duplicates. //===== Additional Comments: ================================= diff --git a/npc/re/quests/cupet.txt b/npc/re/quests/cupet.txt index ce3a499ac4..42f1343e70 100644 --- a/npc/re/quests/cupet.txt +++ b/npc/re/quests/cupet.txt @@ -16,9 +16,9 @@ // 1st NPC - script CPM1 -1,{ - + set .@npc$, "[Cute Pet Manager]"; - + setarray .@tame_id[0],619,620,622,623,624,627,628,629,630; setarray .@tame_amount[0],3,3,3,3,3,3,3,3,3; setarray .@hunt_id[0],909,909,705,916,935,919,919,940,921; @@ -32,7 +32,7 @@ mes .@tame_amount + " times for a taming item."; mes "You can't exchange anymore."; next; - + mes "[Cute Pet Manager]"; mes "Besides me, there are other"; mes "Cute Pet Managers. If you want"; @@ -40,16 +40,16 @@ mes "you go and see them."; close; } - + callfunc "cute_pet_manager",.@tame_id,.@tame_amount,.@hunt_id,.@hunt_amount,.@mob_id,cpm_one,.@tame_gets,.@hunt_id2,.@hunt_amount2; } // 2nd NPC - script CPM2 -1,{ - + set .@npc$, "[Cute Pet Manager]"; - + setarray .@tame_id[0],621,625,632,631,633,634,635,636,659,637,639,640; setarray .@tame_amount[0],2,2,2,2,2,2,2,2,2,2,2,2; setarray .@hunt_id[0],938,935,925,7033,945,942,931,901,1094,1021,936,1035; @@ -63,7 +63,7 @@ mes .@tame_amount + " times for a taming item."; mes "You can't exchange anymore."; next; - + mes "[Cute Pet Manager]"; mes "Besides me, there are other"; mes "Cute Pet Managers. If you want"; @@ -71,16 +71,16 @@ mes "you go and see them."; close; } - + callfunc "cute_pet_manager",.@tame_id,.@tame_amount,.@hunt_id,.@hunt_amount,.@mob_id,cpm_two,.@tame_gets,.@hunt_id2,.@hunt_amount2; } // 3rd NPC - script CPM3 -1,{ - + set .@npc$, "[Cute Pet Manager]"; - + setarray .@tame_id[0],638,626,641,661,660,642; setarray .@tame_amount[0],1,1,1,1,1,1; setarray .@hunt_id[0],1020,943,1038,7047,1970,923; @@ -96,7 +96,7 @@ mes .@tame_amount + " times for a taming item."; mes "You can't exchange anymore."; next; - + mes "[Cute Pet Manager]"; mes "Besides me, there are other"; mes "Cute Pet Managers. If you want"; @@ -104,7 +104,7 @@ mes "you go and see them."; close; } - + callfunc "cute_pet_manager",.@tame_id,.@tame_amount,.@hunt_id,.@hunt_amount,.@mob_id,cpm_three,.@tame_gets,.@hunt_id2,.@hunt_amount2; } @@ -125,7 +125,7 @@ function script cute_pet_manager { mes "who is in charge of public relations"; mes "for the New Upgraded Cute Pet system."; next; - + mes "[Cute Pet Manager]"; mes "If you have any concerns regarding"; mes "the Cute Pet system I am here to guide you."; @@ -134,19 +134,19 @@ function script cute_pet_manager { mes "then I will tell you the monster"; mes "that you can tame with the item."; next; - + mes "[Cute Pet Manager]"; mes "Also I will explain what materials"; mes "you need to bring in order to"; mes "get the taming item."; next; - + mes "[Cute Pet Manager]"; mes "If you already brought materials"; mes "to exchange for the taming item,"; mes "I can exchange it for taming items immediately."; next; - + mes "[Cute Pet Manager]"; mes "However, there is a limit"; mes "for exchanging taming items."; @@ -154,17 +154,17 @@ function script cute_pet_manager { mes getarg(6) + " times. So please make sure"; mes "how many times you have exchanged."; next; - + mes "[Cute Pet Manager]"; mes "So, which taming item do you want?"; mes "Please choose one from the list."; next; - + // Create Menu System set .@size, getarraysize(getarg(0)); for (set .@a, 0; .@a < .@size; set .@a, .@a + 1) set .@menu$, .@menu$ + (.@menu$ == "" ? "" : ":") + getitemname(getelementofarray(getarg(0), .@a)); - + // Query Player Choice set .@choice, select(.@menu$) - 1; @@ -183,7 +183,7 @@ function script cute_pet_manager { // dispbottom "Hunt Name: " + getitemname(.@hunt_id); // dispbottom "Hunt Amount: " + .@hunt_amount; // dispbottom "Mob ID: " + .@mob_id; - if (.@hunt_id2) { + if (.@hunt_id2) { // dispbottom "Hunt ID2: " + .@hunt_id2; // dispbottom "Hunt Amount2: " + .@hunt_amount2; set .@hunt2_count, countitem(.@hunt_id2); @@ -195,7 +195,7 @@ function script cute_pet_manager { mes "exchange for an " + getitemname(.@tame_id) + "."; 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; @@ -206,7 +206,7 @@ function script cute_pet_manager { delitem .@hunt_id2, .@hunt_amount2; set getarg(5), getarg(5) + 1; getitem .@tame_id, .@tame_amount; - + mes "[Cute Pet Manager]"; mes "Wise choice."; mes "I hope you and your pet get along."; diff --git a/npc/re/quests/eden/eden_common.txt b/npc/re/quests/eden/eden_common.txt index 6e167708d3..bc73231113 100644 --- a/npc/re/quests/eden/eden_common.txt +++ b/npc/re/quests/eden/eden_common.txt @@ -1,14 +1,14 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Eden Group Quests - Common NPCs -//===== By: ================================================== +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 2.0 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Eden Group Headquarter NPC's. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. //= 1.1 Removed showevent use, and use of duplicates. //= Commented out warps that should not be active. diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt index 0c66cb5f52..8f93b94fb0 100644 --- a/npc/re/quests/eden/eden_iro.txt +++ b/npc/re/quests/eden/eden_iro.txt @@ -168,7 +168,7 @@ moc_para01,26,15,3 script Primo d'Buffer 790,{ moc_para01,53,30,3 script Clearchus 470,{ if (checkquest(62238,PLAYTIME) > -1 && checkquest(62238,PLAYTIME) < 2) { mes "You must wait for the timer to finish before you can hire a new mercenary."; - close; + close; } mes "[Clearchus]"; mes "Greetings young adventurer! I represent the Midgardian Mercenary Mission."; @@ -478,7 +478,7 @@ moc_para01,50,39,4 script Eve Natalia 882,{ moc_para01,48,184,2 script Gum & Manual Exchanger 562,{ if (checkweight(1201,1) == 0 || MaxWeight - Weight < 2000) { 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 63efb7d752..38f6c3c3f7 100644 --- a/npc/re/quests/eden/eden_quests.txt +++ b/npc/re/quests/eden/eden_quests.txt @@ -4076,7 +4076,7 @@ S_Enchant: // erasequest 7240;// Equipment Enhancement // setquest 7241;// Errands for Thorn timer changequest 7240,7241; - getitem2 getarg(0),1,1,0,0,0,0,.@1st,.@2nd; + getitem2 getarg(0),1,1,0,0,0,0,.@1st,.@2nd; mes "[Thorn]"; mes "Ok, seems that the enhancement went well."; mes "If you don't like the result then you can come back again tomorrow."; diff --git a/npc/re/quests/first_class/tu_archer.txt b/npc/re/quests/first_class/tu_archer.txt index 3f95cb46fe..4024ecef51 100644 --- a/npc/re/quests/first_class/tu_archer.txt +++ b/npc/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] -//============================================================ +//============================================================ pay_fild08,40,83,5 duplicate(Acolyte_Tu) Acolyte#tu 95 diff --git a/npc/re/quests/homun_s.txt b/npc/re/quests/homun_s.txt index b0a577ea9b..520b2ac4a2 100644 --- a/npc/re/quests/homun_s.txt +++ b/npc/re/quests/homun_s.txt @@ -1,20 +1,20 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Homunculus S Mutation Quest -//===== By: ================================================== +//===== By: ================================================== //= Euphy -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= Genetic quest to mutate a level 99 evolved Homunculus //= into a Homunculus S. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version, entirely custom. [Masao] //= 1.1 Cleaning. [Euphy] //= 1.2 Replaced with official script. [Euphy] -//============================================================ +//============================================================ // Main NPCs :: Homun_S //============================================================ diff --git a/npc/re/quests/magic_books.txt b/npc/re/quests/magic_books.txt index 5052b18b12..b6c3a70e81 100644 --- a/npc/re/quests/magic_books.txt +++ b/npc/re/quests/magic_books.txt @@ -1,21 +1,21 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Magic Book Seller -//===== By: ================================================== +//===== By: ================================================== //= Masao, Muad_Dib (translation) -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1a -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= [Official Conversion] //= An NPC which sells you different kinds of Magic Books. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First Version. [Masao] //= 1.1 Optimized. [Euphy] //= 1.1a Updated NPC name to "Master Velofos". [Euphy] //= 1.1b Fixed the rand part in "Mysterious Documents" to match //= Aegis & fixed a bracket issue. [Capuche] -//============================================================ +//============================================================ // Main Quest :: war_book //============================================================ diff --git a/npc/re/quests/mrsmile.txt b/npc/re/quests/mrsmile.txt index 00644d1fdd..7073d3575b 100644 --- a/npc/re/quests/mrsmile.txt +++ b/npc/re/quests/mrsmile.txt @@ -1,18 +1,18 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Mr. Smile Quest -//===== By: ================================================== +//===== By: ================================================== //= Daegaladh, Masao -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== 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 Updated to match the new Izlude Map. [Masao] //= 1.1 Added Izlude duplicates. [Euphy] -//============================================================ +//============================================================ izlude,125,175,4 duplicate(SmileHelper) Smile Assistance#iz 92 izlude_a,125,175,4 duplicate(SmileHelper) Smile Assistance#iz_a 92 diff --git a/npc/re/quests/pile_bunker.txt b/npc/re/quests/pile_bunker.txt index 832dfdbb8b..52c47186ca 100644 --- a/npc/re/quests/pile_bunker.txt +++ b/npc/re/quests/pile_bunker.txt @@ -1,17 +1,17 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Pile Bunker Quest -//===== By: ================================================== +//===== By: ================================================== //= JayPee Mateo -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 2.2 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= 1.0 A Pile Bunker quest based on iRO WiKi. [JayPee Mateo] //= 2.0 Rewrited the Script a little so it looks a bit better. [Masao] //= 2.1 Switched to official script, coded by Gennosuke Kouga. [Euphy] //= 2.2 Updated to match the official script. [Euphy] -//============================================================ +//============================================================ // Main NPC :: mech_book //============================================================ diff --git a/npc/re/quests/quests_13_1.txt b/npc/re/quests/quests_13_1.txt index d6c4498165..b4a5e9c867 100644 --- a/npc/re/quests/quests_13_1.txt +++ b/npc/re/quests/quests_13_1.txt @@ -1,17 +1,17 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Quest NPCs related to Ash-Vacuum -//===== By: ================================================== +//===== By: ================================================== //= Euphy -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== 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] //= 1.1 Added Izlude duplicates. [Euphy] -//============================================================ +//============================================================ izlude,102,171,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz 100 izlude_a,102,171,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz_a 100 diff --git a/npc/re/quests/quests_dewata.txt b/npc/re/quests/quests_dewata.txt index c91a348c01..a74003e502 100644 --- a/npc/re/quests/quests_dewata.txt +++ b/npc/re/quests/quests_dewata.txt @@ -1287,7 +1287,7 @@ dew_fild01,114,275,4 script Lero#dew_drink 536,{ mes "Once you bring the oil palm nuts, Mr. Memo will exchange them with oil."; close; } else if ((.@j & 2) || (.@j & 8) || (.@j & 32)) { - + // .@i[]: ,,, if (.@j & 2) setarray .@i[0],20,5046,10,5000; diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt index 2c73fad36f..4dbd9dc462 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 450,{ 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_ 449,{ 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 < 5) { mes "[Capital City Guard]"; @@ -426,11 +426,11 @@ dic_in01,254,119,0 script Item Storage#01 844,{ 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; } set Zeny, Zeny-500; close2; @@ -457,17 +457,17 @@ function script que_dic { .@type = getarg(0); if (!.@type) { if (checkquest(getarg(1),HUNTING) != 2) return; - mes getarg(3); + mes getarg(3); } else if (.@type == 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 (.@type == 2) { for(set .@i,1; .@i 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."); @@ -1110,7 +1110,7 @@ dic_in01,40,193,1 script Papyrus#0001 453,{ 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 844 @@ -1807,7 +1807,7 @@ OnTouch: mes "Just a moment."; } close2; - warp "dic_in01",155,188; + warp "dic_in01",155,188; } end; } @@ -3694,7 +3694,7 @@ dic_in01,245,119,4 script Shay#ep133_13 884,{ 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.. "; @@ -3840,7 +3840,7 @@ dic_in01,245,119,4 script Shay#ep133_13 884,{ 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."; @@ -3984,7 +3984,7 @@ dic_in01,245,119,4 script Shay#ep133_13 884,{ setarray .@quest, 7194,7195,7196; setarray .@item, 6306,6305,6307; setarray .@str$, "bloodstain","frozen piece of skin","strange magical stone fragment"; - + for (set .@size, getarraysize(.@item); .@i < .@size; set .@i, .@i + 1) { if (countitem(.@item[.@i])) { mes "- You show the " + .@str$[.@i] + " you collected from near the crack.-"; @@ -4797,7 +4797,7 @@ dic_fild01,231,174,5 script BK#ep133_18 496,{ setarray .@item, 6307, 6306, 6305; for (set .@size, getarraysize(.@npc$); .@i < .@size; set .@i, .@i + 1) if (.@n$ == .@npc$[.@i]) set .@type, .@i; - + if (ep13_3_secret == 10) { if (.@npc$[.@type] == "Rock Pile") { mes "There are many piles of rock around because of the unstable crustal movements."; @@ -4842,7 +4842,7 @@ dic_fild01,231,174,5 script BK#ep133_18 496,{ set ep13_3_secret, 11; getitem .@item[.@type], 1; erasequest 7193; - setquest 7194; + setquest 7194; donpcevent strnpcinfo(0)+"::OnDisable"; next; mes "[" + strcharinfo(0) + "]"; @@ -4903,7 +4903,7 @@ dic_fild01,231,174,5 script BK#ep133_18 496,{ } 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; @@ -4980,7 +4980,7 @@ dic_fild02,207,94,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef6 844 dic_fild02,230,71,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef7 844 dic_fild02,188,50,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef8 844 dic_fild02,248,36,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef9 844 -dic_fild02,206,115,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef10 844 +dic_fild02,206,115,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef10 844 dic_fild02,194,86,0 duplicate(ep133_crack#main) Split Earth#ep133_ef1 844 dic_fild02,240,51,0 duplicate(ep133_crack#main) Split Earth#ep133_ef2 844 dic_fild02,176,65,0 duplicate(ep133_crack#main) Split Earth#ep133_ef3 844 @@ -5040,7 +5040,7 @@ dicastes01,117,262,0 script Frede#13_3 491,2,2,{ close; } mes "[Frede]"; - mes "¢£¡ô¡ñ ¡û"; + mes "¢£¡ô¡ñ ¡û"; mes "¡ú¡ö¡ø ¢£ ¡ô"; close; OnTouch: @@ -6088,7 +6088,7 @@ dic_in01,349,129,5 script Bouy#13_3 449,{ close; } mes "[Bouy]"; - mes "¡ø¡ö¡þ ¡ù ¡ú¡ð¡ï ¡ø"; + mes "¡ø¡ö¡þ ¡ù ¡ú¡ð¡ï ¡ø"; mes "¡ï¡ú¡ö ¡ù"; mes "¡õ¡ï¡õ ¡ò"; close; @@ -6102,7 +6102,7 @@ dic_in01,349,129,5 script Bouy#13_3 449,{ 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!"; @@ -6110,7 +6110,7 @@ dic_in01,349,129,5 script Bouy#13_3 449,{ 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,"; @@ -6399,7 +6399,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]"; @@ -6414,7 +6414,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."; @@ -6513,7 +6513,7 @@ mid_campin,168,128,3 script Sapha from Manuk 451,{ 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) { @@ -6523,7 +6523,7 @@ mid_campin,168,128,3 script Sapha from Manuk 451,{ 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; } @@ -6534,7 +6534,7 @@ mid_campin,168,128,3 script Sapha from Manuk 451,{ 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?"; @@ -6547,8 +6547,8 @@ mid_campin,168,128,3 script Sapha from Manuk 451,{ 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."; @@ -6614,10 +6614,10 @@ mid_campin,168,125,3 script Hound#ep133_is06 997,{ } 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."; @@ -6630,7 +6630,7 @@ mid_campin,168,125,3 script Hound#ep133_is06 997,{ 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]"; @@ -6661,7 +6661,7 @@ mid_campin,165,127,5 script Hibba Agip#ep133_is07 459,{ close2; OnInit: disablenpc strnpcinfo(0); - end; + end; } man_in01,315,52,3 script Guard Captain Avalanche 450,{ @@ -6670,7 +6670,7 @@ man_in01,315,52,3 script Guard Captain Avalanche 450,{ mes "¢¤¡ð¡ú? ¢£ ¡ù¡ð..."; mes "¡ï¡ò¡Ð ¢¤ ?"; mes "¡ñ¡ï..?"; - close; + close; } if (ep13_3_invite == 4) { mes "[Avalanche]"; @@ -7156,12 +7156,12 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 453,{ 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$; @@ -7176,7 +7176,7 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 453,{ 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) { @@ -7202,7 +7202,7 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 453,{ 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"; @@ -7264,7 +7264,7 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 453,{ mes .@n$; mes "When you are ready,"; mes "Please come back again."; - close; + close; } if (countitem(6304) < .@req) { mes .@n$; @@ -7327,7 +7327,7 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 453,{ mes "I'm done. Hehe"; close; } - + // Enchant Constants // Ex: .@dex[1]: DEX + 1 | .@cri[5]: CRI + 5 | .@eva[12]: FLEE + 12 set .@matk[1], 4760; set .@matk[2], 4761; @@ -7335,15 +7335,15 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 453,{ 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_). // For example, assume the variable value is 516: // .@f_[] // slot: 2 3 4 // index: 5 1 6 - + // Enchant Format if (compare(.@v$,"ring")) setarray .@f_2[1],.@agi[1],.@agi[2],.@int[1],.@int[2],.@dex[1],.@dex[2]; else setarray .@f_2[1],.@agi[1],.@agi[2],.@agi[3],.@int[1],.@int[2],.@int[3],.@dex[1],.@dex[2],.@dex[3]; @@ -7381,7 +7381,7 @@ dic_fild01,228,159,4 script Jahbong#pa0829 496,{ 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_eclage.txt b/npc/re/quests/quests_eclage.txt index 803966799c..826e0b9975 100644 --- a/npc/re/quests/quests_eclage.txt +++ b/npc/re/quests/quests_eclage.txt @@ -3945,7 +3945,7 @@ ecl_fild01,70,285,4 script Giranni#eclbig 4_F_FAIRY2,{ next; mes "["+ strcharinfo(0) +"]"; mes "Hmm? Where did it go? Did I drop it on the way?"; - close; + close; } mes "- You describe the corpse that you found in the field and show the piece of wing -"; next; @@ -4347,7 +4347,7 @@ OnTouch: mes "It's probably nothing."; mes "I should just go on my way~"; close; - } + } } } @@ -6618,7 +6618,7 @@ ecl_in04,208,194,3 script Daughter Luen#eclage2 4_F_FAIRYKID2,{ mes "I didn't understand him better."; next; select("I... I see..."); - } + } } break; case 5: @@ -6926,7 +6926,7 @@ ecl_in04,208,194,3 script Daughter Luen#eclage2 4_F_FAIRYKID2,{ completequest 9260; changequest 9235,9236; ep14_2_detect = 10; - } + } } close; case 6: @@ -12588,7 +12588,7 @@ OnTouch: else if (checkquest(1222) == 2 && (ep14_2_profe == 4 || ep14_2_profe == 5)) { mes "Professor Worm's notes on this wall have already been read."; Wallnotes(5,1); - close; + close; } } @@ -12790,7 +12790,7 @@ ecl_fild01,173,95,7 script Diary Frog No. 30#worm 4_FROG,{ mes "I'm so mad, I ought'a throw this out!"; next; mes "It seems that a continued search for diary recordings would be meaningless. I should go back to Professor Worm."; - close; + close; } mes "[Diary Frog No. 30]"; if (ep14_2_profe < 9) { @@ -13134,7 +13134,7 @@ ecl_in01,32,52,5 script Traveler Fome#tl01 4_F_DOGTRAVELER,3,3,{ mes "I'm debating whether I should just go back or go to Mora Village..."; } close; - + OnTouch: if (ep14_2_mylord == 0 && BaseLevel > 98) { mes "A group of travelers of Alpheim are having a conversation."; @@ -17062,7 +17062,7 @@ OnEnable: monster "que_avan01",29,36,"DARK_PRIEST",1198,1,"#avtmanager::OnMyMobDead"; monster "que_avan01",29,32,"DARK_PRIEST",1198,1,"#avtmanager::OnMyMobDead"; end; - + OnReset: mapwarp "que_avan01","eclage",265,275; killmonster "que_avan01","#avtmanager::OnMyMobDead"; @@ -17078,7 +17078,7 @@ OnReset: hideoffnpc "#tltimer"; $111204_avantlabo = 0; end; - + OnMyMobDead: if (mobcount ("que_avan01","#avtmanager::OnMyMobDead") == 0) { mapannounce "que_avan01","Hisie: This is it for you! Avant!!",bc_map,"0x7b68ee"; @@ -17099,7 +17099,7 @@ que_avan01,26,41,3 script Avant Magic Scholar#tlac 4_M_FAIRYAVANT,{ initnpctimer; monster "que_avan01",26,38,"HIDDEN_MOB",2337,1,"Avant Magic Scholar#tlac::OnMyMobDead"; end; - + OnInit: hideonnpc "Avant Magic Scholar#tlac"; end; diff --git a/npc/re/quests/quests_izlude.txt b/npc/re/quests/quests_izlude.txt index b5d22c0220..eb92e50e3a 100644 --- a/npc/re/quests/quests_izlude.txt +++ b/npc/re/quests/quests_izlude.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Quest NPCs related to Izlude -//===== By: ================================================== +//===== By: ================================================== //= Daegaladh, Masao -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Contains: //= - Edgar's Offer -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Updated to match the new Izlude Map. [Masao] //= 1.1 Added Izlude duplicates. [Euphy] //============================================================ diff --git a/npc/re/quests/quests_lighthalzen.txt b/npc/re/quests/quests_lighthalzen.txt index e7483a067d..3ee8e6725e 100644 --- a/npc/re/quests/quests_lighthalzen.txt +++ b/npc/re/quests/quests_lighthalzen.txt @@ -1,19 +1,19 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Quest NPCs located in Lighthalzen -//===== By: ================================================== +//===== By: ================================================== //= Ziu, Heris (translation) -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project -//===== Description: ========================================= +//===== Description: ========================================= //= Quests related to Lighthalzen City. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 Updated to match the new Izlude Map. [Masao] //= 1.1 Added Somatology Laboratory F4 quest. [Euphy] //= 1.2 Added Izlude duplicates. [Euphy] //= 1.3 Removed Somatology Laboratory F4 quest. [Euphy] -//============================================================ +//============================================================ // Renewal split [Daegaladh] //============================================================ diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt index b50dde9062..0fba728ac2 100644 --- a/npc/re/quests/quests_malangdo.txt +++ b/npc/re/quests/quests_malangdo.txt @@ -4613,7 +4613,7 @@ mal_in02,187,58,3 script Chef Nyas 548,{ setquest 7276; set mal_food,0; erasequest 7280+.@i; - + // Quantities grouped in 10s repeating. // [ 3, 3, 6, 6, 9, 9, 12, 12, 15, 18 ] // Last group [ 61 - 66 ] receives 25 constant. diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt index 3afc196a30..97984f4e74 100644 --- a/npc/re/quests/quests_malaya.txt +++ b/npc/re/quests/quests_malaya.txt @@ -3168,7 +3168,7 @@ ma_fild01,251,93,3 script Lost Child#malaya01 576,{ } } end; - + OnInit: if (strnpcinfo(0) != "Lost Child#malaya01") disablenpc strnpcinfo(0); @@ -3773,7 +3773,7 @@ ma_fild01,158,243,6 script Tribe Blacksmith#malaya 582,{ .@newItem = 2492; break; } - + if (!getequipisequiped(.@part)) { mes "[Bayani]"; mes "You should wear the equipment to upgrade and not come without it on you."; @@ -3827,7 +3827,7 @@ ma_fild01,158,243,6 script Tribe Blacksmith#malaya 582,{ close; delequip .@part; - getitem .@newItem, 1; + getitem .@newItem, 1; mes "[Bayani]"; mes "Ha ha. Perfect."; mes "Congratulations. Your armor is better than ever."; diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt index 22590dd043..09e0b14d49 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/quests/quests_nameless.txt b/npc/re/quests/quests_nameless.txt index 71d3c73a44..1ed5c081b2 100644 --- a/npc/re/quests/quests_nameless.txt +++ b/npc/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,57,92,3 duplicate(Dorian_izlude) Dorian 878,2,2 izlude_in,58,90,1 duplicate(StrangeMachine_izlude) Strange Machine 111 // unconfirmed diff --git a/npc/re/quests/quests_veins.txt b/npc/re/quests/quests_veins.txt index 29bcf4120d..11d4f9a36b 100644 --- a/npc/re/quests/quests_veins.txt +++ b/npc/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 Veins. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. -//============================================================ +//============================================================ ve_fild02,337,314,4 duplicate(WincingOldMan_veins) Wincing Old Man#ve 945 diff --git a/npc/re/scripts_main.conf b/npc/re/scripts_main.conf index 8ee4d70147..b891bf9096 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 e49f110f12..914a218ea5 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/eclage.txt b/npc/re/warps/cities/eclage.txt index 1995a9e66f..14d7b5e905 100644 --- a/npc/re/warps/cities/eclage.txt +++ b/npc/re/warps/cities/eclage.txt @@ -4,7 +4,7 @@ //= Chilly //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= //= Warp Points for Eclage diff --git a/npc/re/warps/cities/rachel.txt b/npc/re/warps/cities/rachel.txt index a98bad92ab..4a3ada84b0 100644 --- a/npc/re/warps/cities/rachel.txt +++ b/npc/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] //= 1.5 Renewal warp adjustments. //============================================================ diff --git a/npc/re/warps/dungeons/ecl_dun.txt b/npc/re/warps/dungeons/ecl_dun.txt index 4f28ebb5dd..4f99968f1d 100644 --- a/npc/re/warps/dungeons/ecl_dun.txt +++ b/npc/re/warps/dungeons/ecl_dun.txt @@ -4,13 +4,13 @@ //= Chilly //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== +//===== Compatible With: ===================================== //= rAthena Project //===== Description: ========================================= //= Warp Portals for Eclage Dungeon //===== Additional Comments: ================================= //= 1.0 First Version. -//= 1.1 Corrected Warp Co-ordinates and +//= 1.1 Corrected Warp Co-ordinates and //= name of Warp Portal. [Dastgir] //============================================================ diff --git a/npc/re/warps/fields/payon_fild.txt b/npc/re/warps/fields/payon_fild.txt index f85c75bd1e..47b21c0894 100644 --- a/npc/re/warps/fields/payon_fild.txt +++ b/npc/re/warps/fields/payon_fild.txt @@ -1,18 +1,18 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Payon Field Warps -//===== By: ================================================== +//===== By: ================================================== //= Nana (1.0) -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.3 -//===== 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] //= 1.3 Renewal warp adjustments. -//============================================================ +//============================================================ //= Payon Field's ============================================ pay_fild01,13,152,0 warp payf001 2,7,moc_fild03,299,170 diff --git a/npc/re/warps/fields/veins_fild.txt b/npc/re/warps/fields/veins_fild.txt index 145d586b9f..ff9b667c93 100644 --- a/npc/re/warps/fields/veins_fild.txt +++ b/npc/re/warps/fields/veins_fild.txt @@ -45,9 +45,9 @@ ve_fild07,147,371,0 warp ve_fild7-1 1,1,veins,146,28 // Renewal Addon ve_fild06,81,177,0 warp VeF06S_VeF04S 1,1,ve_fild04,115,55 -//============================================================ +//============================================================ // Old changelog -//============================================================ +//============================================================ //= 1.0 Initial version [$ephiroth] //= 1.1 Updated more warps [$ephiroth] //= 1.2 Removed some unofficial warps [Playtester]