summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/airports/airships.txt4
-rw-r--r--npc/battleground/kvm/kvm01.txt2
-rw-r--r--npc/battleground/kvm/kvm02.txt2
-rw-r--r--npc/battleground/kvm/kvm03.txt2
-rw-r--r--npc/cities/amatsu.txt18
-rw-r--r--npc/cities/ayothaya.txt10
-rw-r--r--npc/cities/einbech.txt6
-rw-r--r--npc/cities/einbroch.txt4
-rw-r--r--npc/cities/geffen.txt6
-rw-r--r--npc/cities/hugel.txt2
-rw-r--r--npc/cities/jawaii.txt8
-rw-r--r--npc/cities/morocc.txt1
-rw-r--r--npc/cities/moscovia.txt2
-rw-r--r--npc/cities/yuno.txt4
-rw-r--r--npc/custom/battleground/bg_common.txt24
-rw-r--r--npc/custom/battleground/bg_flavius_01.txt2
-rw-r--r--npc/custom/battleground/bg_flavius_02.txt2
-rw-r--r--npc/custom/battleground/bg_kvm01.txt6
-rw-r--r--npc/custom/battleground/bg_kvm02.txt6
-rw-r--r--npc/custom/battleground/bg_kvm03.txt6
-rw-r--r--npc/custom/battleground/bg_tierra_01.txt8
-rw-r--r--npc/custom/battleground/bg_tierra_02.txt8
-rw-r--r--npc/custom/bgqueue/flavius.txt26
-rw-r--r--npc/custom/card_remover.txt4
-rw-r--r--npc/custom/etc/floating_rates.txt2
-rw-r--r--npc/custom/etc/marriage.txt38
-rw-r--r--npc/custom/etc/monster_arena.txt4
-rw-r--r--npc/custom/etc/penal_servitude.txt3
-rw-r--r--npc/custom/etc/quest_warper.txt21
-rw-r--r--npc/custom/etc/stock_market.txt3
-rw-r--r--npc/custom/events/valentinesdayexp.txt2
-rw-r--r--npc/custom/item_signer.txt1
-rw-r--r--npc/custom/quests/kaho_balmung.txt3
-rw-r--r--npc/custom/quests/questboard.txt230
-rw-r--r--npc/custom/quests/tha_statues.txt1
-rw-r--r--npc/custom/quests/thq/THQS_QuestNPC.txt2
-rw-r--r--npc/events/MemorialDay_2008.txt172
-rw-r--r--npc/events/RWC_2012.txt4
-rw-r--r--npc/events/christmas_2008.txt151
-rw-r--r--npc/events/dumplingfestival.txt4
-rw-r--r--npc/events/god_se_festival.txt2
-rw-r--r--npc/events/halloween_2009.txt6
-rw-r--r--npc/events/nguild/nguild_flags.txt8
-rw-r--r--npc/events/valentinesday_2009.txt17
-rw-r--r--npc/events/xmas.txt2
-rw-r--r--npc/instances/SealedShrine.txt3
-rw-r--r--npc/jobs/1-1e/taekwon.txt1
-rw-r--r--npc/jobs/2-1/assassin.txt2
-rw-r--r--npc/jobs/2-1/priest.txt1
-rw-r--r--npc/jobs/2-1e/StarGladiator.txt2
-rw-r--r--npc/jobs/2-2/crusader.txt3
-rw-r--r--npc/jobs/2-2a/Professor.txt1
-rw-r--r--npc/jobs/valkyrie.txt1
-rw-r--r--npc/merchants/dye_maker.txt2
-rw-r--r--npc/merchants/old_pharmacist.txt2
-rw-r--r--npc/other/Global_Functions.txt25
-rw-r--r--npc/other/books.txt3
-rw-r--r--npc/other/comodo_gambling.txt4
-rw-r--r--npc/other/fortune.txt2
-rw-r--r--npc/other/hugel_bingo.txt2
-rw-r--r--npc/other/monster_museum.txt56
-rw-r--r--npc/other/poring_war.txt2
-rw-r--r--npc/other/pvp.txt2
-rw-r--r--npc/other/turbo_track.txt55
-rw-r--r--npc/pre-re/guides/guides_alberta.txt2
-rw-r--r--npc/pre-re/guides/guides_amatsu.txt2
-rw-r--r--npc/pre-re/guides/guides_izlude.txt2
-rw-r--r--npc/pre-re/guides/guides_morroc.txt2
-rw-r--r--npc/pre-re/guides/guides_moscovia.txt1
-rw-r--r--npc/pre-re/jobs/1-1/acolyte.txt1
-rw-r--r--npc/pre-re/jobs/1-1/archer.txt1
-rw-r--r--npc/pre-re/quests/collection/quest_demonpungus.txt2
-rw-r--r--npc/pre-re/quests/collection/quest_dokebi.txt2
-rw-r--r--npc/pre-re/quests/collection/quest_fabre.txt2
-rw-r--r--npc/pre-re/quests/collection/quest_frilldora.txt2
-rw-r--r--npc/pre-re/quests/collection/quest_goat.txt1
-rw-r--r--npc/pre-re/quests/collection/quest_golem.txt2
-rw-r--r--npc/pre-re/scripts_jobs.conf2
-rw-r--r--npc/quests/newgears/2010_headgears.txt16
-rw-r--r--npc/quests/quests_lighthalzen.txt3
-rw-r--r--npc/quests/quests_nameless.txt2
-rw-r--r--npc/quests/skills/hunter_skills.txt1
-rw-r--r--npc/re/cities/dewata.txt2
-rw-r--r--npc/re/cities/eclage.txt13
-rw-r--r--npc/re/cities/izlude.txt2
-rw-r--r--npc/re/events/halloween_2014.txt7
-rw-r--r--npc/re/instances/BuwayaCave.txt2
-rw-r--r--npc/re/instances/EclageInterior.txt42
-rw-r--r--npc/re/instances/MalangdoCulvert.txt2
-rw-r--r--npc/re/instances/OctopusCave.txt2
-rw-r--r--npc/re/jobs/1-1/acolyte.txt1
-rw-r--r--npc/re/jobs/2e/kagerou_oboro.txt12
-rw-r--r--npc/re/jobs/novice/novice.txt2
-rw-r--r--npc/re/merchants/coin_exchange.txt7
-rw-r--r--npc/re/merchants/diamond.txt27
-rw-r--r--npc/re/merchants/ninja_craftsman.txt22
-rw-r--r--npc/re/merchants/shadow_refiner.txt14
-rw-r--r--npc/re/mobs/champion.txt2
-rw-r--r--npc/re/mobs/fields/niflheim.txt2
-rw-r--r--npc/re/mobs/fields/umbala.txt8
-rw-r--r--npc/re/quests/cupet.txt36
-rw-r--r--npc/re/quests/eden/100-110.txt2
-rw-r--r--npc/re/quests/eden/111-120.txt1
-rw-r--r--npc/re/quests/eden/131-140.txt4
-rw-r--r--npc/re/quests/eden/eden_quests.txt2
-rw-r--r--npc/re/quests/quests_dewata.txt1
-rw-r--r--npc/re/quests/quests_dicastes.txt11
-rw-r--r--npc/re/quests/quests_eclage.txt158
-rw-r--r--npc/re/quests/quests_malangdo.txt2
-rw-r--r--npc/re/quests/quests_malaya.txt8
-rw-r--r--npc/re/warps/dungeons/ecl_dun.txt2
-rw-r--r--npc/warps/cities/einbroch.txt9
-rw-r--r--npc/warps/cities/gonryun.txt2
-rw-r--r--npc/warps/cities/mid_camp.txt1
-rw-r--r--npc/warps/cities/prontera.txt2
-rw-r--r--npc/warps/dungeons/lhz_dun.txt2
-rw-r--r--npc/warps/dungeons/mosk_dun.txt7
-rw-r--r--npc/warps/pvp.txt1
-rw-r--r--npc/woe-fe/agit_main.txt4
119 files changed, 613 insertions, 865 deletions
diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt
index eaf042978..9a9941e25 100644
--- a/npc/airports/airships.txt
+++ b/npc/airports/airships.txt
@@ -650,7 +650,7 @@ airplane,50,66,5 script Apple Merchant#airplane 4_M_04,{
airplane_01,243,73,0 script #AirshipWarp-3 WARPNPC,1,1,{
end;
-
+
OnTouch:
switch ($@airplanelocation2) {
case 0: warp "ra_fild12",292,204; end;
@@ -668,7 +668,7 @@ OnHide:
specialeffect EF_BASH;
disablenpc strnpcinfo(0);
end;
-
+
OnUnhide:
enablenpc strnpcinfo(0);
specialeffect EF_SUMMONSLAVE;
diff --git a/npc/battleground/kvm/kvm01.txt b/npc/battleground/kvm/kvm01.txt
index d5ecdfa31..951d9ef2b 100644
--- a/npc/battleground/kvm/kvm01.txt
+++ b/npc/battleground/kvm/kvm01.txt
@@ -25,7 +25,7 @@ bat_room,169,226,5 script KVM Waiting Room#a::KvM01R_Guillaume 4_M_KY_KNT,{
OnInit:
waitingroom "Battle Station 5 Players",6,"KvM01_BG::OnGuillaumeJoin",1;
end;
-
+
OnEnterBG:
$@KvM01BG_id1 = waitingroom2bg("bat_c01",52,129,"KvM01_BG::OnGuillaumeQuit","KvM01_BG::OnGuillaumeDie");
end;
diff --git a/npc/battleground/kvm/kvm02.txt b/npc/battleground/kvm/kvm02.txt
index bf41528cc..ea2a32bbc 100644
--- a/npc/battleground/kvm/kvm02.txt
+++ b/npc/battleground/kvm/kvm02.txt
@@ -27,7 +27,7 @@ bat_room,197,226,5 script KVM Waiting Room#a2::KvM02R_Guillaume 4_M_KY_KNT,{
OnInit:
waitingroom "Battle Station 5 Players",6,"KvM02_BG::OnGuillaumeJoin",1;
end;
-
+
OnEnterBG:
$@KvM02BG_id1 = waitingroom2bg("bat_c02",52,129,"KvM02_BG::OnGuillaumeQuit","KvM02_BG::OnGuillaumeDie");
end;
diff --git a/npc/battleground/kvm/kvm03.txt b/npc/battleground/kvm/kvm03.txt
index f4bd49d4f..279a0b5fe 100644
--- a/npc/battleground/kvm/kvm03.txt
+++ b/npc/battleground/kvm/kvm03.txt
@@ -26,7 +26,7 @@ bat_room,225,226,5 script KVM Waiting Room#a3::KvM03R_Guillaume 4_M_KY_KNT,{
OnInit:
waitingroom "Battle Station 5 Players",6,"KvM03_BG::OnGuillaumeJoin",1;
end;
-
+
OnEnterBG:
$@KvM03BG_id1 = waitingroom2bg("bat_c03",52,129,"KvM03_BG::OnGuillaumeQuit","KvM03_BG::OnGuillaumeDie");
end;
diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt
index 54f23c853..3db68617e 100644
--- a/npc/cities/amatsu.txt
+++ b/npc/cities/amatsu.txt
@@ -165,7 +165,7 @@ amatsu,230,160,3 script Well-side Maiden#ama 4_F_JPN2,{
mes "It really gives me the creeps.";
close;
}
-
+
amatsu,179,107,4 script John#ama 4_M_04,{
mes "[John]";
mes "Yo~";
@@ -222,7 +222,7 @@ amatsu,179,107,4 script John#ama 4_M_04,{
mes "I guess it's over...";
close;
}
-
+
amatsu,205,163,3 script Mimi#ama 4_F_JPNCHIBI,{
mes "[Mimi]";
mes "Puhuhu~!";
@@ -240,7 +240,7 @@ amatsu,205,163,3 script Mimi#ama 4_F_JPNCHIBI,{
mes "A lady can always use a little more makeup.";
close;
}
-
+
amatsu,185,115,3 script Drunken Man#ama 4_M_JPNOJI2,{
mes "[Kosake]";
mes "*Hiccup*...My wife is just like,";
@@ -280,7 +280,7 @@ amatsu,185,115,3 script Drunken Man#ama 4_M_JPNOJI2,{
mes "If you buy me a drink, I will think about it...Hehehe...*Hiccup*..";
close;
}
-
+
amatsu,217,179,1 script Grandma#ama 4_F_JPNOBA2,{
mes "[Hatsue]";
mes "I'm worried about my husband.";
@@ -292,7 +292,7 @@ amatsu,217,179,1 script Grandma#ama 4_F_JPNOBA2,{
mes "went to the bar and starts drinking again? The man just doesn't have any backbone. *Phew*";
close;
}
-
+
amatsu,287,266,3 script Jyaburo#ama 4_M_JPNOJI,{
mes "[Jyaburo]";
mes "This place is special to me.";
@@ -372,7 +372,7 @@ amatsu,269,221,1 script Propose Girl#ama 4_F_JPN,{
mes "happy things will happen, if you do.";
close;
}
-
+
amatsu,243,202,3 script Drama Teacher#ama 4_F_JPNOBA2,{
jap_tree = 2;
mes "[Garakame sensei]";
@@ -417,7 +417,7 @@ amatsu,243,202,3 script Drama Teacher#ama 4_F_JPNOBA2,{
mes "someday when you are ready.";
close;
}
-
+
amatsu,283,203,1 script Bonubonu#ama1 SEE_OTTER,{
end;
}
@@ -451,7 +451,7 @@ amatsu,283,203,1 script Bonubonu#ama2 HIDDEN_NPC,{
mes "It is really a miraculous and gracious tree...";
close;
}
-
+
amatsu,274,178,7 script Veterinarian#ama 4_M_JOB_WIZARD,{
jap_tree = 4;
mes "[Sakura Seiichi]";
@@ -504,7 +504,7 @@ amatsu,274,178,7 script Veterinarian#ama 4_M_JOB_WIZARD,{
mes "Finally, I couldn't even hear anything. I can't even recall what he was trying to tell me...^000000";
close;
}
-
+
amatsu,262,197,1 script Legendary Tree HIDDEN_NPC,{
if (jap_tree == 1) {
mes "^3355FFAs she mentioned, this tree";
diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt
index db1a47a31..4eba67b7f 100644
--- a/npc/cities/ayothaya.txt
+++ b/npc/cities/ayothaya.txt
@@ -120,7 +120,7 @@ ayothaya,189,120,3 script Young Man#Thang 4_M_THAIONGBAK,{
mes "I think.";
close;
}
-
+
ayothaya,171,152,5 script Girl#Lalitha 4_F_THAIAYO,{
.@sit = rand(1,5);
if (.@sit > 0 && .@sit < 3) {
@@ -191,7 +191,7 @@ ayothaya,171,152,5 script Girl#Lalitha 4_F_THAIAYO,{
mes "What's up?";
close;
}
-
+
ayothaya,143,102,5 script Old Man#ayothaya 4_M_THAIOLD,{
mes "[Villager]";
mes "Ummm.";
@@ -236,7 +236,7 @@ ayothaya,143,102,5 script Old Man#ayothaya 4_M_THAIOLD,{
mes "at least once.";
close;
}
-
+
ayothaya,197,189,5 script Young Man#1ayothaya 4_M_THAIAYO,{
mes "[Kwan]";
mes "Phew, isn't it";
@@ -262,7 +262,7 @@ ayothaya,197,189,5 script Young Man#1ayothaya 4_M_THAIAYO,{
mes "Well, anyway, it's still a really good idea to stay away from that place. I hope you enjoy visiting Ayotaya, and that you keep safe~";
close;
}
-
+
ayothaya,214,142,5 script Young Man#5ayothaya 4_M_THAIONGBAK,{
mes "[Detzi]";
mes "In Ayotaya, we have our own traditional martial arts. We, the young men of the village, practice our traditional martial arts in order to become strong.";
@@ -271,7 +271,7 @@ ayothaya,214,142,5 script Young Man#5ayothaya 4_M_THAIONGBAK,{
mes "Why don't you learn our martial arts? I guarantee that it will help you greatly in your travels.";
close;
}
-
+
ayothaya,241,264,5 script Young Man#5ayothaya2 4_M_THAIONGBAK,{
mes "[Eik]";
mes "Hey...";
diff --git a/npc/cities/einbech.txt b/npc/cities/einbech.txt
index d3d853846..428b680e0 100644
--- a/npc/cities/einbech.txt
+++ b/npc/cities/einbech.txt
@@ -429,7 +429,7 @@ ein_in01,279,92,3 script Tavern Lady#ein 4_M_EINMAN2,{
mes "freshly knit doilies?";
close;
}
-
+
ein_in01,277,95,7 script Ryan Danger#air#einbech 4_M_EINMAN,{
mes "[R.D. Kim]";
mes "Oooh...";
@@ -481,7 +481,7 @@ ein_in01,277,95,7 script Ryan Danger#air#einbech 4_M_EINMAN,{
mes "of his freakin' mind!)";
close;
}
-
+
ein_in01,281,85,3 script Drunken Man#einbech 4_M_DIEMAN,{
mes "[Drunken Man]";
mes "...^333333*Hiccup*^000000...";
@@ -740,7 +740,7 @@ einbech,46,107,6 script Shena#ein::EinMonsters 4_F_EINOLD,{
close;
}
}
-
+
einbech,48,107,4 duplicate(EinMonsters) Luda#ein 4_F_EINWOMAN,{
einbech,148,242,5 script Jung#ein 4_M_EINMAN,{
diff --git a/npc/cities/einbroch.txt b/npc/cities/einbroch.txt
index 714b0bde6..b84a1d897 100644
--- a/npc/cities/einbroch.txt
+++ b/npc/cities/einbroch.txt
@@ -237,7 +237,7 @@ einbroch,232,272,3 script Train Station Staff#ein1::EinbrochTrain 4_M_EIN_SOLDIE
close;
}
}
-
+
einbroch,252,301,3 duplicate(EinbrochTrain) Train Station Staff#ein2 4_M_EIN_SOLDIER
einbroch,259,326,3 script Leslie#ein_1 4_F_EINOLD,{
@@ -285,7 +285,7 @@ einbroch,236,191,3 script Tan#ein 4_M_EINMAN,{
mes "you should carry one with you.";
close;
}
-
+
einbroch,228,121,5 script Little Toby#ein-1 4_M_EINMAN,{
mes "[Little Toby]";
mes "Excuse me...";
diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt
index a5d3e8354..58742ae48 100644
--- a/npc/cities/geffen.txt
+++ b/npc/cities/geffen.txt
@@ -181,7 +181,7 @@ geffen,111,48,0 script Stacey 4W_F_01,{
close;
}
}
-
+
geffen_in,34,170,0 script Theodore 1_M_01,{
mes "[Theodore]";
mes "Hello!";
@@ -872,7 +872,7 @@ geffen_in,79,76,2 script Merchant Daven 2_M_PHARMACIST,{
}
close;
}
-
+
geffen_in,114,73,5 script Hadenheim 4_M_SEAMAN,{
mes "[Hans Hadenheim]";
mes "Man, the Rune-Midgard continent sure is big! How's it going, youngster?";
@@ -1335,7 +1335,7 @@ geffen_in,39,127,2 script Psychic Advisor 4_M_BIBI,{
close;
}
}
-
+
geffen_in,109,72,2 script Monster Scholar 4_F_01,{
mes "[Estheres]";
mes "Hello, I'm the resident expert of Monsterology here in Geffen. Is there anything in particular that you're curious about?";
diff --git a/npc/cities/hugel.txt b/npc/cities/hugel.txt
index aae031ebd..5d3458799 100644
--- a/npc/cities/hugel.txt
+++ b/npc/cities/hugel.txt
@@ -55,7 +55,7 @@ hugel,126,151,3 script Emily 4_F_01,{
mes "Don't you think that sounds weird?";
close;
}
-
+
hugel,86,165,5 script Kayplas 4_M_HUBOY,{
mes "[Kayplas]";
mes "Ooh, I really want to";
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index 85a993c89..a8cc57ee2 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -624,7 +624,7 @@ jawaii_in,30,96,4 script Employee#jaw6 4_F_07,{
}
mes "I hope you will have a good time.";
close;
-
+
OnWelcome:
emotion e_kis;
end;
@@ -714,7 +714,7 @@ OnTouch:
donpcevent "Employee#jaw1::OnSolo";
end;
}
-
+
jawaii_in,15,104,0 script Waitress#jawaii 1_F_PUBGIRL,{
if (checkweight(1201,1) == 0) {
mes "^3355FF * Wait a minute! *";
@@ -1113,7 +1113,7 @@ S_KillChar:
mes "[Bartender]";
return;
}
-
+
jawaii_in,43,115,0 script Customer#jaw_1 4W_M_01,{
if (!getpartnerid()) {
if (Zeny > 99) {
@@ -1388,7 +1388,7 @@ prt_in,173,13,4 script Customer#SoloHan 4_M_04,{
mes "Is this the third time this week I've gotten plastered? Bachewcca, help me count!";
close;
}
-
+
prt_in,170,14,0 script Customer#Bachewcca 4_M_ORIENT02,{
mes "[Bachewcca]";
mes "..............";
diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt
index e2ca328df..70b652508 100644
--- a/npc/cities/morocc.txt
+++ b/npc/cities/morocc.txt
@@ -777,4 +777,3 @@ moc_fild16,200,231,4 duplicate(SinGuard) Assassin Guardian#5 4_M_MOC_SOLDIER
moc_fild16,211,231,4 duplicate(SinGuard) Assassin Guardian#6 4_M_MOC_SOLDIER
moc_fild16,200,257,4 duplicate(SinGuard) Assassin Guardian#7 4_M_MOC_SOLDIER
moc_fild16,211,257,4 duplicate(SinGuard) Assassin Guardian#8 4_M_MOC_SOLDIER
-
diff --git a/npc/cities/moscovia.txt b/npc/cities/moscovia.txt
index 74c121836..e6653fef0 100644
--- a/npc/cities/moscovia.txt
+++ b/npc/cities/moscovia.txt
@@ -46,7 +46,6 @@
mes "I'll help you to have a nice trip";
mes "to Moscovia!";
close;
-
case 2:
mes "[Moscovia P.R. Officer]";
mes "Ok then, let us start now.";
@@ -114,7 +113,6 @@ moscovia,166,53,4 script Moscovia P.R. Officer#2 4_F_RUSWOMAN2,{
end;
}
-
// Moscovia Palace :: mos_swan
//============================================================
moscovia,253,166,4 script Soldier#mosk1 4_M_RUSKNIGHT,{
diff --git a/npc/cities/yuno.txt b/npc/cities/yuno.txt
index cda19d322..526a91551 100644
--- a/npc/cities/yuno.txt
+++ b/npc/cities/yuno.txt
@@ -56,7 +56,7 @@ yuno,184,173,4 script Freidrich#juno 4_F_NOVICE,{
close;
}
}
-
+
yuno,337,227,4 script Juno Granny#juno 8_F_GRANDMOTHER,{
mes "[Granny]";
if (rand(1,50) == 1) {
@@ -195,7 +195,7 @@ yuno,165,111,4 script Juno Sage#juno 2_F_MAGICMASTER,,{
close;
}
}
-
+
yuno,157,205,4 script Juno Artisan#juno 1_M_JOBGUIDER,{
mes "[Artisan]";
mes "*Mumble mumble...*";
diff --git a/npc/custom/battleground/bg_common.txt b/npc/custom/battleground/bg_common.txt
index 8b99deb39..54b13bb28 100644
--- a/npc/custom/battleground/bg_common.txt
+++ b/npc/custom/battleground/bg_common.txt
@@ -137,14 +137,14 @@ bat_room,160,140,3 script Prince Croix 4_M_CRU_CRUA,{
// *********************************************************************
function script Time2Str {
set .@time_left, getarg(0) - gettimetick(2);
-
+
set .@Days, .@time_left / 86400;
set .@time_left, .@time_left - (.@Days * 86400);
set .@Hours, .@time_left / 3600;
set .@time_left, .@time_left - (.@Hours * 3600);
set .@Minutes, .@time_left / 60;
set .@time_left, .@time_left - (.@Minutes * 60);
-
+
set .@Time$, "";
if( .@Days > 1 )
set .@Time$, .@Time$ + .@Days + " days, ";
@@ -165,7 +165,7 @@ function script Time2Str {
set .@Time$, .@Time$ + .@time_left + " seconds.";
else if( .@time_left == 1 )
set .@Time$, .@Time$ + .@time_left + " second.";
-
+
return .@Time$;
}
@@ -203,7 +203,7 @@ bat_room,156,178,5 script Tierra Valley Officer#1 4_M_KY_KNT,{
mes "Please sign up for an army with Prince Croix or General Guillaume!";
close;
}
-
+
mes "Hello " + strcharinfo(0) + ", let's show the power of the Guillaume Army to those stinky Croixs!";
next;
if( select("I want to join your army!:End Conversation") == 2 )
@@ -226,7 +226,7 @@ bat_room,156,178,5 script Tierra Valley Officer#1 4_M_KY_KNT,{
mes "Stand-by for Tierra Gorge Battle until the time limit passes.";
close;
}
-
+
if( BaseLevel < 80 )
{
mes "I'm very please you want to join our army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield";
@@ -343,7 +343,7 @@ bat_room,164,178,5 script Tierra Valley Officer#3 4_M_KY_KNT,{
mes "Please sign up for an army with Prince Croix or General Guillaume!";
close;
}
-
+
mes "Hello " + strcharinfo(0) + ", let's show the power of the Guillaume Army to those stinky Croixs!";
next;
if( select("I want to join your army!:End Conversation") == 2 )
@@ -1260,7 +1260,7 @@ bat_room,160,150,3 script Erundek 4_M_MANAGER,{
case 4: setarray .@Item_DB[0],2376,2377,2378,2379,2380,2381,2382; set .@Value, 80; break;
case 5: setarray .@Item_DB[0],2720,2721,2722,2723,2724,2725,2733; set .@Value, 500; break;
}
-
+
break;
case 3: // Valor Badges
mes "[Erundek]";
@@ -1278,7 +1278,7 @@ bat_room,160,150,3 script Erundek 4_M_MANAGER,{
case 4: setarray .@Item_DB[0],2376,2377,2378,2379,2380,2381,2382; set .@Value, 80; break;
case 5: setarray .@Item_DB[0],2720,2721,2722,2723,2724,2725,2733; set .@Value, 500; break;
}
-
+
break;
case 4: // Heroism Badge
mes "[Erundek]";
@@ -1286,7 +1286,7 @@ bat_room,160,150,3 script Erundek 4_M_MANAGER,{
mes "This shop is not available at the moment.";
close;
}
-
+
mes "[Erundek]";
mes "What item do you want to exchange?";
mes "If you are not sure, check the catalog.";
@@ -1305,21 +1305,21 @@ bat_room,160,150,3 script Erundek 4_M_MANAGER,{
mes "Remember, Battleground Reward Items are ^FF0000Character Bound^000000.";
mes "Are you sure you want this item?";
next;
-
+
if( select("Yes:No") == 2 )
{
mes "[Erundek]";
mes "Do you need more time to check the items?";
close;
}
-
+
if( countitem(.@Badge) < .@Value )
{
mes "[Erundek]";
mes "I'm sorry, but you don't have enough badges to exchange.";
close;
}
-
+
delitem .@Badge,.@Value;
getitem .@Item_ID,1;
mes "[Erundek]";
diff --git a/npc/custom/battleground/bg_flavius_01.txt b/npc/custom/battleground/bg_flavius_01.txt
index fd0cf9112..30693da21 100644
--- a/npc/custom/battleground/bg_flavius_01.txt
+++ b/npc/custom/battleground/bg_flavius_01.txt
@@ -54,7 +54,7 @@ OnReadyCheck:
end;
set .@Guillaume, getwaitingroomstate(0,"Fl1R_Guillaume");
set .@Croix, getwaitingroomstate(0,"Fl1R_Croix");
-
+
if( .@Guillaume < 10 || .@Croix < 10 )
{
mapannounce "bat_room","Battleground -- Flavius [80-99] G: " + .@Guillaume + "/10, C: " + .@Croix + "/10",1,0x006400;
diff --git a/npc/custom/battleground/bg_flavius_02.txt b/npc/custom/battleground/bg_flavius_02.txt
index f7b7756f4..c735614c1 100644
--- a/npc/custom/battleground/bg_flavius_02.txt
+++ b/npc/custom/battleground/bg_flavius_02.txt
@@ -54,7 +54,7 @@ OnReadyCheck:
end;
set .@Guillaume, getwaitingroomstate(0,"Fl2R_Guillaume");
set .@Croix, getwaitingroomstate(0,"Fl2R_Croix");
-
+
if( .@Guillaume < 10 || .@Croix < 10 )
{
mapannounce "bat_room","Battleground -- Flavius [80-99] G: " + .@Guillaume + "/10, C: " + .@Croix + "/10",1,0x808000;
diff --git a/npc/custom/battleground/bg_kvm01.txt b/npc/custom/battleground/bg_kvm01.txt
index aa12759b9..be826215e 100644
--- a/npc/custom/battleground/bg_kvm01.txt
+++ b/npc/custom/battleground/bg_kvm01.txt
@@ -11,7 +11,7 @@ bat_room,253,227,4 script Registration::KvM01R_Guillaume 4_M_KY_KNT,{ // KvM Gui
OnInit:
waitingroom "Battle Station 5 Players",5,"KvM01_BG::OnGuillaumeJoin",1;
end;
-
+
OnEnterBG:
set $@KvM01BG_id1, waitingroom2bg("bat_c01",53,128,"KvM01_BG::OnGuillaumeQuit","KvM01_BG::OnGuillaumeDie");
end;
@@ -150,7 +150,7 @@ OnTimer27000:
OnTimer28000:
donpcevent "::OnKvM01LightB";
end;
-
+
OnTimer29000:
donpcevent "::OnKvM01LightC";
end;
@@ -205,7 +205,7 @@ OnTimer330000:
OnGuillaumeWin:
set $@KvM01BG, 3;
set $@KvM01BG_Victory, 1;
-
+
stopnpctimer;
sleep 2000;
mapannounce "bat_c01","The Guillaume Army has won the Battle of Kreiger Von Midgard",1,0x0000FF;
diff --git a/npc/custom/battleground/bg_kvm02.txt b/npc/custom/battleground/bg_kvm02.txt
index f2f5f7ca1..91e594a90 100644
--- a/npc/custom/battleground/bg_kvm02.txt
+++ b/npc/custom/battleground/bg_kvm02.txt
@@ -11,7 +11,7 @@ bat_room,225,227,4 script Registration::KvM02R_Guillaume 4_M_KY_KNT,{ // KvM Gui
OnInit:
waitingroom "Battle Station 5 Players",5,"KvM02_BG::OnGuillaumeJoin",1;
end;
-
+
OnEnterBG:
set $@KvM02BG_id1, waitingroom2bg("bat_c02",53,128,"KvM02_BG::OnGuillaumeQuit","KvM02_BG::OnGuillaumeDie");
end;
@@ -150,7 +150,7 @@ OnTimer27000:
OnTimer28000:
donpcevent "::OnKvM02LightB";
end;
-
+
OnTimer29000:
donpcevent "::OnKvM02LightC";
end;
@@ -205,7 +205,7 @@ OnTimer330000:
OnGuillaumeWin:
set $@KvM02BG, 3;
set $@KvM02BG_Victory, 1;
-
+
stopnpctimer;
sleep 2000;
mapannounce "bat_c02","The Guillaume Army has won the Battle of Kreiger Von Midgard",1,0x0000FF;
diff --git a/npc/custom/battleground/bg_kvm03.txt b/npc/custom/battleground/bg_kvm03.txt
index f38e81bd1..33edb0be7 100644
--- a/npc/custom/battleground/bg_kvm03.txt
+++ b/npc/custom/battleground/bg_kvm03.txt
@@ -11,7 +11,7 @@ bat_room,197,227,4 script Registration::KvM03R_Guillaume 4_M_KY_KNT,{ // KvM Gui
OnInit:
waitingroom "Battle Station 5 Players",5,"KvM03_BG::OnGuillaumeJoin",1;
end;
-
+
OnEnterBG:
set $@KvM03BG_id1, waitingroom2bg("bat_c03",53,128,"KvM03_BG::OnGuillaumeQuit","KvM03_BG::OnGuillaumeDie");
end;
@@ -150,7 +150,7 @@ OnTimer27000:
OnTimer28000:
donpcevent "::OnKvM03LightB";
end;
-
+
OnTimer29000:
donpcevent "::OnKvM03LightC";
end;
@@ -205,7 +205,7 @@ OnTimer330000:
OnGuillaumeWin:
set $@KvM03BG, 3;
set $@KvM03BG_Victory, 1;
-
+
stopnpctimer;
sleep 2000;
mapannounce "bat_c03","The Guillaume Army has won the Battle of Kreiger Von Midgard",1,0x0000FF;
diff --git a/npc/custom/battleground/bg_tierra_01.txt b/npc/custom/battleground/bg_tierra_01.txt
index 671c2d929..797b3a389 100644
--- a/npc/custom/battleground/bg_tierra_01.txt
+++ b/npc/custom/battleground/bg_tierra_01.txt
@@ -69,7 +69,7 @@ OnReadyCheck:
bg_monster $@TierraBG1_id1,"bat_a01",176,345,"Food Depot",1909,"Tierra_BG1::OnGuillaumeBreak";
bg_monster $@TierraBG1_id2,"bat_a01",167,50,"Food Storage",1910,"Tierra_BG1::OnCroixBreak";
bg_monster 0,"bat_a01",273,204,"Neutrality Flag",1911,"Tierra_BG1::OnNeutralBreak";
-
+
set .Neutral_Base, 0;
set $@TierraBG1_Victory, 0;
@@ -94,7 +94,7 @@ OnReadyCheck:
mapannounce "bat_a01","Guillaume Vintenar Axl Rose : Let's attack to burn down Croix's food storage",1,0x0000FF;
sleep 2000;
mapannounce "bat_a01","Croix Vintenar Swandery : Master of Valhalla! Let us be gifted with unfailing faith and courage",1,0xFF0000;
-
+
initnpctimer;
end;
@@ -120,7 +120,7 @@ OnNeutralBreak:
set .Guardian_1, bg_monster(.Neutral_Base,"bat_a01",280,233,"Guardian",1949,"Tierra_BG1::OnGuardian1");
else
bg_monster_set_team .Guardian_1, .Neutral_Base;
-
+
if( .Guardian_2 == 0 )
set .Guardian_2, bg_monster(.Neutral_Base,"bat_a01",287,203,"Guardian",1950,"Tierra_BG1::OnGuardian2");
else
@@ -294,7 +294,7 @@ OnWall:
OnBuild:
for( set .@i, 0; .@i < 16; set .@i, .@i + 1 )
bg_monster 0,"bat_a01",186+.@i,266,"Barricade",1906,"Croix_TV1B::OnWall";
-
+
setwall "bat_a01",186,266,16,6,1,"bat_a01_c1";
set .MyMobCount,16;
end;
diff --git a/npc/custom/battleground/bg_tierra_02.txt b/npc/custom/battleground/bg_tierra_02.txt
index c6cebf581..f18d60769 100644
--- a/npc/custom/battleground/bg_tierra_02.txt
+++ b/npc/custom/battleground/bg_tierra_02.txt
@@ -69,7 +69,7 @@ OnReadyCheck:
bg_monster $@TierraBG2_id1,"bat_a02",176,345,"Food Depot",1909,"Tierra_BG2::OnGuillaumeBreak";
bg_monster $@TierraBG2_id2,"bat_a02",167,50,"Food Storage",1910,"Tierra_BG2::OnCroixBreak";
bg_monster 0,"bat_a02",273,204,"Neutrality Flag",1911,"Tierra_BG2::OnNeutralBreak";
-
+
set .Neutral_Base, 0;
set $@TierraBG2_Victory, 0;
@@ -94,7 +94,7 @@ OnReadyCheck:
mapannounce "bat_a02","Guillaume Vintenar Axl Rose : Let's attack to burn down Croix's food storage",1,0x0000FF;
sleep 2000;
mapannounce "bat_a02","Croix Vintenar Swandery : Master of Valhalla! Let us be gifted with unfailing faith and courage",1,0xFF0000;
-
+
initnpctimer;
end;
@@ -120,7 +120,7 @@ OnNeutralBreak:
set .Guardian_1, bg_monster(.Neutral_Base,"bat_a02",280,233,"Guardian",1949,"Tierra_BG2::OnGuardian1");
else
bg_monster_set_team .Guardian_1, .Neutral_Base;
-
+
if( .Guardian_2 == 0 )
set .Guardian_2, bg_monster(.Neutral_Base,"bat_a02",287,203,"Guardian",1950,"Tierra_BG2::OnGuardian2");
else
@@ -294,7 +294,7 @@ OnWall:
OnBuild:
for( set .@i, 0; .@i < 16; set .@i, .@i + 1 )
bg_monster 0,"bat_a02",186+.@i,266,"Barricade",1906,"Croix_TV2B::OnWall";
-
+
setwall "bat_a02",186,266,16,6,1,"bat_a02_c1";
set .MyMobCount,16;
end;
diff --git a/npc/custom/bgqueue/flavius.txt b/npc/custom/bgqueue/flavius.txt
index 8112be12e..f93821264 100644
--- a/npc/custom/bgqueue/flavius.txt
+++ b/npc/custom/bgqueue/flavius.txt
@@ -19,7 +19,6 @@
//= 1.5b Adjustments to the team-splitting algorithm [Haruna]
//============================================================
-
//Tacham, while the script is under testings the original will remain, meaning if you wanna test this you need to disable the other, or they'll conflict.
bat_b01,15,15,3 script start#bat_b01 CLEAR_NPC,{
OnInit:
@@ -28,22 +27,21 @@ OnInit:
//$@bg_queue_id is cleared after this event ends
OnPlayerListReady:
-
- set $@FlaviusBG1_id1, bg_create_team("bat_b01",10,290);
+ set $@FlaviusBG1_id1, bg_create_team("bat_b01",10,290);
set $@FlaviusBG1_id2, bg_create_team("bat_b01",390,10);
set $@Croix_QueueBG1, queue();
set $@Guill_QueueBG1, queue();
-
+
queueopt($@Guill_QueueBG1,HQO_OnLogout,"start#bat_b01::OnGuillaumeQuit");
queueopt($@Croix_QueueBG1,HQO_OnLogout,"start#bat_b01::OnCroixQuit");
-
+
set .@i, 0;
-
+
copyarray .@bg_member[0],$@bg_member[0],$@bg_member_size;
copyarray .@bg_member_group[0],$@bg_member_group[0],$@bg_member_size;
copyarray .@bg_member_type[0],$@bg_member_type[0],$@bg_member_size;
-
+
freeloop(1);
// Counting all participants and determining sizes, condensing .@bg_member_group
set .@nogroupcount, 0;
@@ -66,7 +64,7 @@ OnPlayerListReady:
set .@bg_count[.@j], 1;
}
}
-
+
// Now, sorting the group arrays from amount of population descending! Bubble sort powers, I call upon thee!
// Type doesn't matter here for precedence checks, but also needs to be sorted the same way along with groups
for (set .@i, 0; .@i < getarraysize(.@bg_groups); set .@i, .@i + 1) {
@@ -84,7 +82,7 @@ OnPlayerListReady:
}
}
}
-
+
// Add the groups to the queues! :D
for (set .@i, 0; .@i < getarraysize(.@bg_groups); set .@i, .@i + 1){
if (queuesize($@Croix_QueueBG1) <= queuesize($@Guill_QueueBG1)){ // Catch'em all and add to the queue!
@@ -123,7 +121,7 @@ OnPlayerListReady:
set $@FlaviusBG1_Victory, 0;
set $@Croix_ScoreBG1, 0;
set $@Guill_ScoreBG1, 0;
-
+
bg_updatescore "bat_b01",$@Guill_ScoreBG1,$@Croix_ScoreBG1;
donpcevent "OBJ#bat_b01_a::OnKill";
@@ -143,11 +141,11 @@ OnPlayerListReady:
disablenpc "Vintenar#bat_b01_bover";
bg_warp $@FlaviusBG1_id1,"bat_b01",87,75;
bg_warp $@FlaviusBG1_id2,"bat_b01",311,224;
-
+
/* after warp */
queueopt($@Guill_QueueBG1,HQO_OnMapChange,"start#bat_b01::OnGuillaumeQuit");
queueopt($@Croix_QueueBG1,HQO_OnMapChange,"start#bat_b01::OnCroixQuit");
-
+
donpcevent "countdown#bat_b01::OnEnable";
end;
@@ -180,14 +178,14 @@ OnGuillaumeQuit:
queueremove($@Guill_QueueBG1,getcharid(3));
callsub L_OnPlayerQuit;
end;
-
+
L_OnPlayerQuit:
bg_leave;
setd $@bg_delay_var$,gettimetick(2);
if( queuesize($@Guill_QueueBG1) == 0 || queuesize($@Croix_QueueBG1) == 0 ) /* todo check score and decide a winner if anyone left */
callsub OnMatchOver;
end;
-
+
OnMatchOver:
if( $@FlaviusBG1_id1 || $@FlaviusBG1_id2 ) {
queuedel($@Croix_QueueBG1);
diff --git a/npc/custom/card_remover.txt b/npc/custom/card_remover.txt
index e3aa2bb5b..dace8cac0 100644
--- a/npc/custom/card_remover.txt
+++ b/npc/custom/card_remover.txt
@@ -49,7 +49,7 @@ prt_in,28,73,4 script Wise Old Woman#eAcustom 1_F_ORIENT_04,{
close;
}
set .@cardcount,getequipcardcnt(.@part);
-
+
if (!checkweight(1202,(.@cardcount+1))) {
mes "^3355FFJust a minute!";
mes "I can't offer any of my";
@@ -91,7 +91,7 @@ prt_in,28,73,4 script Wise Old Woman#eAcustom 1_F_ORIENT_04,{
Zeny -= (.zenycost+(.@cardcount * .percardcost));
delitem 1000,1;
delitem 715,1;
-
+
// Replace the constants in the next 3 lines with failure chance values defined in refine_db.txt
// First value = Total failure chance (item and cards destroyed)
// Second value = Partial failure chance (one or the other is destroyed, player decides which one is safe)
diff --git a/npc/custom/etc/floating_rates.txt b/npc/custom/etc/floating_rates.txt
index ff3b6e8fa..c207c6275 100644
--- a/npc/custom/etc/floating_rates.txt
+++ b/npc/custom/etc/floating_rates.txt
@@ -35,7 +35,7 @@ OnHour18:
setbattleflag("item_rate_equip",$@drate);
//we don't change card drops rate, because these values won't change them anyway
atcommand "@reloadmobdb";
-
+
announce "Current Rune-Midgard rates are: 1."+($@brate-100)+"x 1."+($@jrate-100)+"x 1."+($@drate-100)+"x",bc_all,0xFF6060;
end;
}
diff --git a/npc/custom/etc/marriage.txt b/npc/custom/etc/marriage.txt
index 0d25be9d5..ab1b48c30 100644
--- a/npc/custom/etc/marriage.txt
+++ b/npc/custom/etc/marriage.txt
@@ -65,7 +65,7 @@ prt_church,100,123,4 script Vomars 1_M_PASTOR,{
function SF_RetrieveRingF;
function SF_RingsAccepted;
function SF_StartCeremony;
-
+
if (getpartnerid() > 0) {
mes "["+@name$+"]";
mes "You have my blessings, have a wonderful married life.";
@@ -81,7 +81,7 @@ prt_church,100,123,4 script Vomars 1_M_PASTOR,{
mes "to prepare for marriage";
close;
} // End official iRO dialog
-
+
if (strcharinfo(0) == $wed_groom$) {
SF_Groom();
end;
@@ -278,7 +278,7 @@ function SF_RetrieveRingM {
mes "Here's the wedding ring for your bride.";
if ($@wed_ring) delitem $@wed_ring,1;
set $wed_groom_progress,4;
-
+
if ($wed_bride_progress == 4)
SF_StartCeremony();
else {
@@ -336,7 +336,7 @@ function SF_StartCeremony {
OnTimer1000:
npctalk "Ladies and Gentlemen, We will now join in holy matrimony these two lovers.";
end;
-
+
OnTimer5000:
npctalk "Now more than ever, will both of your lives be entwined together as so will be your souls.";
end;
@@ -344,31 +344,31 @@ OnTimer5000:
OnTimer10000:
npctalk "You will both honor and cherish each other through the best and worst of times.";
end;
-
+
OnTimer15000:
npctalk "The safety and well being of your other will now also be your responsibility.";
end;
-
+
OnTimer20000:
npctalk "May in sickness or good health, your love burn bright like no force can extinguish it.";
end;
-
+
OnTimer25000:
npctalk "Those here stand witness to these vows bestowed upon you, you must act accordingly to them.";
end;
-
+
OnTimer30000:
npctalk "Understanding that, we are nothing more but mortals on this earth, but this is our triumph.";
end;
-
+
OnTimer35000:
npctalk "We here will now join these two mortal entities, and create an immortal love.";
end;
-
+
OnTimer40000:
npctalk $wed_groom$+", you have accepted to take "+$wed_bride$+" as your lawfully wedded wife,";
end;
-
+
OnTimer45000:
npctalk "and you, "+$wed_bride$+", have accepted take "+$wed_groom$+" as your lawfully wedded husband.";
end;
@@ -440,7 +440,7 @@ prt_church,106,99,3 script Happy Marry 1_F_02,{
mes "Isn't marriage beautiful?";
close;
}
-
+
function SF_WedProgress;
function SF_Principles;
function SF_Procedure;
@@ -451,7 +451,7 @@ prt_church,106,99,3 script Happy Marry 1_F_02,{
SF_WedProgress();
end;
}
-
+
do {
mes "["+@name$+"]";
mes "Marriage... is such a beautiful thing.";
@@ -529,7 +529,7 @@ function SF_Register {
close;
}
}
-
+
function SF_WedProgress {
if (strcharinfo(0) == $wed_groom$) {
mes "["+@name$+"]";
@@ -658,7 +658,7 @@ OnTimer60000:
npctalk "Registration timed out. Is it that noone wants to marry "+$@msg$+"..?";
emotion e_hmm;
-
+
set $wed_groom$,"";
set $wed_groom_sex, 0;
set $wed_bride$,"";
@@ -675,7 +675,7 @@ function SF_TryRegister {
set @type$, "groom";
if (@bride)
set @type$, "bride";
-
+
mes "["+@name$+"]";
mes "Before registering as "+@type$+", let me check if you meet all the requirements...";
next;
@@ -689,7 +689,7 @@ function SF_TryRegister {
set @item, 7170;
else
set @item, 2338;
-
+
if (getequipid(2) != @item) {
mes "["+@name$+"]";
mes "You should be wearing a "+getitemname(@item)+" if you want to get married.";
@@ -814,12 +814,12 @@ prt_church,94,99,4 script Sister Lisa 1_F_PRIEST,{
function SF_DivorceEnd;
function SF_InProgress;
-
+
if ($@divorce_progress==1) {
goto SF_InProgress;
end;
}
-
+
do {
mes "["+@name$+"]";
mes "Divorcing can be such a sad event...";
diff --git a/npc/custom/etc/monster_arena.txt b/npc/custom/etc/monster_arena.txt
index 82f764977..9c00b67a5 100644
--- a/npc/custom/etc/monster_arena.txt
+++ b/npc/custom/etc/monster_arena.txt
@@ -195,7 +195,6 @@ L_Exit:
}
gon_test,56,91,6 duplicate(monsterreferee) Referee#01 1_M_PUBMASTER
-
// Usher //
gon_test,58,94,6 script Usher 4_M_04,{
set @marena,1;
@@ -332,7 +331,6 @@ L_Sell:
mes "You earned ^0000FF" + @sellearn + "^000000z.";
close;
-
L_NoExp:
mes "[Monster Trainer]";
mes "You do not have enough experience.";
@@ -761,8 +759,6 @@ OnTouch:
gon_test,43,87,5 duplicate(SummonPad) Summon Pad 2 HIDDEN_NPC,2,2
gon_test,72,87,5 duplicate(SummonPad) Summon Pad 3 HIDDEN_NPC,2,2
-
-
// Skill Disabler //
gon_test mapflag noskill
diff --git a/npc/custom/etc/penal_servitude.txt b/npc/custom/etc/penal_servitude.txt
index b83bf3f83..30aaf17e2 100644
--- a/npc/custom/etc/penal_servitude.txt
+++ b/npc/custom/etc/penal_servitude.txt
@@ -134,7 +134,7 @@ sec_in02,137,57,1 script Overseer 4_M_PAY_SOLDIER,{
delitem 4009,countitem(4009);//Items: Chonchon_Card,
delitem 4022,countitem(4022);//Items: Spore_Card,
delitem 4048,countitem(4048);//Items: Poison_Spore_Card,
-
+
if (PRISON_Q <= 0 ) goto L_GET_Q;
mes "I want you to gather ^FF0000"+PRISON_Q+" Orange Net Mushroom^000000.";
@@ -170,7 +170,6 @@ L_GET_Q:
close;
}
-
sec_in02 mapflag nomemo
sec_in02 mapflag nosave SavePoint
sec_in02 mapflag noteleport
diff --git a/npc/custom/etc/quest_warper.txt b/npc/custom/etc/quest_warper.txt
index 3526cde5c..fd6865a54 100644
--- a/npc/custom/etc/quest_warper.txt
+++ b/npc/custom/etc/quest_warper.txt
@@ -71,10 +71,10 @@ function script Q_Warpra {
mes "Hello,";
mes "I can warp you to any town or dungeon, but you need to unlock them first by visiting us.";
mes "What do you need?";
-
+
if(getarg(0) == 0) callfunc "QWS_MMarray",0;
if(getarg(0) == 1) callfunc "QWS_MMarray",1;
-
+
set @MMenu,select(@Mmenulist$[0],@Mmenulist$[1],@Mmenulist$[2],@Mmenulist$[3],@Mmenulist$[4],@Mmenulist$[5],@Mmenulist$[6],@Mmenulist$[7],@Mmenulist$[8],@Mmenulist$[9],@Mmenulist$[10],@Mmenulist$[11]);
switch(@Mmenuref[@MMenu-1]+1){
@@ -167,7 +167,7 @@ Setprice:
if (!$QW_S_PRICE) mes "Storage = ^FF0000 Free ^000000";
if ($QW_S_PRICE == 60) mes "Storage = ^0000FF Kafra Mode ^000000";
mes "Guild Storage = "+(($QW_GS_PRICE)?"^00FF00"+$QW_GS_PRICE:"^FF0000Free")+"^000000";
-
+
switch(select("Basic - Warps","Advanced - Warps","Overseas - Warps","Basic Dungeon warp fee","Advanced Dungeon warp fee","Overseas Dungeon warp fee","Full Healing","Part Healing","Storage","Guild Storage","Back","Exit")) {
case 1:
next;
@@ -388,7 +388,7 @@ L_heal_Part:
if (@healchoice == 2) callsub PHeal,1,0;
if (@healchoice == 3) callsub PHeal,0,1;
goto L_End;
-
+
PHeal:
next;
set @Hp, MaxHp-Hp;
@@ -499,7 +499,7 @@ L_GStorage:
close2;
guildopenstorage;
end;
-
+
L_End:
close;
end;
@@ -523,7 +523,7 @@ L_NoUnlock:
mes "I don't unlock this location, my assistant deeper in the dungeon will unlock this place.";
close;
end;
-
+
//=========================Short=On=Zeny===========================
L_Short_on_zeny:
next;
@@ -536,7 +536,7 @@ L_Short_on_zeny:
}
close;
end;
-
+
//===========================Stamp=Card============================
stampcard:
// Counting of the ammount of places you have unlocked
@@ -978,7 +978,6 @@ function script QWS_Tarray {
set @Tmenuref[@Tj],57005; // 57005='dead' in hex
return;
-
//----------------Make Town Menu Function
function QWS_Make_Town_Menu {
@@ -1450,7 +1449,6 @@ function script QWS_Darray {
set @Dmenuref[@Dj],57005; // 57005='dead' in hex
return;
-
//----------------Make Dungeon Menu Function
function QWS_Make_Dungeon_Menu {
@@ -1525,7 +1523,7 @@ function script QWS_DLarray {
function script QWS_Dungeon_Warpra {
function QWS_D_getbin;
function QWS_D_setbin;
-
+
if ((QWS_D_getbin(getarg(0)) == 0) && (getarg(1) != "")) {
mes "[Warpra]";
mes getarg(1)+" unlocked!";
@@ -1538,7 +1536,6 @@ function script QWS_Dungeon_Warpra {
debugmes "QWS_Dungeon_Warpra error, improper syntax?";
return;
-
function QWS_D_setbin {
set @tempsetbindata,1;
if (getarg(0) == 0) goto binset;
@@ -1571,7 +1568,7 @@ binget:
function script QWS_Town_Warpra {
function QWS_T_getbin;
function QWS_T_setbin;
-
+
if ((QWS_T_getbin(getarg(0)) == 0) && (getarg(1) != "")) {
mes "[Warpra]";
mes getarg(1)+" unlocked!";
diff --git a/npc/custom/etc/stock_market.txt b/npc/custom/etc/stock_market.txt
index 060228317..078ce5137 100644
--- a/npc/custom/etc/stock_market.txt
+++ b/npc/custom/etc/stock_market.txt
@@ -431,7 +431,7 @@ S_Buy:
mes $S10N$;
next;
menu "Continue",-,"Cancel",S_Start;
-
+
mes "Enter the name of the share company";
mes "Transaction fee of ^FF0000" + $S_Trans + "z^000000 will apply.";
set @buyname$,"0";
@@ -645,7 +645,6 @@ ACCS11:
next;
goto S_Start;
-
// GM MENU //
GM_Menu:
mes "[Stock Market]";
diff --git a/npc/custom/events/valentinesdayexp.txt b/npc/custom/events/valentinesdayexp.txt
index 5a94bc913..4ed24012d 100644
--- a/npc/custom/events/valentinesdayexp.txt
+++ b/npc/custom/events/valentinesdayexp.txt
@@ -200,7 +200,7 @@ prt_castle,54,34,4 script Carl Orleans#val1 1_M_01,{
mes "Yes? What can I cook for you?";
next;
menu "Black handmade Chocolate, please",-,"I want a White handmade Chocolate...",M_WHITE,"I'm lost, sorry to bother you.",M_End;
-
+
mes "[Carl Orleans]";
mes "Well, I just might be able to fulfill your needs...";
next;
diff --git a/npc/custom/item_signer.txt b/npc/custom/item_signer.txt
index 243ca29c2..ee03c16eb 100644
--- a/npc/custom/item_signer.txt
+++ b/npc/custom/item_signer.txt
@@ -12,7 +12,6 @@
//============================================================
prt_in,24,61,7 script Perchik 1_M_01,{
-
setarray .@item[0],644,3; // Item requirements: <ID>,<Count>{,...} (0 to disable)
setarray .@cost[0],0,5000; // Zeny requirements: <base price>,<price per refine>
diff --git a/npc/custom/quests/kaho_balmung.txt b/npc/custom/quests/kaho_balmung.txt
index 4e598922d..ff581825b 100644
--- a/npc/custom/quests/kaho_balmung.txt
+++ b/npc/custom/quests/kaho_balmung.txt
@@ -12,10 +12,9 @@
//============================================================
prontera,158,356,4 script Royal Messenger 8W_SOLDIER,{
-
setarray .@Req1[0],1161,999,120,984,10,996,10,994,10,995,10,997,10;
setarray .@Req2[0],5013,2298,1,1001,10,996,10,994,10,995,10,997,10;
-
+
mes "[Royal Messenger]";
mes "Welcome to Prontera.";
mes "I am the messenger in charge of the Royal Quests.";
diff --git a/npc/custom/quests/questboard.txt b/npc/custom/quests/questboard.txt
index 3e7a90d9d..e4336a67a 100644
--- a/npc/custom/quests/questboard.txt
+++ b/npc/custom/quests/questboard.txt
@@ -16,7 +16,6 @@
//============================================================
prontera,129,215,5 script Questboard 4_BOARD3,{
-
if(c_run==1){
mes "[^FF7700Questboard^000000]";
mes "^0000FF"+getd("." + currentquest$ + "_collectionname$")+"^000000";
@@ -40,7 +39,7 @@ prontera,129,215,5 script Questboard 4_BOARD3,{
}
goto L_checkitems;
}
-
+
if(h_run==1){
mes "[^FF7700Questboard^000000]";
mes "^0000FF"+getd("." + currentquest$ + "_huntingname$")+"^000000";
@@ -69,114 +68,112 @@ prontera,129,215,5 script Questboard 4_BOARD3,{
}
goto L_checkmobs;
}
-
+
L_questmenu:
mes "[^FF7700Questboard^000000]";
mes "Select category:";
next;
-
+
switch(select((.collection)?"Collection Quests":"",
- (.hunting)?"Hunting Quests":"",
- "Exit")) {
-
-case 1:
- set .@collectmenu$, "";
- for( set .@i,0; .@i < .collectionquestcount; set .@i,.@i+1) {
- if (.@i) set .@collectmenu$,.@collectmenu$+":";
- set .@collectmenu$, .@collectmenu$ + "[" + getd("." +(.@i+1)+"_collectionmin") + " - " + getd("." +(.@i+1)+"_collectionmax") + "] " + getd("." + (.@i+1) + "_collectionname$");
- }
- set .@selection,select(.@collectmenu$);
- if(gettimetick(2) < getd(.@selection + "_collection_delay")){
- set .@time_left, getd(.@selection + "_collection_delay")-gettimetick(2);
- mes "[^FF7700Questboard^000000]";
- if(.@time_left < 60) mes "You have to wait ^0000FF"+.@time_left+" seconds^000000 to do this quest again.";
- if(.@time_left < 3600) mes "You have to wait ^0000FF"+.@time_left/60+" minutes^000000 to do this quest again.";
- mes "You have to wait ^0000FF"+.@time_left/60/60+" hours^000000 to do this quest again.";
- close;
- }
- mes "[^FF7700Questboard^000000]";
- mes "^0000FF"+getd("." + .@selection + "_collectionname$")+"^000000";
- mes "--------------------------------";
- for( set .@j, 0; .@j < getarraysize(getd("."+ .@selection + "_collectionitem")); set .@j,.@j+2) {
- mes "^FF0000"+getitemname(getd("."+.@selection+"_collectionitem["+.@j+"]"))+" - "+getd("."+.@selection+"_collectionitem["+(.@j+1)+"]")+" ea.^000000";
- }
- mes "--------------------------------";
- mes "[Reward]";
- mes "Item: ^0000FF"+((getd("." +.@selection+"_collectionprize"))?getitemname(getd("." +.@selection+"_collectionprize"))+" - "+getd("." +.@selection+"_collectionamount")+" ea.^000000":"Nothing^000000");
- mes "Zeny: ^0000FF"+getd("." +.@selection+"_collectionzeny")+"^000000";
- mes "Base EXP: ^0000FF"+getd("." +.@selection+"_collectionexp["+0+"]")+"^000000";
- mes "Job EXP: ^0000FF"+getd("." +.@selection+"_collectionexp["+1+"]")+"^000000";
- next;
- if(select("Accept:Decline") == 2){
- close;
- }
- if(BaseLevel >= getd("." +.@selection+"_collectionmin") && BaseLevel <= getd("." +.@selection+"_collectionmax"))
- {
- mes "[^FF7700Questboard^000000]";
- mes "Quest accepted.";
- set c_run, 1;
- set currentquest$, .@selection;
- close;
- }
- else
- {
- mes "[^FF7700Questboard^000000]";
- mes "You don't have the required";
- mes "level to do this quest.";
- close;
- }
-
-case 2:
- set .@huntmenu$, "";
- for( set .@i,0; .@i < .huntingquestcount; set .@i,.@i+1) {
- if (.@i) set .@huntmenu$,.@huntmenu$+":";
- set .@huntmenu$, .@huntmenu$ + "[" + getd("." +(.@i+1)+"_huntingmin") + " - " + getd("." +(.@i+1)+"_huntingmax") + "] " + getd("." + (.@i+1) + "_huntingname$");
- }
- set .@selection,select(.@huntmenu$);
- if(gettimetick(2) < getd(.@selection + "_hunting_delay")){
- set .@time_left, getd(.@selection + "_hunting_delay")-gettimetick(2);
- mes "[^FF7700Questboard^000000]";
- if(.@time_left < 60) mes "You have to wait ^0000FF"+.@time_left+" seconds^000000 to do this quest again.";
- if(.@time_left < 3600) mes "You have to wait ^0000FF"+.@time_left/60+" minutes^000000 to do this quest again.";
- mes "You have to wait ^0000FF"+.@time_left/60/60+" hours^000000 to do this quest again.";
- close;
- }
- mes "[^FF7700Questboard^000000]";
- mes "^0000FF"+getd("." + .@selection + "_huntingname$")+"^000000";
- mes "--------------------------------";
- for( set .@j, 0; .@j < getarraysize(getd("."+ .@selection + "_huntingmob")); set .@j,.@j+2) {
- mes "^FF0000"+strmobinfo(1,getd("."+.@selection+"_huntingmob["+.@j+"]"))+" - "+getd("."+.@selection+"_huntingmob["+(.@j+1)+"]")+" ea.^000000";
- }
- mes "--------------------------------";
- mes "[Reward]";
- mes "Item: ^0000FF"+((getd("." +.@selection+"_huntingprize"))?getitemname(getd("." +.@selection+"_huntingprize"))+" - "+getd("." +.@selection+"_huntingamount")+" ea.^000000":"Nothing^000000");
- mes "Zeny: ^0000FF"+getd("." +.@selection+"_huntingzeny")+"^000000";
- mes "Base EXP: ^0000FF"+getd("." +.@selection+"_huntingexp["+0+"]")+"^000000";
- mes "Job EXP: ^0000FF"+getd("." +.@selection+"_huntingexp["+1+"]")+"^000000";
- next;
- if(select("Accept:Decline") == 2){
- close;
- }
- if(BaseLevel >= getd("." +.@selection+"_huntingmin") && BaseLevel <= getd("." +.@selection+"_huntingmax"))
- {
+ (.hunting)?"Hunting Quests":"",
+ "Exit")) {
+ case 1:
+ set .@collectmenu$, "";
+ for( set .@i,0; .@i < .collectionquestcount; set .@i,.@i+1) {
+ if (.@i) set .@collectmenu$,.@collectmenu$+":";
+ set .@collectmenu$, .@collectmenu$ + "[" + getd("." +(.@i+1)+"_collectionmin") + " - " + getd("." +(.@i+1)+"_collectionmax") + "] " + getd("." + (.@i+1) + "_collectionname$");
+ }
+ set .@selection,select(.@collectmenu$);
+ if(gettimetick(2) < getd(.@selection + "_collection_delay")){
+ set .@time_left, getd(.@selection + "_collection_delay")-gettimetick(2);
+ mes "[^FF7700Questboard^000000]";
+ if(.@time_left < 60) mes "You have to wait ^0000FF"+.@time_left+" seconds^000000 to do this quest again.";
+ if(.@time_left < 3600) mes "You have to wait ^0000FF"+.@time_left/60+" minutes^000000 to do this quest again.";
+ mes "You have to wait ^0000FF"+.@time_left/60/60+" hours^000000 to do this quest again.";
+ close;
+ }
mes "[^FF7700Questboard^000000]";
- mes "Quest accepted.";
- set h_run, 1;
- set currentquest$, .@selection;
- close;
- }
- else
- {
+ mes "^0000FF"+getd("." + .@selection + "_collectionname$")+"^000000";
+ mes "--------------------------------";
+ for( set .@j, 0; .@j < getarraysize(getd("."+ .@selection + "_collectionitem")); set .@j,.@j+2) {
+ mes "^FF0000"+getitemname(getd("."+.@selection+"_collectionitem["+.@j+"]"))+" - "+getd("."+.@selection+"_collectionitem["+(.@j+1)+"]")+" ea.^000000";
+ }
+ mes "--------------------------------";
+ mes "[Reward]";
+ mes "Item: ^0000FF"+((getd("." +.@selection+"_collectionprize"))?getitemname(getd("." +.@selection+"_collectionprize"))+" - "+getd("." +.@selection+"_collectionamount")+" ea.^000000":"Nothing^000000");
+ mes "Zeny: ^0000FF"+getd("." +.@selection+"_collectionzeny")+"^000000";
+ mes "Base EXP: ^0000FF"+getd("." +.@selection+"_collectionexp["+0+"]")+"^000000";
+ mes "Job EXP: ^0000FF"+getd("." +.@selection+"_collectionexp["+1+"]")+"^000000";
+ next;
+ if(select("Accept:Decline") == 2){
+ close;
+ }
+ if(BaseLevel >= getd("." +.@selection+"_collectionmin") && BaseLevel <= getd("." +.@selection+"_collectionmax"))
+ {
+ mes "[^FF7700Questboard^000000]";
+ mes "Quest accepted.";
+ set c_run, 1;
+ set currentquest$, .@selection;
+ close;
+ }
+ else
+ {
+ mes "[^FF7700Questboard^000000]";
+ mes "You don't have the required";
+ mes "level to do this quest.";
+ close;
+ }
+
+ case 2:
+ set .@huntmenu$, "";
+ for( set .@i,0; .@i < .huntingquestcount; set .@i,.@i+1) {
+ if (.@i) set .@huntmenu$,.@huntmenu$+":";
+ set .@huntmenu$, .@huntmenu$ + "[" + getd("." +(.@i+1)+"_huntingmin") + " - " + getd("." +(.@i+1)+"_huntingmax") + "] " + getd("." + (.@i+1) + "_huntingname$");
+ }
+ set .@selection,select(.@huntmenu$);
+ if(gettimetick(2) < getd(.@selection + "_hunting_delay")){
+ set .@time_left, getd(.@selection + "_hunting_delay")-gettimetick(2);
+ mes "[^FF7700Questboard^000000]";
+ if(.@time_left < 60) mes "You have to wait ^0000FF"+.@time_left+" seconds^000000 to do this quest again.";
+ if(.@time_left < 3600) mes "You have to wait ^0000FF"+.@time_left/60+" minutes^000000 to do this quest again.";
+ mes "You have to wait ^0000FF"+.@time_left/60/60+" hours^000000 to do this quest again.";
+ close;
+ }
mes "[^FF7700Questboard^000000]";
- mes "You don't have the required";
- mes "level to do this quest.";
+ mes "^0000FF"+getd("." + .@selection + "_huntingname$")+"^000000";
+ mes "--------------------------------";
+ for( set .@j, 0; .@j < getarraysize(getd("."+ .@selection + "_huntingmob")); set .@j,.@j+2) {
+ mes "^FF0000"+strmobinfo(1,getd("."+.@selection+"_huntingmob["+.@j+"]"))+" - "+getd("."+.@selection+"_huntingmob["+(.@j+1)+"]")+" ea.^000000";
+ }
+ mes "--------------------------------";
+ mes "[Reward]";
+ mes "Item: ^0000FF"+((getd("." +.@selection+"_huntingprize"))?getitemname(getd("." +.@selection+"_huntingprize"))+" - "+getd("." +.@selection+"_huntingamount")+" ea.^000000":"Nothing^000000");
+ mes "Zeny: ^0000FF"+getd("." +.@selection+"_huntingzeny")+"^000000";
+ mes "Base EXP: ^0000FF"+getd("." +.@selection+"_huntingexp["+0+"]")+"^000000";
+ mes "Job EXP: ^0000FF"+getd("." +.@selection+"_huntingexp["+1+"]")+"^000000";
+ next;
+ if(select("Accept:Decline") == 2){
+ close;
+ }
+ if(BaseLevel >= getd("." +.@selection+"_huntingmin") && BaseLevel <= getd("." +.@selection+"_huntingmax"))
+ {
+ mes "[^FF7700Questboard^000000]";
+ mes "Quest accepted.";
+ set h_run, 1;
+ set currentquest$, .@selection;
+ close;
+ }
+ else
+ {
+ mes "[^FF7700Questboard^000000]";
+ mes "You don't have the required";
+ mes "level to do this quest.";
+ close;
+ }
+ case 3:
close;
}
-
-case 3:
- close;
- }
-
+
L_checkitems:
for( set .@k,0; .@k < getarraysize(getd("."+currentquest$+"_collectionitem")); set .@k,.@k+2) {
if(countitem(getd("."+currentquest$+"_collectionitem["+.@k+"]"))>=getd("."+currentquest$+"_collectionitem["+(.@k+1)+"]")){
@@ -200,7 +197,7 @@ L_checkitems:
set currentquest$, "";
set c_run, 0;
close;
-
+
L_checkmobs:
set .@goal, (getarraysize(getd("."+currentquest$+"_huntingmob"))/2);
for(set .@i, 1; .@i < getarraysize(getd("."+currentquest$+"_huntingmob")); set .@i,.@i+2){
@@ -214,7 +211,7 @@ L_checkmobs:
}
goto L_checkmobs2;
}
-
+
L_checkmobs2:
if(.@checkmonster<.@goal){
mes "[^FF7700Questboard^000000]";
@@ -248,33 +245,30 @@ OnNPCKillEvent:
continue;
}
end;
-
-OnInit:
+OnInit:
function AddCollection;
function AddHunting;
//Activate/Deactive quest categories here
set .collection, 1;
set .hunting, 1;
-
+
//Quest Delay (seconds)
//24 hours = 86400 seconds
set .quest_delay, 0;
-
+
//Checks if quests are loaded (prevents out of index)
if(.questsloaded==1) end;
- set .questsloaded, 1;
-
- //Add Collection Quests here
- //AddCollection("<Quest Name>",<Min Lvl>,<Max Lvl>,<Reward|Item ID>,<Reward|Item Amount>,<Zeny Reward>,<Base EXP>,<Job EXP>,<Item ID>,<Item Amount>,...);
-
-
- //Add Hunting Quests here
- //AddHunting("<Quest Name>",<Min Lvl>,<Max Lvl>,<Reward|Item ID>,<Reward|Item Amount>,<Zeny Reward>,<Base EXP>,<Job EXP>,<Monster ID>,<Monster Amount>,...);
-
- end;
-
+ set .questsloaded, 1;
+
+ //Add Collection Quests here
+ //AddCollection("<Quest Name>",<Min Lvl>,<Max Lvl>,<Reward|Item ID>,<Reward|Item Amount>,<Zeny Reward>,<Base EXP>,<Job EXP>,<Item ID>,<Item Amount>,...);
+
+ //Add Hunting Quests here
+ //AddHunting("<Quest Name>",<Min Lvl>,<Max Lvl>,<Reward|Item ID>,<Reward|Item Amount>,<Zeny Reward>,<Base EXP>,<Job EXP>,<Monster ID>,<Monster Amount>,...);
+
+ end;
function AddCollection {
set .collectionquestcount,.collectionquestcount+1;
diff --git a/npc/custom/quests/tha_statues.txt b/npc/custom/quests/tha_statues.txt
index c4787fcd3..00a7c9a8f 100644
--- a/npc/custom/quests/tha_statues.txt
+++ b/npc/custom/quests/tha_statues.txt
@@ -38,7 +38,6 @@ done:
mes "[Thalos]";
mes "Go search the 2nd Statue!";
close;
-
}
tha_t09,84,99,4 script Mediane HIDDEN_NPC,{
diff --git a/npc/custom/quests/thq/THQS_QuestNPC.txt b/npc/custom/quests/thq/THQS_QuestNPC.txt
index 76790221b..d4e058fb4 100644
--- a/npc/custom/quests/thq/THQS_QuestNPC.txt
+++ b/npc/custom/quests/thq/THQS_QuestNPC.txt
@@ -66,7 +66,7 @@ N_NewQuest:
mes "Would you like me to asign you a Quest?";
next;
menu "Yes I would like a Quest Please.",-,"Sorry Guy no time today.",N_NoTime;
-
+
mes "[Guy]";
mes "Ok lets see what quest we can give you today.";
mes "The quest names in ^FF0000This Colour^000000 mean that they are more challanging then the rest, but have better rewards.";
diff --git a/npc/events/MemorialDay_2008.txt b/npc/events/MemorialDay_2008.txt
index a6c09fe80..c6628ef12 100644
--- a/npc/events/MemorialDay_2008.txt
+++ b/npc/events/MemorialDay_2008.txt
@@ -65,9 +65,7 @@ prontera,182,214,4 script Lauds#Memorial 1_M_MERCHANT,{
mes "Bring me ^FF000030 Fabric and 20 Fluffs^000000.";
Memorial08 = 1;
close;
- }
-
- else if (Memorial08 == 1) {
+ } else if (Memorial08 == 1) {
if (countitem(1059) < 30 || countitem(914) < 20) {
mes "[Mad Sago Lauds]";
mes "What are these? They aren't enough?!";
@@ -94,9 +92,7 @@ prontera,182,214,4 script Lauds#Memorial 1_M_MERCHANT,{
Memorial08 = 2;
close;
}
- }
-
- else if (Memorial08 == 2) {
+ } else if (Memorial08 == 2) {
mes "[Mad Sago Lauds]";
mes "Ah, you have fluffy new towel now I even put your name on it";
next;
@@ -116,22 +112,16 @@ prontera,182,214,4 script Lauds#Memorial 1_M_MERCHANT,{
mes "What a shame! You should go speak to ^FF0000Grast in Prontera^000000.";
Memorial08 = 3;
close;
- }
-
- else if (Memorial08 == 3) {
+ } else if (Memorial08 == 3) {
mes "[Mad Sago Lauds]";
mes "What are you still doing here?";
mes "I told you to go speak to Grast in Prontera!";
close;
- }
-
- else if (Memorial08 == 4 || Memorial08 == 5 || Memorial08 == 6) {
+ } else if (Memorial08 == 4 || Memorial08 == 5 || Memorial08 == 6) {
mes "[Mad Sago Lauds]";
mes "Go help Grast, and then come back.";
close;
- }
-
- else if (Memorial08 == 7) {
+ } else if (Memorial08 == 7) {
mes "[Mad Sago Lauds]";
mes "Oh, you've brought them all.";
mes "Hahaha!";
@@ -151,16 +141,12 @@ prontera,182,214,4 script Lauds#Memorial 1_M_MERCHANT,{
mes "You should be going to the plaque!";
Memorial08 = 8;
close;
- }
-
- else if (Memorial08 == 8) {
+ } else if (Memorial08 == 8) {
mes "[Mad Sago Lauds]";
mes "Stop trying to give me your garbage!";
mes "Go to the plaque at 12 o'clock direction in Prontera for your journey!";
close;
- }
-
- else if (Memorial08 >= 9) {
+ } else if (Memorial08 >= 9) {
.@RandomMsg = rand(1,5);
if (.@RandomMsg == 1) {
mes "[Mad Sago Lauds]";
@@ -191,7 +177,7 @@ prontera,182,214,4 script Lauds#Memorial 1_M_MERCHANT,{
}
}
}
-
+
// Memorial Plaque
//============================================================
prontera,153,286,4 script Memorial Plaque#Memorial 4_BOARD3,{
@@ -199,9 +185,7 @@ prontera,153,286,4 script Memorial Plaque#Memorial 4_BOARD3,{
mes "[" + strcharinfo(0) + "]";
mes "- It's a dusty old plaque.-";
close;
- }
-
- else if (Memorial08 == 8) {
+ } else if (Memorial08 == 8) {
mes "[" + strcharinfo(0) + "]";
mes "- It's a dusty old plaque.-";
mes "'This must be what Lauds was talking about.'";
@@ -210,43 +194,41 @@ prontera,153,286,4 script Memorial Plaque#Memorial 4_BOARD3,{
Memorial08 = 9;
getexp 93750,43750;
goto L_CleanPlaque;
- }
-
- else if (Memorial08 >= 9) {
+ } else if (Memorial08 >= 9) {
goto L_CleanPlaque;
}
-
- L_CleanPlaque:
- mes "- You see a message from the cleaned plaque.-";
- next;
- mes "-Although no sculptured marble should rise to their memory,-";
- mes "-nor engraved stone bear record of their deeds,-";
- mes "-yet will their remembrance be as lasting as the land they honored.-";
- mes "-Daniel Webster-";
- if (Memorial08 == 9) {
- getexp 93750,43750;
- }
- next;
- mes "-There's another message.-";
- next;
- mes "-I may not have gone where I intended to go,-";
- mes "-but I think I have ended up where I needed to be.-";
- mes "- Douglas Adams.-";
- if (Memorial08 == 9) {
- getexp 93750,43750;
- }
- next;
- mes "-This is the last message.-";
- next;
- mes "-True heroism is remarkably sober, very undramatic.-";
- mes "-It is not the urge to surpass all others at whatever cost,-";
- mes "- but the urge to serve others at whatever cost. -";
- mes "- Arthur Ashe -";
- if (Memorial08 == 9) {
- getexp 93750,43750;
- Memorial08 = 10;
- }
- close;
+
+L_CleanPlaque:
+ mes "- You see a message from the cleaned plaque.-";
+ next;
+ mes "-Although no sculptured marble should rise to their memory,-";
+ mes "-nor engraved stone bear record of their deeds,-";
+ mes "-yet will their remembrance be as lasting as the land they honored.-";
+ mes "-Daniel Webster-";
+ if (Memorial08 == 9) {
+ getexp 93750,43750;
+ }
+ next;
+ mes "-There's another message.-";
+ next;
+ mes "-I may not have gone where I intended to go,-";
+ mes "-but I think I have ended up where I needed to be.-";
+ mes "- Douglas Adams.-";
+ if (Memorial08 == 9) {
+ getexp 93750,43750;
+ }
+ next;
+ mes "-This is the last message.-";
+ next;
+ mes "-True heroism is remarkably sober, very undramatic.-";
+ mes "-It is not the urge to surpass all others at whatever cost,-";
+ mes "- but the urge to serve others at whatever cost. -";
+ mes "- Arthur Ashe -";
+ if (Memorial08 == 9) {
+ getexp 93750,43750;
+ Memorial08 = 10;
+ }
+ close;
}
// Grast
@@ -257,9 +239,7 @@ prontera,150,270,4 script Grast#Memorial 4_M_HUMERCHANT,{
mes "Memorial Day is a sad and yet glorious day.";
mes "I wonder how many people remember them...";
close;
- }
-
- else if (Memorial08 == 3) {
+ } else if (Memorial08 == 3) {
mes "[Grast]";
mes "Oh, isn't that a Towel of Memory?";
mes "I'm so glad to meet someone who understands the meaning of Memorial Day.";
@@ -275,9 +255,7 @@ prontera,150,270,4 script Grast#Memorial 4_M_HUMERCHANT,{
mes "I'll be waiting for your return.";
Memorial08 = 4;
close;
- }
-
- else if (Memorial08 == 4) {
+ } else if (Memorial08 == 4) {
if (countitem(501) < 1 || countitem(506) < 1 || countitem(656) < 1 || countitem(602) < 1) {
mes "[Grast]";
mes "Oops, you haven't brought all materials.";
@@ -306,9 +284,7 @@ prontera,150,270,4 script Grast#Memorial 4_M_HUMERCHANT,{
Memorial08 = 5;
close;
}
- }
-
- else if (Memorial08 == 5) {
+ } else if (Memorial08 == 5) {
if (countitem(1065) < 1 || countitem(610) < 1 || countitem(717) < 1 || countitem(747) < 1 || countitem(517) < 1 || countitem(515) < 1) {
mes "[Grast]";
mes "Oops, you haven't brought all materials.";
@@ -333,9 +309,7 @@ prontera,150,270,4 script Grast#Memorial 4_M_HUMERCHANT,{
Memorial08 = 6;
close;
}
- }
-
- else if (Memorial08 == 6) {
+ } else if (Memorial08 == 6) {
if (countitem(643) < 1 || countitem(12018) < 1 || countitem(741) < 1 || countitem(745) < 1) {
mes "[Grast]";
mes "Oops, you haven't brought all materials.";
@@ -388,42 +362,38 @@ prontera,150,270,4 script Grast#Memorial 4_M_HUMERCHANT,{
getitem 12109,1;
close;
}
- }
-
- else if (Memorial08 == 7) {
+ } else if (Memorial08 == 7) {
mes "[Grast]";
mes "Have you met Lauds?";
mes "I hope you'll remember your freedom and happiness are built on thousands of lives sacrificed in war.";
close;
- }
-
- else if (Memorial08 >= 8) {
+ } else if (Memorial08 >= 8) {
mes "[Grast]";
mes "A towel is about the most massively useful thing an adventurer can have.";
close;
}
- L_GiveUp:
- mes "[Grast]";
- mes "Oh, I see. I guess you're quite busy nowadays, huh?";
- mes "No problem; I'll give you all the supplies...";
- next;
- mes "[Grast]";
- mes "There you go.";
- mes "I crushed all the items together into a more compact form for you.";
- mes "You can thank me later for that extra service.";
- mes "Please bring them to Lauds.";
- Memorial08 = 7;
- getitem 7126,1;
- next;
- mes "[Grast]";
- mes "By the way, he had an unfortunate accident, and has kind of lost his mind.";
- mes "Please don't be alarmed even if he starts babbling.";
- close;
-
- L_Continue:
- mes "[Grast]";
- mes "That's a good idea.";
- mes "Then I'll be waiting for your return.";
- close;
+L_GiveUp:
+ mes "[Grast]";
+ mes "Oh, I see. I guess you're quite busy nowadays, huh?";
+ mes "No problem; I'll give you all the supplies...";
+ next;
+ mes "[Grast]";
+ mes "There you go.";
+ mes "I crushed all the items together into a more compact form for you.";
+ mes "You can thank me later for that extra service.";
+ mes "Please bring them to Lauds.";
+ Memorial08 = 7;
+ getitem 7126,1;
+ next;
+ mes "[Grast]";
+ mes "By the way, he had an unfortunate accident, and has kind of lost his mind.";
+ mes "Please don't be alarmed even if he starts babbling.";
+ close;
+
+L_Continue:
+ mes "[Grast]";
+ mes "That's a good idea.";
+ mes "Then I'll be waiting for your return.";
+ close;
}
diff --git a/npc/events/RWC_2012.txt b/npc/events/RWC_2012.txt
index 43b884a0d..faefaa16a 100644
--- a/npc/events/RWC_2012.txt
+++ b/npc/events/RWC_2012.txt
@@ -313,14 +313,14 @@ prontera,147,59,3 script Goldberg#pron 4_M_OILMAN,{
mes "The enchant option in your item will be initialized.";
delitem 6665,1; //RWC_Inicializer
delequip .@part;
-
+
// GetNonSlotItemSock2 .@equip_refine .@equip_id .@equip_card[0] .@equip_card[1] .@equip_card[2] .@equip_card[3]
for(.@i = 0; .@i < 4; ++.@i) {
if (.@equip_card[.@i] >= 4700) // Armor Enchant System
.@equip_card[.@i] = 0;
}
getitem2 .@equip_id,1,1,.@equip_refine,0,.@equip_card[0],.@equip_card[1],.@equip_card[2],.@equip_card[3];
-
+
close;
}
}
diff --git a/npc/events/christmas_2008.txt b/npc/events/christmas_2008.txt
index 2b6d67eca..c412541cc 100644
--- a/npc/events/christmas_2008.txt
+++ b/npc/events/christmas_2008.txt
@@ -163,81 +163,81 @@ prontera,226,306,4 script Caroller#iROxmas08 1_F_PRIEST,{
}
}
}
+ mes "[Caroller]";
+ mes "You know about Christmas!";
+ mes "Talking about Christmas...";
+ mes "...it's carols!!!";
+ mes "I've been waiting for this for when";
+ mes "Christmas comes around!";
+ next;
+ mes "[Caroller]";
+ mes "But there's been no caroling here and there like before, so we can't feel the Christmas spirit.";
+ next;
+ mes "[Caroller]";
+ mes "So, I installed a Singing Crystal in Prontera...";
+ next;
+ mes "[Caroller]";
+ mes "but that jerk Antonio broke the crystal!";
+ next;
+ mes "[Caroller]";
+ mes "The gift boxes have been changing into monsters since Antonio placed some magic on them, so the monsters ate up the crystal fragments!";
+ next;
+ mes "[Caroller]";
+ mes "I am so devastated, since the Singing Crystal has been the hope of many children around the villages.";
+ next;
+ if (select("There's no other way to carol?:You can hear carols in Lutie.") == 2) {
mes "[Caroller]";
- mes "You know about Christmas!";
- mes "Talking about Christmas...";
- mes "...it's carols!!!";
- mes "I've been waiting for this for when";
- mes "Christmas comes around!";
- next;
- mes "[Caroller]";
- mes "But there's been no caroling here and there like before, so we can't feel the Christmas spirit.";
- next;
- mes "[Caroller]";
- mes "So, I installed a Singing Crystal in Prontera...";
- next;
- mes "[Caroller]";
- mes "but that jerk Antonio broke the crystal!";
- next;
- mes "[Caroller]";
- mes "The gift boxes have been changing into monsters since Antonio placed some magic on them, so the monsters ate up the crystal fragments!";
- next;
- mes "[Caroller]";
- mes "I am so devastated, since the Singing Crystal has been the hope of many children around the villages.";
- next;
- if (select("There's no other way to carol?:You can hear carols in Lutie.") == 2) {
- mes "[Caroller]";
- mes "And just stay there, every Christmas, for your whole life?";
- next;
- mes "["+strcharinfo(0)+"]";
- mes "What? What do you mean?";
- next;
- mes "[Caroller]";
- mes "Oh, nevermind.";
- mes "Ah...";
- close;
- }
- mes "[Caroller]";
- mes "Maybe, it's quite hard to make a jukebox for the villages, but a music box might be possible.";
- next;
- mes "[Caroller]";
- mes "We need the ^0000FFSinging Crystal Pieces^000000 that the monsters ate up.";
- next;
- mes "[Caroller]";
- mes "Please bring me ^0000FF6 Singing Crystal Pieces^000000, and you will be rewarded with presents!";
- next;
- mes "[Caroller]";
- mes "Sounds cool, huh!!";
- next;
- select("........................");
- mes "[Caroller]";
- mes "...Why are you staring at me like that?";
- next;
- mes "[Caroller]";
- mes "You're thinking that we are always getting our plans spoiled, aren't you?";
- next;
- mes "[Caroller]";
- mes "I know that we are not good at controlling stuff, but our rewards are good, right?";
- next;
- select("........................");
- mes "[Caroller]";
- mes "Hey, we treat you good...";
- next;
- select("........................");
- mes "[Caroller]";
- mes "You are so cruel to me!";
- mes "Bad! Bad!";
+ mes "And just stay there, every Christmas, for your whole life?";
next;
- mes "[Caroller]";
- mes "Please, for our children's hope!!!?";
- mes "Please bring me 6 Singing Crystal Pieces from ^0000FFViolent Gift Boxes^000000!";
+ mes "["+strcharinfo(0)+"]";
+ mes "What? What do you mean?";
next;
- emotion e_ok;
mes "[Caroller]";
- mes "They're definitely as harsh as their name.";
- mes "Go on please!";
- iROxmas08carol = 1;
+ mes "Oh, nevermind.";
+ mes "Ah...";
close;
+ }
+ mes "[Caroller]";
+ mes "Maybe, it's quite hard to make a jukebox for the villages, but a music box might be possible.";
+ next;
+ mes "[Caroller]";
+ mes "We need the ^0000FFSinging Crystal Pieces^000000 that the monsters ate up.";
+ next;
+ mes "[Caroller]";
+ mes "Please bring me ^0000FF6 Singing Crystal Pieces^000000, and you will be rewarded with presents!";
+ next;
+ mes "[Caroller]";
+ mes "Sounds cool, huh!!";
+ next;
+ select("........................");
+ mes "[Caroller]";
+ mes "...Why are you staring at me like that?";
+ next;
+ mes "[Caroller]";
+ mes "You're thinking that we are always getting our plans spoiled, aren't you?";
+ next;
+ mes "[Caroller]";
+ mes "I know that we are not good at controlling stuff, but our rewards are good, right?";
+ next;
+ select("........................");
+ mes "[Caroller]";
+ mes "Hey, we treat you good...";
+ next;
+ select("........................");
+ mes "[Caroller]";
+ mes "You are so cruel to me!";
+ mes "Bad! Bad!";
+ next;
+ mes "[Caroller]";
+ mes "Please, for our children's hope!!!?";
+ mes "Please bring me 6 Singing Crystal Pieces from ^0000FFViolent Gift Boxes^000000!";
+ next;
+ emotion e_ok;
+ mes "[Caroller]";
+ mes "They're definitely as harsh as their name.";
+ mes "Go on please!";
+ iROxmas08carol = 1;
+ close;
case 4:
mes "[Caroller]";
@@ -260,7 +260,6 @@ prontera,226,306,4 script Caroller#iROxmas08 1_F_PRIEST,{
mes "It's hot, huh?";
close;
-
case 5:
mes "[Caroller]";
mes "A-N-T-O-N-I-O!!!";
@@ -279,7 +278,7 @@ prontera,226,306,4 script Caroller#iROxmas08 1_F_PRIEST,{
close;
}
}
-
+
if (iROxmas08carol == 1) {
if (countitem(6092) < 6) {
mes "[Caroller]";
@@ -345,7 +344,7 @@ prontera,226,306,4 script Caroller#iROxmas08 1_F_PRIEST,{
close;
}
}
-
+
if (iROxmas08carol == 2) {
if (countitem(1019) < 10 || countitem(1005) < 1 || countitem(7312) < 1 || countitem(938) < 10 || countitem(732) < 1) {
mes "[Caroller]";
@@ -442,7 +441,7 @@ prontera,226,306,4 script Caroller#iROxmas08 1_F_PRIEST,{
mes "All right, what comes to your mind when you think about Christmas?";
next;
switch(select("Carolling:Santa Claus:Gift Boxes:Santa Costume:Not much really...")) {
-
+
case 1:
mes "[Santa Claus]";
mes "Carolling! That's good!";
@@ -471,7 +470,7 @@ prontera,226,306,4 script Caroller#iROxmas08 1_F_PRIEST,{
mes "A bad Santa ruins us good Santa's reputations!";
mes "The World Santa Organization is considering this a grave situation.";
close;
-
+
case 3:
mes "[Santa Claus]";
mes "A gift box! That sounds good!";
@@ -680,7 +679,7 @@ prontera,226,306,4 script Caroller#iROxmas08 1_F_PRIEST,{
mes "There used to be designer who visited my house to make my Santa costumes.";
mes "Do you have any ideas?";
close;
-
+
case 5:
mes "[Santa Claus]";
mes "........................";
diff --git a/npc/events/dumplingfestival.txt b/npc/events/dumplingfestival.txt
index 23a085eb8..e20e4dd2a 100644
--- a/npc/events/dumplingfestival.txt
+++ b/npc/events/dumplingfestival.txt
@@ -10,7 +10,7 @@
//= Ver 1.0- Duplicate of MRO's Dumpling Event
//= 1.01 fixed bugs [Lupus]
//============================================================
-
+
payon,93,81,4 script Exorcist Master Fahae 4_M_BUDDHIST,{
mes "[Exorcist Master Fahae]";
@@ -64,7 +64,7 @@ payon,93,81,4 script Exorcist Master Fahae 4_M_BUDDHIST,{
mes "Here you go, I hope you may succeed in my quest.";
close;
}
-
+
// Monsters
//============================================================
gef_fild00,0,0,0,0 monster Dumpling 1520,20,60000,66000
diff --git a/npc/events/god_se_festival.txt b/npc/events/god_se_festival.txt
index 3b7dd50e8..aed725db5 100644
--- a/npc/events/god_se_festival.txt
+++ b/npc/events/god_se_festival.txt
@@ -120,7 +120,6 @@ yuno,118,192,5 script Rmimi Ravies#gq_fes01 4_F_HUGIRL,{
mes "[Rmimi Ravies]";
mes "Have a good time.";
donpcevent "Rmimi Ravies#gq_fes01::OnStart";
-
announce "["+ strcharinfo(0) +"] member of ["+ getguildname(.@GID) +"] is summoning a 'Valkyrie's Present' in 'Juno'.",bc_all,"0x70dbdb";
close;
}
@@ -390,7 +389,6 @@ OnTimer3900000:
end;
}
-
// Original name: "Festival Manager#god_se_fes02"
rachel,1,1,0 script Festival Manager#gq_fes2 4_F_HUGIRL,{
callfunc "F_GM_NPC";
diff --git a/npc/events/halloween_2009.txt b/npc/events/halloween_2009.txt
index f67841c15..2f3a978e3 100644
--- a/npc/events/halloween_2009.txt
+++ b/npc/events/halloween_2009.txt
@@ -193,17 +193,17 @@ OnInit:
hideonnpc "Trick or Treater#iRO7";
hideonnpc "Trick or Treater#iRO8";
end;
-
+
OnEnableTreat:
enablenpc strnpcinfo(3);
hideonnpc strnpcinfo(3);
end;
-
+
OnTimer15000:
hideonnpc strnpcinfo(3);
disablenpc strnpcinfo(3);
end;
-
+
OnTimer300000:
donpcevent strnpcinfo(3)+"::OnEnableTreat";
stopnpctimer;
diff --git a/npc/events/nguild/nguild_flags.txt b/npc/events/nguild/nguild_flags.txt
index dcd3dbc14..830ded7f9 100644
--- a/npc/events/nguild/nguild_flags.txt
+++ b/npc/events/nguild/nguild_flags.txt
@@ -94,9 +94,6 @@ nguild_alde,74,64,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-18 GUILD_FLAG
nguild_alde,203,150,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-19 GUILD_FLAG
nguild_alde,210,150,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-20 GUILD_FLAG
-
-
-
//============================================================================//
// Castle 2
//============================================================================//
@@ -125,8 +122,6 @@ nguild_gef,17,171,5 duplicate(NGuildGef) NGuild Geffen#g1-10 GUILD_FLAG
nguild_gef,59,16,4 duplicate(NGuildGef) NGuild Geffen#g1-11 GUILD_FLAG
nguild_gef,64,16,4 duplicate(NGuildGef) NGuild Geffen#g1-12 GUILD_FLAG
-
-
//============================================================================//
// Castle 3
//============================================================================//
@@ -155,9 +150,6 @@ nguild_pay,221,116,4 duplicate(NGuildPay) NGuild Payon#f1-9 GUILD_FLAG
nguild_pay,206,108,4 duplicate(NGuildPay) NGuild Payon#f1-10 GUILD_FLAG
nguild_pay,212,108,4 duplicate(NGuildPay) NGuild Payon#f1-11 GUILD_FLAG
-
-
-
//=============================================================================//
// Castle 4
//=============================================================================//
diff --git a/npc/events/valentinesday_2009.txt b/npc/events/valentinesday_2009.txt
index 56195d06a..aaaf74a85 100644
--- a/npc/events/valentinesday_2009.txt
+++ b/npc/events/valentinesday_2009.txt
@@ -314,7 +314,7 @@ prontera,154,185,5 script Event Ring Maker#Val09 4_F_KAFRA7,{
mes "Come back when you're experienced enough to handle the quests.";
close;
}
-
+
if (iROval09ring >= 1) {
mes "[Event Ring Maker]";
mes "The box with the ring, carved with your name, is for the one you love.";
@@ -328,7 +328,7 @@ prontera,154,185,5 script Event Ring Maker#Val09 4_F_KAFRA7,{
mes "Be aware, and always try to stay popular!";
close;
}
-
+
mes "[Event Ring Maker]";
mes "Hi, there, how are ya?";
mes "Come to me if you're interested in the event, 'Who's Valentine's Hottest?'";
@@ -435,7 +435,7 @@ prontera,157,185,4 script Valentine Vote Manager#v 4_F_KAFRA5,{
next;
break;
}
-
+
if (Sex) {
if (countitem(7947) > .@input) {
mes "[Valentine Vote Manager]";
@@ -444,7 +444,7 @@ prontera,157,185,4 script Valentine Vote Manager#v 4_F_KAFRA5,{
next;
break;
}
-
+
if (countitem(7947) < .@input) {
mes "[Valentine Vote Manager]";
mes "Seems like the value you entered is too large.";
@@ -452,7 +452,7 @@ prontera,157,185,4 script Valentine Vote Manager#v 4_F_KAFRA5,{
next;
break;
}
-
+
mes "[Valentine Vote Manager]";
mes "I'll take those silver rings, and count the votes for you.";
mes "Thank you for participating.";
@@ -472,7 +472,7 @@ prontera,157,185,4 script Valentine Vote Manager#v 4_F_KAFRA5,{
next;
break;
}
-
+
if (countitem(7946) < .@input) {
mes "[Valentine Vote Manager]";
mes "Seems like the value you entered is too large.";
@@ -480,7 +480,7 @@ prontera,157,185,4 script Valentine Vote Manager#v 4_F_KAFRA5,{
next;
break;
}
-
+
mes "[Valentine Vote Manager]";
mes "I'll take those gold rings, and count the votes for you.";
mes "Thank you for participating.";
@@ -533,7 +533,7 @@ prt_castle,42,35,3 script Dessert Manager#Val09 1_M_01,{
mes "Annoying, annoying, annoying~~!";
close;
}
-
+
mes "[Charles Orleans]";
mes "Oh, Mademoiselle!";
mes "This little trifling space felt like heaven the minute you walked in!";
@@ -629,5 +629,4 @@ prt_castle,42,35,3 script Dessert Manager#Val09 1_M_01,{
mes "I hope this is just what you wanted, for it bears your beautiful heart inside.";
close;
}
-
}
diff --git a/npc/events/xmas.txt b/npc/events/xmas.txt
index e420f9e6d..be43b3752 100644
--- a/npc/events/xmas.txt
+++ b/npc/events/xmas.txt
@@ -90,7 +90,7 @@ L_Start:
mes "If you get 3 more, I'll give you another.";
mes "Hope you get a good item.";
close;
-
+
L_NotEnuf:
mes "You don't have enough socks as proof.";
mes "Go take down those evil Santas";
diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt
index a9bc499c5..da2244323 100644
--- a/npc/instances/SealedShrine.txt
+++ b/npc/instances/SealedShrine.txt
@@ -130,7 +130,7 @@ monk_test,309,146,3 script Friar Patrick#edq 4_M_OLDFRIAR,{
instance_set_timeout 7200,300,.@instance;
instance_init(.@instance);
-
+
mes "Okay... I'll adjust the shrine's seal so that you and your group can enter.";
next;
mes "[Friar Patrick]";
@@ -1455,7 +1455,6 @@ OnTimer70000:
end;
}
-
1@cata,1,1,0 script ins_1f_spawn_mobs -1,{
OnInstanceInit:
.@map$ = instance_mapname("1@cata");
diff --git a/npc/jobs/1-1e/taekwon.txt b/npc/jobs/1-1e/taekwon.txt
index 5f15305c0..e7d94e567 100644
--- a/npc/jobs/1-1e/taekwon.txt
+++ b/npc/jobs/1-1e/taekwon.txt
@@ -417,4 +417,3 @@ payon,157,141,5 script Phoenix#TKJobChange 4_M_MONK,{
close;
}
}
-
diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt
index e88f0adc6..c98fca135 100644
--- a/npc/jobs/2-1/assassin.txt
+++ b/npc/jobs/2-1/assassin.txt
@@ -1482,7 +1482,7 @@ OnTimer187000:
OnDisable:
stopnpctimer;
end;
-
+
OnMyMobDead:
mapannounce "in_moc_16","Hey, what the hell was that?! I told you: No killing monsters!",bc_map;
mapannounce "in_moc_16","I'm bringing you back... *Sigh...*",bc_map;
diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt
index e28106f69..89573956e 100644
--- a/npc/jobs/2-1/priest.txt
+++ b/npc/jobs/2-1/priest.txt
@@ -1860,4 +1860,3 @@ function script F_FatherYos {
mes "...Acolyte, you don't have any business with me here.";
close;
}
-
diff --git a/npc/jobs/2-1e/StarGladiator.txt b/npc/jobs/2-1e/StarGladiator.txt
index 91ac02ea3..e45d7c576 100644
--- a/npc/jobs/2-1e/StarGladiator.txt
+++ b/npc/jobs/2-1e/StarGladiator.txt
@@ -352,7 +352,7 @@ OnTouch:
mes "You're blocking my sun!";
close;
}
-
+
comodo,172,230,3 script Wandering Master#job_sta 4_M_JOB_ASSASSIN,{
if (Class == Job_Taekwon) {
if (STGL_Q == 1) {
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index c713194de..22e9b917d 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -969,8 +969,6 @@ prt_castle,35,151,5 script Patron Knight 4_M_CRU,{
close;
}
-
-
// Actual tests
//============================================================
@@ -1201,7 +1199,6 @@ OnDead:
end;
}
-
job_cru,98,105,4 script Summoner#cr5 WARPNPC,3,3,{
OnTouch:
CRUS_Q = 6;
diff --git a/npc/jobs/2-2a/Professor.txt b/npc/jobs/2-2a/Professor.txt
index 68cac14cf..8fee58494 100644
--- a/npc/jobs/2-2a/Professor.txt
+++ b/npc/jobs/2-2a/Professor.txt
@@ -88,4 +88,3 @@ valkyrie,53,47,3 script Scholar#Valkyrie 2_M_SAGE_OLD,{
mes "Honor to the warriors!";
close;
}
-
diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt
index c7cef8107..d2a7108b1 100644
--- a/npc/jobs/valkyrie.txt
+++ b/npc/jobs/valkyrie.txt
@@ -398,4 +398,3 @@ S_Warpchar:
//============================================================
valkyrie,48,73,0 warp valk01#1 1,1,valkyrie,48,64
valkyrie,48,66,0 warp valk01#2 1,1,valkyrie,48,75
-
diff --git a/npc/merchants/dye_maker.txt b/npc/merchants/dye_maker.txt
index bca4ef276..bd2440c19 100644
--- a/npc/merchants/dye_maker.txt
+++ b/npc/merchants/dye_maker.txt
@@ -185,7 +185,7 @@ S_MakeDye:
Zeny -= .@cost;
// get dyestuff
getitem .@dyestuff,1;
-
+
mes "[Dye Maker Java Dullihan]";
mes "Hmm... It came out pretty well. A very rich color. Of course I'll be trying harder to make a more charming color...";
next;
diff --git a/npc/merchants/old_pharmacist.txt b/npc/merchants/old_pharmacist.txt
index 1889ea3b9..15a8206b6 100644
--- a/npc/merchants/old_pharmacist.txt
+++ b/npc/merchants/old_pharmacist.txt
@@ -181,7 +181,7 @@ alberta_in,16,28,4 script Pharmacist 1_M_PUBMASTER,{
mes "What a boring person. If you have something to say, why don't you say it?!";
close;
}
-
+
L_Making:
next;
mes "[Old Pharmacist]";
diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt
index b88fa647a..ff5b78b2d 100644
--- a/npc/other/Global_Functions.txt
+++ b/npc/other/Global_Functions.txt
@@ -42,7 +42,6 @@
//= 2.19 Improved 'F_InsertComma' function. [Emistry]
//============================================================
-
//////////////////////////////////////////////////////////////////////////////////
// Returns a number with commas based on precision of digits and custom separator.
// -- callfunc "F_InsertComma",<number>{,<precision>,<separator>}
@@ -56,10 +55,10 @@ function script F_InsertComma {
.@value = getarg(0);
.@precision = getarg(1,3);
.@separator$ = getarg( 2,"," );
-
+
.@str$ = ""+.@value;
.@is_negative = ( .@value < 0 );
-
+
.@length = getstrlen( .@str$ ) - .@precision - .@is_negative;
while ( .@length > 0 ) {
.@str$ = insertchar( .@str$, .@separator$ , ( .@length + .@is_negative ) );
@@ -68,7 +67,6 @@ function script F_InsertComma {
return .@str$;
}
-
//////////////////////////////////////////////////////////////////////////////////
// Function that clears job quest variables
//////////////////////////////////////////////////////////////////////////////////
@@ -125,10 +123,10 @@ function script F_ClearGarbage {
RES_SKILL = 0;
//Here you put outdated variables from your outdated EVENTS
//e.g. Is XMAS done? Add the EVENT var clearing code here.
-
+
//due to bugs in BS quest:
wizard_m2 = 0;
-
+
// Old Novice Ground Variables.
NEW_MES_FLAG0 = 0;
NEW_MES_FLAG1 = 0;
@@ -139,11 +137,11 @@ function script F_ClearGarbage {
NEW_LVUP0 = 0;
NEW_LVUP1 = 0;
NEW_JOBLVUP = 0;
-
+
// Old DTS variables that are no longer used.
dtseligible = 0;
MISC_QUEST = MISC_QUEST & ~128;
-
+
return;
}
@@ -160,7 +158,6 @@ function script Job_Change {
return;
}
-
//////////////////////////////////////////////////////////////////////////////////
// Functions used to spiff up dialoges [Lupus]
//////////////////////////////////////////////////////////////////////////////////
@@ -177,7 +174,6 @@ function script F_Rand {
return getarg(rand(getargcount()));
}
-
//////////////////////////////////////////////////////////////////////////////////
// *** Function "F_Sex"
//////////////////////////////////////////////////////////////////////////////////
@@ -188,7 +184,6 @@ function script F_SexMes {
return getarg(Sex);
}
-
//////////////////////////////////////////////////////////////////////////////////
// *** Function "F_Hi"
//////////////////////////////////////////////////////////////////////////////////
@@ -198,7 +193,6 @@ function script F_Hi {
return callfunc("F_Rand","Hi!","Hello!","Good day!","How are you?","Hello there.");
}
-
//////////////////////////////////////////////////////////////////////////////////
// *** Function "F_Bye"
//////////////////////////////////////////////////////////////////////////////////
@@ -208,7 +202,6 @@ function script F_Bye {
return callfunc("F_Rand","Bye. See you again.","Later.","Goodbye.","Good luck!","Have a nice day!","Byebye!!!");
}
-
//////////////////////////////////////////////////////////////////////////////////
// *** Function "F_ItemName"
//////////////////////////////////////////////////////////////////////////////////
@@ -337,14 +330,14 @@ function script F_GetArmorType {
// *********************************************************************
function script Time2Str {
.@time_left = getarg(0) - gettimetick(2);
-
+
.@Days = .@time_left / 86400;
.@time_left -= (.@Days * 86400);
.@Hours = .@time_left / 3600;
.@time_left -= (.@Hours * 3600);
.@Minutes = .@time_left / 60;
.@time_left -= (.@Minutes * 60);
-
+
.@Time$ = "";
if( .@Days > 1 )
.@Time$ += .@Days + " days, ";
@@ -365,6 +358,6 @@ function script Time2Str {
.@Time$ += .@time_left + " seconds";
else if( .@time_left == 1 )
.@Time$ += .@time_left + " second";
-
+
return .@Time$;
}
diff --git a/npc/other/books.txt b/npc/other/books.txt
index 6ad8968b2..aef8a4079 100644
--- a/npc/other/books.txt
+++ b/npc/other/books.txt
@@ -391,7 +391,7 @@ prt_in,168,56,4 script Monster Encyclopedia#prt HIDDEN_NPC,{
}
}
}
-
+
prt_in,159,56,4 script Monster Encyclopedia#2pr HIDDEN_NPC,{
mes "^FF0000[Monster Encyclopedia]^000000";
mes "This is a Monster Encyclopedia";
@@ -1720,7 +1720,6 @@ prt_in,172,96,4 script Monster Encyclopedia#4pr HIDDEN_NPC,{
}
}
-
prt_in,164,96,4 script Monster Encyclopedia#5pr HIDDEN_NPC,{
mes "^FF0000[Dungeon Monster Encyclopedia]^000000";
mes "This is an Encyclopedia describing";
diff --git a/npc/other/comodo_gambling.txt b/npc/other/comodo_gambling.txt
index ea354e490..3d0e2b389 100644
--- a/npc/other/comodo_gambling.txt
+++ b/npc/other/comodo_gambling.txt
@@ -71,7 +71,7 @@ comodo,219,158,6 script Kachua 4_F_02,{
mes "you something from one of my";
mes "collections~";
next;
-
+
if (MaxWeight - Weight < 5500) {
cutin "katsua01.bmp",255;
cutin "katsua03.bmp",2;
@@ -379,7 +379,7 @@ comodo,219,158,6 script Kachua 4_F_02,{
close;
break;
}
-
+
getitem .@item,1;
cutin "katsua01.bmp",255;
diff --git a/npc/other/fortune.txt b/npc/other/fortune.txt
index a14f63fc9..dad407482 100644
--- a/npc/other/fortune.txt
+++ b/npc/other/fortune.txt
@@ -3525,7 +3525,7 @@ payon_in03,75,129,5 script Poring Fortune Teller 4_M_BIBI,{
}
close;
}
-
+
payon_in03,118,119,1 script Ascetic 4W_F_01,2,2,{
mes "[Kissy-Kissy]";
mes "NyangNyangNyang~";
diff --git a/npc/other/hugel_bingo.txt b/npc/other/hugel_bingo.txt
index d84c94cd3..a31a8f47a 100644
--- a/npc/other/hugel_bingo.txt
+++ b/npc/other/hugel_bingo.txt
@@ -406,7 +406,7 @@ OnInit:
disablenpc "24e#bingo";
disablenpc "25e#bingo";
end;
-
+
OnTouch:
if(@bingoplate[1] == $bingo[$@bingoresult -1]){ @bingo_a1$ = "^ff0000- -^000000"; setarray @bingoplate[1],99; }
else if(@bingoplate[2] == $bingo[$@bingoresult -1]){ @bingo_a2$ = "^ff0000- -^000000"; setarray @bingoplate[2],99; }
diff --git a/npc/other/monster_museum.txt b/npc/other/monster_museum.txt
index fae93fd3e..d39b034da 100644
--- a/npc/other/monster_museum.txt
+++ b/npc/other/monster_museum.txt
@@ -59,7 +59,7 @@ yuno_in03,32,15,3 script Museum Guide 1_F_02,{
mes "Feel free to talk to me anytime.";
close;
}
-
+
yuno_in03,36,21,3 script Deviace#yuno DEVIACE,{
end;
}
@@ -85,7 +85,7 @@ yuno_in03,33,21,1 script #DEVIACE HIDDEN_NPC,{
mes "it's better to be careful with this monster.";
close;
}
-
+
yuno_in03,36,27,3 script Seal#yuno FUR_SEAL,{
end;
}
@@ -111,7 +111,7 @@ yuno_in03,33,27,1 script #FUR_SEAL HIDDEN_NPC,{
mes "for people to produce winter coats.";
close;
}
-
+
yuno_in03,36,33,3 script Sage Worm#yuno SAGEWORM,{
end;
}
@@ -133,7 +133,7 @@ yuno_in03,33,33,1 script #SAGEWORM HIDDEN_NPC,{
mes "indicates, it's usually seen near books or book shelves.";
close;
}
-
+
yuno_in03,39,39,3 script Penomena#yuno PENOMENA,{
end;
}
@@ -159,7 +159,7 @@ yuno_in03,38,39,1 script #PENOMANA HIDDEN_NPC,{
mes "enough to kill its enemy at once.";
close;
}
-
+
yuno_in03,39,44,3 script Galapago#yuno GALAPAGO,{
end;
}
@@ -180,7 +180,7 @@ yuno_in03,37,44,3 script #GALAPAGO HIDDEN_NPC,{
mes "generally laid back monster.";
close;
}
-
+
yuno_in03,15,21,5 script Raydric#yuno RAYDRIC,{
end;
}
@@ -201,7 +201,7 @@ yuno_in03,19,21,1 script #RAYDRIC HIDDEN_NPC,{
mes "and powerful attack strength.";
close;
}
-
+
yuno_in03,15,27,5 script Chepet#yuno CHEPET,{
end;
}
@@ -220,7 +220,7 @@ yuno_in03,19,27,1 script #CHEPET HIDDEN_NPC,{
mes "only a few places.";
close;
}
-
+
yuno_in03,15,33,5 script Violy#yuno VIOLY,{
end;
}
@@ -237,7 +237,7 @@ yuno_in03,19,33,1 script #VIOLY HIDDEN_NPC,{
mes "Exercise extreme caution upon encountering a Violy. Otherwise, it will snatch your soul in no time with its charming song.";
close;
}
-
+
yuno_in03,10,39,5 script Alice#yuno ALICE,{
end;
}
@@ -259,7 +259,7 @@ yuno_in03,12,39,1 script #ALICE HIDDEN_NPC,{
mes "is still a scientific mystery.";
close;
}
-
+
yuno_in03,10,45,5 script Assulter#yuno ASSULTER,{
end;
}
@@ -284,7 +284,7 @@ yuno_in03,12,45,1 script #ASSULTER HIDDEN_NPC,{
mes "is more threatening.";
close;
}
-
+
yuno_in03,38,50,3 script PecoPeco Egg#yuno PECOPECO_EGG,{
end;
}
@@ -316,7 +316,7 @@ yuno_in03,20,96,1 script #WANDER_MAN HIDDEN_NPC,{
mes "stroke of its sword.";
close;
}
-
+
yuno_in03,16,100,5 script Caterpillar#yuno CATERPILLAR,{
end;
}
@@ -338,7 +338,7 @@ yuno_in03,18,100,1 script #CATERPILLAR HIDDEN_NPC,{
mes "Creamy.";
close;
}
-
+
yuno_in03,16,104,5 script Male Thiefbug#yuno THIEF_BUG__,{
end;
}
@@ -356,7 +356,7 @@ yuno_in03,18,104,1 script #THIEF_BUG__ HIDDEN_NPC,{
mes "However, it is stronger than other Thief Bugs because it's designated to protect the females and babies from danger.";
close;
}
-
+
yuno_in03,16,108,5 script Tri Joint#yuno TRI_JOINT,{
end;
}
@@ -376,7 +376,7 @@ yuno_in03,18,108,1 script #TRI_JOINT HIDDEN_NPC,{
mes "Recently, since many Tri Joints have been discovered inside many caves, Sages are very excited to study them to learn more about the evolution of monsters in Rune-Midgard.";
close;
}
-
+
yuno_in03,16,111,5 script Arclouz#yuno ARCLOUSE,{
end;
}
@@ -399,7 +399,7 @@ yuno_in03,18,111,1 script #ARCLOUSE HIDDEN_NPC,{
mes "compared to PecoPecos.";
close;
}
-
+
yuno_in03,16,117,5 script Dragon Tail#yuno DRAGON_TAIL,{
end;
}
@@ -418,7 +418,7 @@ yuno_in03,18,116,1 script #DRAGON_TAIL HIDDEN_NPC,{
mes "a sleeping poison.";
close;
}
-
+
yuno_in03,46,96,3 script Owl Duke#yuno OWL_DUKE,{
end;
}
@@ -443,7 +443,7 @@ yuno_in03,44,96,1 script #OWL_DUKE HIDDEN_NPC,{
mes "aristocratic pompousness.";
close;
}
-
+
yuno_in03,48,100,3 script Marine Sphere#yuno MARINE_SPHERE,{
end;
}
@@ -467,7 +467,7 @@ yuno_in03,46,101,1 script #MARINE_SPHERE HIDDEN_NPC,{
mes "a dangerous chain reaction.";
close;
}
-
+
yuno_in03,48,104,3 script Mandragora#yuno MANDRAGORA,{
end;
}
@@ -498,7 +498,7 @@ yuno_in03,46,105,1 script #MANDRAGORA HIDDEN_NPC,{
mes "from useful in attracting prey.";
close;
}
-
+
yuno_in03,48,108,3 script Geographer#yuno GEOGRAPHER,{
end;
}
@@ -532,7 +532,7 @@ yuno_in03,46,108,1 script #GEOGRAPHER HIDDEN_NPC,{
mes "never be forgotten...";
close;
}
-
+
yuno_in03,48,112,3 script Rafflesia#yuno RAFFLESIA,{
end;
}
@@ -557,7 +557,7 @@ yuno_in03,46,112,1 script #RAFFLESIA HIDDEN_NPC,{
mes "cultivate and save the Rafflesias.";
close;
}
-
+
yuno_in03,48,116,3 script Stem Worm#yuno STEM_WORM,{
end;
}
@@ -601,7 +601,7 @@ yuno_in03,24,122,1 script #BLAZZER HIDDEN_NPC,{
mes "form of communication.";
close;
}
-
+
yuno_in03,28,124,5 script Ride Word#yuno RIDEWORD,{
end;
}
@@ -616,7 +616,7 @@ yuno_in03,28,122,1 script #RIDEWORD HIDDEN_NPC,{
mes "sharp teeth. It exists to attack any living thing nearby.";
close;
}
-
+
yuno_in03,31,124,3 script Megalodon#yuno MEGALODON,{
end;
}
@@ -634,7 +634,7 @@ yuno_in03,31,122,1 script #MEGALODON HIDDEN_NPC,{
mes "undersea travellers outright.";
close;
}
-
+
yuno_in03,35,124,3 script Sleeper#yuno SLEEPER,{
end;
}
@@ -655,7 +655,7 @@ yuno_in03,35,122,1 script #SLEEPER HIDDEN_NPC,{
mes "cause indirect attacks by causing a sand storm.";
close;
}
-
+
yuno_in03,39,124,3 script Ancient Mummy#yuno ANCIENT_MUMMY,{
end;
}
@@ -684,7 +684,7 @@ yuno_in03,39,122,1 script #ANCIENT_MUMMY HIDDEN_NPC,{
mes "attack any living thing nearby.";
close;
}
-
+
yuno_in03,18,122,5 script Incubus#yuno INCUBUS,{
end;
}
@@ -706,7 +706,7 @@ yuno_in03,19,120,1 script #INCUBUS HIDDEN_NPC,{
mes "it can eventually take them to hell.";
close;
}
-
+
yuno_in03,44,120,3 script Succubus#yuno SUCCUBUS,{
end;
}
diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt
index 5e99c97d8..6b52dd870 100644
--- a/npc/other/poring_war.txt
+++ b/npc/other/poring_war.txt
@@ -356,7 +356,7 @@ OnInit:
//============================================================
poring_w01,91,97,3 script Poring#wop_door_all PORING,{
end;
-
+
OnInit:
waitingroom "[Recruiting 10 Battle Participants]",11,"Poring#wop_door_all::OnStartArena",10,500,9;
enablewaitingroomevent;
diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt
index b8d104ce2..70c02d1bc 100644
--- a/npc/other/pvp.txt
+++ b/npc/other/pvp.txt
@@ -314,8 +314,6 @@ function script F_PVP_FSRS {
end;
}
-
-
// Event Contestant Entrance
//============================================================
pvp_room,54,85,4 script Registration Staff#1 8W_SOLDIER,{
diff --git a/npc/other/turbo_track.txt b/npc/other/turbo_track.txt
index e2dd1d661..36a1b4fe1 100644
--- a/npc/other/turbo_track.txt
+++ b/npc/other/turbo_track.txt
@@ -45,7 +45,7 @@ OnStartArena:
donpcevent "Broadcast#"+.@in$+.@in+"::OnEnable";
disablewaitingroomevent strnpcinfo(0);
end;
-
+
OnInit:
if (compare(strnpcinfo(0),"main")) end;
if (compare(strnpcinfo(2),"n1")) {
@@ -66,7 +66,7 @@ turbo_room,77,135,3 duplicate(entrance#tt_main) Normal mode - 4 person 4_F_TELEP
turbo_room,84,135,3 duplicate(entrance#tt_main) Normal mode - 8 person 4_F_TELEPORTER
turbo_room,91,135,3 duplicate(entrance#tt_main) Normal mode - 16 person 4_F_TELEPORTER
turbo_room,72,132,3 duplicate(entrance#tt_main) Solo Mode#n1 4_F_TELEPORTER
-
+
turbo_e_4,298,167,3 script Helper#tt_main 4_F_TELEPORTER,{
mes "[Helper]";
mes "You are now in the";
@@ -96,7 +96,7 @@ OnTouch:
else
warp strnpcinfo(4),59,364;
end;
-
+
OnInit:
.@w$ = callfunc("F_tt");
disablenpc "Point Give-Away Guy#"+.@w$;
@@ -391,12 +391,12 @@ OnTimer927000:
disablenpc "Flasher_Exit_1#"+.@w$;
disablenpc "Flasher_Exit_2#"+.@w$;
end;
-
+
OnInit:
.@w$ = callfunc("F_tt");
disablenpc "Master#"+.@w$;
end;
-
+
function RName {
.@s = (getstrlen(getarg(0)) > 2)?(substr(getarg(0),1,2)):(charat(getarg(0),getstrlen(getarg(0))-1));
.@rn$ = ((compare(strnpcinfo(4),"_e_"+.@s))?"Expert mode":"Normal mode")+" - "+.@s+" person";
@@ -1641,7 +1641,6 @@ turbo_n_8,332,279,0 duplicate(snake02#tt_main) snake02#n8 WARPNPC,1,1
turbo_n_16,332,279,0 duplicate(snake02#tt_main) snake02#n16 WARPNPC,1,1
turbo_n_1,332,279,0 duplicate(snake02#tt_main) snake02#n1 WARPNPC,1,1
-
- script snake03#tt_main WARPNPC,1,1,{
OnTouch:
.@turbo2 = rand(1,8);
@@ -1659,7 +1658,6 @@ turbo_n_8,324,270,0 duplicate(snake03#tt_main) snake03#n8 WARPNPC,1,1
turbo_n_16,324,270,0 duplicate(snake03#tt_main) snake03#n16 WARPNPC,1,1
turbo_n_1,324,270,0 duplicate(snake03#tt_main) snake03#n1 WARPNPC,1,1
-
- script snake04#tt_main WARPNPC,1,1,{
OnTouch:
.@turbo2 = rand(1,7);
@@ -1679,7 +1677,7 @@ turbo_n_1,332,270,0 duplicate(snake04#tt_main) snake04#n1 WARPNPC,1,1
- script SnakeHunt#tt_main -1,{
end;
-
+
OnReset:
killmonsterall strnpcinfo(4);
end;
@@ -1947,7 +1945,7 @@ OnTouch:
}
disablenpc "#cos_"+.@w$+"_end";
end;
-
+
function GetNumber {
setarray .@w_n$[1], "n4","n8","n16","e4","e8","e16";
for (.@i = 1; .@i <= getarraysize(.@w_n$); ++.@i) {
@@ -1955,7 +1953,7 @@ OnTouch:
return .@i;
}
}
-
+
OnInit:
.@w$ = callfunc("F_tt");
enablenpc "#cos_"+.@w$+"_end";
@@ -1980,7 +1978,7 @@ OnTouch:
disablenpc "#cos_"+.@w$+"_end2";
enablenpc "#cos_"+.@w$+"_end3";
end;
-
+
OnInit:
.@w$ = callfunc("F_tt");
disablenpc "#cos_"+.@w$+"_end2";
@@ -2038,7 +2036,7 @@ OnTouch:
mapannounce strnpcinfo(4),strcharinfo(0) +" has just passed the Flasher Maze!",bc_map,"0x70DBDB";
warp strnpcinfo(4),185,227;
end;
-
+
OnInit:
.@w$ = callfunc("F_tt");
disablenpc strnpcinfo(0);
@@ -2361,7 +2359,7 @@ turbo_n_1,114,190,0 duplicate(Flasher#tt_main) Flasher_Exit_2#n1 WARPNPC,1,1
end;
}
}
-
+
OnEnable:
.@w$ = callfunc("F_tt");
enablenpc "Winner Helper#TBT_"+.@w$;
@@ -2403,12 +2401,12 @@ OnTimer25000:
.@w$ = callfunc("F_tt");
if (!compare(.@w$,"4")) mapannounce strnpcinfo(4),"In the meantime, winners must procceed to receive their rewards as soon as possible.",bc_map,"0x33FF66";
end;
-
+
OnTimer28000:
.@w$ = callfunc("F_tt");
if (compare(.@w$,"4")) mapannounce strnpcinfo(4),"Al De Baran Turbo Track is brought to you by...",bc_map,"0x33FF66";
end;
-
+
OnTimer30000:
.@w$ = callfunc("F_tt");
if (!compare(.@w$,"4")) mapannounce strnpcinfo(4),"Thank you for visiting Al De Baran Turbo Track.",bc_map,"0x33FF66";
@@ -2422,7 +2420,7 @@ OnTimer35000:
.@w$ = callfunc("F_tt");
if (!compare(.@w$,"4")) mapannounce strnpcinfo(4),"Al De Baran Turbo Track is brought to you by...",bc_map,"0x33FF66";
end;
-
+
OnTimer36000:
.@w$ = callfunc("F_tt");
if (compare(.@w$,"4")) mapannounce strnpcinfo(4),"[Al De Baran Guild Castle Management Luina]",bc_map,"0x33FF66";
@@ -2450,7 +2448,7 @@ OnTimer48000:
.@w$ = callfunc("F_tt");
if (compare(.@w$,"4")) mapannounce strnpcinfo(4),"Once again, we'd like to thank our sponsors.",bc_map,"0x33FF66";
end;
-
+
OnTimer50000:
.@w$ = callfunc("F_tt");
if (!compare(.@w$,"4")) mapannounce strnpcinfo(4),"[Blacksmith Union]",bc_map,"0x33FF66";
@@ -2460,7 +2458,7 @@ OnTimer52000:
.@w$ = callfunc("F_tt");
if (compare(.@w$,"4")) mapannounce strnpcinfo(4),"Have a good day.",bc_map,"0x33FF66";
end;
-
+
OnTimer55000:
.@w$ = callfunc("F_tt");
if (!compare(.@w$,"4")) mapannounce strnpcinfo(4),"And [Comodo Casino].",bc_map,"0x33FF66";
@@ -2492,17 +2490,17 @@ OnTimer60000:
mapannounce strnpcinfo(4),"Once again, we'd like to thank our sponsors.",bc_map,"0x33FF66";
}
end;
-
+
OnTimer65000:
.@w$ = callfunc("F_tt");
if (!compare(.@w$,"4")) mapannounce strnpcinfo(4),"Have a good day.",bc_map,"0x33FF66";
end;
-
+
OnTimer70000:
.@w$ = callfunc("F_tt");
if (!compare(.@w$,"4")) mapwarp strnpcinfo(4),"turbo_room",72,89;
end;
-
+
OnTimer71000:
.@w$ = callfunc("F_tt");
if (!compare(.@w$,"4")) {
@@ -2525,13 +2523,13 @@ OnTimer71000:
stopnpctimer;
}
end;
-
+
function RName {
.@s = (getstrlen(getarg(0)) > 2)?(substr(getarg(0),1,2)):(charat(getarg(0),getstrlen(getarg(0))-1));
.@rn$ = ((compare(strnpcinfo(4),"_e_"+.@s))?"Expert mode":"Normal mode")+" - "+.@s+" person";
return .@rn$;
}
-
+
OnInit:
.@w$ = callfunc("F_tt");
disablenpc "Winner Helper#TBT_"+.@w$;
@@ -2672,7 +2670,7 @@ turbo_n_1,384,167,1 script Guide#TBT_n1 1_M_01,{
end;
}
}
-
+
OnEnable:
.@w$ = callfunc("F_tt");
enablenpc "Guide#TBT_"+.@w$;
@@ -2752,7 +2750,7 @@ OnTimer60000:
donpcevent "Solo Mode#"+.@w$+"::OnEnable";
stopnpctimer;
end;
-
+
OnInit:
.@w$ = callfunc("F_tt");
disablenpc "Guide#TBT_"+.@w$;
@@ -2766,7 +2764,7 @@ OnTouch:
donpcevent "Turbo Track Guide::OnEnd_"+.@w$;
disablenpc "Notice_Maker1#TBT_"+.@w$;
end;
-
+
OnInit:
.@w$ = callfunc("F_tt");
enablenpc "Notice_Maker1#TBT_"+.@w$;
@@ -2786,7 +2784,7 @@ OnTouch:
mapannounce strnpcinfo(4),strcharinfo(0) +" is now entering the Single Snail! " + strcharinfo(0) +" is now in the lead!",bc_map,"0xFFFF00";
disablenpc "Notice_Maker3#TBT_"+.@w$;
end;
-
+
OnInit:
.@w$ = callfunc("F_tt");
enablenpc "Notice_Maker3#TBT_"+.@w$;
@@ -3625,7 +3623,7 @@ OnTouch:
default: break;
}
end;
-
+
OnInit:
.@w$ = callfunc("F_tt");
disablenpc "bing2#"+.@w$;
@@ -4251,7 +4249,6 @@ turbo_room,93,117,5 script Point Exchange Helper 4_M_TELEPORTER,{
mes "Points you have earned before";
mes "redeeming your points again.";
close;
-
}
tt_point -= 40;
if (BaseLevel < 70) getexp 3000,0;
diff --git a/npc/pre-re/guides/guides_alberta.txt b/npc/pre-re/guides/guides_alberta.txt
index 164aa528b..26a4bc6f1 100644
--- a/npc/pre-re/guides/guides_alberta.txt
+++ b/npc/pre-re/guides/guides_alberta.txt
@@ -48,7 +48,7 @@ alberta,23,238,4 script Guide#alb::AlbGuide 8W_SOLDIER,{
while (.@loop2) {
if (.@wait_button_chk == 0) .@wait_button_chk = 1;
else next;
-
+
switch(select("^FF0000Merchant Guild^000000:Weapon Shop:Tool Shop:Inn:Forge:Cancel")) {
case 1:
mes "[Alberta Guide]";
diff --git a/npc/pre-re/guides/guides_amatsu.txt b/npc/pre-re/guides/guides_amatsu.txt
index 85bd79047..fc27425af 100644
--- a/npc/pre-re/guides/guides_amatsu.txt
+++ b/npc/pre-re/guides/guides_amatsu.txt
@@ -66,7 +66,7 @@ amatsu,207,89,3 script Amatsu Guide#ama 4_F_JPN,{
close;
}
}
-
+
amatsu,251,283,4 script Guide Man#2ama 8_M_JPNSOLDIER,{
mes "[Guide Man]";
mes "Welcome, tourist from Rune-Midgard.";
diff --git a/npc/pre-re/guides/guides_izlude.txt b/npc/pre-re/guides/guides_izlude.txt
index 7961f46da..16bcf2146 100644
--- a/npc/pre-re/guides/guides_izlude.txt
+++ b/npc/pre-re/guides/guides_izlude.txt
@@ -45,7 +45,7 @@ izlude,121,87,6 script Guide#iz 8W_SOLDIER,{
while(.@loop2) {
if (.@wait_button_chk == 0) .@wait_button_chk = 1;
else next;
-
+
switch(select("^FF0000Swordman Association^000000:Swordman Hall:Arena:Izlude Marina:Weapon Shop:Tool Shop:Cancel")) {
case 1:
mes "[Izlude Guide]";
diff --git a/npc/pre-re/guides/guides_morroc.txt b/npc/pre-re/guides/guides_morroc.txt
index 47777fa17..82e233173 100644
--- a/npc/pre-re/guides/guides_morroc.txt
+++ b/npc/pre-re/guides/guides_morroc.txt
@@ -45,7 +45,7 @@ morocc,153,286,6 script Guide#moc::MocGuide 4_M_MOC_SOLDIER,{
while(.@loop2) {
if (.@wait_button_chk == 0) .@wait_button_chk = 1;
else next;
-
+
switch(select("^FF0000Thief Guild^000000:Weapon Shop:Inn:Pub:Mercenary Guild:Forge:Cancel")) {
case 1:
mes "[Morroc Guide]";
diff --git a/npc/pre-re/guides/guides_moscovia.txt b/npc/pre-re/guides/guides_moscovia.txt
index 49975358f..32abb90f6 100644
--- a/npc/pre-re/guides/guides_moscovia.txt
+++ b/npc/pre-re/guides/guides_moscovia.txt
@@ -80,7 +80,6 @@ moscovia,161,76,4 script Moscovia Guide#mosk 4_F_RUSWOMAN1,{
viewpoint 2,223,174,3,0x00FF00;
viewpoint 2,229,208,4,0x3355FF;
close;
-
case 3:
mes "[Moscovia Guide]";
mes "It'd be great to walk about alone.";
diff --git a/npc/pre-re/jobs/1-1/acolyte.txt b/npc/pre-re/jobs/1-1/acolyte.txt
index 9e138d9c6..1f9411f53 100644
--- a/npc/pre-re/jobs/1-1/acolyte.txt
+++ b/npc/pre-re/jobs/1-1/acolyte.txt
@@ -465,4 +465,3 @@ prt_fild00,208,218,6 script Ascetic#3aco 4W_M_02,{
}
}
}
-
diff --git a/npc/pre-re/jobs/1-1/archer.txt b/npc/pre-re/jobs/1-1/archer.txt
index 97ea540c1..d1ba4bf99 100644
--- a/npc/pre-re/jobs/1-1/archer.txt
+++ b/npc/pre-re/jobs/1-1/archer.txt
@@ -241,4 +241,3 @@ payon_in02,64,71,4 script Archer Guildsman#archer 4_M_03,{
close;
}
}
-
diff --git a/npc/pre-re/quests/collection/quest_demonpungus.txt b/npc/pre-re/quests/collection/quest_demonpungus.txt
index d72e3f816..b255e26b5 100644
--- a/npc/pre-re/quests/collection/quest_demonpungus.txt
+++ b/npc/pre-re/quests/collection/quest_demonpungus.txt
@@ -238,5 +238,3 @@ ein_fild01,43,249,0 script Local Villager#hunt 4_M_HUMAN_01,{
close;
}
}
-
-
diff --git a/npc/pre-re/quests/collection/quest_dokebi.txt b/npc/pre-re/quests/collection/quest_dokebi.txt
index 898c353cb..4e9aabd2e 100644
--- a/npc/pre-re/quests/collection/quest_dokebi.txt
+++ b/npc/pre-re/quests/collection/quest_dokebi.txt
@@ -228,5 +228,3 @@ pay_fild10,108,357,5 script Li#Dokebi_Hunt 4_F_01,{
close;
}
}
-
-
diff --git a/npc/pre-re/quests/collection/quest_fabre.txt b/npc/pre-re/quests/collection/quest_fabre.txt
index 5de7e74fd..f5cd2bf19 100644
--- a/npc/pre-re/quests/collection/quest_fabre.txt
+++ b/npc/pre-re/quests/collection/quest_fabre.txt
@@ -225,5 +225,3 @@ gef_fild07,321,193,4 script Langry#Fabre_Hunt 4_M_SAGE_A,{
close;
}
}
-
-
diff --git a/npc/pre-re/quests/collection/quest_frilldora.txt b/npc/pre-re/quests/collection/quest_frilldora.txt
index 95ee22d3c..2b6b9139d 100644
--- a/npc/pre-re/quests/collection/quest_frilldora.txt
+++ b/npc/pre-re/quests/collection/quest_frilldora.txt
@@ -234,5 +234,3 @@ moc_fild17,66,273,5 script Lemly#Frilldora_Hunt 4_F_JOB_ASSASSIN,{
close;
}
}
-
-
diff --git a/npc/pre-re/quests/collection/quest_goat.txt b/npc/pre-re/quests/collection/quest_goat.txt
index ee5c33f54..4f6ae56e3 100644
--- a/npc/pre-re/quests/collection/quest_goat.txt
+++ b/npc/pre-re/quests/collection/quest_goat.txt
@@ -240,4 +240,3 @@ ein_fild06,82,171,0 script Vegetable Farmer#Goat 4_F_SHABBY,{
close;
}
}
-
diff --git a/npc/pre-re/quests/collection/quest_golem.txt b/npc/pre-re/quests/collection/quest_golem.txt
index 8ad2d47b2..0f0ca8e5d 100644
--- a/npc/pre-re/quests/collection/quest_golem.txt
+++ b/npc/pre-re/quests/collection/quest_golem.txt
@@ -226,5 +226,3 @@ moc_fild11,57,138,0 script Private Jeremy#hunt 4_M_MOC_SOLDIER,{
close;
}
}
-
-
diff --git a/npc/pre-re/scripts_jobs.conf b/npc/pre-re/scripts_jobs.conf
index 6dd259148..491fba8dd 100644
--- a/npc/pre-re/scripts_jobs.conf
+++ b/npc/pre-re/scripts_jobs.conf
@@ -15,4 +15,4 @@ npc: npc/pre-re/jobs/novice/novice.txt
// ------------------------ Skill Quests ------------------------
// - Novice
-npc: npc/pre-re/quests/skills/novice_skills.txt \ No newline at end of file
+npc: npc/pre-re/quests/skills/novice_skills.txt
diff --git a/npc/quests/newgears/2010_headgears.txt b/npc/quests/newgears/2010_headgears.txt
index c2a44eacb..844cf5d23 100644
--- a/npc/quests/newgears/2010_headgears.txt
+++ b/npc/quests/newgears/2010_headgears.txt
@@ -1,16 +1,16 @@
-//===== Hercules Script ======================================
+//===== Hercules Script ======================================
//= 2010 Headgear Quest
-//===== By: ==================================================
+//===== By: ==================================================
//= Dastgir
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 1.0
-//===== Description: =========================================
+//===== Description: =========================================
//= Quests For Headgears:
//= Flower Of Fairy, NeckTie, Hair Brush
//= Status Of Baby Angel, Frog Cap, Solo Play Box
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 Converted from the official Aegis script. [Dastgir]
-//============================================================
+//============================================================
gonryun,149,189,0 script Yotang#Flower_Of_Fairy 1_M_04,{
mes "[Yotang]";
@@ -709,7 +709,6 @@ gef_fild07,108,161,4 script Roda Frog#Frog_Cap RODA_FROG,1,1,{
close2;
donpcevent "Roda Frog#Frog_Cap::OnDisable";
end;
-
}
else if (2009_hat == 5) {
if (questprogress(5004,HUNTING) == 1) {
@@ -827,7 +826,6 @@ OnTouch:
close;
}
-
// 6. Making the new headgear Solo Playing Box 1,2 ()5448,5449)
alberta,120,206,3 script Alonie#Solo_Play_Box 4_M_UMKID,{
if (2009_1_hat == 0) {
@@ -948,7 +946,6 @@ alberta,120,206,3 script Alonie#Solo_Play_Box 4_M_UMKID,{
mes "Go and kill";
mes "^FF000040 Arclouses and 30 High Orcs^000000!";
close;
-
}
else if (2009_1_hat == 3) {
if ((questprogress(1108,HUNTING) == 2) && (questprogress(1105,HUNTING) == 2)) {
@@ -1109,5 +1106,4 @@ alberta,120,206,3 script Alonie#Solo_Play_Box 4_M_UMKID,{
close;
}
end;
-
}
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index 7e34a9729..6cadc346a 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -3082,7 +3082,6 @@ lighthalzen,337,232,3 script Maku 4_M_LGTPOOR,{
end;
}
-
yuno_in04,107,14,5 script Student 4_M_SAGE_A,{
if (friendship == 7 || friendship == 8) {
mes "[Joey Choryee]";
@@ -9787,8 +9786,6 @@ OnTimer190000:
end;
}
-
-
lhz_in01,182,35,0 script File Search Engine HIDDEN_NPC,{
if((lhz_boss > 28) && (lhz_boss < 35))
diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt
index e43318e8a..d14ddaa8e 100644
--- a/npc/quests/quests_nameless.txt
+++ b/npc/quests/quests_nameless.txt
@@ -1147,8 +1147,6 @@ OnInit:
end;
}
-
-
nameless_i,168,257,0 script outtoin_01#mo WARPNPC,1,1,{
end;
diff --git a/npc/quests/skills/hunter_skills.txt b/npc/quests/skills/hunter_skills.txt
index b85aa3d42..b0b4f7bf7 100644
--- a/npc/quests/skills/hunter_skills.txt
+++ b/npc/quests/skills/hunter_skills.txt
@@ -373,4 +373,3 @@ pay_arche,109,169,3 script Arpesto 4_M_05,{
close;
}
}
-
diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt
index fe6b661a3..4e96f7b33 100644
--- a/npc/re/cities/dewata.txt
+++ b/npc/re/cities/dewata.txt
@@ -496,7 +496,7 @@ dewata,89,191,6 script Small Shrine#dew1 CLEAR_NPC,{
"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)
.@bonus = 1;
for(.@i = 0; .@i<getarraysize(.@wishes$); ++.@i) {
diff --git a/npc/re/cities/eclage.txt b/npc/re/cities/eclage.txt
index 35984cd64..51b7ae764 100644
--- a/npc/re/cities/eclage.txt
+++ b/npc/re/cities/eclage.txt
@@ -1,14 +1,14 @@
-//===== Hercules Script ======================================
+//===== Hercules Script ======================================
//= General Eclage NPC.
-//===== By: ==================================================
+//===== By: ==================================================
//= Dastgir
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 1.0
-//===== Description: =========================================
+//===== Description: =========================================
//= Eclage Town NPC
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 Converted from the official Aegis script. [Dastgir]
-//============================================================
+//============================================================
ecl_in02,96,22,3 script sign#prison_inn 2_BOARD1,{
mes "[North] Prison";
@@ -51,7 +51,6 @@ ecl_in02,164,56,3 script Receptionist#Laphine 4_F_FAIRYKID2,{
percentheal 100,100;
warp "ecl_in02",167,49;
end;
-
case 2:
if (Zeny < 5000) {
mes "[Receptionist]";
diff --git a/npc/re/cities/izlude.txt b/npc/re/cities/izlude.txt
index 4417fb9fd..875a2039f 100644
--- a/npc/re/cities/izlude.txt
+++ b/npc/re/cities/izlude.txt
@@ -281,4 +281,4 @@ prt_fild08,338,217,7 script Resting Adventurer#iz 4_F_SITDOWN,{
prt_fild08a,338,217,7 duplicate(Resting Adventurer#iz) Resting Adventurer#iza 4_F_SITDOWN
prt_fild08b,338,217,7 duplicate(Resting Adventurer#iz) Resting Adventurer#izb 4_F_SITDOWN
prt_fild08c,338,217,7 duplicate(Resting Adventurer#iz) Resting Adventurer#izc 4_F_SITDOWN
-prt_fild08d,338,217,7 duplicate(Resting Adventurer#iz) Resting Adventurer#izd 4_F_SITDOWN \ No newline at end of file
+prt_fild08d,338,217,7 duplicate(Resting Adventurer#iz) Resting Adventurer#izd 4_F_SITDOWN
diff --git a/npc/re/events/halloween_2014.txt b/npc/re/events/halloween_2014.txt
index 5b81a2777..69eeab721 100644
--- a/npc/re/events/halloween_2014.txt
+++ b/npc/re/events/halloween_2014.txt
@@ -45,7 +45,6 @@
mes "Let's take a look at it.";
next;
if (countitem("Captured_Soul") > 4 && countitem("Black_Soul") > 0) {
-
mes "[Mighty Priest]";
mes "Wow, this is so strong!";
mes "You may be better than our priests!";
@@ -994,7 +993,7 @@ niflheim,194,189,3 script Loru#14hal 4_LOLI_RURI,{
getitem Trans_Candy_Yellow, 10;
getitem Trans_Candy_Green, 10;
erasequest 14461;
- setquest 14464;
+ setquest 14464;
close;
} else {
mes "[Loru]";
@@ -1380,7 +1379,7 @@ niflheim,193,186,6 script Bonfire Spirit#14hal 4_TRACE,{
OnTimer27000:
donpcevent "Bonfire Spirit#14hal::OnEnable";
- end;
+ end;
}
//= Sister / Nun
@@ -1558,7 +1557,7 @@ prt_church,96,91,4 script Spiritual Sister#14hal 1_F_PRIEST,5,5,{
delitem Holy_Water, 6;
getitem Sacred_Rosary, 1;
erasequest 14452;
- setquest 14453;
+ setquest 14453;
close;
} else {
mes "[Sister Haley]";
diff --git a/npc/re/instances/BuwayaCave.txt b/npc/re/instances/BuwayaCave.txt
index 2333a2428..908c15e2f 100644
--- a/npc/re/instances/BuwayaCave.txt
+++ b/npc/re/instances/BuwayaCave.txt
@@ -89,7 +89,7 @@ ma_fild02,312,317,5 script Guard#buwaya_cave 4_MAL_SOLDIER,{
}
instance_set_timeout 3600,300,.@instance;
instance_init(.@instance);
-
+
mes "[Guard]";
mes "I will open up the tunnel to ^0000ff"+.@md_name$+"^000000.";
mes "I wish you good luck.";
diff --git a/npc/re/instances/EclageInterior.txt b/npc/re/instances/EclageInterior.txt
index 88fc414ba..d28d7cf64 100644
--- a/npc/re/instances/EclageInterior.txt
+++ b/npc/re/instances/EclageInterior.txt
@@ -1,14 +1,14 @@
-//===== Hercules Script ======================================
+//===== Hercules Script ======================================
//= Eclage Instance Script
-//===== By: ==================================================
+//===== By: ==================================================
//= Dastgir
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 1.0
-//===== Description: =========================================
+//===== Description: =========================================
//= Eclage Interior Instance
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 Converted from the official Aegis script. [Dastgir]
-//============================================================
+//============================================================
ecl_hub01,132,12,3 script Chief of Staff#tl01::EclInstance 4_F_FAIRY,{
.@party_id = getcharid(1);
@@ -19,7 +19,7 @@ ecl_hub01,132,12,3 script Chief of Staff#tl01::EclInstance 4_F_FAIRY,{
mes "Only the party leader will enter. Please create your party.";
close;
}
-
+
if (getpartyleader(.@party_id,2) != getcharid(0)) {
mes "-! Warning !-";
mes "This current quest will be held at Memorial dungeon.";
@@ -52,7 +52,6 @@ ecl_hub01,132,12,3 script Chief of Staff#tl01::EclInstance 4_F_FAIRY,{
mes "Given the tight internal security, you should prepare yourself.";
mes "Wait here for a minute.";
close;
-
case 2:
mes "[Shenime]";
mes "It's not an easy task.";
@@ -73,7 +72,7 @@ ecl_hub01,130,15,0 script It is closed shut. CLEAR_NPC,{
switch (select("Enter it.:Forget it.")) {
case 1:
.@party_id = getcharid(1);
-
+
if (has_instance("1@ecl") == "") {
mes "It is closed shut.";
close;
@@ -101,7 +100,6 @@ ecl_hub01,130,15,0 script It is closed shut. CLEAR_NPC,{
mes "This current quest will be held at Memorial dungeon.";
mes "Only the party leader will enter. Please create your party.";
close;
-
case 2:
close;
}
@@ -110,10 +108,8 @@ ecl_hub01,130,15,0 script It is closed shut. CLEAR_NPC,{
mes "It's also a place where the lighting is set up to make Orb seem more beautiful.";
mes "It is closed shut.";
close;
- end;
}
-
1@ecl,58,69,3 script Shenime#ecl01 4_F_FAIRY,{
mes "[Shenime]";
mes "Oh, what's going on here?";
@@ -167,16 +163,16 @@ OnInstanceInit:
1@ecl,53,83,0 script #sndmaster HIDDEN_WARP_NPC,10,10,{
end;
-
+
OnInstanceInit:
.mob_summoned = 0;
disablenpc instance_npcname(strnpcinfo(0));
end;
-
+
OnEnable:
initnpctimer;
end;
-
+
OnReset:
killmonster instance_mapname("1@ecl"),instance_npcname("#sndmaster")+"::OnMyMobDead";
stopnpctimer;
@@ -191,19 +187,19 @@ OnTimer2000:
hideoffnpc instance_npcname("Suspicious Creature#7");
hideoffnpc instance_npcname("Suspicious Creature#8");
end;
-
+
OnTimer3000:
hideonnpc instance_npcname("#sndmaster");
stopnpctimer;
end;
-
+
OnMyMobDead:
if (mobcount(instance_mapname("1@ecl"),instance_npcname("#sndmaster")+"::OnMyMobDead") == 0) {
donpcevent instance_npcname("Shenime#ecl01")+"::OnEnable";
mapannounce instance_mapname("1@ecl"),"Shenime: Good, I got here just in time.",bc_map,"0xffff00"; //FW_NORMAL 12 0 0
}
end;
-
+
OnTouch:
if (.mob_summoned) end;
mes "Upon eliminating the intruders near the Orb, another strange-looking creatures appeared.";
@@ -368,20 +364,20 @@ OnInstanceInit:
warp "1@ecl",146,29;
end;
}
-
+
1@ecl,148,29,3 script Loki#ecl01 4_M_ROKI2,{
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 4_F_NYDHOG,{
mes "[Guardian Nydhog]";
mes "I think you should talk to Hisie first.";
close;
}
-
+
1@ecl,144,27,5 script Hisie#ecl01 4_M_FARIY_HISIE,{
cutin "hisie01",0;
mes "[Hisie]";
@@ -495,4 +491,4 @@ OnInstanceInit:
cutin "",255;
warp "ecl_in03",57,76;
end;
-} \ No newline at end of file
+}
diff --git a/npc/re/instances/MalangdoCulvert.txt b/npc/re/instances/MalangdoCulvert.txt
index 0751b46a2..6f23195cc 100644
--- a/npc/re/instances/MalangdoCulvert.txt
+++ b/npc/re/instances/MalangdoCulvert.txt
@@ -418,7 +418,7 @@ mal_in01,160,34,4 script Missing, the Cleaner 4_CAT_SAILOR2,{
}
instance_set_timeout 3600,300,.@instance;
instance_init(.@instance);
-
+
mes "^3333FF"+.@md_name$+"^000000 - Reserving";
mes "After making the reservation, you";
mes "have to select Enter the Culvert.";
diff --git a/npc/re/instances/OctopusCave.txt b/npc/re/instances/OctopusCave.txt
index c55d5e2bf..6c3be5199 100644
--- a/npc/re/instances/OctopusCave.txt
+++ b/npc/re/instances/OctopusCave.txt
@@ -101,7 +101,7 @@ mal_dun01,151,235,5 script Starfish 4_ASTER,{
}
instance_set_timeout 3600,300,.@instance;
instance_init(.@instance);
-
+
mes "[Starfish]";
mes "I will open the gate for a while to ^0000ff"+.@md_name$+"^000000.";
mes "Please catch that pervert octopus,";
diff --git a/npc/re/jobs/1-1/acolyte.txt b/npc/re/jobs/1-1/acolyte.txt
index 3ba4bcce9..91817e071 100644
--- a/npc/re/jobs/1-1/acolyte.txt
+++ b/npc/re/jobs/1-1/acolyte.txt
@@ -330,4 +330,3 @@ prt_fild00,208,218,6 script Ascetic#3aco 4W_M_02,{
}
}
}
-
diff --git a/npc/re/jobs/2e/kagerou_oboro.txt b/npc/re/jobs/2e/kagerou_oboro.txt
index c9f639d67..b60dcc85b 100644
--- a/npc/re/jobs/2e/kagerou_oboro.txt
+++ b/npc/re/jobs/2e/kagerou_oboro.txt
@@ -1,17 +1,17 @@
-//===== Hercules Script =======================================
+//===== Hercules Script ======================================
//= Kagerou / Oboro Job Quest
-//===== By: ==================================================
+//===== By: ==================================================
//= (1.0) Dastgir, M45T3R
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 1.1.1
//===== Description: =========================================
-//= [Official Conversion]
+//= [Official Conversion]
//= Job change Quest from Ninja -> Kagerou / Oboro.
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0.0 Initial Release. [Dastgir, M45T3R]
//= 1.1.0 Structure Clean-Up. [Euphy]
//= 1.1.1 Updated questlog commands. [Kisuka]
-//============================================================
+//============================================================
// Starting the Quest
//============================================================
diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt
index aa991e8c3..bc7bf572c 100644
--- a/npc/re/jobs/novice/novice.txt
+++ b/npc/re/jobs/novice/novice.txt
@@ -2267,7 +2267,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/merchants/coin_exchange.txt b/npc/re/merchants/coin_exchange.txt
index cabd9753b..7b553e0bd 100644
--- a/npc/re/merchants/coin_exchange.txt
+++ b/npc/re/merchants/coin_exchange.txt
@@ -1006,7 +1006,7 @@ ecl_in01,33,98,5 script Herb Merchant Plafina#e 4_M_FAIRYKID2,{
delitem Splendide_Coin,.cost[.@item]*.@buy; //Splendide_Coin
getitem .items[.@item],.@buy;
close;
-
+
OnInit:
setarray .items[0],Snow_Flip,Peony_Mommy,Slapping_Herb,Yggdrasil_Dust;
setarray .cost[0],5,5,1,1; //Splendide Coins
@@ -1028,7 +1028,6 @@ ecl_in01,67,39,4 script Replication Expert Paltu 4_M_FAIRYKID4,{
mes "[Paltu]";
mes "Really? Hmm?";
close;
-
case 2:
mes "[Paltu]";
mes "One can say that there's no one better in Eclage than I at utilizing magic resistance.";
@@ -1124,7 +1123,7 @@ ecl_in01,67,39,4 script Replication Expert Paltu 4_M_FAIRYKID4,{
C_Boy's_Cap;
if ((countitem(Splendide_Coin) >= 50) && (countitem(Crystal_Mirror) >= 4) && countitem(Angel_Magic_Power) && (countitem(Azure_Jewel) >= 10) && (countitem(Cardinal_Jewel) >= 10) && (countitem(Blue_Jewel) >= 10) && (countitem(Golden_Jewel) >= 10) && (countitem(Bluish_Green_Jewel) >= 10))
.@item_check =1;
-
+
for(.@i = 0; .@i<getarraysize(.@items); .@i++) {
if (.@item_check && countitem(.@items[.@i]))
.@menu$ = .@menu$+getitemname(.@items[.@i])+" (^2502FDAble to Replicate^000000):";
@@ -1213,4 +1212,4 @@ ecl_in01,67,39,4 script Replication Expert Paltu 4_M_FAIRYKID4,{
mes "Good. This is a satisfying result.";
mes "I'll do even a better job next time. Please tell others about my work. Have a good day~";
close;
-} \ No newline at end of file
+}
diff --git a/npc/re/merchants/diamond.txt b/npc/re/merchants/diamond.txt
index 80fcb88de..73b09802a 100644
--- a/npc/re/merchants/diamond.txt
+++ b/npc/re/merchants/diamond.txt
@@ -27,21 +27,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!";
@@ -61,33 +61,28 @@
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";
@@ -95,7 +90,6 @@
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.";
@@ -103,38 +97,31 @@
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;
-
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.";
@@ -143,7 +130,6 @@
Zeny -= 501000000;
getitem 6024, 1;
next;
-
mes .@npc$;
mes "You may exchange the diamond back for zeny at any time.";
mes "However, there will be a 1,000,000z service fee.";
@@ -180,32 +166,26 @@
emotion e_dots;
close;
}
-
mes .@npc$;
mes "I see. After I receive your signature, ";
mes "You must offer your ^FF82FF'17 Carat Diamond'^000000.";
mes "Also don't forget there is a 1,000,000z service fee!";
next;
-
mes .@npc$;
mes "What is your name?";
next;
-
mes "[" + strcharinfo(0) + "]";
mes "My name is " + strcharinfo(0) + ".";
next;
-
mes .@npc$;
mes "Alright then, please sign here.";
next;
-
while (1) {
if (select("Sign:Don't Sign") == 2) {
mes .@npc$;
mes "The trade cannot be completed without your signature.";
close;
}
-
input .@charname$;
if (.@charname$ == strcharinfo(0)) {
mes .@npc$;
@@ -213,7 +193,6 @@
mes "I will now take your ^FF82FF'17 Carat Diamond'^000000..";
mes "You will receive ^0000FF499,000,000z^000000 afterwards.";
next;
-
mes .@npc$;
mes "Thank you for your business.";
mes "Whenever you need a ^FF82FF'17 Carat Diamond'^000000,";
diff --git a/npc/re/merchants/ninja_craftsman.txt b/npc/re/merchants/ninja_craftsman.txt
index a88069e99..cb6d47cd9 100644
--- a/npc/re/merchants/ninja_craftsman.txt
+++ b/npc/re/merchants/ninja_craftsman.txt
@@ -1,14 +1,14 @@
-//===== Hercules Script ======================================
+//===== Hercules Script ======================================
//= Ninja Weapon and Armor
-//===== By: ==================================================
+//===== By: ==================================================
//= Dastgir
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 1.0
-//===== Description: =========================================
+//===== Description: =========================================
//= Ninja Armor and Weapon Craftsman
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 Official Conversion. [Dastgir]
-//============================================================
+//============================================================
que_ng,21,72,6 script Master Craftsman Gyo#arm 4_M_RASWORD,{
mes "[Gyo]";
mes "How would you define victory?";
@@ -55,7 +55,7 @@ que_ng,21,72,6 script Master Craftsman Gyo#arm 4_M_RASWORD,{
mes "Looks like you need more time to decide.";
close;
}
-
+
L_Menu:
.@item_make = getarg(0);
while(1){
@@ -177,7 +177,7 @@ L_Menu:
}
next;
}
-
+
L_Ingredients:
switch(getarg(0)){
case 2172: //Wolf_Armguard
@@ -190,7 +190,6 @@ L_Ingredients:
return "you'll need a Special Ninja Suit with a slot and 10 Dark Pieces";
}
end;
-
}
que_ng,23,70,6 script Master Craftsman Ki#weap 4_DST_SOLDIER,{
@@ -231,7 +230,7 @@ que_ng,23,70,6 script Master Craftsman Ki#weap 4_DST_SOLDIER,{
mes "Think carefully~~";
close;
}
-
+
L_Menu:
.@item_make = getarg(0);
while(1){
@@ -336,7 +335,7 @@ L_Menu:
}
next;
}
-
+
L_Ingredients:
switch(getarg(0)){
case 13076: //Raksasa_Dagger
@@ -347,5 +346,4 @@ L_Ingredients:
return "you need one Huuma Calm Mind Shuriken and 100 Broken Shurikens";
}
end;
-
}
diff --git a/npc/re/merchants/shadow_refiner.txt b/npc/re/merchants/shadow_refiner.txt
index 33d23450c..d184af61d 100644
--- a/npc/re/merchants/shadow_refiner.txt
+++ b/npc/re/merchants/shadow_refiner.txt
@@ -1,14 +1,14 @@
-//===== Hercules Script ======================================
+//===== Hercules Script ======================================
//= Shadow Refiner
-//===== By: ==================================================
+//===== By: ==================================================
//= Dastgir
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 1.0
-//===== Description: =========================================
+//===== Description: =========================================
//= [Aegis Conversion]
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 First Version [Dastgir]
-//============================================================
+//============================================================
itemmall,31,76,3 script Shadow Blacksmith#nomal 4_F_JOB_BLACKSMITH,{
disable_items;
@@ -61,7 +61,7 @@ itemmall,31,76,3 script Shadow Blacksmith#nomal 4_F_JOB_BLACKSMITH,{
.@mate$[1] = "^8C8C8C"+ getitemname(.@s_weapon2[.@index]) +"^000000";
.@miss[1] = 1;
}
- if (getequiprefinerycnt(.@SelectedPart) > 6 && countitem(.@s_weapon3[.@index]))
+ if (getequiprefinerycnt(.@SelectedPart) > 6 && countitem(.@s_weapon3[.@index]))
.@mate$[2] = getitemname(.@s_weapon3[.@index]);
else {
.@mate$[2] = "^8C8C8C"+ getitemname(.@s_weapon3[.@index]) +"^000000";
diff --git a/npc/re/mobs/champion.txt b/npc/re/mobs/champion.txt
index d880fb2d4..cbbee88dd 100644
--- a/npc/re/mobs/champion.txt
+++ b/npc/re/mobs/champion.txt
@@ -318,4 +318,4 @@ kh_dun02,0,0,0,0 monster Furious Alicel 2909,2,300000,0
c_tower3,0,0,0,0 monster Elusive Alarm 2910,2,300000,0
ra_san05,0,0,0,0 monster Swift Agav 2911,2,300000,0
abyss_03,0,0,0,0 monster Solid Acidus 2912,2,300000,0
-abyss_02,0,0,0,0 monster Acidus Ringleader 2913,2,300000,0 \ No newline at end of file
+abyss_02,0,0,0,0 monster Acidus Ringleader 2913,2,300000,0
diff --git a/npc/re/mobs/fields/niflheim.txt b/npc/re/mobs/fields/niflheim.txt
index 2446ec0e0..245ce4c7c 100644
--- a/npc/re/mobs/fields/niflheim.txt
+++ b/npc/re/mobs/fields/niflheim.txt
@@ -125,7 +125,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/umbala.txt b/npc/re/mobs/fields/umbala.txt
index f33c07db8..d346dbc3b 100644
--- a/npc/re/mobs/fields/umbala.txt
+++ b/npc/re/mobs/fields/umbala.txt
@@ -11,7 +11,7 @@
//============================================================
//==================================================
-// um_fild01 - Luluka Forest
+// um_fild01 - Luluka Forest
//==================================================
um_fild01,0,0,0,0 monster Dryad 1493,60,5000,0,0
um_fild01,0,0,0,0 monster Stone Shooter 1495,25,5000,0,0
@@ -23,7 +23,7 @@ um_fild01,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1
um_fild01,0,0,0,0 monster Shining Plant 1083,5,180000,90000,1
//==================================================
-// um_fild02 - Hoomga Forest
+// um_fild02 - Hoomga Forest
//==================================================
um_fild02,0,0,0,0 monster Wootan Fighter 1499,40,5000,0,0
um_fild02,0,0,0,0 monster Stone Shooter 1495,15,5000,0,0
@@ -33,7 +33,7 @@ um_fild02,0,0,0,0 monster Red Plant 1078,5,180000,90000,1
um_fild02,0,0,0,0 monster Yellow Plant 1081,5,180000,90000,1
//==================================================
-// um_fild03 - Kalala Swamp
+// um_fild03 - Kalala Swamp
//==================================================
um_fild03,0,0,0,0 monster Parasite 1500,60,5000,0,0
um_fild03,0,0,0,0 monster Stone Shooter 1495,15,5000,0,0
@@ -44,7 +44,7 @@ um_fild03,0,0,0,0 monster Green Plant 1080,10,180000,90000,1
um_fild03,0,0,0,0 monster Shining Plant 1083,2,180000,90000,1
//==================================================
-// um_fild04 - Hoomga Jungle
+// um_fild04 - Hoomga Jungle
//==================================================
um_fild04,0,0,0,0 monster Wild Rose 1261,30,5000,0,0
um_fild04,0,0,0,0 monster Stone Shooter 1495,15,5000,0,0
diff --git a/npc/re/quests/cupet.txt b/npc/re/quests/cupet.txt
index 3e339e168..03f5f69dc 100644
--- a/npc/re/quests/cupet.txt
+++ b/npc/re/quests/cupet.txt
@@ -13,9 +13,8 @@
// 1st NPC
- script CPM1 4_M_ALCHE_C,{
-
.@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;
@@ -29,7 +28,6 @@
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";
@@ -37,16 +35,14 @@
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;
+ 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 4_M_ALCHE_C,{
-
.@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;
@@ -61,7 +57,6 @@
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";
@@ -69,16 +64,14 @@
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;
+ 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 4_M_ALCHE_C,{
-
.@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;
@@ -94,7 +87,6 @@
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";
@@ -102,9 +94,8 @@
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;
+ callfunc "cute_pet_manager",.@tame_id,.@tame_amount,.@hunt_id,.@hunt_amount,.@mob_id,cpm_three,.@tame_gets,.@hunt_id2,.@hunt_amount2;
}
function script cute_pet_manager {
@@ -123,7 +114,6 @@ 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.";
@@ -132,18 +122,15 @@ function script cute_pet_manager {
mes "then I will tell you the monster";
mes "that you can tame with the item.";
next;
-
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.";
@@ -151,17 +138,14 @@ 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
for (.@a = 0; .@a < getarraysize(getarg(0)); ++.@a) {
.@menu$ += (.@menu$ == "" ? "" : ":") + getitemname(getelementofarray(getarg(0), .@a));
}
-
// Query Player Choice
.@choice = select(.@menu$) - 1;
@@ -173,7 +157,6 @@ function script cute_pet_manager {
.@mob_id = getelementofarray(getarg(4), .@choice);
.@hunt_id2 = getelementofarray(getarg(7), .@choice);
.@hunt_amount2 = getelementofarray(getarg(8), .@choice);
-
dispbottom "Tame ID: " + .@tame_id;
dispbottom "Tame Amount: " + .@tame_amount;
dispbottom "Hunt ID: " + .@hunt_id;
@@ -182,28 +165,23 @@ function script cute_pet_manager {
dispbottom "Mob ID: " + .@mob_id;
dispbottom "Hunt ID2: " + .@hunt_id2;
dispbottom "Hunt Amount2: " + .@hunt_amount2;
-
if (.@hunt_id2) { .@hunt2_count = countitem(.@hunt_id2); }
if (countitem(.@hunt_id) >= .@hunt_amount && countitem(6083) > 0 && .@hunt2_count >= .@hunt_amount2) {
-
mes "[Cute Pet Manager]";
mes "Ah, you have gathered all items";
mes "with your friends. You can now";
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;
}
-
delitem .@hunt_id, .@hunt_amount;
delitem 6083, 1;
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/100-110.txt b/npc/re/quests/eden/100-110.txt
index 486a4b6e6..c0065b293 100644
--- a/npc/re/quests/eden/100-110.txt
+++ b/npc/re/quests/eden/100-110.txt
@@ -782,7 +782,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{
.@ran = rand(1,1000);
if (.@amount == 1) {
if (.@ran <= 100)
- setarray .@item[0],Blue_Potion,2;
+ setarray .@item[0],Blue_Potion,2;
else if (.@ran <= 200)
setarray .@item[0],White_Slim_Potion,10;
else if (.@ran == 333)
diff --git a/npc/re/quests/eden/111-120.txt b/npc/re/quests/eden/111-120.txt
index b8bd667f1..a8ea81361 100644
--- a/npc/re/quests/eden/111-120.txt
+++ b/npc/re/quests/eden/111-120.txt
@@ -1135,7 +1135,6 @@ S_Hunting:
mes "You finished researching about "+ getarg(.@i+2) +". Thank you.";
getexp 700000,getarg(.@i+1);
break;
-
}
erasequest .@quest_id;
next;
diff --git a/npc/re/quests/eden/131-140.txt b/npc/re/quests/eden/131-140.txt
index b40c4167f..e23b6a83d 100644
--- a/npc/re/quests/eden/131-140.txt
+++ b/npc/re/quests/eden/131-140.txt
@@ -573,7 +573,7 @@ S_Erasequest:
mes "I'll ask someone else to take care of the rest of the Satan Morroc Incarnations, then!";
break;
case 3:
- mes "I'll need to ask another adventurer to help with the Scaraba!";
+ mes "I'll need to ask another adventurer to help with the Scaraba!";
}
break;
case 2:
@@ -584,7 +584,7 @@ S_Erasequest:
getexp 1100000,300000;
break;
case 2:
- mes "Was the story of Satan Morroc worth putting to song? Great work!";
+ mes "Was the story of Satan Morroc worth putting to song? Great work!";
getexp 1100000,200000;
break;
case 3:
diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt
index 1d25e17d3..1ac4f83f1 100644
--- a/npc/re/quests/eden/eden_quests.txt
+++ b/npc/re/quests/eden/eden_quests.txt
@@ -4037,7 +4037,7 @@ S_Enchant:
delitem getarg(0),1;
para_2nd04 = 4;
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/quests_dewata.txt b/npc/re/quests/quests_dewata.txt
index db78bce54..821ee6d8d 100644
--- a/npc/re/quests/quests_dewata.txt
+++ b/npc/re/quests/quests_dewata.txt
@@ -1285,7 +1285,6 @@ dew_fild01,114,275,4 script Lero#dew_drink 4_M_DEWMAN,{
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[]: <required amount>,<quest ID>,<reward amount>,<free weight>
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 10bb003e5..f3d16473d 100644
--- a/npc/re/quests/quests_dicastes.txt
+++ b/npc/re/quests/quests_dicastes.txt
@@ -902,7 +902,6 @@ dic_in01,40,270,2 script Transport Dept. 2 Mgr 4_MAN_BENKUNI,{
close;
}
-
dic_in01,40,193,1 script Papyrus#0001 4_MAN_NITT,{
if (!checkweight(1201,1)) {
mes "You have too many items in your inventory.";
@@ -3985,7 +3984,6 @@ dic_in01,245,119,4 script Shay#ep133_13 4_M_ACROSS,{
setarray .@quest, 7194,7195,7196;
setarray .@item, 6306,6305,6307;
setarray .@str$, "bloodstain","frozen piece of skin","strange magical stone fragment";
-
.@size = getarraysize(.@item);
for (.@i = 0; .@i < .@size; ++.@i) {
if (countitem(.@item[.@i])) {
@@ -4800,7 +4798,6 @@ dic_fild01,231,174,5 script BK#ep133_18 4_M_MERCAT2,{
.@size = getarraysize(.@npc$);
for (.@i = 0; .@i < .@size; ++.@i)
if (.@n$ == .@npc$[.@i]) .@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.";
@@ -7332,7 +7329,7 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 4_MAN_NITT,{
mes "I'm done. Hehe";
close;
}
-
+
// Enchant Constants
// Ex: .@dex[1]: DEX + 1 | .@cri[5]: CRI + 5 | .@eva[12]: FLEE + 12
.@matk[1] = 4760; .@matk[2] = 4761;
@@ -7342,13 +7339,13 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 4_MAN_NITT,{
.@dex[1] = 4720; .@dex[2] = 4721; .@dex[3] = 4722;
.@int[1] = 4710; .@int[2] = 4711; .@int[3] = 4712;
.@agi[1] = 4730; .@agi[2] = 4731; .@agi[3] = 4732;
-
+
// Enchant attribute is determined by the digit position of variable value (ep13_3_<type>).
// For example, assume the variable value is 516:
// .@f_<slot>[<index>]
// slot: 2 3 4
- // index: 5 1 6
-
+ // 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];
diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt
index 918a8edd3..3b4e7ba0f 100644
--- a/npc/re/quests/quests_eclage.txt
+++ b/npc/re/quests/quests_eclage.txt
@@ -1,15 +1,15 @@
-//===== Hercules Script ======================================
+//===== Hercules Script ======================================
//= Eclage Quests
-//===== By: ==================================================
+//===== By: ==================================================
//= Dastgir
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 1.0
-//===== Description: =========================================
+//===== Description: =========================================
//= Quests of Eclage
//= Contains All Quest of Eclage
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 Converted from the official Aegis script. [Dastgir]
-//============================================================
+//============================================================
// Teleport Cats
//============================================================
@@ -63,7 +63,7 @@ ecl_fild01,118,311,4 script Teleport Cat No.1#1 4_M_BOSSCAT,{
}
warp .maps$[.@mindex[.@i]],.x[.@mindex[.@i]],.y[.@mindex[.@i]];
end;
-
+
OnInit:
setarray .maps$,"bif_fild02","ecl_fild01","spl_fild02","mid_camp","man_fild02","dic_fild01"; //Map Names //2,4,8,16,32,64
setarray .x,291,116,51,180,133,159; //X-Co-ordinate of Maps
@@ -89,7 +89,7 @@ dic_fild01,161,266,4 duplicate(Teleport Cat No.1#1) Teleport Cat No.6#6 4_M_BOSS
//============================================================
ecl_fild01,97,322,0 script #ep14_2Entrance WARPNPC,3,3,{
end;
-
+
OnTouch:
if (ep14_2_oliver < 3) {
mes "[Security Guard]";
@@ -552,7 +552,6 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{
ep14_2_oliver = 4;
setquest 11312;
close;
-
case 3:
mes "[Fairy Carpenter]";
mes "You can't get past here until it's repaired, so please be careful.";
@@ -792,7 +791,6 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{
ep14_2_oliver = 7;
changequest 11314,11315;
close;
-
}
else if (ep14_2_oliver == 7) {
mes "[Carpenter Fon]";
@@ -2312,7 +2310,7 @@ ecl_in01,70,88,4 script Sack Merchant#ep14_2 4_M_MERCAT1,{
eclage,292,265,0 script #ep14_2Yube Entrance WARPNPC,2,2,{
end;
-
+
OnTouch:
if (ep14_2_oliver < 15) {
mes "- Looks like the door is locked. -";
@@ -3326,7 +3324,6 @@ eclage,282,255,4 script Wuhari#eclbig 4_M_FAIRYKID6,{
mes "Oh, no, no. I am sure you are really busy. I'm sorry to have asked such a favor.";
ep14_2_big = 1;
close;
-
case 2:
mes "[" + strcharinfo(PC_NAME) + "]";
mes "Sure. It's not a big deal.";
@@ -4132,10 +4129,9 @@ ecl_in02,149,117,4 script Wuhuru#eclbig 4_M_FAIRYFREAK,{
mes "......";
close;
}
-end;
+ end;
}
-
eclage,200,272,4 script Masione#eclbig 4_F_FAIRYKID2,{
if (checkweight(Knife,1) == 0 || (MaxWeight - Weight)<2000) {
mes "- Stop Here!! -";
@@ -4285,7 +4281,6 @@ eclage,163,228,4 script Goatie#eclbig 4_F_FAIRYKID3,{
}
}
-
eclage,170,195,4 script Svery#eclbig 4_M_FAIRYKID2,{
if (checkweight(Knife,1) == 0 || (MaxWeight - Weight) < 2000) {
mes "- Stop Here!! -";
@@ -4412,7 +4407,6 @@ eclage,170,195,4 script Svery#eclbig 4_M_FAIRYKID2,{
close;
}
-
eclage,126,151,4 script Pompe#eclbig 4_M_FAIRYKID3,{
if (checkweight(Knife,1) == 0 || (MaxWeight - Weight) < 2000) {
mes "- Stop Here!! -";
@@ -4503,7 +4497,6 @@ eclage,126,151,4 script Pompe#eclbig 4_M_FAIRYKID3,{
close;
}
-
ecl_fild01,70,285,4 script Giranni#eclbig 4_F_FAIRY2,{
if (checkweight(Knife,1) == 0 || (MaxWeight - Weight) < 2000) {
mes "- Stop Here!! -";
@@ -4608,7 +4601,7 @@ ecl_fild01,70,285,4 script Giranni#eclbig 4_F_FAIRY2,{
next;
mes "[" + strcharinfo(PC_NAME) + "]";
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;
@@ -4701,7 +4694,6 @@ ecl_fild01,70,285,4 script Giranni#eclbig 4_F_FAIRY2,{
close;
}
-
ecl_fild01,269,165,4 script A Laphine corpse#eclbig 4_FAIRYDEADLEAF,{
if (checkweight(Knife,1) == 0 || (MaxWeight - Weight) < 2000) {
mes "- Stop Here!! -";
@@ -4996,8 +4988,7 @@ ecl_in01,50,104,4 duplicate(Choir member#eclbig01) Choir member#eclbig03 4_M_FAI
ecl_in01,52,104,4 duplicate(Choir member#eclbig01) Choir member#eclbig04 4_M_FAIRYKID
ecl_in01,54,104,4 duplicate(Choir member#eclbig01) Choir member#eclbig05 4_M_FAIRYKID
-
-// Mystery Burglary Quest
+// Mystery Burglary Quest
//============================================================
eclage,156,51,6 script #hidden_eclage HIDDEN_NPC,3,3,{
end;
@@ -5037,7 +5028,7 @@ OnTouch:
mes "It's probably nothing.";
mes "I should just go on my way~";
close;
- }
+ }
}
}
@@ -7538,7 +7529,7 @@ ecl_in04,208,194,3 script Daughter Luen#eclage2 4_F_FAIRYKID2,{
mes "I'll think about it more and";
mes "figure out who the robber is...";
close;
- }
+ }
case 2:
mes "[" + strcharinfo(PC_NAME) + "]";
mes "I... I guess";
@@ -7882,7 +7873,7 @@ ecl_in04,208,194,3 script Daughter Luen#eclage2 4_F_FAIRYKID2,{
ep14_2_detect = 10;
break;
}
- break;
+ break;
}
break;
case 6:
@@ -9449,7 +9440,6 @@ ecl_in01,82,79,4 script Magazine#02 HIDDEN_NPC,{
close;
}
-
// Light and Darkness
//============================================================
ecl_in02,98,32,3 script Eclage Guard#tl1b 4_M_FAIRYSOLDIER2,{
@@ -9469,7 +9459,7 @@ ecl_in02,98,32,3 script Eclage Guard#tl1b 4_M_FAIRYSOLDIER2,{
ecl_in02,133,115,0 script #pa0829Prison Guard HIDDEN_WARP_NPC,3,3,{
end;
-
+
OnTouch:
if (ep14_2_etran < 2) {
mes "[Clever]";
@@ -10226,7 +10216,6 @@ ecl_in04,109,215,3 script Hiel#pa0829 4_M_FAIRYSCHOLAR,{
mes "Oh... I guess it was too much to ask for. That's too bad then.";
ep14_2_etran = 12;
close;
-
case 2:
mes "[Hiel]";
mes "Wow wow! Thank you so much! I'll return the favor by operating it together when the experiments are complete! In the meantime, I'll start preparing for material combination!";
@@ -10289,7 +10278,6 @@ ecl_in04,109,215,3 script Hiel#pa0829 4_M_FAIRYSCHOLAR,{
mes "[Hiel]";
mes "How ruthless... Saying that he won't give them after showing them to me.";
close;
-
case 2:
if ((countitem(Dark_Debris)) && (countitem(Yellow_Gemstone) > 1) && (countitem(Red_Gemstone) > 1) && (countitem(Blue_Gemstone) > 1)) {
mes "[Hiel]";
@@ -11572,7 +11560,6 @@ OnTouch:
next;
mes "^000099The reactor was activated, but the dimension does not seem to be related to Etran.^000000";
close;
-
case 2:
mes "[????]";
mes "I... I did it. The restricted area!! Absolute zero ductility!!!!!! And they stole it from me. My gravitational pull of 300 grams.";
@@ -11582,7 +11569,6 @@ OnTouch:
next;
mes "^000099The reactor was activated, but the dimension does not seem to be related to Etran.^000000";
close;
-
case 3:
mes "[????]";
mes "Is this-...(Static static) Is this guy really in the right mind?";
@@ -11619,14 +11605,12 @@ OnTouch:
next;
mes "^000099The reactor was activated, but the dimension does not seem to be related to Etran. It's cold somehow.^000000";
close;
-
case 2:
mes "[????]";
mes "Human!! Human Chicken!!!!!!!!";
next;
mes "^000099The reactor was activated, but the dimension does not seem to be related to Etran. It smells delicious somehow.^000000";
close;
-
case 3:
mes "[????]";
mes "You don't know why I'm upset, do you?";
@@ -11641,7 +11625,7 @@ OnTouch:
close;
}
}
-end;
+ end;
}
ecl_fild01,179,179,0 duplicate(#pa0829Reactor3) #pa0829Reactor8 HIDDEN_WARP_NPC,3,3
@@ -11665,14 +11649,12 @@ OnTouch:
next;
mes "^000099The reactor was activated but... For some reason, I'm getting lonely.^000000";
close;
-
case 2:
mes "[???]";
mes "3..8..12..33...31..The last number is erased...";
next;
mes "^000099How intriguing...^000000";
close;
-
case 3:
mes "[???]";
mes "I'm going insane.";
@@ -11710,14 +11692,12 @@ OnTouch:
next;
mes "^000099The reactor was activated. Somehow it felt like I had to do whatever they said in it.^000000";
close;
-
case 2:
mes "[???]";
mes "3..8..12..33...31..The last number is erased...";
next;
mes "^000099How intriguing...^000000";
close;
-
case 3:
mes "[????]";
mes "Baby, you don't know why I'm upset, do you?";
@@ -11953,14 +11933,12 @@ ecl_in04,105,216,4 script Hiel's Workshop#pa0829 HIDDEN_NPC,{
next;
mes "^000099It's been a while since I felt that about myself. Yes, indeed... This machine is getting on my nerves.^000000";
close;
-
case 2:
mes "[???]";
mes "CHTTTTSTATIC~~~~ ANG!?~~ CHTTTTT ~ oh my shoulder!!";
next;
mes "^000099Oh, I'm sorry. I'm going to leave this channel.^000000";
close;
-
case 3:
mes "^000099Etran's sad legend^000000";
next;
@@ -12014,7 +11992,6 @@ ecl_in04,105,216,4 script Hiel's Workshop#pa0829 HIDDEN_NPC,{
close2;
cutin "",255;
end;
-
case 4:
mes "^000099What if Etran and Robert were the priosoner and the guard?^000000";
next;
@@ -12032,7 +12009,6 @@ ecl_in04,105,216,4 script Hiel's Workshop#pa0829 HIDDEN_NPC,{
close2;
cutin "",255;
end;
-
case 5:
mes "^000099Etran and Robert were put to work as cat merchants.^000000";
next;
@@ -12074,7 +12050,6 @@ ecl_in04,105,216,4 script Hiel's Workshop#pa0829 HIDDEN_NPC,{
close2;
cutin "",255;
end;
-
case 6:
mes "^000099Etran and Robert were placed in a Flight machine.^000000";
next;
@@ -12127,7 +12102,6 @@ ecl_in04,105,216,4 script Hiel's Workshop#pa0829 HIDDEN_NPC,{
close2;
cutin "",255;
end;
-
case 7:
mes "^000099Iron Chef Robert^000000";
next;
@@ -12159,7 +12133,6 @@ ecl_in04,105,216,4 script Hiel's Workshop#pa0829 HIDDEN_NPC,{
close2;
cutin "",255;
end;
-
case 8:
mes "^000099Robert actually likes beer.^000000";
next;
@@ -12206,7 +12179,6 @@ ecl_in04,105,216,4 script Hiel's Workshop#pa0829 HIDDEN_NPC,{
close2;
cutin "",255;
end;
-
case 9:
mes "^000099Robert the cook^000000";
next;
@@ -12244,7 +12216,6 @@ ecl_in04,105,216,4 script Hiel's Workshop#pa0829 HIDDEN_NPC,{
close2;
cutin "",255;
end;
-
case 10:
mes "^000099Childhood friends, Etran and Robert^000000";
next;
@@ -12292,19 +12263,16 @@ ecl_in04,105,216,4 script Hiel's Workshop#pa0829 HIDDEN_NPC,{
close2;
cutin "",255;
end;
-
case 11:
mes "^000099In boiling water~ 3 minutes~ ... Static static^000000";
next;
mes "^0000993 minutes in boiling water... What after that. Does it mean it will die 3 minutes in boiling water? Do I pour the boiling water over a monster or something?^000000";
close;
-
case 12:
mes "^000099Houston~ Houston~ This is CHTTTCHTTT~ We see a large tower and a tree. It seems like there are life forms here on this planet as well~ STATIC~ ^000000";
next;
mes "^000099Some desperate voices are heard. Not sure what the words, planets and life forms, are referring to.^000000";
close;
-
default:
mes "^000099There's too much static. Try adjusting the frequency. ^000000";
close;
@@ -12336,18 +12304,15 @@ ecl_fild01,190,93,5 script Fili#1 4_M_FAIRYANG,1,1,{
mes "[Fili]";
mes "What is Eclage like? It's such a nice place.";
close;
-
case 2:
mes "[Fili]";
mes "People wouldn't hate or hold each other at knife point if their hearts are filled with love for flowers and the earth.";
close;
-
case 3:
mes "[Fili]";
mes "You should avoid going into the tower. It's dangerous. We can't do much for the ones who have already entered, though.";
close;
}
-
case 2:
if (questprogress(13059,PLAYTIME) == 2) {
mes "[Fili]";
@@ -12365,7 +12330,7 @@ ecl_fild01,190,93,5 script Fili#1 4_M_FAIRYANG,1,1,{
mes "[Fili]";
mes "There are four in the work group. Don't forget to tell everyone.";
close;
- }
+ }
mes "[Fili]";
mes "Thanks. Can you hear the earth singing? The sound of flowers and trees dancing in the wind. You'll hear it someday.";
emotion e_lv;
@@ -12544,7 +12509,7 @@ ecl_fild01,190,93,5 script Fili#1 4_M_FAIRYANG,1,1,{
mes "[Fili]";
mes "I think their work for the field is finished for the day. By the way, ^FF0000there's another work. Ask about it if you're interested.^000000";
erasequest 13050;
- ep14_2_nines = 2;
+ ep14_2_nines = 2;
getitem Splendide_Coin,1; //Splendide_Coin
getexp 300000,300000;
close;
@@ -12588,7 +12553,7 @@ ecl_fild01,190,93,5 script Fili#1 4_M_FAIRYANG,1,1,{
close2;
}
}
- }
+ }
if (ep14_2_oliver > 4) {
mes "[Fili]";
mes "Look at this beautiful field filled with little blades of grass and twigs breathing!";
@@ -12677,7 +12642,7 @@ ecl_fild01,83,263,5 script Watering Laphine#1 4_M_FAIRYKID3,{
mes "I think this is enough for the day. I have to take a break and draw water, too. Hehe~!";
close;
}
- else if ((questprogress(13050) == 1) && (questprogress(13052) == 1)) {
+ else if ((questprogress(13050) == 1) && (questprogress(13052) == 1)) {
mes "[Watering Laphine]";
mes "I'll water these dying flowers and grasses again. This brings them back to life! Hehe~!";
erasequest 13052;
@@ -12691,7 +12656,6 @@ ecl_fild01,83,263,5 script Watering Laphine#1 4_M_FAIRYKID3,{
mes "[Watering Laphine]";
mes "I'm sure Eclage needs a Laphine like me! Hehe~!";
close;
-
}
else if (ep14_2_nines == 1){
if ((questprogress(13050) == 1) && (questprogress(13052) == 1)) {
@@ -12708,7 +12672,6 @@ ecl_fild01,83,263,5 script Watering Laphine#1 4_M_FAIRYKID3,{
mes "[Watering Laphine]";
mes "Hehe~! Now that I'm done watering, I should wait for the great Fili.";
close;
-
}
mes "[Watering Laphine]";
mes "It's my job to water the earth.";
@@ -12727,7 +12690,7 @@ ecl_fild01,163,196,5 script Dancing Laphine#1 4_F_FAIRYKID3,{
mes "I would love to see the great Fili next time...";
close;
}
- if ((questprogress(13050) == 1) && (questprogress(13053) == 1)) {
+ if ((questprogress(13050) == 1) && (questprogress(13053) == 1)) {
mes "[Dancing Laphine]";
mes "Ah, it's you again! You're so insensitive. Anyway, you're here to tell me to start working, right? I see, I see. You can go now.";
emotion e_pif;
@@ -12860,13 +12823,13 @@ ecl_fild01,237,181,5 script Cute Laphine#1 4_M_FAIRYKID5,{
ecl_tdun02,99,63,5 script Rosi#No.1 4_F_HUWOMAN,1,1,{
end;
-
+
OnInit:
if (atoi( charat( strnpcinfo(0), getstrlen(strnpcinfo(0))-1 ) ) > 1){
disablenpc strnpcinfo(0);
}
end;
-
+
OnTouch:
if (ep14_2_nines < 2) {
mes "[Rosi]";
@@ -12902,7 +12865,6 @@ OnTouch:
mes "[Rosi]";
mes "This tower is very quiet yet mysterious. It's definitely something that adventurers would love, right?";
close;
-
}
else if (ep14_2_nines == 2) {
if ((questprogress(13055) == 1) && (questprogress(13056) == 1)) {
@@ -12952,7 +12914,7 @@ ecl_tdun02,22,36,5 duplicate(Rosi#No.1) Rosi#No.3 4_F_HUWOMAN,1,1
ecl_tdun01,11,62,5 script Euncheong#No.1 4_M_HUBOY,1,1,{
end;
-
+
OnInit:
if (atoi( charat( strnpcinfo(0), getstrlen(strnpcinfo(0))-1 ) ) > 1){
disablenpc strnpcinfo(0);
@@ -13125,7 +13087,6 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{
close2;
cutin "",255;
end;
-
case 2:
if (questprogress(13062,PLAYTIME) == 1) {
cutin "nines02",2;
@@ -13218,7 +13179,6 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{
close2;
cutin "",255;
end;
-
case 3:
if (questprogress(13064,PLAYTIME) == 1) {
cutin "nines02",2;
@@ -13285,7 +13245,6 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{
close2;
cutin "",255;
end;
-
case 4:
if (questprogress(13066,PLAYTIME) == 1) {
cutin "nines03",2;
@@ -13411,7 +13370,7 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{
close2;
cutin "",255;
end;
- }
+ }
cutin "nines03",2;
mes "[New Oz]";
mes "Don't worry. I'm pretty much done writing a song. I'm almost done with the lyrics as well as the melody.";
@@ -13421,7 +13380,6 @@ ecl_tdun03,68,80,3 script New Oz#1 4_M_NEWOZ,1,1,{
close2;
cutin "",255;
end;
-
}
cutin "nines02",2;
mes "[New Oz]";
@@ -14126,7 +14084,7 @@ ecl_tdun04,26,39,1 script Professor Worm#worm 4_M_PROFESSORWORM,{
ecl_tdun04,21,41,0 script #pf HIDDEN_WARP_NPC,2,2,{
end;
-
+
OnTouch:
.@pro = rand(1,100);
if (ep14_2_profe == 1) {
@@ -14209,7 +14167,6 @@ OnTouch:
mes "But why do I have to remain in a place like this, too?";
close;
}
-
}
ecl_tdun04,35,31,0 script #prf2 HIDDEN_WARP_NPC,2,2,{
@@ -14251,7 +14208,6 @@ OnTouch:
mes "I wonder if I'll forget even my name... How it worries me...";
close;
}
-
}
ecl_tdun04,28,43,0 script #prf3 HIDDEN_WARP_NPC,2,2,{
@@ -14378,7 +14334,7 @@ OnTouch:
next;
mes "[Wall Note 5]";
mes "Monsters, I have to create more monsters to protect me. As many as I could possibly create!";
- close;
+ close;
}
}
@@ -14608,7 +14564,7 @@ ecl_fild01,173,95,7 script Diary Frog No. 30#worm 4_FROG,{
mes "If you come back to late, all you'll hear are my moans and groans.";
changequest 1226,1227;
ep14_2_profe = 10;
- close;
+ close;
}
else if (ep14_2_profe == 10) {
if (countitem(Star_Shape_Mushroom) < 10) {
@@ -14672,7 +14628,7 @@ ecl_fild01,173,95,7 script Diary Frog No. 30#worm 4_FROG,{
mes "I'm so mad, I oughta 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;
}
}
@@ -14797,7 +14753,6 @@ ecl_in01,32,52,5 script Traveler Fome#tl01 4_F_DOGTRAVELER,3,3,{
mes "Let's talk to other travelers.";
setquest 7411;
break;
-
case 2:
mes "[Fome]";
mes "The main attraction of Eclage?";
@@ -14855,7 +14810,6 @@ ecl_in01,32,52,5 script Traveler Fome#tl01 4_F_DOGTRAVELER,3,3,{
hideonnpc "Eclage Guard#tl01";
warp "ecl_in03",244,89;
end;
-
case 2:
mes "[Eclage Guard]";
mes "Oh, is that right?";
@@ -14875,7 +14829,6 @@ ecl_in01,32,52,5 script Traveler Fome#tl01 4_F_DOGTRAVELER,3,3,{
cutin "",255;
hideonnpc "Eclage Guard#tl01";
end;
-
}
}
mes "[Fome]";
@@ -14948,7 +14901,6 @@ ecl_in01,32,52,5 script Traveler Fome#tl01 4_F_DOGTRAVELER,3,3,{
mes "What Fome said is interesting.";
mes "A distrusted king...should I listen to what other Laphines say about it?";
close;
-
}
mes "[Fome]";
mes "I'm sure there is something.";
@@ -14959,7 +14911,7 @@ ecl_in01,32,52,5 script Traveler Fome#tl01 4_F_DOGTRAVELER,3,3,{
mes "I should start planning on moving to the next region. ";
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.";
@@ -14971,7 +14923,6 @@ OnTouch:
case 1:
mes "They don't seem to care that much.";
close;
-
case 2:
mes "When you approach, they stop talking for a second and make a seat for you.";
mes "Start a conversation.";
@@ -15081,7 +15032,6 @@ ecl_in01,32,51,7 script Traveler Litrip#tl02 4_M_DOGTRAVELER,{
cutin "",255;
warp "ecl_in03",244,89;
end;
-
case 2:
mes "[Eclage Guard]";
mes "Oh, is that right?";
@@ -15101,7 +15051,6 @@ ecl_in01,32,51,7 script Traveler Litrip#tl02 4_M_DOGTRAVELER,{
hideonnpc "Eclage Guard#tl01";
cutin "",255;
end;
-
}
}
mes "[Litrip]";
@@ -15270,7 +15219,6 @@ ecl_in01,35,51,3 script Traveler Chiba#tl03 4_M_DOGTRAVELER2,{
warp "ecl_in03",244,89;
cutin "",255;
end;
-
case 2:
mes "[Eclage Guard]";
mes "Oh, is that right?";
@@ -15290,7 +15238,6 @@ ecl_in01,35,51,3 script Traveler Chiba#tl03 4_M_DOGTRAVELER2,{
hideonnpc "Eclage Guard#tl01";
cutin "",255;
end;
-
}
}
mes "[Chiba]";
@@ -15338,11 +15285,11 @@ ecl_in01,31,49,7 script Eclage Guard#tl01 4_M_FAIRYSOLDIER,{
OnInit:
hideonnpc "Eclage Guard#tl01";
end;
-
+
OnEnable:
hideoffnpc "Eclage Guard#tl01";
end;
-
+
OnDisable:
hideonnpc "Eclage Guard#tl01";
end;
@@ -15375,7 +15322,6 @@ ecl_in01,82,70,3 script Eclage Guard#tl02 4_M_FAIRYSOLDIER,{
cutin "",255;
warp "ecl_in03",244,89;
end;
-
case 2:
mes "[Eclage Guard]";
mes "Ah...is that right?";
@@ -15404,7 +15350,6 @@ ecl_in01,82,70,3 script Eclage Guard#tl02 4_M_FAIRYSOLDIER,{
warp "ecl_in03",244,89;
cutin "",255;
end;
-
case 2:
mes "[Eclage Guard]";
mes "Is that right?";
@@ -15439,7 +15384,6 @@ ecl_in01,82,70,3 script Eclage Guard#tl02 4_M_FAIRYSOLDIER,{
warp "ecl_in03",58,72;
cutin "",255;
end;
-
case 2:
mes "[Eclage Guard]";
mes "Do as you wish although Mayor Jun might be upset if you keep him waiting for too long.";
@@ -15460,7 +15404,6 @@ ecl_in01,82,70,3 script Eclage Guard#tl02 4_M_FAIRYSOLDIER,{
warp "ecl_in03",58,72;
cutin "",255;
end;
-
case 2:
mes "[Eclage Guard]";
mes "Thank you.";
@@ -15496,7 +15439,6 @@ ecl_in01,82,70,3 script Eclage Guard#tl02 4_M_FAIRYSOLDIER,{
mes "Well, I understand.";
cutin "minuel01",2;
break;
-
case 2:
mes "[Minuel]";
mes "Actually I don't have any time for myself since I have to be here all the time.";
@@ -15531,7 +15473,6 @@ ecl_in01,82,70,3 script Eclage Guard#tl02 4_M_FAIRYSOLDIER,{
mes "I'll be counting on you!";
setquest 7418;
break;
-
case 2:
mes "[Minuel]";
mes "Ha, do you really think so?";
@@ -15539,7 +15480,6 @@ ecl_in01,82,70,3 script Eclage Guard#tl02 4_M_FAIRYSOLDIER,{
mes "Soon, in the near future. Hehehe";
cutin "minuel02",2;
break;
-
}
close2;
cutin "",255;
@@ -15731,7 +15671,6 @@ ecl_in01,82,70,3 script Eclage Guard#tl02 4_M_FAIRYSOLDIER,{
mes "That's too bad.";
mes "Maybe next time!";
break;
-
case 2:
mes "[Minuel]";
mes "Thank you so much.";
@@ -16041,7 +15980,6 @@ ecl_in03,245,93,3 script Chief of Staff#tl01 4_F_FAIRY,{
mes "A scholar of magics? There's no one with that name among the scholars I know. ";
mes "I don't know.";
close;
-
}
else if ((ep14_2_mylord > 17) && (ep14_2_mylord < 22)) {
mes "[Shenime]";
@@ -16232,7 +16170,6 @@ ecl_in03,245,93,3 script Chief of Staff#tl01 4_F_FAIRY,{
ep14_2_mylord = 26;
changequest 7445,7447;
close;
-
}
else if (ep14_2_mylord == 26) {
mes "[Shenime]";
@@ -16308,7 +16245,6 @@ ecl_in03,245,93,3 script Chief of Staff#tl01 4_F_FAIRY,{
ep14_2_mylord = 28;
changequest 7448,7449;
close;
-
case 2:
mes "When you held Shenime's hand, you felt a sharp pain in your hand.";
mes "You took your hand off quickly and examined it, but nothing was there.";
@@ -16323,7 +16259,6 @@ ecl_in03,245,93,3 script Chief of Staff#tl01 4_F_FAIRY,{
close2;
warp "ecl_hub01",129,12;
end;
-
}
}
else if (ep14_2_mylord == 28) {
@@ -16336,7 +16271,6 @@ ecl_in03,245,93,3 script Chief of Staff#tl01 4_F_FAIRY,{
mes "Shouldn't you, a foreigner, consider it as an honor and receive the offer?";
mes "You're hesitating too much.";
close;
-
case 2:
mes "When you held Shenime's hand, you felt a sharp pain in your hand.";
mes "You took your hand off quickly and examined it, but nothing was there.";
@@ -17993,7 +17927,6 @@ eclage,112,40,3 script Eclage Guard Leo#tl 4_M_FAIRYSOLDIER2,{
mes ".........isn't it depressing.";
close;
}
-
}
ecl_fild01,205,86,3 script Eclage Messenger Roy#tl 4_M_FAIRYSOLDIER2,{
@@ -18825,7 +18758,6 @@ ecl_tdun04,32,35,3 script Hisie#tlord 4_M_FARIY_HISIE,{
mes "I need to see what Avant is researching about.";
mes "Let's hurry.";
close2;
-
}
else if ((ep14_2_mylord == 22) || (ep14_2_mylord == 23)) {
cutin "hisie03",0;
@@ -19119,18 +19051,18 @@ OnTouch:
close2;
cutin "",255;
end;
-
+
OnStop:
stopnpctimer;
end;
OnTimer5000:
- mapannounce "que_avan01","Welcome, Sir Avant. User certification standby for 5 minutes.",bc_map,"0xA8A8A8";
+ mapannounce "que_avan01","Welcome, Sir Avant. User certification standby for 5 minutes.",bc_map,"0xA8A8A8";
end;
OnTimer360000:
- mapannounce "que_avan01","Warning: Long-term use was not certified. Restrictive magic on unauthorized personnel will automatically be executed.",bc_map,"0xA8A8A8";
+ mapannounce "que_avan01","Warning: Long-term use was not certified. Restrictive magic on unauthorized personnel will automatically be executed.",bc_map,"0xA8A8A8";
end;
OnTimer365000:
- mapannounce "que_avan01","Research lab interior space has been distorted. Sweeping in process.",bc_map,"0x7b68ee";
+ mapannounce "que_avan01","Research lab interior space has been distorted. Sweeping in process.",bc_map,"0x7b68ee";
end;
OnTimer368000:
mapwarp "que_avan01","eclage",265,275;
@@ -19383,7 +19315,7 @@ OnEnable:
monster "que_avan01",29,36,"DARK_PRIEST",DARK_PRIEST,1;
monster "que_avan01",29,32,"DARK_PRIEST",DARK_PRIEST,1;
end;
-
+
OnReset:
mapwarp "que_avan01","eclage",265,275;
killmonster "que_avan01","#avtmanager::OnMyMobDead";
@@ -19399,10 +19331,10 @@ 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";
+ mapannounce "que_avan01","Hisie: This is it for you! Avant!!",bc_map,"0x7b68ee";
hideonnpc "Hisie#tlspt";
hideoffnpc "Hisie#tlhunt";
}
@@ -19420,20 +19352,20 @@ que_avan01,26,41,3 script Avant Magic Scholar#tlac 4_M_FAIRYAVANT,{
initnpctimer;
monster "que_avan01",26,38,"HIDDEN_MOB",HIDDEN_MOB,1;
end;
-
+
OnInit:
hideonnpc "Avant Magic Scholar#tlac";
end;
-
+
OnKill:
killmonster "que_avan01","Avant Magic Scholar#tlac::OnMyMobDead";
stopnpctimer;
end;
-
+
OnTimer2000:
- mapannounce "que_avan01","Hisie: Watch out!!!",bc_map,"0x7b68ee";
+ mapannounce "que_avan01","Hisie: Watch out!!!",bc_map,"0x7b68ee";
end;
-
+
OnTimer8000:
killmonster "que_avan01","Avant Magic Scholar#tlac::OnMyMobDead";
stopnpctimer;
diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt
index 4cd3ec886..2f13ad618 100644
--- a/npc/re/quests/quests_malangdo.txt
+++ b/npc/re/quests/quests_malangdo.txt
@@ -4612,7 +4612,7 @@ mal_in02,187,58,3 script Chef Nyas 4_CAT_CHEF,{
setquest 7276;
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 e67a827e9..925f28507 100644
--- a/npc/re/quests/quests_malaya.txt
+++ b/npc/re/quests/quests_malaya.txt
@@ -3165,7 +3165,7 @@ ma_fild01,251,93,3 script Lost Child#malaya01 4_F_BARYO_GIRL,{
}
}
end;
-
+
OnInit:
if (strnpcinfo(0) != "Lost Child#malaya01")
disablenpc strnpcinfo(0);
@@ -3770,7 +3770,7 @@ ma_fild01,158,243,6 script Tribe Blacksmith#malaya 4_M_MALAYA,{
.@newItem = 2492;
break;
}
-
+
if (!(.@item)) {
mes "[Bayani]";
mes "You should wear the equipment to upgrade and not come without it on you.";
@@ -3817,11 +3817,11 @@ ma_fild01,158,243,6 script Tribe Blacksmith#malaya 4_M_MALAYA,{
mes "[Bayani]";
mes "BAM!!";
next;
-
+
delitem 6499,20; //Ancient_Grudge
delequip .@part;
getitem .@newItem, 1;
-
+
mes "[Bayani]";
mes "Ha ha. Perfect.";
mes "Congratulations. Your armor is better than ever.";
diff --git a/npc/re/warps/dungeons/ecl_dun.txt b/npc/re/warps/dungeons/ecl_dun.txt
index e0677c3a9..24f6c6cf0 100644
--- a/npc/re/warps/dungeons/ecl_dun.txt
+++ b/npc/re/warps/dungeons/ecl_dun.txt
@@ -8,7 +8,7 @@
//= Warp Portals for Eclage Dungeon
//===== Additional Comments: =================================
//= 1.0 First Version.
-//= 1.0a Corrected Warp Co-ordinates and
+//= 1.0a Corrected Warp Co-ordinates and
//= name of Warp Portal. [Dastgir]
//============================================================
diff --git a/npc/warps/cities/einbroch.txt b/npc/warps/cities/einbroch.txt
index bbb562a95..c05940360 100644
--- a/npc/warps/cities/einbroch.txt
+++ b/npc/warps/cities/einbroch.txt
@@ -22,7 +22,6 @@ ein_in01,13,213,0 warp ein_fa01a 1,1,einbroch,129,79
ein_in01,81,198,0 warp ein_fa02 1,1,einbroch,179,70
einbroch,179,73,0 warp ein_fa02a 1,1,ein_in01,81,203
-
//==========================================================================
//Einbroch - Near Train station
//==========================================================================
@@ -31,14 +30,12 @@ einbroch,233,312,0 warp ein_to01a 1,1,einbroch,214,260
einbroch,250,263,0 warp ein_to02 1,1,einbroch,269,315
einbroch,269,312,0 warp ein_to02a 1,1,einbroch,250,260
-
//==========================================================================
//Einbroch - Weapon shop
//==========================================================================
einbroch,216,214,0 warp ein_wp01 1,1,ein_in01,108,17
ein_in01,108,13,0 warp ein_wp01a 1,1,einbroch,216,211
-
//=========================================================================
//Einbroch - Hotel
//=========================================================================
@@ -59,7 +56,6 @@ ein_in01,232,176,0 warp ein_h07a 1,1,ein_in01,264,206
ein_in01,284,224,0 warp ein_h08 1,1,ein_in01,177,277
ein_in01,180,277,0 warp ein_h08a 1,1,ein_in01,280,224
-
//==========================================================================
//Einbroch - Building behind the hotel
//==========================================================================
@@ -70,20 +66,17 @@ ein_in01,100,142,0 warp ein_ho02a 1,1,ein_in01,123,85
einbroch,290,222,0 warp ein_ho03 1,1,ein_in01,121,80
ein_in01,121,77,0 warp ein_ho03a 1,1,einbroch,290,219
-
//==========================================================================
//Einbroch - House of Kapetain
//==========================================================================
einbroch,129,229,0 warp ein_kf01 1,1,ein_in01,14,147
ein_in01,11,147,0 warp ein_kf01a 1,1,einbroch,126,229
-
//=========================================================================
//Einbroch - Lab
//=========================================================================
ein_in01,286,25,0 warp ein_lab 1,1,einbroch,54,52
-
//=========================================================================
//Einbroch - Blacksmith guild
//=========================================================================
@@ -92,7 +85,6 @@ ein_in01,14,14,0 warp ein_jb01a 1,1,einbroch,255,110
ein_in01,39,36,0 warp ein_jb02 1,1,ein_in01,35,83
ein_in01,39,85,0 warp ein_jb02a 1,1,ein_in01,36,36
-
//==========================================================================
//Einbroch - Field related
//==========================================================================
@@ -100,4 +92,3 @@ einbroch,157,331,0 warp ein_fd01 1,1,ein_fild04,184,31
ein_fild04,184,26,0 warp ein_fd01a 1,1,einbroch,157,327
einbroch,150,25,0 warp ein_fd02 1,1,ein_fild08,164,377
ein_fild08,164,380,0 warp ein_fd02a 1,1,einbroch,150,28
-
diff --git a/npc/warps/cities/gonryun.txt b/npc/warps/cities/gonryun.txt
index 1f74e02f5..b4e831dda 100644
--- a/npc/warps/cities/gonryun.txt
+++ b/npc/warps/cities/gonryun.txt
@@ -29,5 +29,3 @@ gon_in,42,35,0 warp gon_castle2-1 1,1,gon_in,34,97
gon_in,31,97,0 warp gon_castle2-2 1,1,gon_in,39,35
gonryun,161,8,0 warp gon_fild1-1 1,1,gon_fild01,191,261
gon_fild01,192,265,0 warp gon_fild1-2 1,1,gonryun,161,11
-
-
diff --git a/npc/warps/cities/mid_camp.txt b/npc/warps/cities/mid_camp.txt
index b1e26b0ae..b6da7046a 100644
--- a/npc/warps/cities/mid_camp.txt
+++ b/npc/warps/cities/mid_camp.txt
@@ -42,4 +42,3 @@ mid_camp,266,260,0 warp mid_house1-1 1,1,mid_campin,284,124
mid_campin,282,124,0 warp mid_house1-2 1,1,mid_camp,263,260
mid_camp,163,231,0 warp mid_house2-1 1,1,mid_campin,376,133
mid_campin,376,136,0 warp mid_house2-2 1,1,mid_camp,163,234
-
diff --git a/npc/warps/cities/prontera.txt b/npc/warps/cities/prontera.txt
index 7327b2901..2e446ec97 100644
--- a/npc/warps/cities/prontera.txt
+++ b/npc/warps/cities/prontera.txt
@@ -73,8 +73,6 @@ prt_church,168,19,0 warp prtch01-1 1,2,prt_church,105,81
prt_church,31,19,0 warp prtch02 1,2,prt_church,94,81
prt_church,90,81,0 warp prtch02-1 1,2,prt_church,27,19
-
-
//= Prontera Castle ===========================================
prt_castle,102,129,0 warp prtca01 3,2,prt_castle,102,143
prt_castle,102,140,0 warp prtca01-1 3,2,prt_castle,102,126
diff --git a/npc/warps/dungeons/lhz_dun.txt b/npc/warps/dungeons/lhz_dun.txt
index b77b0d2ef..5ed05bd7c 100644
--- a/npc/warps/dungeons/lhz_dun.txt
+++ b/npc/warps/dungeons/lhz_dun.txt
@@ -201,7 +201,7 @@ lhz_cube,123,26,0 script cubew09-4 WARPNPC,1,1,{
callfunc "randomw";
end;
}
-
+
//----- Function for Random Warps ----------------------------
function script randomw {
switch(rand(3)) {
diff --git a/npc/warps/dungeons/mosk_dun.txt b/npc/warps/dungeons/mosk_dun.txt
index 7543b5a9b..b4b83e1bf 100644
--- a/npc/warps/dungeons/mosk_dun.txt
+++ b/npc/warps/dungeons/mosk_dun.txt
@@ -121,7 +121,7 @@ mosk_dun02,53,215,3 script Soldier1#mos 4_M_RUSKNIGHT,{
mes "We're called out for emergencies,";
mes "don't disturb us anymore.";
close;
-
+
OnInit:
hideonnpc "Soldier1#mos";
end;
@@ -137,7 +137,7 @@ mosk_dun02,50,217,3 script Soldier2#mos 4_M_RUSKNIGHT,{
mes "We're called out for emergencies,";
mes "don't disturb us anymore.";
close;
-
+
OnInit:
hideonnpc "Soldier2#mos";
end;
@@ -147,14 +147,13 @@ OnEnable:
end;
}
-
mosk_dun02,56,217,5 script Soldier3#mos 4_M_RUSKNIGHT,{
mes "[Soldier]";
mes "We're the Csar's soldiers.";
mes "We're called out for emergencies,";
mes "don't disturb us anymore.";
close;
-
+
OnInit:
hideonnpc "Soldier3#mos";
end;
diff --git a/npc/warps/pvp.txt b/npc/warps/pvp.txt
index c8276ce23..61f233910 100644
--- a/npc/warps/pvp.txt
+++ b/npc/warps/pvp.txt
@@ -171,4 +171,3 @@ pvp_n_8-4,150,71,0 warp Link#pt_link_1-41 1,1,pvp_n_8-4,0,0
pvp_n_8-4,144,166,0 warp Link#pt_link_1-42 1,1,pvp_n_8-4,0,0
// Invalid Warp
//pvp_n_8-5,30,30,0 warp a 3,3,pvp_n_8-5,100,100
-
diff --git a/npc/woe-fe/agit_main.txt b/npc/woe-fe/agit_main.txt
index 6f4130962..36fb453fa 100644
--- a/npc/woe-fe/agit_main.txt
+++ b/npc/woe-fe/agit_main.txt
@@ -1130,9 +1130,9 @@ OnGuardianDied:
OnClock0001:
// Do nothing if this script is the template.
if (strnpcinfo(1) == "Gld_Trea_Spawn") end;
-
+
.@GID = getcastledata(strnpcinfo(2),1);
-
+
// If there is no owner, do nothing.
if (!.@GID) end;