diff options
| author | Haru <haru@dotalux.com> | 2014-05-13 18:15:14 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2014-05-13 18:15:14 +0200 |
| commit | c03094034f5338016221775bce4b39a0e9b75ee6 (patch) | |
| tree | 559e52c5207911190ea336eb82a933ce37305065 /npc/re | |
| parent | 3bd57cf4858696b2586543098bc9eeac70a1854e (diff) | |
| download | hercules-c03094034f5338016221775bce4b39a0e9b75ee6.tar.gz hercules-c03094034f5338016221775bce4b39a0e9b75ee6.tar.bz2 hercules-c03094034f5338016221775bce4b39a0e9b75ee6.tar.xz hercules-c03094034f5338016221775bce4b39a0e9b75ee6.zip | |
Removed trailing whitespace (scripts)
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/re')
36 files changed, 171 insertions, 171 deletions
diff --git a/npc/re/cities/dicastes.txt b/npc/re/cities/dicastes.txt index efd1c6efc..90130c3ab 100644 --- a/npc/re/cities/dicastes.txt +++ b/npc/re/cities/dicastes.txt @@ -26,7 +26,7 @@ dicastes01,194,159,5 script Excited Galten#a 4_MAN_GALTUN1,{ mes "As long as we have him,"; mes "it will only be a matter of time before Sapha"; mes "will rule this land."; - close; + close; } mes "¡ø¢²¢£ ¡Ð ¡ò¡ð¡ð"; mes "¡÷¡ø¡ñ ¡ü ¡ü"; @@ -49,7 +49,7 @@ dicastes01,202,86,3 script Sentinel#a 4_MAN_GALTUN1,{ next; mes "[Sentinel]"; mes "Hey, you are an outsider!"; - close; + close; } mes "¡ô¢±¢± ¡û ¡ó¡Ð¡ñ ¢£ ¢¤¡ú"; mes "¡ø¡ó¢² ¢¤ "; @@ -60,7 +60,7 @@ dicastes01,202,86,3 script Sentinel#a 4_MAN_GALTUN1,{ next; mes "[Sentinel]"; mes "¡ñ¡ö¡ï ¡ú ¡ó¢³¡ô"; - close; + close; } dicastes01,194,95,5 script Sentinel#b 4_MAN_GALTUN,{ @@ -69,7 +69,7 @@ dicastes01,194,95,5 script Sentinel#b 4_MAN_GALTUN,{ mes "I permit your entry."; mes "But if you dare to cause trouble"; mes "you won't know what hit you. Beware!"; - close; + close; } mes "¡ø¡ô¡ü ¡ø ¡ó"; mes "¡ø¡ï¡û ¡ó ¡û¢¤¢² ¡÷ ¢£"; @@ -96,7 +96,7 @@ dicastes01,244,166,0 script Training Galten#b 4_MAN_GALTUN,{ if (isequipped(2782)) { mes "I wonder if Ahat knows how"; mes "hard I am training."; - close; + close; } mes "¡ø¡ô¡ü ¡ø"; mes "¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü ¡ø"; @@ -127,7 +127,7 @@ dicastes01,248,129,0 script Training Galten#d 4_MAN_GALTUN,{ mes "I heard this isn't training"; mes "equipment but a massager"; mes "for trainees like me."; - close; + close; } mes "¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü"; mes "¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü ¡ø"; @@ -155,7 +155,7 @@ dic_in01,349,282,4 script Waiting Galten#in_1 4_MAN_GALTUN1,{ mes "[Waiting Galten]"; mes "Here is the Battle Station."; mes "We are all tensed up to be ready for action."; - close; + close; } mes "[¢²¡Ð¡û ¡ù ¡Ð]"; mes "¡ñ¡õ¡ü ¢£ ¡ó"; @@ -167,7 +167,7 @@ dic_in01,370,261,1 script Waiting Galten#in_2 4_MAN_GALTUN1,{ if (isequipped(2782)) { mes "[Waiting Galten]"; mes "Boring."; - close; + close; } mes "[¢²¡Ð¡û ¡ù ¡Ð]"; mes "¡ù¢¤¢±"; @@ -178,7 +178,7 @@ dic_in01,381,261,1 script Waiting Galten#in_3 4_MAN_GALTUN1,{ if (isequipped(2782)) { mes "[Waiting Galten]"; mes "Zzzzz..."; - close; + close; } mes "[¢²¡Ð¡û ¡ù ¡Ð]"; mes "¡ú¡ô"; @@ -189,7 +189,7 @@ dic_in01,370,282,4 script Waiting Galten#in_4 4_MAN_GALTUN1,{ if (isequipped(2782)) { mes "[Waiting Galten]"; mes "El Dicastes is the most peaceful place in this world as long as I am here."; - close; + close; } mes "[¢²¡Ð¡û ¡ù ¡Ð]"; mes "¡ï¡ï¢³ ¡þ ¡ö¢³¢£ ¢± ¢³¡û¡õ ¡ø ¡þ¡ï¡ï ¡ø ¡û"; @@ -200,7 +200,7 @@ dic_in01,354,219,4 script Resting Galten#in_5 4_MAN_GALTUN1,{ if (isequipped(2782)) { mes "[Resting Galten]"; mes "Resting is always so sweet."; - close; + close; } mes "[¡õ¡ø¡ò ¡ü ¢¤]"; mes "¡ï¡õ¡ù ¡ö ¡ò¡ð¢² ¢³ ¡ö"; @@ -214,7 +214,7 @@ dic_in01,365,197,1 script Resting Galten#in_6 4_MAN_GALTUN1,{ next; mes "[Resting Galten]"; mes "You say I don't look like I'm resting? But I'm already used to this."; - close; + close; } mes "[¡õ¡ø¡ò ¡ü ¢¤]"; mes "¡ô¡ï¢¤ ¡ö ¡ù¡ð¡ñ ¡ü ¡ó¡û¡û"; @@ -230,7 +230,7 @@ dic_in01,29,119,4 script Resting Piom#04 4_MAN_PIOM6,{ if (isequipped(2782)) { mes "[Resting Piom]"; mes "Why is it so noisy when I'm trying to get rest?"; - close; + close; } mes "[¢£¡ù¡ò ¢¤ ¡ù]"; mes "¡ü¢²¡ð ¡Ð ¡ò¡ø¢² ¡ô ¢²¡õ"; @@ -246,7 +246,7 @@ dic_in01,91,113,5 script Suspicious Piom#a 4_MAN_PIOM6,{ if(select("Nope!:You first.") == 1) { mes "[Suspicious Piom]"; mes "Never mind."; - close; + close; } mes "[Suspicious Piom]"; mes "Oh, you do seem to know?"; @@ -258,11 +258,11 @@ dic_in01,91,113,5 script Suspicious Piom#a 4_MAN_PIOM6,{ mes "[Suspicious Piom]"; mes "I'm only a very curious"; mes "ordinary Piom."; - close; + close; } mes "[Suspicious Piom]"; mes "I am not going to say anything, either!"; - close; + close; } mes "¡ó¢³¡ó ¡ó ¡ó¡þ¡ö"; mes "¡õ ¢³¢²¡÷ ¡ó¡ó"; @@ -270,7 +270,7 @@ dic_in01,91,113,5 script Suspicious Piom#a 4_MAN_PIOM6,{ if(select("Can't tell what it means:Is it a curse??") == 2) { mes "[Suspicious Piom]"; mes "Too bad."; - close; + close; } mes "[Suspicious Piom]"; mes "Be on your"; @@ -285,7 +285,7 @@ dic_in01,168,116,5 script Tired Piom#c 4_MAN_PIOM5,{ mes "information, you'd have better"; mes "luck with the Cat Merchant than wandering around here."; mes "But of course you'll have to pay the price."; - close; + close; } mes "¡þ¡õ¡ð ¢³ ¢³¡þ"; mes "¡þ¡ø¡ð ¡ö ¡ñ¡ú¡ð ¡ò"; @@ -302,7 +302,7 @@ dic_in01,149,104,5 script Tired Piom#b 4_MAN_PIOM2,{ mes "I think the effects are weaker than before,"; mes "or is it just me?"; emotion e_what; - close; + close; } mes "¡ð¡Ð¡ú ¡ø ¢²"; mes "¡ö¡õ¡ó ¢¤ ¡ò¡ò¢³ ¡ô ¡ô¡ó¡ñ"; @@ -327,7 +327,7 @@ dic_in01,341,113,3 script Tired Piom#a 4_MAN_PIOM5,{ emotion e_swt; mes "[Tired Piom]"; mes "I'll be rejected again, right?"; - close; + close; } mes "¡÷¡ò¡û ¡ó ¡ó¡Ð¢±"; mes "¡ó¡õ¡ù ¡þ ¡ò¢±¡ñ ¡õ ¢£"; @@ -364,7 +364,7 @@ dic_in01,32,54,5 script Venknick#el_01 4_MAN_BENKUNI,{ mes "[Venknick]"; mes "Oh feels so refreshed."; mes "The refined Bradium was the best ever. Do you want to try some?"; - close; + close; } mes "[¡ó¡ò¡ð]"; mes "¡ù¡ó¢¤ ¢± ¢£"; @@ -408,7 +408,7 @@ dic_in01,360,125,5 script Serious Venknicka 4_MAN_BENKUNI,{ mes "A sudden increase in Bradium production."; mes "Why?"; mes "I will have to get more factory lines running."; - close; + close; } mes "¡û¡õ¡ñ ¢² ¢²¢¤¡Ð ¢² ¡ü¡ñ¡õ"; mes "¡þ¡ó¡ö ¢²"; @@ -418,7 +418,7 @@ dic_in01,360,125,5 script Serious Venknicka 4_MAN_BENKUNI,{ dic_in01,42,250,5 script Guide#diel_1 4_MAN_PIOM6,{ if (isequipped(2782)) { - if (ep13_3_invite > 5) { + if (ep13_3_invite > 5) { mes "[Guide]"; mes "I'm Dior, your kind guide for El Dicastes."; mes "How can I help you?"; @@ -437,7 +437,7 @@ dic_in01,42,250,5 script Guide#diel_1 4_MAN_PIOM6,{ mes "[Guide]"; mes "Oh, you didn't ask?"; mes "But since I'm Dior, the kind guide. He he."; - close; + close; } mes "- The guide looks at you with an alert expression. -"; close; @@ -465,14 +465,14 @@ dic_in01,42,250,5 script Guide#diel_1 4_MAN_PIOM6,{ dic_in01,335,34,5 script Talkative Piom#a 4_MAN_PIOM4,{ mes "[Talkative Piom]"; - if (isequipped(2782)) { + if (isequipped(2782)) { mes "At my factory"; mes "we not only refine Bradium,"; mes "but we also produce various"; mes "tools for daily use."; mes "We manufacture war supplies"; mes "here too."; - close; + close; } mes "¡ü¡ù¢± ¢³"; mes "¡÷¡ø¡ï ¡þ ¡ó¡ó"; @@ -488,7 +488,7 @@ dic_in01,387,30,1 script Manuk Piom#a 4_MAN_PIOM,{ if (isequipped(2782)) { mes "You! We met in Manuk, didn't we?"; mes "I've come to pick up the weapon I ordered."; - close; + close; } mes "¡ü¡ó¡þ ¡ó ¡ï¡ð¢¤ ¡ü ¡ð¢±"; mes "¡ù¡ô¡ï ¡ú ¡ñ¡ù¢³ ¡ó ¡ò¡ö¡ó ¡ô¡ô"; @@ -503,7 +503,7 @@ dicastes01,282,210,4 script Free Knit#a 4_MAN_NITT,{ mes "Saphas can live forever."; mes "Our childhood lasts 10 years,"; mes "which is short."; - close; + close; } mes "¡ñ¡þ¡ð ¡ó ¡ü¡ò¡ö ¡÷"; mes "¢³¡ð¡ï ¢£ ¡ù¡ô¡ò ¡ô ¡ó¡þ¡ñ ¢² ¡ñ¡û¢£ ¢²"; @@ -527,7 +527,7 @@ dicastes01,246,210,3 script Free Venknick#a 4_MAN_BENKUNI,{ mes "[Free Venknick]"; mes "The thing rolling around is a gem,"; mes "but why are you interested in it?"; - close; + close; } mes "¡ô¡ï¢£ ¢¤ ¡÷¡õ¢± ¡ü ¡ñ¡õ"; mes "¡ü¢³"; @@ -549,7 +549,7 @@ dicastes01,235,245,4 script Excited Piom#a 4_MAN_PIOM4,{ mes "Have you seen Ahat?"; emotion e_ho; mes "His popularity here in El Discastes is phenomenal!"; - close; + close; } mes "[Excited Piom]"; mes "¡ú¡þ¡ó ¢³ ¡ü¢²¡ñ ¢±"; @@ -566,7 +566,7 @@ dicastes01,284,262,3 script Favorable Knit#a 4_MAN_NITT,{ mes "We start by living together in common facilities after we are born."; mes "That is why all Saphas are like family."; mes "We never have any quarrels between classes."; - close; + close; } mes "¡ô¢±¡ó ¡õ ¡ú¡÷¡Ð ¡õ"; mes "¡ü¡ï¡Ð ¡õ ¡ô¡ó¡ü ¡ó ¢³"; @@ -585,7 +585,7 @@ dicastes01,164,180,4 script Limpy Piom#a 4_MAN_PIOM6,{ mes "I hope it doesn't come all"; mes "the way to the capital city here."; emotion e_dots; - close; + close; } mes "¢²¡ô¡þ ¡ù ¡õ¡Ð"; mes "¢³¡ô¡û ¡ú ¡ø"; @@ -610,7 +610,7 @@ dicastes01,191,202,4 script Complaining Galten#fihs 4_MAN_GALTUN,{ mes "[Complaining Galten]"; mes "Then you don't know about the legend behind the statue?"; mes "Then, I don't know what to talk about with you."; - close; + close; } emotion e_gg,0,"Crazy Venknick#fihsing1"; mes "[Complaining Galten]"; @@ -645,7 +645,7 @@ dicastes01,202,197,4 script Crazy Venknick#fihsing1 4_MAN_BENKUNI,{ if(select("Give 5000 Zeny.:Don't give 5000 Zeny.") == 2) { mes "[Crazy Venknick]"; mes "Don't come back with regrets."; - close; + close; } if (Zeny < 5000) { mes "[Crazy Venknick]"; @@ -653,7 +653,6 @@ dicastes01,202,197,4 script Crazy Venknick#fihsing1 4_MAN_BENKUNI,{ mes "no legend to share with"; mes "the poor."; close; - close; } Zeny -= 5000; mes "[Crazy Venknick]"; @@ -676,7 +675,7 @@ dicastes01,202,197,4 script Crazy Venknick#fihsing1 4_MAN_BENKUNI,{ sc_start SC_BLIND,20000,0; next; mes "You feel outraged at being tricked."; - close; + close; } mes "[¡ö¡ú¡ù ¢³ ]"; mes "¢²¡û¡ó ¡ó ¡ù¢¤¡ø"; diff --git a/npc/re/cities/malangdo.txt b/npc/re/cities/malangdo.txt index ae5d8b48c..e8cfdb615 100644 --- a/npc/re/cities/malangdo.txt +++ b/npc/re/cities/malangdo.txt @@ -359,7 +359,7 @@ OnTouch: case 3: soundeffect "assassin_of_sunset.wav",0; break; - case 4: + case 4: emotion e_ho; emotion e_ho,0,"Wandering Minstrel#mal"; break; diff --git a/npc/re/guides/guides_dicastes.txt b/npc/re/guides/guides_dicastes.txt index e5b6f4133..9feca9df7 100644 --- a/npc/re/guides/guides_dicastes.txt +++ b/npc/re/guides/guides_dicastes.txt @@ -84,7 +84,7 @@ dicastes01,181,191,5 script Traveler Ichack#info 4_M_SHADOWCHASER,2,2,{ close; } OnTouch: - if (ep13_3_invite == 6) + if (ep13_3_invite == 6) emotion e_gasp,0; end; } diff --git a/npc/re/instances/BangungotHospital.txt b/npc/re/instances/BangungotHospital.txt index de076489e..b995092a1 100644 --- a/npc/re/instances/BangungotHospital.txt +++ b/npc/re/instances/BangungotHospital.txt @@ -392,7 +392,7 @@ OnInstanceInit: disablenpc instance_npcname("#Memorial Start_time"); end; OnEnable: - specialeffect EF_BAT2,AREA,instance_npcname("#Memorial Start"); + specialeffect EF_BAT2,AREA,instance_npcname("#Memorial Start"); initnpctimer; end; OnDisable: diff --git a/npc/re/instances/BuwayaCave.txt b/npc/re/instances/BuwayaCave.txt index f20a7e3b5..0a26dab9c 100644 --- a/npc/re/instances/BuwayaCave.txt +++ b/npc/re/instances/BuwayaCave.txt @@ -142,7 +142,7 @@ OnTouch: setquest 4229; warp "1@ma_c",35,57; end; - } + } case 2: mes "[Guard]"; mes "You must value your life."; diff --git a/npc/re/instances/HazyForest.txt b/npc/re/instances/HazyForest.txt index c76fe2c46..0c32c73c6 100644 --- a/npc/re/instances/HazyForest.txt +++ b/npc/re/instances/HazyForest.txt @@ -111,8 +111,9 @@ bif_fild01,158,340,5 script Laphine Soldier#mist 4_M_FAIRYSOLDIER,{ mes "but maybe you humans can."; mes "Good luck!"; close; - } else + } else { instance_destroy(.@instance); + } case 2: mes "[Laphine Soldier]"; mes "Well, you've made the right decision."; @@ -156,13 +157,13 @@ bif_fild01,161,355,0 script Log Tunnel CLEAR_NPC,{ mes "The world beyond the log tunnel looks dark and suffocating."; mes "Your instinct is screaming that this forest is dangerous."; close; - } else { + } else { if (checkquest(7211,PLAYTIME) == 2) erasequest 7211; if (checkquest(7211,PLAYTIME) == -1) setquest 7211; mapannounce "bif_fild01",getpartyname(getcharid(1))+" party's "+strcharinfo(0)+" member is entering the Mistwood Maze.",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0 warp "1@mist",89,29; close; - } + } } // Instance Scripts diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt index 33027e830..4be3133bc 100644 --- a/npc/re/instances/OldGlastHeim.txt +++ b/npc/re/instances/OldGlastHeim.txt @@ -480,7 +480,7 @@ OnTimer35000: end; OnTimer45000: donpcevent instance_npcname("Himmelmez#ghinstance1")+"::OnTalk4"; - end; + end; OnTimer50000: donpcevent instance_npcname("Himmelmez#ghinstance1")+"::OnTalk5"; end; @@ -517,7 +517,7 @@ OnTimer85000: hideonnpc instance_npcname("Khalitzburg Crusader#22"); set .@map$, instance_mapname("1@gl_k"); - set .@label$, instance_npcname("#talkinstance1")+"::OnMyMobDead"; + set .@label$, instance_npcname("#talkinstance1")+"::OnMyMobDead"; monster .@map$,145,59,"Abyss Knight",2470,1,.@label$; monster .@map$,154,59,"Abyss Knight",2470,1,.@label$; monster .@map$,145,69,"Abyss Knight",2470,1,.@label$; @@ -558,7 +558,7 @@ OnTimer88000: hideonnpc instance_npcname(".#ghinstance22"); set .@map$, instance_mapname("1@gl_k"); - set .@label$, instance_npcname("#talkinstance1")+"::OnMyMobDead"; + set .@label$, instance_npcname("#talkinstance1")+"::OnMyMobDead"; monster .@map$,145,54,"Khalitzburg",2471,1,.@label$; monster .@map$,154,54,"Khalitzburg",2471,1,.@label$; monster .@map$,145,64,"Khalitzburg",2471,1,.@label$; @@ -1771,7 +1771,7 @@ OnTalk1: } 2@gl_k,158,252,3 script Himmelmez#ghinstance4 4_F_HIMEL,4,4,{ - end; + end; OnInstanceInit: donpcevent instance_npcname("Himmelmez#ghinstance4")+"::OnDisable"; end; diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt index 114555547..8faa15cf2 100644 --- a/npc/re/instances/WolfchevLaboratory.txt +++ b/npc/re/instances/WolfchevLaboratory.txt @@ -434,13 +434,13 @@ lighthalzen,342,291,4 script Weird old man#Bio4Reward 4_M_EINOLD,{ mes "These are the armors I have."; next; for(.@i = 1; .@i < 8; .@i++) { - if(((.@i == 1 || .@i == 5) && (countitem(Will_Of_Warrior) >= 100) && (countitem(Blood_Thirst) >= 50) && - (countitem(Goast_Chill) >= 35)) || - ((.@i == 2 || .@i == 3) && (countitem(Will_Of_Warrior) >= 100) && (countitem(Blood_Thirst) >= 50) && + if(((.@i == 1 || .@i == 5) && (countitem(Will_Of_Warrior) >= 100) && (countitem(Blood_Thirst) >= 50) && + (countitem(Goast_Chill) >= 35)) || + ((.@i == 2 || .@i == 3) && (countitem(Will_Of_Warrior) >= 100) && (countitem(Blood_Thirst) >= 50) && (countitem(Goast_Chill) >= 22)) || - ((.@i == 4 || .@i == 7) && (countitem(Will_Of_Warrior) >= 300) && (countitem(Blood_Thirst) >= 300) && + ((.@i == 4 || .@i == 7) && (countitem(Will_Of_Warrior) >= 300) && (countitem(Blood_Thirst) >= 300) && (countitem(Goast_Chill) >= 400)) || - ((.@i == 6) && (countitem(Will_Of_Warrior) >= 100) && (countitem(Blood_Thirst) >= 50) && + ((.@i == 6) && (countitem(Will_Of_Warrior) >= 100) && (countitem(Blood_Thirst) >= 50) && (countitem(Goast_Chill) >= 30))) { .@armor$[.@i] = "^0000FF"; } else { @@ -465,8 +465,8 @@ lighthalzen,342,291,4 script Weird old man#Bio4Reward 4_M_EINOLD,{ break; case 2: mes "<<Giant Shield[1]>>"; - mes "Decrease 5% of Damage from Large Monsters, if Refine Lv is 9, decrease 5% more of the Damage."; - mes "Shield / Def 130 / Weight 280 / Required Lv 100 / Socket 1 / for 3rd Swordman Classes"; + mes "Decrease 5% of Damage from Large Monsters, if Refine Lv is 9, decrease 5% more of the Damage."; + mes "Shield / Def 130 / Weight 280 / Required Lv 100 / Socket 1 / for 3rd Swordman Classes"; callsub L_Reward, Giant_Shield, 100, 50, 35; break; case 3: @@ -516,15 +516,15 @@ lighthalzen,342,291,4 script Weird old man#Bio4Reward 4_M_EINOLD,{ mes "These are the Weapons I got."; next; for(.@i = 1; .@i < 15; .@i++) { - if(((.@i == 1) && (countitem(Will_Of_Warrior) >= 50) && (countitem(Blood_Thirst) >= 100) && + if(((.@i == 1) && (countitem(Will_Of_Warrior) >= 50) && (countitem(Blood_Thirst) >= 100) && (countitem(Goast_Chill) >= 10)) || - ((.@i == 2) && (countitem(Will_Of_Warrior) >= 50) && (countitem(Blood_Thirst) >= 100) && + ((.@i == 2) && (countitem(Will_Of_Warrior) >= 50) && (countitem(Blood_Thirst) >= 100) && (countitem(Goast_Chill) >= 85)) || - ((.@i == 3 || .@i == 4 || (.@i >= 8 && .@i < 11) || .@i >= 12) && (countitem(Will_Of_Warrior) >= 50) && + ((.@i == 3 || .@i == 4 || (.@i >= 8 && .@i < 11) || .@i >= 12) && (countitem(Will_Of_Warrior) >= 50) && (countitem(Blood_Thirst) >= 100) && (countitem(Goast_Chill) >= 35)) || ((.@i == 5 || .@i == 7 || .@i == 11) && (countitem(Will_Of_Warrior) >= 50) && (countitem(Blood_Thirst) >= 100) && (countitem(Goast_Chill) >= 40)) || - ((.@i == 6) && (countitem(Will_Of_Warrior) >= 300) && (countitem(Blood_Thirst) >= 300) && + ((.@i == 6) && (countitem(Will_Of_Warrior) >= 300) && (countitem(Blood_Thirst) >= 300) && (countitem(Goast_Chill) >= 400))) { .@weapon$[.@i] = "^0000FF"; } else { @@ -865,7 +865,7 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{ .@equipped$[.@i] = getequipname(.@parts[.@i]); } } - switch(select("I changed my mind.", .@equipped$[0], .@equipped$[1], .@equipped$[2], .@equipped$[3], .@equipped$[4], + switch(select("I changed my mind.", .@equipped$[0], .@equipped$[1], .@equipped$[2], .@equipped$[3], .@equipped$[4], .@equipped$[5], .@equipped$[6])) { case 1: mes "[Pudding]"; @@ -947,8 +947,8 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{ .@refine_count = getequiprefinerycnt(.@position); .@equip_item = getequipid(.@position); .@lhz_max_num = 4000; - if(.@equip_item == Agent_Katar || .@equip_item == Guillotine_Katar || .@equip_item == Ygnus_Stale || - .@equip_item == End_Sektura || .@equip_item = Cannon_Spear || .@equip_item == Giant_Lance || + if(.@equip_item == Agent_Katar || .@equip_item == Guillotine_Katar || .@equip_item == Ygnus_Stale || + .@equip_item == End_Sektura || .@equip_item = Cannon_Spear || .@equip_item == Giant_Lance || .@equip_item == Aztoe_Nail || .@equip_item == Scarletto_Nail || .@equip_item == Bloody_Cross) { .@type = 1; if(.@equip_item == Giant_Lance) @@ -958,7 +958,7 @@ lhz_cube,233,24,4 script Sorcerer#Bio4Reward 4_M_UMDANCEKID,{ } else if(.@equip_item == Chilly_Spell_Book || .@equip_item == Recovery_Light) { .@type = 3; } else if(.@equip_item== Giant_Shield || .@equip_item == Geffenia_Book_Water || .@equip_item == Bible_Of_Promise2 || - .@equip_item == Salvage_Cape || .@equip_item == Assassin_Handcuffs || .@equip_item == Green_Operation_Coat || + .@equip_item == Salvage_Cape || .@equip_item == Assassin_Handcuffs || .@equip_item == Green_Operation_Coat || .@equip_item == Ancient_Gold_Deco) { if(.@equip_item == Salvage_Cape || .@equip_item == Ancient_Gold_Deco) .@lhz_max_num = 4200; @@ -2020,7 +2020,7 @@ lhz_dun04,151,276,3 script Researcher#memo 4_LGTSCIENCE,{ mes "Now, your party is free to pass the entrance."; } else { instance_destroy(.@instance); - } + } } close; } else { @@ -2249,7 +2249,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ OnEnable: specialeffect EF_LIGHTSPHERE; enablenpc instance_npcname("Manual Sheet#1_1"); - end; + end; } // Left Valve @@ -2865,7 +2865,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ monster .@map$,85,58,"Starving Lab animal",MD_DESERT_WOLF,1,.@label$; monster .@map$,82,60,"Starving Lab animal",MD_DESERT_WOLF_B,1,.@label$; monster .@map$,83,58,"Starving Lab animal",MD_DESERT_WOLF_B,1,.@label$; - monster .@map$,85,56,"Starving Lab animal",MD_DESERT_WOLF_B,1,.@label$; + monster .@map$,85,56,"Starving Lab animal",MD_DESERT_WOLF_B,1,.@label$; monster .@map$,86,60,"Starving Lab animal",MD_DESERT_WOLF_B,1,.@label$; monster .@map$,87,58,"Starving Lab animal",MD_DESERT_WOLF_B,1,.@label$; end; @@ -3135,7 +3135,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ end; case 13: donpcevent instance_npcname("Howard Alt-Eisen#boss13")+"::OnEnable"; - end; + end; } OnDisable: diff --git a/npc/re/jobs/novice/supernovice_ex.txt b/npc/re/jobs/novice/supernovice_ex.txt index 05d98dc96..044e386fe 100644 --- a/npc/re/jobs/novice/supernovice_ex.txt +++ b/npc/re/jobs/novice/supernovice_ex.txt @@ -477,7 +477,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 4_M_SIT_NOVICE,{ nude; callfunc "F_ClearJobVar"; // -- Clears all job variables for the current player jobchange roclass(eaclass()|EAJL_THIRD); - set EXSUPNOV_Q,5; + set EXSUPNOV_Q,5; emotion e_heh; mes "[Nodor]"; mes "Puhahahahahahahahahahah!!"; diff --git a/npc/re/kafras/kafras.txt b/npc/re/kafras/kafras.txt index 448bbc8c4..3e94f180d 100644 --- a/npc/re/kafras/kafras.txt +++ b/npc/re/kafras/kafras.txt @@ -9,12 +9,12 @@ //= arg(0): 0 - Default Kafra message //= 1 - Niflhiem Kafra message //= 2 - Guild Kafra message -//= arg(1): 1 - Disable teleport menu +//= arg(1): 1 - Disable teleport menu //= arg(2): 1 - Disable info menu //= arg(3): Cost of Storage service //= arg(4): Cost of Rent a Pushcart service //===== Additional Comments: ================================= -//= 0.x Previous Authors: +//= 0.x Previous Authors: //= - L0ne_W0lf, Daegaladh //= 1.0 Merged and cleaned up Kafras. [Euphy] //= 1.1 Added Dewata Kafra. [Lemongrass] diff --git a/npc/re/merchants/refine.txt b/npc/re/merchants/refine.txt index 4905feb4a..db57a1d5d 100644 --- a/npc/re/merchants/refine.txt +++ b/npc/re/merchants/refine.txt @@ -226,7 +226,7 @@ function script refinenew { } else set .@menu2,2; switch(.@menu2){ - case 1: + case 1: set .@refinecnt,.@safe - getequiprefinerycnt(.@part); break; case 2: diff --git a/npc/re/mobs/dungeons/alde_dun.txt b/npc/re/mobs/dungeons/alde_dun.txt index 5f1570b49..56ed111e7 100644 --- a/npc/re/mobs/dungeons/alde_dun.txt +++ b/npc/re/mobs/dungeons/alde_dun.txt @@ -11,13 +11,13 @@ //============================================================ //================================================== -// alde_dun01 - Clock Tower B1f +// alde_dun01 - Clock Tower B1f //================================================== alde_dun01,0,0,0,0 monster Arclouze 1194,50,5000,0,0 alde_dun01,0,0,0,0 monster Drainliar 1111,40,5000,0,0 //================================================== -// alde_dun02 - Clock Tower B2f +// alde_dun02 - Clock Tower B2f //================================================== alde_dun02,0,0,0,0 monster High Orc 1213,50,5000,0,0 alde_dun02,0,0,0,0 monster Brilight 1211,20,5000,0,0 @@ -25,7 +25,7 @@ alde_dun02,0,0,0,0 monster Arclouze 1194,20,5000,0,0 alde_dun02,0,0,0,0 monster Orc Archer 1189,20,5000,0,0 //================================================== -// alde_dun03 - Clock Tower B3f +// alde_dun03 - Clock Tower B3f //================================================== alde_dun03,0,0,0,0 monster Penomena 1216,85,5000,0,0 alde_dun03,0,0,0,0 monster Cramp 1209,56,5000,0,0 diff --git a/npc/re/mobs/dungeons/beach_dun.txt b/npc/re/mobs/dungeons/beach_dun.txt index 658444a76..0e4d2ee26 100644 --- a/npc/re/mobs/dungeons/beach_dun.txt +++ b/npc/re/mobs/dungeons/beach_dun.txt @@ -12,7 +12,7 @@ //============================================================ //================================================== -// beach_dun - Karu, the West cave +// beach_dun - Karu, the West cave //================================================== beach_dun,0,0,0,0 monster Medusa 1148,60,5000,0,0 beach_dun,0,0,0,0 monster Nereid 1255,20,5000,0,0 @@ -21,7 +21,7 @@ beach_dun,0,0,0,0 monster Merman 1264,3,5000,0,0 beach_dun,0,0,0,0 boss_monster Tao Gunka 1583,1,18000000,600000,0 //================================================== -// beach_dun2 - Ruande the northern cave +// beach_dun2 - Ruande the northern cave //================================================== beach_dun2,0,0,0,0 monster Stalactic Golem 1278,65,5000,0,0 beach_dun2,0,0,0,0 monster Tri Joint 1279,20,5000,0,0 @@ -30,7 +30,7 @@ beach_dun2,0,0,0,0 monster Hydra 1068,10,5000,0,0 beach_dun2,0,0,0,0 monster Nereid 1255,3,5000,0,0 //================================================== -// beach_dun3 - Mao, the East Cave +// beach_dun3 - Mao, the East Cave //================================================== beach_dun3,0,0,0,0 monster Thara Frog 1034,50,5000,0,0 beach_dun3,0,0,0,0 monster Megalodon 1064,30,5000,0,0 diff --git a/npc/re/mobs/dungeons/glastheim.txt b/npc/re/mobs/dungeons/glastheim.txt index 267541aa5..fa746ef29 100644 --- a/npc/re/mobs/dungeons/glastheim.txt +++ b/npc/re/mobs/dungeons/glastheim.txt @@ -35,7 +35,7 @@ gl_cas01,0,0,0,0 monster Owl Baron 1295,6,5000,0,0 gl_cas01,0,0,0,0 monster Alice 1275,1,5000,0,0 //================================================== -// gl_cas02 - Glast Heim 2f +// gl_cas02 - Glast Heim 2f //================================================== gl_cas02,0,0,0,0 monster Wanderer 1208,41,5000,0,0 gl_cas02,0,0,0,0 monster Raydric 1163,36,5000,0,0 diff --git a/npc/re/mobs/dungeons/kh_dun.txt b/npc/re/mobs/dungeons/kh_dun.txt index b4c700534..4e9d1fbf7 100644 --- a/npc/re/mobs/dungeons/kh_dun.txt +++ b/npc/re/mobs/dungeons/kh_dun.txt @@ -12,7 +12,7 @@ //============================================================ //================================================== -// kh_dun01 - Robot Factory level 1 +// kh_dun01 - Robot Factory level 1 //================================================== kh_dun01,0,0,0,0 monster Aliza 1737,45,5000,0,0 kh_dun01,0,0,0,0 monster Alice 1275,25,5000,0,0 @@ -32,7 +32,7 @@ kh_dun02,0,0,0,0 monster Constant 1745,5,5000,0,0 kh_dun02,0,0,0,0 boss_monster Kiel D-01 1734,1,7200000,600000,0 //================================================== -// kh_kiehl01 - Kiehl's Room +// kh_kiehl01 - Kiehl's Room //================================================== kh_kiehl01,0,0,0,0 monster Constant 1745,10,5000,0,0 kh_kiehl01,67,171,5,5 monster Aliot 1740,1,180000,120000,0 diff --git a/npc/re/mobs/dungeons/lou_dun.txt b/npc/re/mobs/dungeons/lou_dun.txt index 1c6637712..6f50cebad 100644 --- a/npc/re/mobs/dungeons/lou_dun.txt +++ b/npc/re/mobs/dungeons/lou_dun.txt @@ -11,7 +11,7 @@ //============================================================ //================================================== -// lou_dun01 - The Royal Tomb +// lou_dun01 - The Royal Tomb //================================================== lou_dun01,0,0,0,0 monster Jing Guai 1517,45,5000,0,0 lou_dun01,0,0,0,0 monster Grizzly 1381,15,5000,0,0 @@ -31,7 +31,7 @@ lou_dun02,0,0,0,0 monster Mimic 1191,5,5000,0,0 lou_dun02,0,0,0,0 monster Zhu Po Long 1514,5,5000,0,0 //================================================== -// lou_dun03 - Suei Long Gon +// lou_dun03 - Suei Long Gon //================================================== lou_dun03,0,0,0,0 monster Zhu Po Long 1514,25,5000,0,0 lou_dun03,0,0,0,0 monster Yao Jun 1512,25,5000,0,0 diff --git a/npc/re/mobs/dungeons/prt_sew.txt b/npc/re/mobs/dungeons/prt_sew.txt index a7608aa7c..0ec2fe5dd 100644 --- a/npc/re/mobs/dungeons/prt_sew.txt +++ b/npc/re/mobs/dungeons/prt_sew.txt @@ -10,7 +10,7 @@ //============================================================ //================================================== -// prt_sewb1 - Prontera Culvert +// prt_sewb1 - Prontera Culvert //================================================== prt_sewb1,0,0,0,0 monster Thief Bug 1051,30,5000,0,0 prt_sewb1,0,0,0,0 monster Thief Bug Egg 1048,80,5000,0,0 diff --git a/npc/re/mobs/dungeons/ra_san.txt b/npc/re/mobs/dungeons/ra_san.txt index 51f7c42fd..eea77aa0f 100644 --- a/npc/re/mobs/dungeons/ra_san.txt +++ b/npc/re/mobs/dungeons/ra_san.txt @@ -20,7 +20,7 @@ ra_san01,0,0,0,0 monster Beholder 1633,6,5000,0,0 ra_san01,0,0,0,0 monster Hodremlin 1773,6,5000,0,0 //================================================== -// ra_san02 - Holy Ground +// ra_san02 - Holy Ground //================================================== ra_san02,0,0,0,0 monster Isilla 1772,85,5000,0,0 ra_san02,0,0,0,0 monster Vanberk 1771,30,5000,0,0 diff --git a/npc/re/mobs/dungeons/tha_t.txt b/npc/re/mobs/dungeons/tha_t.txt index eb84e8975..efa7cca38 100644 --- a/npc/re/mobs/dungeons/tha_t.txt +++ b/npc/re/mobs/dungeons/tha_t.txt @@ -85,7 +85,7 @@ tha_t06,0,0,0,0 monster Plasma 1694,10,5000,0,0 tha_t06,0,0,0,0 monster Maero of Thanatos 1706,2,5000,0,0 //================================================== -// tha_t07 - Thanatos Tower - Upper Level +// tha_t07 - Thanatos Tower - Upper Level //================================================== tha_t07,0,0,0,0 monster Baroness of Retribution 1702,15,5000,0,0 tha_t07,0,0,0,0 monster Death Word 1698,10,5000,0,0 diff --git a/npc/re/mobs/fields/comodo.txt b/npc/re/mobs/fields/comodo.txt index 45a39f7bb..d2d4ef236 100644 --- a/npc/re/mobs/fields/comodo.txt +++ b/npc/re/mobs/fields/comodo.txt @@ -65,7 +65,7 @@ cmd_fild06,293,235,5,5 monster Yellow Plant 1081,2,1800000,900000,1 cmd_fild06,84,375,10,10 monster Yellow Plant 1081,3,1800000,900000,1 //================================================== -// cmd_fild07 - Beacon Island, Pharos +// cmd_fild07 - Beacon Island, Pharos //================================================== cmd_fild07,0,0,0,0 monster Raggler 1254,100,5000,0,0 cmd_fild07,0,0,0,0 monster Aster 1266,30,5000,0,0 diff --git a/npc/re/mobs/fields/mjolnir.txt b/npc/re/mobs/fields/mjolnir.txt index 78e39d96b..fddd95c6b 100644 --- a/npc/re/mobs/fields/mjolnir.txt +++ b/npc/re/mobs/fields/mjolnir.txt @@ -159,7 +159,7 @@ mjolnir_07,97,210,0,0 monster Green Plant 1080,1,180000,90000,1 mjolnir_07,249,214,0,0 monster Blue Plant 1079,2,360000,180000,1 //================================================== -// mjolnir_08 - Mt.Mjolnir +// mjolnir_08 - Mt.Mjolnir //================================================== mjolnir_08,0,0,0,0 monster Beetle King 1494,140,5000,0,0 mjolnir_08,0,0,0,0 monster Savage 1166,30,5000,0,0 @@ -200,7 +200,7 @@ mjolnir_10,123,331,10,10 monster Shining Plant 1083,1,1800000,900000,1 mjolnir_10,0,0,0,0 monster Green Plant 1080,10,180000,90000,1 //================================================== -// mjolnir_11 - Mt.Mjolnir +// mjolnir_11 - Mt.Mjolnir //================================================== mjolnir_11,0,0,0,0 monster Argiope 1099,130,5000,0,0 mjolnir_11,0,0,0,0 monster Argos 1100,35,5000,0,0 @@ -220,7 +220,7 @@ mjolnir_11,282,300,0,0 monster Green Plant 1080,1,180000,90000,1 mjolnir_11,295,271,0,0 monster Green Plant 1080,1,180000,90000,1 //================================================== -// mjolnir_12 - Mt.Mjolnir +// mjolnir_12 - Mt.Mjolnir //================================================== mjolnir_12,0,0,0,0 monster Dustiness 1114,130,5000,0,0 mjolnir_12,0,0,0,0 monster Hunter Fly 1035,35,5000,0,0 diff --git a/npc/re/mobs/fields/morocc.txt b/npc/re/mobs/fields/morocc.txt index 663f46134..048dda6ba 100644 --- a/npc/re/mobs/fields/morocc.txt +++ b/npc/re/mobs/fields/morocc.txt @@ -17,7 +17,7 @@ //============================================================ //================================================== -// moc_fild01 - Sograt Desert +// moc_fild01 - Sograt Desert //================================================== moc_fild01,0,0,0,0 monster Peco Peco 1019,130,5000,0,0 moc_fild01,0,0,0,0 monster Muka 1055,50,5000,0,0 @@ -25,7 +25,7 @@ moc_fild01,0,0,0,0 monster Peco Peco Egg 1047,20,5000,0,0 moc_fild01,194,51,10,10 monster Yellow Plant 1081,10,900000,450000,1 //================================================== -// moc_fild02 - Sograt Desert +// moc_fild02 - Sograt Desert //================================================== moc_fild02,0,0,0,0 monster Muka 1055,130,5000,0,0 moc_fild02,0,0,0,0 monster Peco Peco 1019,60,5000,0,0 @@ -46,7 +46,7 @@ moc_fild02,353,103,0,0 monster Green Plant 1080,1,180000,90000,1 moc_fild02,337,35,0,0 monster Green Plant 1080,1,180000,90000,1 //================================================== -// moc_fild03 - Sograt Desert +// moc_fild03 - Sograt Desert //================================================== moc_fild03,0,0,0,0 monster Wolf 1013,140,5000,0,0 moc_fild03,0,0,0,0 monster Argos 1100,20,5000,0,0 @@ -72,7 +72,7 @@ moc_fild03,200,263,5,5 monster Green Plant 1080,2,180000,90000,1 //================================================== //================================================== -// moc_fild07 - Sograt Desert +// moc_fild07 - Sograt Desert //================================================== moc_fild07,0,0,0,0 monster Drops 1113,140,5000,0,0 moc_fild07,0,0,0,0 monster Chonchon 1011,30,5000,0,0 @@ -101,7 +101,7 @@ moc_fild11,0,0,0,0 monster Condor 1009,30,5000,0,0 moc_fild11,0,0,0,0 monster Scorpion 1001,30,5000,0,0 //================================================== -// moc_fild12 - Sograt Desert +// moc_fild12 - Sograt Desert //================================================== moc_fild12,0,0,0,0 monster Picky 1049,50,5000,0,0 moc_fild12,0,0,0,0 monster Picky 1050,50,5000,0,0 @@ -111,7 +111,7 @@ moc_fild12,0,0,0,0 monster Condor 1009,30,5000,0,0 moc_fild12,181,336,40,20 monster Yellow Plant 1081,10,180000,90000,1 //================================================== -// moc_fild13 - Sograt Desert +// moc_fild13 - Sograt Desert //================================================== moc_fild13,0,0,0,0 monster Steel Chonchon 1042,140,5000,0,0 moc_fild13,0,0,0,0 monster Wolf 1013,15,5000,0,0 @@ -157,7 +157,7 @@ moc_fild16,0,0,0,0 monster Hode 1127,30,5000,0,0 moc_fild16,0,0,0,0 monster Frilldora 1119,10,5000,0,0 //================================================== -// moc_fild17 - Sograt Desert +// moc_fild17 - Sograt Desert //================================================== moc_fild17,0,0,0,0 monster Hode 1127,130,5000,0,0 moc_fild17,0,0,0,0 monster Sandman 1165,30,5000,0,0 @@ -192,7 +192,7 @@ moc_fild18,325,272,0,0 monster Yellow Plant 1081,1,180000,90000,1 //================================================== //================================================== -// moc_fild20 - Sograt Desert - Continental Guard Quarantine +// moc_fild20 - Sograt Desert - Continental Guard Quarantine //================================================== moc_fild20,0,0,0,0 monster Incarnation of Morroc 1918,1,30000,0,0 moc_fild20,0,0,0,0 monster Incarnation of Morroc 1919,1,30000,0,0 @@ -200,7 +200,7 @@ moc_fild20,0,0,0,0 monster Incarnation of Morroc 1920,1,30000,0,0 moc_fild20,0,0,0,0 monster Incarnation of Morroc 1921,1,30000,0,0 //================================================== -// moc_fild21 - Dimensional Gorge +// moc_fild21 - Dimensional Gorge //================================================== moc_fild21,0,0,0,0 monster Incarnation of Morroc 1918,46,30000,0,0 moc_fild21,0,0,0,0 monster Incarnation of Morroc 1919,46,30000,0,0 @@ -208,7 +208,7 @@ moc_fild21,0,0,0,0 monster Incarnation of Morroc 1920,46,30000,0,0 moc_fild21,0,0,0,0 monster Incarnation of Morroc 1921,34,30000,0,0 //================================================== -// moc_fild22 - Dimensional Gorge +// moc_fild22 - Dimensional Gorge //================================================== moc_fild22,0,0,0,0 monster Incarnation of Morroc 1918,60,30000,0,0 moc_fild22,0,0,0,0 monster Incarnation of Morroc 1919,60,30000,0,0 diff --git a/npc/re/mobs/fields/payon.txt b/npc/re/mobs/fields/payon.txt index 0d2f13874..473bd2bfd 100644 --- a/npc/re/mobs/fields/payon.txt +++ b/npc/re/mobs/fields/payon.txt @@ -36,7 +36,7 @@ pay_fild01,70,246,0,0 monster Black Mushroom 1084,1,180000,90000,1 pay_fild01,0,0,0,0 monster Green Plant 1080,5,180000,90000,1 //================================================== -// pay_fild02 - Payon Forest +// pay_fild02 - Payon Forest //================================================== pay_fild02,0,0,0,0 monster Boa 1025,140,5000,0,0 pay_fild02,0,0,0,0 monster Wormtail 1024,30,5000,0,0 diff --git a/npc/re/mobs/fields/prontera.txt b/npc/re/mobs/fields/prontera.txt index ec7091e0b..7968cbdc0 100644 --- a/npc/re/mobs/fields/prontera.txt +++ b/npc/re/mobs/fields/prontera.txt @@ -13,7 +13,7 @@ //============================================================ //================================================== -// prt_fild00 - Prontera Field +// prt_fild00 - Prontera Field //================================================== prt_fild00,0,0,0,0 monster Roda Frog 1012,130,5000,0,0 prt_fild00,0,0,0,0 monster Ambernite 1094,50,5000,0,0 @@ -22,7 +22,7 @@ prt_fild00,227,212,0,0 monster Shining Plant 1083,1,1800000,900000,1 prt_fild00,285,138,10,10 monster Green Plant 1080,5,360000,180000,1 //================================================== -// prt_fild01 - Prontera Field +// prt_fild01 - Prontera Field //================================================== prt_fild01,0,0,0,0 monster Lunatic 1063,140,5000,0,0 prt_fild01,0,0,0,0 monster Poring 1002,30,5000,0,0 @@ -31,7 +31,7 @@ prt_fild01,199,266,3,3 monster Green Plant 1080,3,360000,180000,1 prt_fild01,199,266,3,3 monster Blue Plant 1079,1,900000,450000,1 //================================================== -// prt_fild02 - Prontera Field +// prt_fild02 - Prontera Field //================================================== prt_fild02,0,0,0,0 monster Stainer 1174,140,5000,0,0 prt_fild02,0,0,0,0 monster Creamy 1018,30,5000,0,0 @@ -41,7 +41,7 @@ prt_fild02,339,309,3,3 monster Shining Plant 1083,1,1800000,900000,1 prt_fild02,0,0,0,0 monster Shining Plant 1083,2,1800000,900000,1 //================================================== -// prt_fild03 - Prontera Field +// prt_fild03 - Prontera Field //================================================== prt_fild03,0,0,0,0 monster Yoyo 1057,100,5000,0,0 prt_fild03,0,0,0,0 monster Poporing 1031,30,5000,0,0 @@ -54,7 +54,7 @@ prt_fild03,147,219,5,5 monster Green Plant 1080,5,360000,180000,1 prt_fild03,148,107,5,5 monster Green Plant 1080,5,360000,180000,1 //================================================== -// prt_fild04 - Prontera Field +// prt_fild04 - Prontera Field //================================================== prt_fild04,0,0,0,0 monster Ambernite 1094,80,5000,0,0 prt_fild04,0,0,0,0 monster Roda Frog 1012,20,5000,0,0 @@ -62,7 +62,7 @@ prt_fild04,0,0,0,0 monster Vocal 1088,1,1800000,1200000,0 prt_fild04,350,114,10,10 monster Green Plant 1080,5,900000,450000,1 //================================================== -// prt_fild05 - Prontera Field +// prt_fild05 - Prontera Field //================================================== prt_fild05,0,0,0,0 monster Hornet 1004,140,5000,0,0 prt_fild05,0,0,0,0 monster Thief Bug Egg 1048,30,5000,0,0 @@ -71,7 +71,7 @@ prt_fild05,208,37,10,10 monster Green Plant 1080,6,900000,450000,1 prt_fild05,208,37,10,10 monster Blue Plant 1079,1,900000,450000,1 //================================================== -// prt_fild06 - Prontera Field +// prt_fild06 - Prontera Field //================================================== prt_fild06,0,0,0,0 monster Fabre 1007,140,5000,0,0 prt_fild06,0,0,0,0 monster Poring 1002,30,5000,0,0 @@ -79,7 +79,7 @@ prt_fild06,0,0,0,0 monster Lunatic 1063,30,5000,0,0 prt_fild06,222,30,40,10 monster Green Plant 1080,15,900000,450000,1 //================================================== -// prt_fild07 - Prontera Field +// prt_fild07 - Prontera Field //================================================== prt_fild07,0,0,0,0 monster Rocker 1052,150,5000,0,0 prt_fild07,0,0,0,0 monster Savage Babe 1167,50,5000,0,0 @@ -87,14 +87,14 @@ prt_fild07,0,0,0,0 monster Vocal 1088,1,1800000,1200000,0 prt_fild07,225,110,5,5 monster Black Mushroom 1084,3,360000,180000,1 //================================================== -// prt_fild08 - Prontera Field +// prt_fild08 - Prontera Field //================================================== prt_fild08,0,0,0,0 monster Poring 1002,140,5000,0,0 prt_fild08,0,0,0,0 monster Lunatic 1063,40,5000,0,0 prt_fild08,0,0,0,0 monster Fabre 1007,40,5000,0,0 //================================================== -// prt_fild08 - Duplicates +// prt_fild08 - Duplicates //================================================== prt_fild08a,0,0,0,0 monster Poring 1002,140,5000,0,0 prt_fild08b,0,0,0,0 monster Poring 1002,140,5000,0,0 @@ -110,14 +110,14 @@ prt_fild08c,0,0,0,0 monster Fabre 1007,40,5000,0,0 prt_fild08d,0,0,0,0 monster Fabre 1007,40,5000,0,0 //================================================== -// prt_fild09 - Prontera Field +// prt_fild09 - Prontera Field //================================================== prt_fild09,0,0,0,0 monster Magnolia 1138,140,5000,0,0 prt_fild09,0,0,0,0 monster Metaller 1058,60,5000,0,0 prt_fild09,237,115,5,5 monster Yellow Plant 1081,3,360000,180000,1 //================================================== -// prt_fild10 - Prontera Field +// prt_fild10 - Prontera Field //================================================== prt_fild10,0,0,0,0 monster Elder Willow 1033,140,5000,0,0 prt_fild10,0,0,0,0 monster Poporing 1031,20,5000,0,0 diff --git a/npc/re/mobs/fields/umbala.txt b/npc/re/mobs/fields/umbala.txt index 34e9d10de..24e93dfd2 100644 --- a/npc/re/mobs/fields/umbala.txt +++ b/npc/re/mobs/fields/umbala.txt @@ -11,7 +11,7 @@ //============================================================ //================================================== -// um_fild01 - Luluka Forest +// um_fild01 - Luluka Forest //================================================== um_fild01,0,0,0,0 monster Dryad 1493,70,5000,0,0 um_fild01,0,0,0,0 monster Stone Shooter 1495,15,5000,0,0 @@ -23,7 +23,7 @@ um_fild01,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1 um_fild01,0,0,0,0 monster Shining Plant 1083,5,180000,90000,1 //================================================== -// um_fild02 - Hoomga Forest +// um_fild02 - Hoomga Forest //================================================== um_fild02,0,0,0,0 monster Wootan Fighter 1499,40,5000,0,0 um_fild02,0,0,0,0 monster Stone Shooter 1495,15,5000,0,0 @@ -33,7 +33,7 @@ um_fild02,0,0,0,0 monster Red Plant 1078,5,180000,90000,1 um_fild02,0,0,0,0 monster Yellow Plant 1081,5,180000,90000,1 //================================================== -// um_fild03 - Kalala Swamp +// um_fild03 - Kalala Swamp //================================================== um_fild03,0,0,0,0 monster Parasite 1500,60,5000,0,0 um_fild03,0,0,0,0 monster Stone Shooter 1495,15,5000,0,0 @@ -44,7 +44,7 @@ um_fild03,0,0,0,0 monster Green Plant 1080,10,180000,90000,1 um_fild03,0,0,0,0 monster Shining Plant 1083,2,180000,90000,1 //================================================== -// um_fild04 - Hoomga Jungle +// um_fild04 - Hoomga Jungle //================================================== um_fild04,0,0,0,0 monster Wild Rose 1261,30,5000,0,0 um_fild04,0,0,0,0 monster Stone Shooter 1495,10,5000,0,0 diff --git a/npc/re/mobs/fields/veins.txt b/npc/re/mobs/fields/veins.txt index dd52b4257..54261c8d6 100644 --- a/npc/re/mobs/fields/veins.txt +++ b/npc/re/mobs/fields/veins.txt @@ -50,7 +50,7 @@ ve_fild03,200,212,114,60 monster Red Plant 1078,10,10000,0,1 ve_fild03,0,0,0,0 monster Yellow Plant 1081,10,10000,0,1 //================================================== -// ve_fild04 - Veins Field +// ve_fild04 - Veins Field //================================================== ve_fild04,0,0,0,0 monster Muscipular 1780,100,5000,0,0 ve_fild04,0,0,0,0 monster Drosera 1781,50,5000,0,0 diff --git a/npc/re/mobs/fields/yuno.txt b/npc/re/mobs/fields/yuno.txt index 40641ff5c..3916884ca 100644 --- a/npc/re/mobs/fields/yuno.txt +++ b/npc/re/mobs/fields/yuno.txt @@ -23,7 +23,7 @@ //============================================================ //================================================== -// yuno_fild01 - Border Posts +// yuno_fild01 - Border Posts //================================================== yuno_fild01,0,0,0,0 monster Geographer 1368,50,5000,0,0 yuno_fild01,0,0,0,0 monster Dustiness 1114,35,5000,0,0 @@ -112,7 +112,7 @@ yuno_fild08,0,0,0,0 monster Green Plant 1080,10,180000,90000,1 yuno_fild08,0,0,0,0 monster Yellow Plant 1081,10,180000,90000,1 //================================================== -// yuno_fild09 - Schwaltzvalt Guards Camp +// yuno_fild09 - Schwaltzvalt Guards Camp //================================================== yuno_fild09,0,0,0,0 monster Grand Peco 1369,130,5000,0,0 yuno_fild09,0,0,0,0 monster Sleeper 1386,30,5000,0,0 diff --git a/npc/re/quests/cupet.txt b/npc/re/quests/cupet.txt index 182214064..829ec2dae 100644 --- a/npc/re/quests/cupet.txt +++ b/npc/re/quests/cupet.txt @@ -158,7 +158,7 @@ function script cute_pet_manager { next; // Create Menu System - for (set .@a, 0; .@a < getarraysize(getarg(0)); set .@a, .@a + 1) { + for (set .@a, 0; .@a < getarraysize(getarg(0)); set .@a, .@a + 1) { set .@menu$, .@menu$ + (.@menu$ == "" ? "" : ":") + getitemname(getelementofarray(getarg(0), .@a)); } @@ -193,7 +193,7 @@ function script cute_pet_manager { mes "Do you want to exchange with me?"; next; - if (select("Exchange:Don't Exchange") == 2) { + if (select("Exchange:Don't Exchange") == 2) { mes "[Cute Pet Manager]"; mes "You don't? You will come back again."; close; diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt index f7481d04d..78107cc46 100644 --- a/npc/re/quests/eden/eden_iro.txt +++ b/npc/re/quests/eden/eden_iro.txt @@ -340,7 +340,7 @@ moc_para01,50,39,4 script Eve Natalia 4_F_SITDOWN,{ moc_para01,48,184,2 script Gum & Manual Exchanger 2_DROP_MACHINE,{ if (Weight < MaxWeight / 2) { mes "You're carrying too many items right now."; - close; + close; } mes "[Trader Machine]"; mes "Insert Bubble Gums and/or Battle Manuals to trade for higher efficiency Gums and Manuals."; diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt index cebd70b87..f1b54a9e7 100644 --- a/npc/re/quests/eden/eden_quests.txt +++ b/npc/re/quests/eden/eden_quests.txt @@ -4562,7 +4562,7 @@ moc_para01,111,83,3 script Toren 2_M_OLDBLSMITH,{ if (para_suv02 == 14) { setarray .@check[0],18514,2571,2473,15031; setarray .@item$[0],"Hat","Mantle","Boots","Uniform"; - for(set .@i,0; .@i<4; set .@i,.@i+1) + for(set .@i,0; .@i<4; set .@i,.@i+1) if (countitem(.@check[.@i]) < 1) { mes "[Toren]"; mes "Where is the Paradise "+.@item$[.@i]+" I gave you?"; diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt index 9478ba1c9..d17b63267 100644 --- a/npc/re/quests/quests_dicastes.txt +++ b/npc/re/quests/quests_dicastes.txt @@ -52,13 +52,13 @@ manuk,321,182,5 script Entrance Manager#ep133 4_MAN_GALTUN,{ if(select("Yes.:No.") == 2) { mes "[Entrance Manager]"; mes "Then use the tunnel next time."; - close; + close; } mes "[Entrance Manager]"; mes "Be careful."; close2; - warp "dic_dun01",33,212; - end; + warp "dic_dun01",33,212; + end; } mes "[Entrance Manager]"; mes "Sorry."; @@ -124,12 +124,12 @@ dic_dun01,266,113,5 script Curious Sapha#ep13_3_ 4_MAN_BENKUNI,{ if (.@deal == 0) { mes "[Curious Sapha]"; mes "You changed your mind?"; - close; + close; } if (Zeny < .@deal) { mes "[Curious Sapha]"; mes "You don't have enough money."; - close; + close; } mes "[Curious Sapha]"; mes "Will you buy "+.@input+"?"; @@ -354,7 +354,7 @@ OnEnable: mes "¡ð¡ú¢± ¡ô ¡ò¡õ¡ú ¡õ..!"; next; mes "- Cannot communicate with him. -"; - close; + close; } if (ep13_3_invite < 4) { mes "[Capital City Guard]"; @@ -426,11 +426,11 @@ dic_in01,254,119,0 script Item Storage#01 CLEAR_NPC,{ if(select("Use safe:No way.")==2) { mes "["+strcharinfo(0)+"]"; mes "I will use it later."; - close; + close; } if (Zeny < 500) { mes "Not enough Zeny."; - close; + close; } Zeny -= 500; close2; @@ -456,17 +456,17 @@ sec_in02,10,42,1 script 13.3 Related Reset 4_MAN_BENKUNI,{ function script que_dic { if (!getarg(0)) { if (checkquest(getarg(1),HUNTING) != 2) return; - mes getarg(3); + mes getarg(3); } else if (getarg(0) == 1) { if (checkquest(getarg(1)) == -1) return; if (countitem(getarg(3)) < getarg(4)) { mes "It looks like you are short on the amount."; - close; + close; } - mes getarg(5); + mes getarg(5); mes getarg(6,""); - delitem getarg(3), getarg(4); + delitem getarg(3), getarg(4); } else if (getarg(0) == 2) { for(set .@i,1; .@i<getargcount(); set .@i,.@i+1) { @@ -1044,7 +1044,7 @@ dic_in01,40,193,1 script Papyrus#0001 4_MAN_NITT,{ } else if (.@doc > 60 && .@doc <= 70) { mes "You suddenly feel nauseated. You feel like this won't go away any time soon. Finding the documents will have to wait."; setquest 12165; - close; + close; } else if (.@doc == 1) eldicastes_dp(12209,"Horn","Hard wedge-like horn from some insects. Doesn't have much practical use.",""); else if (.@doc == 2) eldicastes_dp(12195,"Horrendous Mouth","Tooth from a dead body.","Important material for research on time of death and health conditions. Useful in discovering human ecology."); @@ -1109,7 +1109,7 @@ dic_in01,40,193,1 script Papyrus#0001 4_MAN_NITT,{ mes "You've found a document about ^990099"+getarg(1)+"^000000. Check for details in the ^800080Quest Window^000000."; specialeffect2 EF_STEAL; setquest getarg(0); - close; + close; } } dic_in01,31,192,0 duplicate(Document Package#main) Document Package#0001 CLEAR_NPC @@ -1806,7 +1806,7 @@ OnTouch: mes "Just a moment."; } close2; - warp "dic_in01",155,188; + warp "dic_in01",155,188; } end; } @@ -3693,7 +3693,7 @@ dic_in01,245,119,4 script Shay#ep133_13 4_M_ACROSS,{ mes "What will it be?"; mes "I have Tropical Sograt and Vermilion on the Beach flown in from Morroc."; mes "A bit on the expensive side though."; - next; + next; if (select("Tropical Sorgrat - 2000z:Vermilion on the Beach - 2000z:Anything else?") == 3) { mes "[Shay]"; mes "Here.. "; @@ -3839,7 +3839,7 @@ dic_in01,245,119,4 script Shay#ep133_13 4_M_ACROSS,{ mes "What is it now?"; mes "Any luck?"; next; - setarray .@ward$, + setarray .@ward$, "7188","The Knits at the square are interested in Ahat.", "7189","I heard from Pioms that most of the Saphas are interested in the minister.", "7190","Galtens are interested in the Cat Merchant for their cat ears."; @@ -4841,7 +4841,7 @@ dic_fild01,231,174,5 script BK#ep133_18 4_M_MERCAT2,{ set ep13_3_secret, 11; getitem .@item[.@type], 1; erasequest 7193; - setquest 7194; + setquest 7194; donpcevent strnpcinfo(0)+"::OnDisable"; next; mes "[" + strcharinfo(0) + "]"; @@ -4902,7 +4902,7 @@ dic_fild01,231,174,5 script BK#ep133_18 4_M_MERCAT2,{ } if (.@npc$[.@type] == "Rock Pile") mes "You collect another stone fragment that emits a strange magical force."; else if (.@npc$[.@type] == "Dirt Pile") mes "You collect another clotted bloodstain from a dirt pile."; - else if (.@npc$[.@type] == "Split Earth") mes "You collect another piece of skin frozen in the frost in the crack of the split earth."; + else if (.@npc$[.@type] == "Split Earth") mes "You collect another piece of skin frozen in the frost in the crack of the split earth."; getitem .@item[.@type], 1; donpcevent strnpcinfo(0)+"::OnDisable"; close; @@ -4979,7 +4979,7 @@ dic_fild02,207,94,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef6 CLEAR_NPC dic_fild02,230,71,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef7 CLEAR_NPC dic_fild02,188,50,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef8 CLEAR_NPC dic_fild02,248,36,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef9 CLEAR_NPC -dic_fild02,206,115,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef10 CLEAR_NPC +dic_fild02,206,115,0 duplicate(ep133_crack#main) Dirt Pile#ep133_ef10 CLEAR_NPC dic_fild02,194,86,0 duplicate(ep133_crack#main) Split Earth#ep133_ef1 CLEAR_NPC dic_fild02,240,51,0 duplicate(ep133_crack#main) Split Earth#ep133_ef2 CLEAR_NPC dic_fild02,176,65,0 duplicate(ep133_crack#main) Split Earth#ep133_ef3 CLEAR_NPC @@ -5039,7 +5039,7 @@ dicastes01,117,262,0 script Frede#13_3 4_MAN_PIOM5,2,2,{ close; } mes "[Frede]"; - mes "¢£¡ô¡ñ ¡û"; + mes "¢£¡ô¡ñ ¡û"; mes "¡ú¡ö¡ø ¢£ ¡ô"; close; OnTouch: @@ -6087,7 +6087,7 @@ dic_in01,349,129,5 script Bouy#13_3 4_MAN_BENKUNI,{ close; } mes "[Bouy]"; - mes "¡ø¡ö¡þ ¡ù ¡ú¡ð¡ï ¡ø"; + mes "¡ø¡ö¡þ ¡ù ¡ú¡ð¡ï ¡ø"; mes "¡ï¡ú¡ö ¡ù"; mes "¡õ¡ï¡õ ¡ò"; close; @@ -6101,7 +6101,7 @@ dic_in01,349,129,5 script Bouy#13_3 4_MAN_BENKUNI,{ mes "[Maha]"; mes "But I do think the Sapha race is overly kind, almost unnaturally."; mes "Guess it'll be fine."; - close; + close; } mes "[Ben]"; mes "There is nothing strange!"; @@ -6109,7 +6109,7 @@ dic_in01,349,129,5 script Bouy#13_3 4_MAN_BENKUNI,{ next; mes "[Ben]"; mes "I can also visit the Sapha if I work well here, can't I?"; - close; + close; } mes "[Ben]"; mes "Hmm. Hey, Maha,"; @@ -6398,7 +6398,7 @@ function script eldicastes_c { mes "[Vyhannus]"; mes "Amazing."; mes "Like with Hound, that ring you humans made..."; - mes "is like a ring of wisdom."; + mes "is like a ring of wisdom."; } else { mes "[Hound]"; @@ -6413,7 +6413,7 @@ function script eldicastes_c { } mes "[Vyhannus]"; mes "Shall we skip to the point?"; - mes "The reason why I am here..."; + mes "The reason why I am here..."; next; mes "[Someone's voice]"; mes "Excuse me, hold on a second."; @@ -6512,7 +6512,7 @@ mid_campin,168,128,3 script Sapha from Manuk 4_MAN_JERUTOO,{ mes "You just stand there without"; mes "knowing what he says, so the"; mes "expedition guard next to you starts to talk. -"; - next; + next; callfunc "eldicastes_c",3; } else if (ep13_3_invite == 2) { @@ -6522,7 +6522,7 @@ mid_campin,168,128,3 script Sapha from Manuk 4_MAN_JERUTOO,{ mes "He's name is Galten. He is so quick, you won't notice the weight of his armor."; next; callfunc "eldicastes_c",1; - } + } else if (ep13_3_invite == 3) { callfunc "eldicastes_c",2; } @@ -6533,7 +6533,7 @@ mid_campin,168,128,3 script Sapha from Manuk 4_MAN_JERUTOO,{ mes "The tunnel might be a little scary."; mes "But I'm sure you will reach the end of it since you are strong."; close; - } + } else if (ep13_3_invite == 5) { mes "[Vyhannus]"; mes "Oh, the tunnel?"; @@ -6546,8 +6546,8 @@ mid_campin,168,128,3 script Sapha from Manuk 4_MAN_JERUTOO,{ next; mes "[Vyhannus]"; mes "That is it."; - close; - } + close; + } else if (ep13_3_invite == 6) { mes "[Vyhannus]"; mes "You received the Light of El Dicastes."; @@ -6613,10 +6613,10 @@ mid_campin,168,125,3 script Hound#ep133_is06 4_M_MOCASS1,{ } else if (ep13_3_invite == 2) { callfunc "eldicastes_c",1; - } + } else if (ep13_3_invite == 3) { callfunc "eldicastes_c",2; - } + } else if (ep13_3_invite == 4) { mes "[Hound]"; mes "First thing you need to do when you reach Manuk is to meet General Guard Avalanche."; @@ -6629,7 +6629,7 @@ mid_campin,168,125,3 script Hound#ep133_is06 4_M_MOCASS1,{ mes "[Hound]"; mes "And don't forget what the captain said."; mes "Inspector Doha is in the next room."; - close; + close; } else if (ep13_3_invite > 4) { mes "[Hound]"; @@ -6660,7 +6660,7 @@ mid_campin,165,127,5 script Hibba Agip#ep133_is07 4_M_REDSWORD,{ close2; OnInit: disablenpc strnpcinfo(0); - end; + end; } man_in01,315,52,3 script Guard Captain Avalanche 4_MAN_GALTUN,{ @@ -6669,7 +6669,7 @@ man_in01,315,52,3 script Guard Captain Avalanche 4_MAN_GALTUN,{ mes "¢¤¡ð¡ú? ¢£ ¡ù¡ð..."; mes "¡ï¡ò¡Ð ¢¤ ?"; mes "¡ñ¡ï..?"; - close; + close; } if (ep13_3_invite == 4) { mes "[Avalanche]"; @@ -7155,12 +7155,12 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 4_MAN_NITT,{ mes .@n$; mes "When you are ready,"; mes "Please come back again"; - close; + close; } if (countitem(.@Items_) < 1) { mes .@n$; mes "Then, take the equipment off first."; - close; + close; } specialeffect2 EF_OVERTHRUST; mes .@n$; @@ -7175,7 +7175,7 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 4_MAN_NITT,{ mes .@n$; mes "But..."; mes "you don't seem to be wearing or even carrying equipment to upgrade on you."; - close; + close; } } if (getd("ep13_3_"+.@v$) == 0) { @@ -7201,7 +7201,7 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 4_MAN_NITT,{ mes .@n$; mes "Second upgrade step requires ^9900992 Exploit Certifications of Sapha^000000. Do you want to proceed?"; set .@req, 2; - } + } else if (getd("ep13_3_"+.@v$) < 69) { mes .@n$; mes "I'm preparing for the"; @@ -7263,7 +7263,7 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 4_MAN_NITT,{ mes .@n$; mes "When you are ready,"; mes "Please come back again."; - close; + close; } if (countitem(6304) < .@req) { mes .@n$; @@ -7334,7 +7334,7 @@ dic_in01,42,264,3 script Adventurer Clerk#ep133 4_MAN_NITT,{ set .@cri[5], 4764; set .@cri[7], 4765; set .@atk[2], 4766; set .@atk[3], 4767; set .@dex[1], 4720; set .@dex[2], 4721; set .@dex[3], 4722; - set .@int[1], 4710; set .@int[2], 4711; set .@int[3], 4712; + set .@int[1], 4710; set .@int[2], 4711; set .@int[3], 4712; set .@agi[1], 4730; set .@agi[2], 4731; set .@agi[3], 4732; // Enchant attribute is determined by the digit position of variable value (ep13_3_<type>). @@ -7380,7 +7380,7 @@ dic_fild01,228,159,4 script Jahbong#pa0829 4_M_MERCAT2,{ next; mes "[Jahbong]"; mes "Come back to me once you have one. I'll give you something good in exchange."; - close; + close; } set .@cattalkj,rand(1,9); if (.@cattalkj == 1) mes "Don't touch my back! I might bite you unconsciously."; diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt index 150928d49..0c9eb2a82 100644 --- a/npc/re/quests/quests_malaya.txt +++ b/npc/re/quests/quests_malaya.txt @@ -3820,7 +3820,7 @@ ma_fild01,158,243,6 script Tribe Blacksmith#malaya 4_M_MALAYA,{ delitem 6499,20; //Ancient_Grudge delequip .@part; - getitem .@newItem, 1; + getitem .@newItem, 1; mes "[Bayani]"; mes "Ha ha. Perfect."; diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt index 1c1e64046..a8697058a 100644 --- a/npc/re/quests/quests_mora.txt +++ b/npc/re/quests/quests_mora.txt @@ -4184,7 +4184,7 @@ OnTimer20000: OnTimer30000: OnTimer40000: OnTimer50000: - if (rand(2)) + if (rand(2)) donpcevent strnpcinfo(0)+"::OnEnable"; end; OnTimer60000: diff --git a/npc/re/scripts_main.conf b/npc/re/scripts_main.conf index 8ee3c45e5..28f514d19 100644 --- a/npc/re/scripts_main.conf +++ b/npc/re/scripts_main.conf @@ -4,7 +4,7 @@ // The idea of this new system is to make scripts more organized // since the old system was rather messy with all the NPCs in one // file. Now scripts are organized in to files arraged by type. -// Custom scripts are now in scripts_custom.conf, all other +// Custom scripts are now in scripts_custom.conf, all other // scripts are deemed as 'official'. You should place your NPCs // in to scripts_custom.conf to follow the trend. // diff --git a/npc/re/warps/cities/dicastes.txt b/npc/re/warps/cities/dicastes.txt index 52c641bc4..9af35d123 100644 --- a/npc/re/warps/cities/dicastes.txt +++ b/npc/re/warps/cities/dicastes.txt @@ -11,7 +11,7 @@ //===== Additional Comments: ================================= //= 1.0 First Version. //= 1.1 Added Elevators. -//= 1.2 Removed a warp. [Joseph] +//= 1.2 Removed a warp. [Joseph] //= 1.3 Updated to match official script. [Joseph] //============================================================ diff --git a/npc/re/warps/cities/rachel.txt b/npc/re/warps/cities/rachel.txt index 608e7ec2b..9ec33e229 100644 --- a/npc/re/warps/cities/rachel.txt +++ b/npc/re/warps/cities/rachel.txt @@ -7,14 +7,14 @@ //===== Description: ========================================= //= Warp Points for Rachel City, shops & other locations //===== Additional Comments: ================================= -//= 1.0 Added the official warps and commented out the +//= 1.0 Added the official warps and commented out the //= "custom duplicates" for future checkout. Special thanks //= to RockmanEXE who provided all the info. [erKURITA] //= 1.1 Added warp to Veins Field [Playtester] //= 1.2 Fully official rachel warps [Playtester] //= 1.2a Added missing warp (Pope's office entryway -> temple) [L0ne_W0lf] //= 1.3 Updated Rachel -> Veins Field warp. [L0ne_W0lf] -//= 1.4 Disabled rachel33, moved to quest_rachel.txt [L0ne_W0lf] +//= 1.4 Disabled rachel33, moved to quest_rachel.txt [L0ne_W0lf] //= 1.5 Renewal warp adjustments. //============================================================ |