From 14a22de99385f79c66bcda841537e86a32cf0e16 Mon Sep 17 00:00:00 2001 From: Atemo Date: Fri, 28 Jun 2024 20:20:49 +0200 Subject: [PATCH] Added missing clear cutin (#8467) Corrected encoding of some files --- npc/kafras/kafras.txt | 2 +- npc/merchants/hair_style.txt | 4 +- npc/pre-re/merchants/hair_style.txt | 6 +- npc/quests/bard_quest.txt | 90 ++++++++++++-------------- npc/quests/cooking_quest.txt | 2 +- npc/quests/quests_rachel.txt | 58 ++++++++--------- npc/quests/seals/mjolnir_seal.txt | 2 +- npc/quests/the_sign_quest.txt | 4 +- npc/re/cities/dicastes.txt | 6 +- npc/re/custom/lasagna/lasagna_npcs.txt | 2 +- npc/re/guild3/agit_main_te.txt | 2 +- npc/re/instances/CharlestonCrisis.txt | 4 +- npc/re/instances/SealedOs.txt | 11 +++- npc/re/jobs/novice/academy.txt | 2 +- npc/re/other/clans.txt | 8 +-- npc/re/quests/quests_16_1.txt | 6 +- npc/re/quests/quests_16_2.txt | 5 +- npc/re/quests/quests_17_1.txt | 4 +- npc/re/quests/quests_17_2.txt | 2 +- npc/re/quests/quests_malaya.txt | 12 ++-- npc/re/quests/quests_mora.txt | 14 ++-- 21 files changed, 122 insertions(+), 124 deletions(-) diff --git a/npc/kafras/kafras.txt b/npc/kafras/kafras.txt index 9774348e08..b0efa0e141 100644 --- a/npc/kafras/kafras.txt +++ b/npc/kafras/kafras.txt @@ -59,7 +59,7 @@ aldeba_in,96,181,4 script Kafra Service 113,{ mes "seems that you don't"; mes "have the 20 zeny to pay"; mes "the Storage access fee..."; - close; + close3; } mes "[Kafra Leilah]"; mes "Although this facility is"; diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt index ae630d0cc9..a3c4af6ce9 100644 --- a/npc/merchants/hair_style.txt +++ b/npc/merchants/hair_style.txt @@ -302,7 +302,7 @@ lhz_in02,91,155,5 script Assistant Beautician#li 862,{ mes "Oooh, there must"; mes "be some style that"; mes "you like, right? Hmmm..."; - close; + close3; } } mes "[Assistant Beautician]"; @@ -353,7 +353,7 @@ lhz_in02,91,155,5 script Assistant Beautician#li 862,{ mes "me! Thank you for using"; mes "my service and come again~"; emotion ET_CHUP; - close; + close3; case 2: mes "[Assistant Beautician]"; mes "Huh? Oh no, you're"; diff --git a/npc/pre-re/merchants/hair_style.txt b/npc/pre-re/merchants/hair_style.txt index 786329e699..4a1185b3c2 100644 --- a/npc/pre-re/merchants/hair_style.txt +++ b/npc/pre-re/merchants/hair_style.txt @@ -594,7 +594,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 122,{ mes "you can be more daring than"; mes "that! Be fashionably adventurous, you fashionable adventurer~"; emotion ET_THROB; - close; + close3; } } else { @@ -917,7 +917,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 122,{ mes "I'll make you the best looking"; mes "person in the entire world!"; emotion ET_BEST; - close; + close3; case 2: mes "[Prince Shammi]"; mes "Oh, did you forget which"; @@ -925,7 +925,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 122,{ mes "number? By all means, please"; mes "check again! Find the one that"; mes "is perfect just for you, okay?"; - close; + close3; } } break; diff --git a/npc/quests/bard_quest.txt b/npc/quests/bard_quest.txt index 52eab8c02b..c4d7d0249b 100644 --- a/npc/quests/bard_quest.txt +++ b/npc/quests/bard_quest.txt @@ -157,19 +157,19 @@ geffen,132,38,3 script Bard#2 51,{ next; mes "[Errende]"; mes "I hope that you'll always remain honest and respectful towards other people, and that you continue to ignore greed for fortune or power."; - goto L_End; + close3; } else if (gef_bard_q > 11 && gef_bard_q < 14) { cutin "bard_eland02",2; mes "[Errende]"; mes "It seems you haven't found it yet. Well, take your time, I can wait as long as you want. It doesn't really bore me, since waiting seems to be a part of my profession."; - goto L_End; + close3; } else if (gef_bard_q == 11) { cutin "bard_eland01",2; mes "[Errende]"; mes "Mr. Skezti has a small book store on the book street at the right side of Mineta in Juno. If you show him the seal, he'll help you out."; - goto L_End; + close3; } else if (gef_bard_q == 10) { cutin "bard_eland01",2; @@ -199,7 +199,7 @@ geffen,132,38,3 script Bard#2 51,{ mes "show him the Seal of Friendship."; mes "Good luck, now~"; set gef_bard_q,11; - goto L_End; + close3; } else if (gef_bard_q == 20) { cutin "bard_eland03",2; @@ -249,7 +249,7 @@ geffen,132,38,3 script Bard#2 51,{ mes "[Errende]"; mes "Waaah, wah~"; mes "You can't just ignore me like that! Where's your sense of merriment, your sense of romance?"; - goto L_End; + close3; } } else if (gef_bard_q == 27) { @@ -295,7 +295,7 @@ geffen,132,38,3 script Bard#2 51,{ mes "I beseech you, if you meet him, please ask him of the 8th love and inform me of that lyric immediately~"; set gef_bard_q,22; } - goto L_End; + close3; } else if (gef_bard_q == 26) { cutin "bard_eland01",2; @@ -349,17 +349,17 @@ geffen,132,38,3 script Bard#2 51,{ mes "in advance~"; set gef_bard_q,24; } - goto L_End; + close3; } else if (.@inputstr$ == "Gunther") { mes "[Errende]"; mes "Gunther? I don't think he would do this. He always puts lines in his songs like 'doubleharmony for you.' Plus, he's too silly for that."; - goto L_End; + close3; } else if (.@inputstr$ == "Gunther Doubleharmony") { mes "[Errende]"; mes "Gunther? I don't think he would do this. He always puts lines in his songs like 'doubleharmony for you.' Plus, he's too silly for that."; - goto L_End; + close3; } else if (.@inputstr$ == "Errende") { cutin "bard_eland04",2; @@ -368,7 +368,7 @@ geffen,132,38,3 script Bard#2 51,{ mes "If I did, why would"; mes "I not know what"; mes "this song is about?"; - goto L_End; + close3; } else { mes "[Errende]"; @@ -381,7 +381,7 @@ geffen,132,38,3 script Bard#2 51,{ mes "How could I forget"; mes "the 8th love?"; set gef_bard_q,26; - goto L_End; + close3; } } else if (gef_bard_q == 25) { @@ -427,7 +427,7 @@ geffen,132,38,3 script Bard#2 51,{ mes "heart wrenching song."; mes "But at what cost to your soul?^000000"; } - goto L_End; + close3; } else { cutin "bard_eland01",2; @@ -438,7 +438,7 @@ geffen,132,38,3 script Bard#2 51,{ mes "Noboooody looooves meee"; mes "Friends foooooor never..."; mes "Ooooooooh wah!^000000"; - goto L_End; + close3; } } else if (gef_bard_q == 24) { @@ -464,7 +464,7 @@ geffen,132,38,3 script Bard#2 51,{ mes "Once again,"; mes "thank you so much"; mes "for your help."; - goto L_End; + close3; } else if (gef_bard_q == 22) { mes "[Errende]"; @@ -480,7 +480,7 @@ geffen,132,38,3 script Bard#2 51,{ next; mes "[Errende]"; mes "Please ask ^483D8BGunther^000000 about the ^483D8B8th love^000000 in ^483D8BAt One, I Fall in Love^000000. Thank you in advance."; - goto L_End; + close3; } else if (gef_bard_q == 23) { cutin "bard_eland02",2; @@ -570,19 +570,19 @@ geffen,132,38,3 script Bard#2 51,{ mes "in advance~"; set gef_bard_q,24; } - goto L_End; + close3; } else if (.@inputstr$ == "Gunther") { mes "[Errende]"; mes "Gunther? I don't think he would do this. He always puts lines in his songs like 'doubleharmony for you.' Plus, he's too silly for that."; set gef_bard_q,26; - goto L_End; + close3; } else if (.@inputstr$ == "Gunther Doubleharmony") { mes "[Errende]"; mes "Gunther? I don't think he would do this. He always puts lines in his songs like 'doubleharmony for you.' Plus, he's too silly for that."; set gef_bard_q,26; - goto L_End; + close3; } else if (.@inputstr$ == "Errende") { cutin "bard_eland04",2; @@ -592,7 +592,7 @@ geffen,132,38,3 script Bard#2 51,{ mes "I not know what this"; mes "song is about?"; set gef_bard_q,26; - goto L_End; + close3; } else { mes "[Errende]"; @@ -605,7 +605,7 @@ geffen,132,38,3 script Bard#2 51,{ mes "How could I forget"; mes "the 8th love?"; set gef_bard_q,26; - goto L_End; + close3; } } else if (gef_bard_q == 21) { @@ -655,7 +655,7 @@ geffen,132,38,3 script Bard#2 51,{ mes "I beseech you, if you meet him, please ask him of the 8th love and inform me of that lyric immediately~"; set gef_bard_q,2; } - goto L_End; + close3; } else if (gef_bard_q == 6) { cutin "bard_eland04",2; @@ -699,23 +699,23 @@ geffen,132,38,3 script Bard#2 51,{ mes "I'll pay you back somehow! Thank you for your trouble in advance~"; set gef_bard_q,4; } - goto L_End; + close3; } else if (.@inputstr$ == "Gunther") { mes "[Errende]"; mes "Gunther? I don't think he would do this. He always puts lines in his songs like 'doubleharmony for you.' Plus, he's too silly for that."; - goto L_End; + close3; } else if (.@inputstr$ == "Gunther Doubleharmony") { mes "[Errende]"; mes "Gunther? I don't think he would do this. He always puts lines in his songs like 'doubleharmony for you.' Plus, he's too silly for that."; - goto L_End; + close3; } else if (.@inputstr$ == "Errende") { cutin "bard_eland04",2; mes "[Errende]"; mes "Surely you jest! If I did, why would I not know what this song is about?"; - goto L_End; + close3; } else { mes "[Errende]"; @@ -727,7 +727,7 @@ geffen,132,38,3 script Bard#2 51,{ mes "How could I forget"; mes "the 8th love?"; set gef_bard_q,6; - goto L_End; + close3; } } else if (gef_bard_q == 5) { @@ -764,7 +764,7 @@ geffen,132,38,3 script Bard#2 51,{ mes "heart wrenching song."; mes "But at what cost to your soul?^000000"; } - goto L_End; + close3; } else { cutin "bard_eland01",2; @@ -775,7 +775,7 @@ geffen,132,38,3 script Bard#2 51,{ mes "Noboooody looooves meee"; mes "Friends foooooor never..."; mes "Ooooooooooh wah!^000000"; - goto L_End; + close3; } } else if (gef_bard_q == 4) { @@ -800,7 +800,7 @@ geffen,132,38,3 script Bard#2 51,{ mes "Once again,"; mes "thank you so much"; mes "for your help."; - goto L_End; + close3; } else if (gef_bard_q == 2) { cutin "bard_eland04",2; @@ -813,7 +813,7 @@ geffen,132,38,3 script Bard#2 51,{ next; mes "[Errende]"; mes "Please ask ^483D8BGunther^000000 about the ^483D8B8th love^000000 in ^483D8BAt One, I Fall in Love^000000. Thank you in advance."; - goto L_End; + close3; } else if (gef_bard_q == 3) { cutin "bard_eland02",2; @@ -898,27 +898,27 @@ geffen,132,38,3 script Bard#2 51,{ mes "I'll pay you back somehow! Thank you for your trouble in advance~"; set gef_bard_q,4; } - goto L_End; + close3; } else if (.@inputstr$ == "Gunther") { mes "[Errende]"; mes "Gunther? I don't think he would do this. He always puts lines in his songs like 'doubleharmony for you.' Plus, he's too silly for that."; set gef_bard_q,6; - goto L_End; + close3; } else if (.@inputstr$ == "Gunther Doubleharmony") { mes "[Errende]"; mes "Gunther? I don't think he would do this. He always puts lines in his songs like 'doubleharmony for you.' Plus, he's too silly for that."; set gef_bard_q,6; - goto L_End; + close3; } else if (.@inputstr$ == "Errende") { cutin "bard_eland04",2; mes "[Errende]"; mes "Surely you jest! If I did, why would I not know what this song is about?"; set gef_bard_q,6; - goto L_End; + close3; } else { mes "[Errende]"; @@ -930,7 +930,7 @@ geffen,132,38,3 script Bard#2 51,{ mes "How could I forget"; mes "the 8th love?"; set gef_bard_q,6; - goto L_End; + close3; } } else if (gef_bard_q == 1) { @@ -993,11 +993,7 @@ geffen,132,38,3 script Bard#2 51,{ } } - -L_End: - close2; - cutin "",255; - end; + close3; // SubRoutine for 5 similiar dialogues of the quest @@ -1114,7 +1110,7 @@ S_StorySong: mes "[Errende]"; mes "Oh, how disappointing. But promise me that you will drop by later, so that we can share stories and merriment."; } - goto L_End; + close3; case 2: .@num = getarg(0); @@ -1149,7 +1145,7 @@ S_StorySong: mes "My apologies,"; mes "But I cannot offer my services for free. Even a Bard needs zeny to live, wouldn't you agree?"; } - goto L_End; + close3; case 2: cutin "bard_eland03",2; @@ -1218,7 +1214,7 @@ S_StorySong: mes "may never know"; mes "with certainty."; } - goto L_End; + close3; } else if (.@random == 2) { @@ -1321,7 +1317,7 @@ S_StorySong: if(gef_bard_q==1) set gef_bard_q,7; if(gef_bard_q==21) set gef_bard_q,27; } - goto L_End; + close3; } mes "^483D8BA good Bard sings"; @@ -1345,7 +1341,7 @@ S_StorySong: mes "[Errende]"; mes "H-how can you say such a thing, "+ @name$ +"? Have you ever been a Bard before? It's difficult to come up with fresh, original melodies!"; } - goto L_End; + close3; case 3: cutin "bard_eland01",2; @@ -1355,7 +1351,7 @@ S_StorySong: mes "enjoyed when you"; mes "are in the mood for it."; mes "Please come again."; - goto L_End; + close3; } @@ -1364,7 +1360,7 @@ S_StorySong: mes "[Errende]"; mes "Hmm~?"; mes "Well, alright. Though, listening to a good story or cheerful song can really do you some good. Alright then, see you later."; - goto L_End; + close3; } } diff --git a/npc/quests/cooking_quest.txt b/npc/quests/cooking_quest.txt index 6701ac0e40..6666949e95 100644 --- a/npc/quests/cooking_quest.txt +++ b/npc/quests/cooking_quest.txt @@ -61,7 +61,7 @@ mes "cooking when Novices"; mes "like yourself are running"; mes "around here like children."; - close; + close3; } cutin "orleans_1",0; mes "[Charles Orleans]"; diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt index 43e6e51806..fbb5b93c44 100644 --- a/npc/quests/quests_rachel.txt +++ b/npc/quests/quests_rachel.txt @@ -3816,7 +3816,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{ mes "wouldn't come here to pray..."; mes "Well, I hope you enjoy your"; mes "time here, adventurer."; - goto L_End; + close3; } mes "[Priestess Nemma]"; mes "Oh! I'm glad to see that"; @@ -3869,7 +3869,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{ mes "all your journeys. May the"; mes "grace of the goddess always"; mes "support us in all that we do~"; - goto L_End; + close3; } mes "[Priestess Nemma]"; mes "Great! How much would you"; @@ -3898,7 +3898,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{ mes "protecting you, wherever you go~"; break; } - goto L_End; + close3; } else { cutin "ra_nemma03",2; @@ -3939,7 +3939,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{ mes "protecting you, wherever you go~"; break; } - goto L_End; + close3; case 2: mes "[Priestess Nemma]"; mes "Oh! If you'd like some"; @@ -3968,7 +3968,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{ mes "Oh, how sweet of you~"; break; } - goto L_End; + close3; } } else { @@ -3976,7 +3976,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{ cutin "ra_nemma01",2; mes "[Priestess Nemma]"; mes "Welcome to our temple!"; - goto L_End; + close3; } if (ra_tem_q < 1) { mes "[Priestess Nemma]"; @@ -4009,7 +4009,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{ mes "to go inside. ^333333*Sob*^000000 P-Panno!"; mes "Panno, I neeeed heeeeelp~!"; set ra_tem_q,1; - goto L_End; + close3; } else if ((ra_tem_q >= 1) && (ra_tem_q < 10)) { mes "[Priestess Nemma]"; @@ -4024,7 +4024,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{ mes "Panno would know"; mes "what to do... I think."; mes "Ooh, Panno, help me!"; - goto L_End; + close3; } else if (ra_tem_q == 10) { cutin "ra_nemma04",2; @@ -4050,7 +4050,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{ mes "I'm outside. What if"; mes "the gate locks up again?"; mes "Oooh, what should I do?!"; - goto L_End; + close3; } else if (ra_tem_q == 11) { emotion ET_DELIGHT; @@ -4062,7 +4062,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{ mes "longer asking for donations,"; mes "but you can still redeem your"; mes "Lottery Tickets inside, okay?"; - goto L_End; + close3; } else if (ra_tem_q == 12) { mes "[Priestess Nemma]"; @@ -4089,7 +4089,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{ mes "like, ^FF000020 of them^000000! Thank"; mes "you thank you thank you!"; set ra_tem_q,13; - goto L_End; + close3; } else if (ra_tem_q == 13) { mes "[Priestess Nemma]"; @@ -4124,7 +4124,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{ mes "to play! Hm, maybe"; mes "our pope would like"; mes "to see these too?"; - goto L_End; + close3; } cutin "ra_nemma02",2; mes "[Priestess Nemma]"; @@ -4143,20 +4143,16 @@ ra_temple,116,174,3 script Nemma#ra_temple 920,{ mes "have much to pay you"; mes "back with, anyway~"; } - goto L_End; + close3; } else { cutin "ra_nemma01",2; mes "[Priestess Nemma]"; mes "Welcome to our temple!"; } - goto L_End; + close3; } - -L_End: - close2; - cutin "",255; - end; + close3; S_Donate: .@num = getarg(0); @@ -6329,7 +6325,7 @@ ra_temin,170,46,3 script Panno#rachel 920,{ mes "everything I know."; mes "Remember to keep"; mes "quiet about what I said."; - goto L_End; + close3; } } else if (ra_tem_q < 2) { @@ -6358,7 +6354,7 @@ ra_temin,170,46,3 script Panno#rachel 920,{ mes "time, so please visit"; mes "me at your leisure."; mes "Go with Freya."; - goto L_End; + close3; case 2: cutin "ra_fano01",2; @@ -6397,14 +6393,14 @@ ra_temin,170,46,3 script Panno#rachel 920,{ mes "side of the hallway. However,"; mes "you can only enter if you've"; mes "been permitted beforehand."; - goto L_End; + close3; case 3: mes "[Priestess Panno]"; mes "......................"; mes "No chit-chat"; mes "inside the temple."; - goto L_End; + close3; } } else if (ra_tem_q == 10) { @@ -6439,7 +6435,7 @@ ra_temin,170,46,3 script Panno#rachel 920,{ mes "time, so please visit"; mes "me at your leisure."; mes "Go with Freya."; - goto L_End; + close3; case 2: cutin "ra_fano01",2; @@ -6478,7 +6474,7 @@ ra_temin,170,46,3 script Panno#rachel 920,{ mes "side of the hallway. However,"; mes "you can only enter if you've"; mes "been permitted beforehand."; - goto L_End; + close3; case 3: cutin "ra_fano02",2; @@ -6525,7 +6521,7 @@ ra_temin,170,46,3 script Panno#rachel 920,{ mes "[Priestess Panno]"; mes "........."; set ra_tem_q,11; - goto L_End; + close3; } } else if (ra_tem_q == 11) { @@ -6660,7 +6656,7 @@ ra_temin,170,46,3 script Panno#rachel 920,{ mes "Excuse me now, I need"; mes "to get back to work."; set ra_tem_q,12; - goto L_End; + close3; } cutin "ra_fano02",2; mes "[Priestess Panno]"; @@ -6668,7 +6664,7 @@ ra_temin,170,46,3 script Panno#rachel 920,{ mes "Behave yourself, and"; mes "respect those who have"; mes "come here just to worship."; - goto L_End; + close3; L_Lottery: if(checkweight(607,1) == 0){ @@ -6680,7 +6676,7 @@ L_Lottery: mes "something large, unwieldy"; mes "and heavy? Put your junk"; mes "away in Storage first."; - goto L_End; + close3; } mes "[Priestess Panno]"; mes "Here we go"; @@ -6716,7 +6712,7 @@ L_Lottery: else if (.@bonus_donate > 5 && .@bonus_donate < 11) getitem 518,1; //Honey 5% else if (.@bonus_donate > 0 && .@bonus_donate < 6) getitem 526,1; //Royal Jelly 5% else getitem 547,1; //Condensed White Potion 39% - goto L_End; + close3; } mes "[Priestess Panno]"; mes "You..."; @@ -6736,7 +6732,7 @@ L_Lottery: cutin "ra_fano03",2; mes "[Priestess Panno]"; mes "May Freya be with you."; - goto L_End; + close3; L_End: close2; diff --git a/npc/quests/seals/mjolnir_seal.txt b/npc/quests/seals/mjolnir_seal.txt index 63062018c4..e8a296cffa 100644 --- a/npc/quests/seals/mjolnir_seal.txt +++ b/npc/quests/seals/mjolnir_seal.txt @@ -284,7 +284,7 @@ prontera,124,297,3 script Tialfi 706,{ next; mes "[Tialfi]"; mes "I think we'd better wait and see what's happening. Someone will deliver the news to us. Though, I am unsure of whether or not it will be good news or bad..."; - close; + close3; } else if (BaseLevel < 70) { cutin "god_tialpi02",2; diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt index 36f81e78ec..5d920a5a53 100644 --- a/npc/quests/the_sign_quest.txt +++ b/npc/quests/the_sign_quest.txt @@ -3093,13 +3093,11 @@ OnTouch_: end; } -/* Currently broken. prt_maze02,25,161,0 script #music -1,7,7,{ OnTouch_: - soundeffect "effect\\¼®¾çÀÇ ¾î½Ø½Å.wav",1; + soundeffect "effect\\¼®¾çÀÇ ¾î½Ø½Å.wav",1; end; } -*/ prt_maze02,132,132,0 script #skill -1,{ OnEnable: diff --git a/npc/re/cities/dicastes.txt b/npc/re/cities/dicastes.txt index 606a4f86d0..0e861ff76d 100644 --- a/npc/re/cities/dicastes.txt +++ b/npc/re/cities/dicastes.txt @@ -84,8 +84,8 @@ dicastes01,234,158,0 script Training Galten#a 450,{ mes "if I keep up with my training every day."; close; } - mes "ø¡ô¡ü ¡¡ø¡ô¡ü ¡ø"; - mes "ô ¡ø"; + mes "¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü ¡ø"; + mes "¡ô ¡ø"; next; mes "Don't know what it means."; close; @@ -130,7 +130,7 @@ dicastes01,248,129,0 script Training Galten#d 450,{ close; } mes "¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü"; - mes "¡ø¡ô¡ü ¡ø¡ ø¡ô¡ü ¡ø"; + mes "¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü ¡ø"; next; mes "Don't know what it means."; close; diff --git a/npc/re/custom/lasagna/lasagna_npcs.txt b/npc/re/custom/lasagna/lasagna_npcs.txt index ad53bacf90..058a208ed2 100644 --- a/npc/re/custom/lasagna/lasagna_npcs.txt +++ b/npc/re/custom/lasagna/lasagna_npcs.txt @@ -323,7 +323,7 @@ lasa_fild01,60,322,3 script Vigilante Aglio#doram02 4_DR_AGLIO,{ cutin "tutorial02.BMP",4; mes "^4d4dff!- Notice -!^000000"; mes "^4d4dffCheck out the quest details by pressing the shortcut key [Alt+U],^000000 or through the Quest icon found in the menu tray.^000000"; - close; + close3; } mes "[Vigilante Aglio]"; mes "Whoa, you're good!"; diff --git a/npc/re/guild3/agit_main_te.txt b/npc/re/guild3/agit_main_te.txt index 7b66736840..d3121a0e45 100644 --- a/npc/re/guild3/agit_main_te.txt +++ b/npc/re/guild3/agit_main_te.txt @@ -438,7 +438,7 @@ function GuardianData; if (select( "Fire","Cancel" ) == 2) { mes "[ Hired Kafra Employee ]"; mes "I'll work hard for you... Thank you!"; - close; + close3; } mes "[ Hired Kafra Employee ]"; mes "Oh, my goodness! This is nonsense!"; diff --git a/npc/re/instances/CharlestonCrisis.txt b/npc/re/instances/CharlestonCrisis.txt index 0d8243d693..f04a905559 100644 --- a/npc/re/instances/CharlestonCrisis.txt +++ b/npc/re/instances/CharlestonCrisis.txt @@ -727,11 +727,11 @@ OnTimer300: } 1@mcd,141,214,5 script Charleston 2#1 4_F_CHARLESTON02,{ - cutin "dalle01.bmp",2; if (is_party_leader() == false) { + cutin "dalle01.bmp",2; mes "[Charleston 1]"; mes "Please let me talk to your leader about the supplementation of the factory."; - close; + close3; } if ('ep15_1_mcd01 > 11) end; diff --git a/npc/re/instances/SealedOs.txt b/npc/re/instances/SealedOs.txt index 848be59d7d..869b641b16 100644 --- a/npc/re/instances/SealedOs.txt +++ b/npc/re/instances/SealedOs.txt @@ -263,7 +263,6 @@ OnTouch: 1@os_b,137,139,0 duplicate(Thick Wire#171_os_0) Thick Wire#171_os_2 4_ENERGY_BLUE 1@os_b,122,212,5 script Dien#171_os_3 4_F_DIENE,{ -OnTalk: cutin "ep162_dn01",2; mes "[Dien]"; mes "Oh!"; @@ -281,8 +280,14 @@ OnTalk: mes "It will take some time to break it~"; npctalk "Cotnes : Oh, is this gate too hard? It will take some time to break it."; next; - doevent instance_npcname("Dien#171_os_3") + "::OnTalk"; - close; + cutin "ep162_dn01",2; + mes "[Dien]"; + mes "Oh!"; + mes "If you go to the right, I think you can go back on the railroad without having to break the door."; + npctalk "Dien : Oh! If you go to the right, I think you can go back on the railroad without having to break the door"; + if (!'unlocked) + donpcevent instance_npcname("#171_sealedos_control") + "::OnEvent04"; + close3; } 1@os_b,146,221,7 script Ridsh#171_os_2 4_F_LEEDSH,{ diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt index 2481a2f526..16947da956 100644 --- a/npc/re/jobs/novice/academy.txt +++ b/npc/re/jobs/novice/academy.txt @@ -5218,7 +5218,7 @@ new_1-3,99,169,3 script Friendly Poring#ac 4_PORING,{ next; mes "[Poring]"; mes "It may fail, but keep trying to lure way those Little Porings!"; - close; + close3; } } else if (isbegin_quest(2297) == 1) { mes "[Poring]"; diff --git a/npc/re/other/clans.txt b/npc/re/other/clans.txt index e2d573e5b4..0fba407124 100644 --- a/npc/re/other/clans.txt +++ b/npc/re/other/clans.txt @@ -103,7 +103,7 @@ prt_in,33,114,5 script Raffam Oranpere 10058,{ if( getcharid( 2 ) ){ mes "[Raffam Oranpere]"; mes "Come back to join after you leave your current guild."; - close; + close3; }else if( getcharid( 5 ) != 0 ){ cutin "laperm04.bmp", 2; mes "[Raffam Oranpere]"; @@ -268,7 +268,7 @@ prt_in,35,114,5 script Devon Aire 10059,{ if( getcharid( 2 ) ){ mes "[Devon Aire]"; mes "Leave your guild first to join my Clan, duh."; - close; + close3; }else if( getcharid( 5 ) != 0 ){ cutin "debon03.bmp", 2; mes "[Devon Aire]"; @@ -421,7 +421,7 @@ prt_in,37,114,5 script Berman Aire 10060,{ mes "[Berman Aire]"; mes "Oh, no."; mes "In order to join, you first have to leave your current guild."; - close; + close3; }else if( getcharid( 5 ) != 0 ){ mes "[Berman Aire]"; mes "You're already in a Clan."; @@ -567,7 +567,7 @@ prt_in,39,114,5 script Shaam Rumi 10027,{ if( getcharid( 2 ) ){ mes "[Shaam Rumi]"; mes "Did you finish things up with your guild?"; - close; + close3; }else if( getcharid( 5 ) != 0 ){ mes "[Shaam Rumi]"; mes "Eh, you're already in a Clan. Hey, this isn't funny."; diff --git a/npc/re/quests/quests_16_1.txt b/npc/re/quests/quests_16_1.txt index 1feafa6c62..f2f5dcb40e 100644 --- a/npc/re/quests/quests_16_1.txt +++ b/npc/re/quests/quests_16_1.txt @@ -4057,7 +4057,7 @@ prt_cas_q,20,139,3 script Spica Nerius#ep16_room01 4_EP16_SPICA,{ next; mes "[Spica]"; mes "" + strcharinfo(0) + ", why don't you go back to your room and wait for the message?"; - close; + close3; } mes "[Spica]"; mes "Why don't you go visit other families if you have not visited them all?"; @@ -4105,7 +4105,7 @@ prt_cas_q,20,139,3 script Spica Nerius#ep16_room01 4_EP16_SPICA,{ next; mes "[Spica]"; mes "I wonder if the old folks would hear me out though."; - close; + close3; } mes "[Spica]"; mes "Skia told me something similar to that."; @@ -8968,7 +8968,7 @@ prt_cas_q,93,74,4 script Po Richard#EP161GAM 4_M_6THPRIN1,{ emotion ET_OTL; mes "[Po Richard]"; mes "I guess the offer hasn't been attractive to you. I am sorry, but come back later when you change your mind."; - close; + close3; } emotion ET_OK; mes "[Po Richard]"; diff --git a/npc/re/quests/quests_16_2.txt b/npc/re/quests/quests_16_2.txt index 6d0c33dc8a..44d1e141bf 100644 --- a/npc/re/quests/quests_16_2.txt +++ b/npc/re/quests/quests_16_2.txt @@ -3650,6 +3650,7 @@ que_swat,145,57,3 script Philopontess#ep162_04 4_M_PHILOFONTES,{ terra_gloria_main = 25; questinfo_refresh(); close2; + cutin "",255; npctalk "Oh, please come here for a moment.", "Rookie#ep162_03", bc_self; end; } @@ -3669,7 +3670,7 @@ que_swat,145,57,3 script Philopontess#ep162_04 4_M_PHILOFONTES,{ mes "[Tess]"; mes "Not now?"; mes "Then get some rest and come back please."; - close; + close3; } mes "[Tess]"; mes "Since we don't know where they are hiding, start looking in corners such as cabinets and boxes."; @@ -3876,7 +3877,7 @@ rebel_in,70,78,3 script Elena Volkova#16.2rm 4_F_ELENA,{ if (countitem(25161) < 1) { mes "[USU commander Elena]"; mes "...Why are you empty-handed? Where is the cookie?"; - close; + close3; } emotion ET_DELIGHT; mes "[USU commander Elena]"; diff --git a/npc/re/quests/quests_17_1.txt b/npc/re/quests/quests_17_1.txt index c38b925f9f..5f7d7f8131 100644 --- a/npc/re/quests/quests_17_1.txt +++ b/npc/re/quests/quests_17_1.txt @@ -3955,7 +3955,7 @@ sp_rudus,184,360,5 script Elena Volkova#171_rudus 4_F_ELENA,{ setquest 7859; getitem 25723,15; getexp 800000,800000; - close; + close3; } if (isbegin_quest(7859) == 1) { cutin "162elena_01",2; @@ -4359,6 +4359,7 @@ sp_rudus,130,200,4 script Morning#171_rudus 4_EP17_MORNING,{ unittalk getcharid(3),strcharinfo(0) + " : This kid seems to be Morning.",bc_self; switch (prompt("Find a meal for Morning.:Chat with Morning.")) { case 255: + cutin "",255; setpcblock PCBLOCK_ALL,false; end; case 1: @@ -4382,6 +4383,7 @@ sp_rudus,130,200,4 script Morning#171_rudus 4_EP17_MORNING,{ sleep2 2000; switch (prompt("I'll bring it.:Something urgent happened.")) { case 255: + cutin "",255; setpcblock PCBLOCK_ALL,false; end; case 1: diff --git a/npc/re/quests/quests_17_2.txt b/npc/re/quests/quests_17_2.txt index 71d42315e5..17b314693f 100644 --- a/npc/re/quests/quests_17_2.txt +++ b/npc/re/quests/quests_17_2.txt @@ -3944,7 +3944,7 @@ ba_in01,51,157,3 script Est#ep172_est01 4_F_ESTLOVELOY,{ if (!is_party_leader()) { mes "^4D4DFFThis place is a memorial dungeon."; mes "You have to be a party leader to create a memorial dungeon.^000000"; - close; + close3; } if (instance_create(.@md_name$) == -3) dispbottom "The reservation of the instance '" + .@md_name$ + "' has failed due to an active instance."; diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt index c8524524ef..9ec0dfb60d 100644 --- a/npc/re/quests/quests_malaya.txt +++ b/npc/re/quests/quests_malaya.txt @@ -2625,13 +2625,13 @@ OnTouch: delitem 6506, 1; // Memorial_Boquet erasequest 7398; setquest 7399; - close; + close3; } else if (malaya_diwata == 5) { cutin "malaya_diwata02", 2; mes "[Diwata]"; mes "I promise I'll be a good little girl if those hillbillies leave me alone."; mes "If they bother me again, however, I won't be."; - close; + close3; } else { if (checkquest(7402) == -1) { if (checkquest(7403) == -1) { @@ -2650,7 +2650,7 @@ OnTouch: mes "The flowers you bring makes me calm down."; mes "...."; mes ".. It's not because I miss people or I like the flowers. Don't take it the wrong way."; - close; + close3; } cutin "malaya_diwata01", 2; mes "[Diwata]"; @@ -2658,7 +2658,7 @@ OnTouch: mes "What? Oh, it's you."; mes "Those hillbillies came back again!"; mes "I'm going to kill them!"; - close; + close3; } cutin "malaya_diwata02", 2; mes "[Diwata]"; @@ -2669,7 +2669,7 @@ OnTouch: mes "The flowers you bring makes me calm down."; mes "...."; mes ".. It's not because I miss people or I like the flowers. Don't take it the wrong way."; - close; + close3; } cutin "malaya_diwata01", 2; mes "[Diwata]"; @@ -2718,7 +2718,7 @@ OnTouch: delitem 6506, 1; // Memorial_Boquet setquest 7403; erasequest 7402; - close; + close3; } cutin "", 255; end; diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt index cdefa1cb56..9a832605be 100644 --- a/npc/re/quests/quests_mora.txt +++ b/npc/re/quests/quests_mora.txt @@ -3389,26 +3389,26 @@ L_ShowReport: mes "[Experimental Results]"; mes "*** Researcher - Inffle"; mes "*** Research Assistant - "+strcharinfo(0); - mes "¡¡"; + mes " "; mes ""; mes "*** Bath of Mora Village"; - mes "¡¡"; + mes " "; mes ""; mes "To investigate the mysterious power of the bath water"; mes "and to find out ways to better utilize"; mes "the water."; - mes "¡¡"; + mes " "; mes ""; mes "1. Obtained an unidentified DNA sample."; mes "Obtained a sample of an unidentified DNA,"; mes "and collected more samples to look further into it."; - mes "¡¡"; + mes " "; mes "2. A comparison analysis on the unidentified DNA"; mes "Concluded that the DNA belongs to"; mes "an unidentified creature living in the bath water."; mes "combine and result in"; mes "from the swordfish DNA."; - mes "¡¡"; + mes " "; mes "3. Research on the puddles around the village"; mes "From the four puddles around the village,"; mes "confirmed that the testing substances were"; @@ -3416,9 +3416,9 @@ L_ShowReport: mes "It is thought that the four puddles"; mes "combine and result in"; mes "the mysterious power."; - mes "¡¡"; + mes " "; mes ""; - mes "*** Temperature ***** 33.5° "; + mes "*** Temperature ***** 33.5¡Æ"; mes "*** PH ************ 9.8"; mes "*** Solid residues *** 176"; mes "*** K+ ************ 0,23";