summaryrefslogtreecommitdiff
path: root/npc/quests
diff options
context:
space:
mode:
authorAtlantisRO <atlas@atlantis-ro.net>2017-01-18 00:36:32 -0700
committerAtlantisRO <atlas@atlantis-ro.net>2017-03-08 18:46:51 -0700
commit060c4ba50162363315f2f50b35cad931e2b75ec9 (patch)
tree14eea2a8bf638823be6364c494e8443cda21cba3 /npc/quests
parent7d7b08b52250951da969e2680d10719a686dcd3c (diff)
downloadhercules-060c4ba50162363315f2f50b35cad931e2b75ec9.tar.gz
hercules-060c4ba50162363315f2f50b35cad931e2b75ec9.tar.bz2
hercules-060c4ba50162363315f2f50b35cad931e2b75ec9.tar.xz
hercules-060c4ba50162363315f2f50b35cad931e2b75ec9.zip
Removed the usage of deprecated command goto from npc scripts (except custom folder).
Signed-off-by: Ragno <ragno@atlantis-ro.net>
Diffstat (limited to 'npc/quests')
-rw-r--r--npc/quests/bard_quest.txt84
-rw-r--r--npc/quests/bunnyband.txt62
-rw-r--r--npc/quests/cooking_quest.txt108
-rw-r--r--npc/quests/quests_airship.txt160
-rw-r--r--npc/quests/quests_lighthalzen.txt573
-rw-r--r--npc/quests/quests_rachel.txt124
-rw-r--r--npc/quests/thana_quest.txt42
7 files changed, 578 insertions, 575 deletions
diff --git a/npc/quests/bard_quest.txt b/npc/quests/bard_quest.txt
index 0c46a9ab6..79eca7720 100644
--- a/npc/quests/bard_quest.txt
+++ b/npc/quests/bard_quest.txt
@@ -166,19 +166,19 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
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;
+ callsub L_End;
} 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;
+ callsub L_End;
} 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;
+ callsub L_End;
} else if (gef_bard_q == 10) {
cutin "bard_eland01",2;
@@ -208,7 +208,7 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
mes "show him the Seal of Friendship.";
mes "Good luck, now~";
gef_bard_q = 11;
- goto L_End;
+ callsub L_End;
} else if (gef_bard_q == 20) {
cutin "bard_eland03",2;
@@ -258,7 +258,7 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
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;
+ callsub L_End;
}
} else if (gef_bard_q == 27) {
@@ -304,7 +304,7 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
mes "I beseech you, if you meet him, please ask him of the 8th love and inform me of that lyric immediately~";
gef_bard_q = 22;
}
- goto L_End;
+ callsub L_End;
} else if (gef_bard_q == 26) {
cutin "bard_eland01",2;
@@ -358,17 +358,17 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
mes "in advance~";
gef_bard_q = 24;
}
- goto L_End;
+ callsub L_End;
} 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;
+ callsub L_End;
} 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;
+ callsub L_End;
} else if (.@inputstr$ == "Errende") {
cutin "bard_eland04",2;
@@ -377,7 +377,7 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
mes "If I did, why would";
mes "I not know what";
mes "this song is about?";
- goto L_End;
+ callsub L_End;
} else {
mes "[Errende]";
@@ -390,7 +390,7 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
mes "How could I forget";
mes "the 8th love?";
gef_bard_q = 26;
- goto L_End;
+ callsub L_End;
}
} else if (gef_bard_q == 25) {
@@ -436,7 +436,7 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
mes "heart wrenching song.";
mes "But at what cost to your soul?^000000";
}
- goto L_End;
+ callsub L_End;
} else {
cutin "bard_eland01",2;
@@ -447,7 +447,7 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
mes "Noboooody looooves meee";
mes "Friends foooooor never...";
mes "Ooooooooh wah!^000000";
- goto L_End;
+ callsub L_End;
}
} else if (gef_bard_q == 24) {
@@ -473,7 +473,7 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
mes "Once again,";
mes "thank you so much";
mes "for your help.";
- goto L_End;
+ callsub L_End;
} else if (gef_bard_q == 22) {
mes "[Errende]";
@@ -489,7 +489,7 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
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;
+ callsub L_End;
} else if (gef_bard_q == 23) {
cutin "bard_eland02",2;
@@ -579,19 +579,19 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
mes "in advance~";
gef_bard_q = 24;
}
- goto L_End;
+ callsub L_End;
} 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.";
gef_bard_q = 26;
- goto L_End;
+ callsub L_End;
} 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.";
gef_bard_q = 26;
- goto L_End;
+ callsub L_End;
} else if (.@inputstr$ == "Errende") {
cutin "bard_eland04",2;
@@ -601,7 +601,7 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
mes "I not know what this";
mes "song is about?";
gef_bard_q = 26;
- goto L_End;
+ callsub L_End;
} else {
mes "[Errende]";
@@ -614,7 +614,7 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
mes "How could I forget";
mes "the 8th love?";
gef_bard_q = 26;
- goto L_End;
+ callsub L_End;
}
} else if (gef_bard_q == 21) {
@@ -664,7 +664,7 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
mes "I beseech you, if you meet him, please ask him of the 8th love and inform me of that lyric immediately~";
gef_bard_q = 2;
}
- goto L_End;
+ callsub L_End;
} else if (gef_bard_q == 6) {
cutin "bard_eland04",2;
@@ -708,23 +708,23 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
mes "I'll pay you back somehow! Thank you for your trouble in advance~";
gef_bard_q = 4;
}
- goto L_End;
+ callsub L_End;
} 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;
+ callsub L_End;
} 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;
+ callsub L_End;
} 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;
+ callsub L_End;
} else {
mes "[Errende]";
@@ -736,7 +736,7 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
mes "How could I forget";
mes "the 8th love?";
gef_bard_q = 6;
- goto L_End;
+ callsub L_End;
}
} else if (gef_bard_q == 5) {
@@ -773,7 +773,7 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
mes "heart wrenching song.";
mes "But at what cost to your soul?^000000";
}
- goto L_End;
+ callsub L_End;
} else {
cutin "bard_eland01",2;
@@ -784,7 +784,7 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
mes "Noboooody looooves meee";
mes "Friends foooooor never...";
mes "Ooooooooooh wah!^000000";
- goto L_End;
+ callsub L_End;
}
} else if (gef_bard_q == 4) {
@@ -809,7 +809,7 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
mes "Once again,";
mes "thank you so much";
mes "for your help.";
- goto L_End;
+ callsub L_End;
} else if (gef_bard_q == 2) {
cutin "bard_eland04",2;
@@ -822,7 +822,7 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
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;
+ callsub L_End;
} else if (gef_bard_q == 3) {
cutin "bard_eland02",2;
@@ -907,27 +907,27 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
mes "I'll pay you back somehow! Thank you for your trouble in advance~";
gef_bard_q = 4;
}
- goto L_End;
+ callsub L_End;
} 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.";
gef_bard_q = 6;
- goto L_End;
+ callsub L_End;
}
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.";
gef_bard_q = 6;
- goto L_End;
+ callsub L_End;
} 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?";
gef_bard_q = 6;
- goto L_End;
+ callsub L_End;
} else {
mes "[Errende]";
@@ -939,7 +939,7 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{
mes "How could I forget";
mes "the 8th love?";
gef_bard_q = 6;
- goto L_End;
+ callsub L_End;
}
} else if (gef_bard_q == 1) {
@@ -1122,7 +1122,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;
+ callsub L_End;
case 2:
mes "[Errende]";
@@ -1156,7 +1156,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;
+ callsub L_End;
case 2:
cutin "bard_eland03",2;
@@ -1225,7 +1225,7 @@ S_StorySong:
mes "may never know";
mes "with certainty.";
}
- goto L_End;
+ callsub L_End;
} else if (.@random == 2) {
@@ -1328,7 +1328,7 @@ S_StorySong:
if(gef_bard_q==1) gef_bard_q = 7;
if(gef_bard_q==21) gef_bard_q = 27;
}
- goto L_End;
+ callsub L_End;
}
mes "^483D8BA good Bard sings";
@@ -1352,7 +1352,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;
+ callsub L_End;
case 3:
cutin "bard_eland01",2;
@@ -1362,7 +1362,7 @@ S_StorySong:
mes "enjoyed when you";
mes "are in the mood for it.";
mes "Please come again.";
- goto L_End;
+ callsub L_End;
}
@@ -1371,7 +1371,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;
+ callsub L_End;
}
}
diff --git a/npc/quests/bunnyband.txt b/npc/quests/bunnyband.txt
index 957e3ab01..9b3537312 100644
--- a/npc/quests/bunnyband.txt
+++ b/npc/quests/bunnyband.txt
@@ -101,43 +101,43 @@ alberta,26,229,0 script Kafra Employee#bunny 4_M_01,{
mes "of the Kafra Services~";
close;
case 2:
- goto L_Info;
+ break;
case 3:
close;
}
- }
- mes "[Kafra Employee]";
- mes "Hi there~! Would you like";
- mes "to join our special ^529DFFBunny";
- mes "Band Event^000000 hosted by the Kafra";
- mes "Corporation and sponsored by";
- mes "the Alberta Merchant Guild?";
- next;
- switch(select("Join the Event", "Event Information", "Cancel")) {
- case 1:
- BUNYBND = 1;
+ } else {
mes "[Kafra Employee]";
- mes "Great! Thanks for";
- mes "participating! If you";
- mes "haven't already heard,";
- mes "you need to collect these";
- mes "items if you want me put a";
- mes "Bunny Band together for you...";
+ mes "Hi there~! Would you like";
+ mes "to join our special ^529DFFBunny";
+ mes "Band Event^000000 hosted by the Kafra";
+ mes "Corporation and sponsored by";
+ mes "the Alberta Merchant Guild?";
next;
- mes "[Kafra Employee]";
- mes "100 Feathers,";
- mes "1 Four-Leaf Clover,";
- mes "1 Kitty Band and";
- mes "1 Pearl. That's it!";
- mes "Good luck and I'll be";
- mes "waiting for you here~";
- close;
- case 2:
- break;
- case 3:
- close;
+ switch(select("Join the Event", "Event Information", "Cancel")) {
+ case 1:
+ BUNYBND = 1;
+ mes "[Kafra Employee]";
+ mes "Great! Thanks for";
+ mes "participating! If you";
+ mes "haven't already heard,";
+ mes "you need to collect these";
+ mes "items if you want me put a";
+ mes "Bunny Band together for you...";
+ next;
+ mes "[Kafra Employee]";
+ mes "100 Feathers,";
+ mes "1 Four-Leaf Clover,";
+ mes "1 Kitty Band and";
+ mes "1 Pearl. That's it!";
+ mes "Good luck and I'll be";
+ mes "waiting for you here~";
+ close;
+ case 2:
+ break;
+ case 3:
+ close;
+ }
}
-L_Info:
mes "[Kafra Employee]";
mes "To thank our valued";
mes "customers, Kafra Corporation";
diff --git a/npc/quests/cooking_quest.txt b/npc/quests/cooking_quest.txt
index 3b97f60ee..048201063 100644
--- a/npc/quests/cooking_quest.txt
+++ b/npc/quests/cooking_quest.txt
@@ -85,7 +85,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "be careful and watch your";
mes "step when you climb up";
mes "the stairs for me, alright?";
- goto L_End;
+ callsub L_End;
}
else if (getequipid(1) != 5026) {
if (Sex == SEX_MALE) {
@@ -123,7 +123,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "But I do find that you";
mes "adventurers do have";
mes "your strong points...";
- goto L_End;
+ callsub L_End;
}
cutin "orleans_1",0;
mes "[Charles Orleans]";
@@ -236,7 +236,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "treats that only I can offer.";
mes "Until that day comes, I shall";
mes "reluctantly bid you adieu.";
- goto L_End;
+ callsub L_End;
}
else if (cooking_q == 0) {
cutin "orleans_5",0;
@@ -342,7 +342,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "^4D4DFF1 Cooking Oil^000000, and";
mes "^4D4DFF1 Old Frying Pan^000000.";
mes "Then, we can begin.";
- goto L_End;
+ callsub L_End;
}
else if (.@cook_m1 == 2) {
cooking_q = 2;
@@ -359,7 +359,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "^4D4DFF2 Red Potions^000000";
mes "so that we can";
mes "begin the lesson~";
- goto L_End;
+ callsub L_End;
}
else if (.@cook_m1 == 3) {
cooking_q = 3;
@@ -375,7 +375,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "^4D4DFF1 Honey^000000,";
mes "^4D4DFF2 Grapes^000000, and";
mes "^4D4DFF1 Red Potion^000000.";
- goto L_End;
+ callsub L_End;
}
else if (.@cook_m1 == 4) {
cooking_q = 4;
@@ -393,7 +393,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "^4D4DFF1 Bag of Grain^000000,";
mes "^4D4DFF10 Spawns^000000, and";
mes "^4D4DFF1 Squid Ink^000000.";
- goto L_End;
+ callsub L_End;
}
else if (.@cook_m1 == 5) {
cooking_q = 5;
@@ -410,7 +410,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "^4D4DFF10 Green Herbs^000000,";
mes "^4D4DFF10 Nippers^000000, and";
mes "^4D4DFF1 Yellow Potion^000000.";
- goto L_End;
+ callsub L_End;
}
cooking_q = 6;
mes "[Charles Orleans]";
@@ -426,7 +426,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "^4D4DFF1 Frying Pan^000000,";
mes "^4D4DFF5 Yoyo Tails^000000, and";
mes "^4D4DFF1 Cooking Oil^000000.";
- goto L_End;
+ callsub L_End;
}
else if (cooking_q == 1) {
if (countitem(Grasshoppers_Leg) > 4 && countitem(Old_Frying_Pan) > 0 && countitem(Cooking_Oil) > 0) {
@@ -467,7 +467,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
delitem Cooking_Oil,1;
cooking_q = 7;
getitem Str_Dish01,1;
- goto L_End;
+ callsub L_End;
}
cutin "orleans_6",0;
.@talk_j = rand(1,2);
@@ -479,14 +479,14 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "If a restaurant patron had";
mes "ordered this, then you'd";
mes "already be making him wait!";
- goto L_End;
+ callsub L_End;
}
mes "[Charles Orleans]";
mes "Just go and ambush those";
mes "happy-go-lucky grasshoppers";
mes "just playing in the fields. Hurry and smash them, then rip their";
mes "legs off--but be humane about it! ";
- goto L_End;
+ callsub L_End;
}
else if (cooking_q == 2) {
if (countitem(Grape) > 2 && countitem(Red_Potion) > 1) {
@@ -524,7 +524,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
delitem Red_Potion,2;
cooking_q = 7;
getitem Int_Dish01,1;
- goto L_End;
+ callsub L_End;
}
cutin "orleans_6",0;
.@talk_j = rand(1,2);
@@ -535,7 +535,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "ingredients for Grape Juice";
mes "Herbal Tea! At a real restaurant, you'd never be able to take your";
mes "time like this! Quickly, now!";
- goto L_End;
+ callsub L_End;
}
mes "[Charles Orleans]";
mes "Having trouble finding";
@@ -543,7 +543,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "those cute little Poporings...";
mes "Of course, you should try to";
mes "be humane when you hunt them...";
- goto L_End;
+ callsub L_End;
}
else if (cooking_q == 3) {
if (countitem(Honey) > 0 && countitem(Grape) > 1 && countitem(Red_Potion) > 0) {
@@ -585,7 +585,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
delitem Red_Potion,1;
cooking_q = 7;
getitem Dex_Dish01,1;
- goto L_End;
+ callsub L_End;
}
cutin "orleans_6",0;
.@talk_j = rand(1,2);
@@ -596,7 +596,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "brought me the ingredients";
mes "to make Honey Grape Juice";
mes "a while ago. Hurry it up!";
- goto L_End;
+ callsub L_End;
}
mes "[Charles Orleans]";
mes "You're having trouble";
@@ -605,7 +605,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "Just go and hunt some bears,";
mes "they're always carrying some";
mes "of that Honey around.";
- goto L_End;
+ callsub L_End;
}
else if (cooking_q == 4) {
if (countitem(Grain) > 0 && countitem(Spawn) > 9 && countitem(Chinese_Ink) > 0) {
@@ -646,7 +646,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
delitem Chinese_Ink,1; //Chinese_ink
cooking_q = 7;
getitem Agi_Dish01,1;
- goto L_End;
+ callsub L_End;
}
cutin "orleans_6",0;
.@talk_j = rand(1,2);
@@ -657,7 +657,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "preparing ingredients";
mes "for Frog Egg and Squid";
mes "Ink Soup right now!";
- goto L_End;
+ callsub L_End;
}
mes "[Charles Orleans]";
mes "You have to be careful";
@@ -665,7 +665,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "Eggs. If you feed them raw to";
mes "somebody, well, their flavor is";
mes "decidely less than magnifique.";
- goto L_End;
+ callsub L_End;
}
else if (cooking_q == 5) {
if (countitem(Nipper) > 9 && countitem(Green_Herb) > 9 && countitem(Yellow_Potion) > 0) {
@@ -706,7 +706,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
delitem Yellow_Potion,1;
cooking_q = 7;
getitem Vit_Dish01,1;
- goto L_End;
+ callsub L_End;
}
cutin "orleans_6",0;
.@talk_j = rand(1,2);
@@ -718,7 +718,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "Crab Nippers? You need";
mes "to work quickly for those";
mes "hungry restaurant patrons!";
- goto L_End;
+ callsub L_End;
}
mes "[Charles Orleans]";
mes "It shouldn't be too hard";
@@ -726,7 +726,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "find some Vadons and crush";
mes "them, making sure to rip off";
mes "their Nippers. That sounds strange, I know, but just do it.";
- goto L_End;
+ callsub L_End;
}
else if (cooking_q == 6) {
if (countitem(Yoyo_Tail) > 4 && countitem(Old_Frying_Pan) > 0 && countitem(Cooking_Oil) > 0) {
@@ -767,7 +767,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
delitem Cooking_Oil,1;
cooking_q = 7;
getitem Luk_Dish01,1;
- goto L_End;
+ callsub L_End;
}
cutin "orleans_6",0;
.@talk_j = rand(1,2);
@@ -779,7 +779,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "you can. In a real restaurant,";
mes "you'd never able to take your";
mes "time like this. Toute allure!";
- goto L_End;
+ callsub L_End;
}
mes "[Charles Orleans]";
mes "You need more tails?";
@@ -788,7 +788,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "and then slice off their tails.";
mes "You're a beginner, but I won't";
mes "allow you to be inhumane!";
- goto L_End;
+ callsub L_End;
}
else if (cooking_q == 7) {
cutin "orleans_7",0;
@@ -808,7 +808,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "teaching until one of you can";
mes "become a worthy successor.";
mes "It will take some time...";
- goto L_End;
+ callsub L_End;
}
else if (cooking_q == 8) {
cutin "orleans_5",0;
@@ -847,7 +847,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes ".....Who told you";
mes "to ask her name?";
mes "You don't even understand what she is saying.";
- goto L_End;
+ callsub L_End;
case 2:
cutin "nyuang_2",2;
emotion e_pif,0,"Child with Cat#cook";
@@ -863,7 +863,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "the child won't talk to us...";
mes "Still, we need to get those";
mes "two out of the kitchen.";
- goto L_End;
+ callsub L_End;
case 3:
cutin "nyuang_3",2;
emotion e_heh,0,"Child with Cat#cook";
@@ -876,7 +876,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "[Charles Orleans]";
mes "...Are you playing with that kid...?";
mes "...Then I don't need you to be here.";
- goto L_End;
+ callsub L_End;
case 4:
emotion e_dots,0,"Child with Cat#cook";
mes "[Child with Cat]";
@@ -897,7 +897,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "You should have";
mes "been more careful";
mes "handling that cat...";
- goto L_End;
+ callsub L_End;
}
}
else if (cooking_q == 9) {
@@ -1029,7 +1029,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "Ah...";
mes "There goes a true";
mes "lady... Madam Wickebine...";
- goto L_End;
+ callsub L_End;
}
else if (cooking_q == 10) {
cutin "orleans_5",0;
@@ -1071,7 +1071,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "Praise the glories of the";
mes "Rune-Midgarts Kingdom!";
mes "Long live King Tristram III!";
- goto L_End;
+ callsub L_End;
}
else if (cooking_q == 11) {
cutin "orleans_5",0;
@@ -1112,7 +1112,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "1 to 5. Those are the";
mes "only cookbooks that I will";
mes "lend out to my students.";
- goto L_End;
+ callsub L_End;
}
else if (.@new_book == 0) {
cutin "orleans_5",0;
@@ -1122,7 +1122,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "study the recipes that you";
mes "have right now before trying";
mes "something new, I suppose.";
- goto L_End;
+ callsub L_End;
}
mes "[Charles Orleans]";
mes "So you wanted to borrow a";
@@ -1140,7 +1140,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "levels 1 to 5. Hmm, well, ask";
mes "me again when you remember";
mes "which cookbook you have, okay?";
- goto L_End;
+ callsub L_End;
}
else if (.@old_book == 0) {
cutin "orleans_5",0;
@@ -1150,7 +1150,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "study the recipes that you";
mes "have right now before trying";
mes "something new, I suppose.";
- goto L_End;
+ callsub L_End;
}
else if (.@old_book == .@new_book) {
cutin "orleans_4",0;
@@ -1161,7 +1161,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "cookbook that you already";
mes "have? I guess you made";
mes "some sort of mistake?";
- goto L_End;
+ callsub L_End;
}
else {
if (countitem(7471+.@old_book) < 1) {
@@ -1172,7 +1172,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "that you'd return to me?";
mes "Find it first, and then I can";
mes "lend another cookbook to you.";
- goto L_End;
+ callsub L_End;
}
cutin "orleans_2",0;
mes "[Charles Orleans]";
@@ -1264,10 +1264,10 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "Oh, how I miss the";
mes "taste of Pumpkins!";
mes "Ahhh, how nostalgic~";
- goto L_End;
+ callsub L_End;
}
}
- else goto L_End;
+ else callsub L_End;
}
else if (.@new_book== 2) {
cutin "orleans_7",0;
@@ -1298,10 +1298,10 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "soon... But the experience";
mes "isn't complete without any";
mes "Well-Baked Cookies to munch~";
- goto L_End;
+ callsub L_End;
}
}
- else goto L_End;
+ else callsub L_End;
}
else if (.@new_book== 3) {
cutin "orleans_7",0;
@@ -1330,10 +1330,10 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "things I don't know";
mes "how to make extremely";
mes "well. Can you believe that?";
- goto L_End;
+ callsub L_End;
}
}
- else goto L_End;
+ else callsub L_End;
}
else if (.@new_book== 4) {
cutin "orleans_7",0;
@@ -1364,10 +1364,10 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "of that delicious Bao.";
mes "I'd cook it myself, but";
mes "I don't know the secret!";
- goto L_End;
+ callsub L_End;
}
}
- else goto L_End;
+ else callsub L_End;
}
else if (.@new_book== 5) {
cutin "orleans_7",0;
@@ -1396,10 +1396,10 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "cook with those Shoots";
mes "soon, so I'd appreciate it";
mes "if you'd do this little favor~";
- goto L_End;
+ callsub L_End;
}
}
- else goto L_End;
+ else callsub L_End;
}
if (.@old_book == 1) delitem Cookbook01,1;
@@ -1434,7 +1434,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "good care of it--don't sell";
mes "it or lose it or anything like";
mes "that. Good luck cooking now~";
- goto L_End;
+ callsub L_End;
case 2:
cutin "orleans_3",0;
@@ -1462,7 +1462,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "why my spirit to create";
mes "culinary masterpieces has";
mes "been reinvigorated lately...";
- goto L_End;
+ callsub L_End;
case 3:
cutin "orleans_5",0;
@@ -1470,7 +1470,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "Please, do not worry";
mes "yourself about it. Just";
mes "let me rest for now~";
- goto L_End;
+ callsub L_End;
}
}
@@ -1479,7 +1479,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{
mes "Mon dieu!";
mes "An error has";
mes "occurred!";
- goto L_End;
+ callsub L_End;
}
L_End:
diff --git a/npc/quests/quests_airship.txt b/npc/quests/quests_airship.txt
index c5c8f69b5..8c743d99a 100644
--- a/npc/quests/quests_airship.txt
+++ b/npc/quests/quests_airship.txt
@@ -2831,88 +2831,90 @@ airplane,33,69,4 script Kaci 1_F_MERCHANT_01,{
mes "do it himself. Reading that";
mes "letter really made my day~";
next;
-L_Ask:
- switch(select("Ask about Hallen", "Ask about Mawong", "Ask about the Airship")) {
- case 1:
- .@mesa = 1;
- mes "[Kaci]";
- mes "Hallen? Well, he and I are";
- mes "pretty close. Did you know";
- mes "that we're cousins? In fact,";
- mes "his dad, my uncle, brought";
- mes "me as a child after my father";
- mes "passed away 20 years ago.";
- next;
- mes "[Kaci]";
- mes "There was some kind of";
- mes "mine explosion accident in";
- mes "Einbech. I don't remember.";
- mes "Anyway, me and Hallen are";
- mes "like sister and brother, and";
- mes "we always stick together.";
- next;
- mes "[Kaci]";
- mes "When Captain Ferlock saw me";
- mes "host a Dice game by coincidence";
- mes "and then hired me to work on his Airship, Hallen insisted on coming";
- mes "along. He's stubborn like that,";
- mes "but he's also very sweet.";
- next;
- break;
- case 2:
- .@mesb = 1;
- mes "[Kaci]";
- mes "Mr. Mawong? Oh, don't get";
- mes "the wrong idea! He's my";
- mes "mentor, the one who taught";
- mes "me how to play all of these";
- mes "wonderful games. He's pretty";
- mes "famous around Juno, you know.";
- next;
- mes "[Kaci]";
- mes "I used to be so depressed,";
- mes "not caring about the world";
- mes "at all, after my father died.";
- mes "Then, I ran into Mr. Mawong,";
- mes "and he taught me how to find";
- mes "the joy in life once again.";
- next;
- mes "[Kaci]";
- mes "Because of him, I decided";
- mes "to learn his games and to";
- mes "help people forget their";
- mes "worries and just enjoy";
- mes "themselves, even if it's";
- mes "just for a little while.";
- next;
- break;
- case 3:
- .@mesc = 1;
- mes "[Kaci]";
- mes "The Airship? It's so";
- mes "huge and beautiful, and";
- mes "I'm always amazed that it";
- mes "can fly so gracefully through";
- mes "the air. I've always wanted to live someplace close to the sky...";
- next;
+ while (true) {
+ switch (select("Ask about Hallen", "Ask about Mawong", "Ask about the Airship")) {
+ case 1:
+ .@mesa = 1;
+ mes "[Kaci]";
+ mes "Hallen? Well, he and I are";
+ mes "pretty close. Did you know";
+ mes "that we're cousins? In fact,";
+ mes "his dad, my uncle, brought";
+ mes "me as a child after my father";
+ mes "passed away 20 years ago.";
+ next;
+ mes "[Kaci]";
+ mes "There was some kind of";
+ mes "mine explosion accident in";
+ mes "Einbech. I don't remember.";
+ mes "Anyway, me and Hallen are";
+ mes "like sister and brother, and";
+ mes "we always stick together.";
+ next;
+ mes "[Kaci]";
+ mes "When Captain Ferlock saw me";
+ mes "host a Dice game by coincidence";
+ mes "and then hired me to work on his Airship, Hallen insisted on coming";
+ mes "along. He's stubborn like that,";
+ mes "but he's also very sweet.";
+ next;
+ break;
+ case 2:
+ .@mesb = 1;
+ mes "[Kaci]";
+ mes "Mr. Mawong? Oh, don't get";
+ mes "the wrong idea! He's my";
+ mes "mentor, the one who taught";
+ mes "me how to play all of these";
+ mes "wonderful games. He's pretty";
+ mes "famous around Juno, you know.";
+ next;
+ mes "[Kaci]";
+ mes "I used to be so depressed,";
+ mes "not caring about the world";
+ mes "at all, after my father died.";
+ mes "Then, I ran into Mr. Mawong,";
+ mes "and he taught me how to find";
+ mes "the joy in life once again.";
+ next;
+ mes "[Kaci]";
+ mes "Because of him, I decided";
+ mes "to learn his games and to";
+ mes "help people forget their";
+ mes "worries and just enjoy";
+ mes "themselves, even if it's";
+ mes "just for a little while.";
+ next;
+ break;
+ case 3:
+ .@mesc = 1;
+ mes "[Kaci]";
+ mes "The Airship? It's so";
+ mes "huge and beautiful, and";
+ mes "I'm always amazed that it";
+ mes "can fly so gracefully through";
+ mes "the air. I've always wanted to live someplace close to the sky...";
+ next;
+ mes "[Kaci]";
+ mes "A place where I can see";
+ mes "the clouds and bask in the";
+ mes "sun. So, when Captain Ferlock";
+ mes "invited me to work here, it was";
+ mes "like a dream come true~";
+ next;
+ break;
+ }
mes "[Kaci]";
- mes "A place where I can see";
- mes "the clouds and bask in the";
- mes "sun. So, when Captain Ferlock";
- mes "invited me to work here, it was";
- mes "like a dream come true~";
+ mes "Please don't hesitate";
+ mes "to ask me anything if";
+ mes "you need a small favor,";
+ mes "or if you're just curious";
+ mes "about me in general~";
next;
- break;
+ if (.@mesa && .@mesb && .@mesc)
+ break;
}
mes "[Kaci]";
- mes "Please don't hesitate";
- mes "to ask me anything if";
- mes "you need a small favor,";
- mes "or if you're just curious";
- mes "about me in general~";
- next;
- if (!.@mesa || !.@mesb || !.@mesc) goto L_Ask;
- mes "[Kaci]";
mes "By the way, if Hallen";
mes "bothers you with another";
mes "request, please refuse to";
@@ -3077,7 +3079,6 @@ OnTouch:
}
while (1) {
while (1) {
-L_Retry:
next;
input @input;
if (@input < 100 || @input > 999) {
@@ -3218,7 +3219,6 @@ L_Retry:
case 3: mes "Initialing 4th attempt...^000000"; break;
case 4: mes "Initialing final attempt...^000000"; break;
}
- goto L_Retry;
}
}
end;
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index 0a80c25ae..d2df83768 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -7737,136 +7737,138 @@ yuno_pre,69,79,4 script Mr. President 4_M_PRESIDENT,{
mes "Now, I'm sure that you must";
mes "have some questions for me...";
next;
-L_Mission:
- switch( select( "Secret Wing's Background","Rekenber's Purpose","Secret Wing's Goal","Details about my mission","I'm ready for my mission." ) )
- {
- case 1:
- mes "[Karl]";
- mes "Rekenber has been";
- mes "unopposed for a very long";
- mes "time. Our nation is unhappy";
- mes "with their rule, but since our";
- mes "country lacks solidarity, the";
- mes "people can do nothing.";
- next;
- mes "[Karl]";
- mes "But one day, I was contacted";
- mes "by some people who claimed to";
- mes "share my sentiments against";
- mes "the Rekenber Corporation.";
- mes "Later, I learned that they were";
- mes "from the Kafra Corporation.";
- next;
- mes "[Karl]";
- mes "Apparently, they were";
- mes "facing some aggressive";
- mes "competition from Cool";
- mes "Event Corp, which is";
- mes "actually backed by the";
- mes "Rekenber Corporation.";
- next;
- mes "[Karl]";
- mes "We decided to pool our";
- mes "resources to deal with what";
- mes "we perceived as a common";
- mes "enemy. Before long, we gathered";
- mes "more devotees to our cause and";
- mes "formed the ''Secret Wing.''";
- next;
- mes "[Karl]";
- mes "It may be helpful for";
- mes "you to know that our";
- mes "direct contact to the";
- mes "Kafra Corporation is the";
- mes "^FF00003rd Security Team^000000. Oh, did";
- mes "you have any other questions?";
- next;
- goto L_Mission;
+ while (true) {
+ switch( select( "Secret Wing's Background","Rekenber's Purpose","Secret Wing's Goal","Details about my mission","I'm ready for my mission." ) )
+ {
+ case 1:
+ mes "[Karl]";
+ mes "Rekenber has been";
+ mes "unopposed for a very long";
+ mes "time. Our nation is unhappy";
+ mes "with their rule, but since our";
+ mes "country lacks solidarity, the";
+ mes "people can do nothing.";
+ next;
+ mes "[Karl]";
+ mes "But one day, I was contacted";
+ mes "by some people who claimed to";
+ mes "share my sentiments against";
+ mes "the Rekenber Corporation.";
+ mes "Later, I learned that they were";
+ mes "from the Kafra Corporation.";
+ next;
+ mes "[Karl]";
+ mes "Apparently, they were";
+ mes "facing some aggressive";
+ mes "competition from Cool";
+ mes "Event Corp, which is";
+ mes "actually backed by the";
+ mes "Rekenber Corporation.";
+ next;
+ mes "[Karl]";
+ mes "We decided to pool our";
+ mes "resources to deal with what";
+ mes "we perceived as a common";
+ mes "enemy. Before long, we gathered";
+ mes "more devotees to our cause and";
+ mes "formed the ''Secret Wing.''";
+ next;
+ mes "[Karl]";
+ mes "It may be helpful for";
+ mes "you to know that our";
+ mes "direct contact to the";
+ mes "Kafra Corporation is the";
+ mes "^FF00003rd Security Team^000000. Oh, did";
+ mes "you have any other questions?";
+ next;
+ break;
- case 2:
- mes "[Karl]";
- mes "It's true that companies";
- mes "exist to create money, but";
- mes "the Rekenber Corporation";
- mes "is much more nefarious.";
- mes "They actually want to dominate the entire Rune-Midgard continent.";
- next;
- mes "[Karl]";
- mes "In fact, the chairman of";
- mes "that company is shrouded";
- mes "in mystery. Although I'm";
- mes "the president, I go through";
- mes "many difficulties just to";
- mes "send a message to him.";
- next;
- mes "[Karl]";
- mes "It's disheartening,";
- mes "but we really have no";
- mes "idea what their true goals";
- mes "and plans might be. Now, did";
- mes "you have any other questions?";
- next;
- goto L_Mission;
+ case 2:
+ mes "[Karl]";
+ mes "It's true that companies";
+ mes "exist to create money, but";
+ mes "the Rekenber Corporation";
+ mes "is much more nefarious.";
+ mes "They actually want to dominate the entire Rune-Midgard continent.";
+ next;
+ mes "[Karl]";
+ mes "In fact, the chairman of";
+ mes "that company is shrouded";
+ mes "in mystery. Although I'm";
+ mes "the president, I go through";
+ mes "many difficulties just to";
+ mes "send a message to him.";
+ next;
+ mes "[Karl]";
+ mes "It's disheartening,";
+ mes "but we really have no";
+ mes "idea what their true goals";
+ mes "and plans might be. Now, did";
+ mes "you have any other questions?";
+ next;
+ break;
- case 3:
- mes "[Karl]";
- mes "''Secret Wing's'' only";
- mes "goal is to destroy the";
- mes "Rekenber Corporation in";
- mes "order to break the Schwaltzvalt Republic free from its oppression.";
- next;
- mes "[Karl]";
- mes "Of course, we realize";
- mes "that it will take time and";
- mes "a lot of sacrifice to make";
- mes "this a reality. Now, do you";
- mes "have anything else to ask?";
- next;
- goto L_Mission;
+ case 3:
+ mes "[Karl]";
+ mes "''Secret Wing's'' only";
+ mes "goal is to destroy the";
+ mes "Rekenber Corporation in";
+ mes "order to break the Schwaltzvalt Republic free from its oppression.";
+ next;
+ mes "[Karl]";
+ mes "Of course, we realize";
+ mes "that it will take time and";
+ mes "a lot of sacrifice to make";
+ mes "this a reality. Now, do you";
+ mes "have anything else to ask?";
+ next;
+ break;
- case 4:
- mes "[Karl]";
- mes "Ah, your next mission.";
- mes "I'm ready to give you";
- mes "some of the details if";
- mes "you no longer have any";
- mes "questions to ask. Let me";
- mes "know when you are ready.";
- next;
- goto L_Mission;
+ case 4:
+ mes "[Karl]";
+ mes "Ah, your next mission.";
+ mes "I'm ready to give you";
+ mes "some of the details if";
+ mes "you no longer have any";
+ mes "questions to ask. Let me";
+ mes "know when you are ready.";
+ next;
+ break;
- case 5:
- mes "[Karl]";
- mes "Very well, then.";
- mes "Your mission will not";
- mes "be too difficult, but it does";
- mes "have great urgency so you";
- mes "must accomplish it as soon";
- mes "as you can. Understood?";
- next;
- switch( select( "Wait, I have one more question!","Yes sir, Mr. President." ) )
- {
- case 1:
- mes "[Karl]";
- mes "Hm? I thought you";
- mes "didn't have any more";
- mes "questions. However, I still";
- mes "have the luxury to give you";
- mes "any answers that I can provide.";
- next;
- goto L_Mission;
+ case 5:
+ mes "[Karl]";
+ mes "Very well, then.";
+ mes "Your mission will not";
+ mes "be too difficult, but it does";
+ mes "have great urgency so you";
+ mes "must accomplish it as soon";
+ mes "as you can. Understood?";
+ next;
+ switch( select( "Wait, I have one more question!","Yes sir, Mr. President." ) )
+ {
+ case 1:
+ mes "[Karl]";
+ mes "Hm? I thought you";
+ mes "didn't have any more";
+ mes "questions. However, I still";
+ mes "have the luxury to give you";
+ mes "any answers that I can provide.";
+ next;
+ break;
- case 2:
- mes "[Karl]";
- mes "I'm glad to hear that.";
- mes "Alright, give me a second";
- mes "to search for this file before";
- mes "I explain the mission.";
- lhz_boss = 15;
- close2;
- cutin "",255;
- end;
- }
+ case 2:
+ mes "[Karl]";
+ mes "I'm glad to hear that.";
+ mes "Alright, give me a second";
+ mes "to search for this file before";
+ mes "I explain the mission.";
+ lhz_boss = 15;
+ close2;
+ cutin "",255;
+ end;
+ }
+ break;
+ }
}
}
else if(lhz_boss == 15)
@@ -9690,68 +9692,68 @@ OnTouch:
mes "You need to input the correct";
mes "password to open the door.^000000";
next;
-L_Enter:
- input @sneakpass;
- if(@sneakpass == 738495)
- {
- mes "^3355FF*Beep~*";
- mes "You hear a pleasant";
- mes "sounding electronic chirp,";
- mes "signaling that you have input";
- mes "the correct password. The door";
- mes "automatically slides open.";
+ while (true) {
+ input @sneakpass;
+ if(@sneakpass == 738495)
+ {
+ mes "^3355FF*Beep~*";
+ mes "You hear a pleasant";
+ mes "sounding electronic chirp,";
+ mes "signaling that you have input";
+ mes "the correct password. The door";
+ mes "automatically slides open.";
+ next;
+ switch( select( "Enter","Retreat" ) )
+ {
+ case 1:
+ mes "[Security System]";
+ mes "You have 3 minutes to";
+ mes "search the Information Archive.";
+ mes "When this time elapses, you";
+ mes "will be automatically sent";
+ mes "outside for security reasons.";
+ close2;
+ lhz_boss = 29;
+ donpcevent "Timer_Sneak::OnEnter";
+ warp "lhz_in01",177,35;
+ end;
+
+ case 2:
+ mes "^3355FFPerhaps now would";
+ mes "not be the best time to";
+ mes "enter the Secret Archive.";
+ mes "Or at least, that's what";
+ mes "you've decided for yourself.^000000";
+ close;
+ }
+ }
+ mes "^3355FF*Eeeeeee*";
+ mes "The door emits an";
+ mes "unnerving, high pitched";
+ mes "screech after you input";
+ mes "the password. You really";
+ mes "should try to input it again.^000000";
+ ++@sneakerror;
next;
- switch( select( "Enter","Retreat" ) )
+ if(@sneakerror > 2)
{
- case 1:
mes "[Security System]";
- mes "You have 3 minutes to";
- mes "search the Information Archive.";
- mes "When this time elapses, you";
- mes "will be automatically sent";
- mes "outside for security reasons.";
+ mes "*Gzzzzz*";
+ mes "You have entered the";
+ mes "password incorrectly";
+ mes "3 times. Please stand by";
+ mes "for managerial assistance.";
+ next;
+ mes "^3355FFUh oh!";
+ mes "You better get";
+ mes "out of here before";
+ mes "you get caught!^000000";
close2;
- lhz_boss = 29;
- donpcevent "Timer_Sneak::OnEnter";
- warp "lhz_in01",177,35;
+ warp "lhz_in01",191,49;
end;
-
- case 2:
- mes "^3355FFPerhaps now would";
- mes "not be the best time to";
- mes "enter the Secret Archive.";
- mes "Or at least, that's what";
- mes "you've decided for yourself.^000000";
- close;
}
- }
- mes "^3355FF*Eeeeeee*";
- mes "The door emits an";
- mes "unnerving, high pitched";
- mes "screech after you input";
- mes "the password. You really";
- mes "should try to input it again.^000000";
- ++@sneakerror;
- next;
- if(@sneakerror > 2)
- {
- mes "[Security System]";
- mes "*Gzzzzz*";
- mes "You have entered the";
- mes "password incorrectly";
- mes "3 times. Please stand by";
- mes "for managerial assistance.";
- next;
- mes "^3355FFUh oh!";
- mes "You better get";
- mes "out of here before";
- mes "you get caught!^000000";
- close2;
- warp "lhz_in01",191,49;
- end;
- }
- goto L_Enter;
+ }
case 2:
mes "^3355FFPerhaps now would";
@@ -9812,113 +9814,114 @@ lhz_in01,182,35,0 script File Search Engine HIDDEN_NPC,{
mes "keywords to in order to find";
mes "specific file locations.";
next;
-L_Search:
- switch( select( "Search Engine.","Cancel." ) )
- {
- case 1:
- mes "^663300- Search Engine Initiated -";
- mes "- Please enter a keyword -";
- mes " ";
- mes "*Search Engine";
- mes "is case sensitve.";
- mes "Please do not use";
- mes "capital letters.^000000";
- next;
- input @sneaksearch$;
- if((@sneaksearch$ == "kafra") || (@sneaksearch$ == "cool event"))
- {
- mes "^663300[Search Result]";
- mes "Documents regarding";
- mes "Kafra Corporation and";
- mes "Cool Event Corp are";
- mes "located in Arena 3-2.^000000";
- lhz_boss = 30;
- close;
- }
- else if(@sneaksearch$ == "shinokas")
- {
- mes "^663300[Search Result]";
- mes "Documents regarding";
- mes "Shinokas are located";
- mes "in Arena 1-5.^000000";
- lhz_boss = 31;
- close;
- }
- else if((@sneaksearch$ == "stein") || (@sneaksearch$ == "STEIN") || (@sneaksearch$ == "S.T.E.I.N"))
- {
- mes "^663300[Search Result]";
- mes "Documents regarding";
- mes "S.T.E.I.N are considered";
- mes "highly classified and";
- mes "cannot be accessed";
- mes "through this system.^000000";
- close;
- }
- else if(@sneaksearch$ == "ymir")
- {
- mes "^663300[Search Result]";
- mes "Documents regarding";
- mes "Ymir's Heart are ranked";
- mes "as highly classified and";
- mes "cannot be accessed";
- mes "through this system.^000000";
- close;
- }
- else if((@sneaksearch$ == "president") || (@sneaksearch$ == "karl") || (@sneaksearch$ == "weierstrass"))
- {
- mes "^663300[Search Result]";
- mes "2nd Class documents on";
- mes "President Karl Weierstrass";
- mes "are located in Area 1-7. For";
- mes "more highly classified files";
- mes "on Weierstrass, please use";
- mes "a higher security archive.^000000";
- lhz_boss = 32;
- close;
- }
- else if(@sneaksearch$ == "einbroch")
- {
- mes "^663300[Search Result]";
- mes "Documents regarding";
- mes "Einbroch are stored";
- mes "in Area 6-1.^000000";
- lhz_boss = 33;
- close;
- }
- else if(@sneaksearch$ == "lighthalzen")
- {
- mes "^663300[Search Result]" ;
- mes "Documents regarding";
- mes "Lighthalzen are stored";
- mes "in Area 3-3.^000000";
- lhz_boss = 34;
- close;
- }
- else if(@sneaksearch$ == "rekenber")
- {
- mes "^663300[Search Result]";
- mes "Documents regarding";
- mes "Rekenber are highly classified and cannot be accessed by this system.^000000";
+ while (true) {
+ switch( select( "Search Engine.","Cancel." ) )
+ {
+ case 1:
+ mes "^663300- Search Engine Initiated -";
+ mes "- Please enter a keyword -";
+ mes " ";
+ mes "*Search Engine";
+ mes "is case sensitve.";
+ mes "Please do not use";
+ mes "capital letters.^000000";
next;
- goto L_Search;
- }
- else
- {
- mes "^663300[Search Result]";
- mes "Keyword not found.";
- mes "Please search another";
- mes "archive or increase";
- mes "access permissions.^000000";
- close;
- }
+ input @sneaksearch$;
+ if((@sneaksearch$ == "kafra") || (@sneaksearch$ == "cool event"))
+ {
+ mes "^663300[Search Result]";
+ mes "Documents regarding";
+ mes "Kafra Corporation and";
+ mes "Cool Event Corp are";
+ mes "located in Arena 3-2.^000000";
+ lhz_boss = 30;
+ close;
+ }
+ else if(@sneaksearch$ == "shinokas")
+ {
+ mes "^663300[Search Result]";
+ mes "Documents regarding";
+ mes "Shinokas are located";
+ mes "in Arena 1-5.^000000";
+ lhz_boss = 31;
+ close;
+ }
+ else if((@sneaksearch$ == "stein") || (@sneaksearch$ == "STEIN") || (@sneaksearch$ == "S.T.E.I.N"))
+ {
+ mes "^663300[Search Result]";
+ mes "Documents regarding";
+ mes "S.T.E.I.N are considered";
+ mes "highly classified and";
+ mes "cannot be accessed";
+ mes "through this system.^000000";
+ close;
+ }
+ else if(@sneaksearch$ == "ymir")
+ {
+ mes "^663300[Search Result]";
+ mes "Documents regarding";
+ mes "Ymir's Heart are ranked";
+ mes "as highly classified and";
+ mes "cannot be accessed";
+ mes "through this system.^000000";
+ close;
+ }
+ else if((@sneaksearch$ == "president") || (@sneaksearch$ == "karl") || (@sneaksearch$ == "weierstrass"))
+ {
+ mes "^663300[Search Result]";
+ mes "2nd Class documents on";
+ mes "President Karl Weierstrass";
+ mes "are located in Area 1-7. For";
+ mes "more highly classified files";
+ mes "on Weierstrass, please use";
+ mes "a higher security archive.^000000";
+ lhz_boss = 32;
+ close;
+ }
+ else if(@sneaksearch$ == "einbroch")
+ {
+ mes "^663300[Search Result]";
+ mes "Documents regarding";
+ mes "Einbroch are stored";
+ mes "in Area 6-1.^000000";
+ lhz_boss = 33;
+ close;
+ }
+ else if(@sneaksearch$ == "lighthalzen")
+ {
+ mes "^663300[Search Result]" ;
+ mes "Documents regarding";
+ mes "Lighthalzen are stored";
+ mes "in Area 3-3.^000000";
+ lhz_boss = 34;
+ close;
+ }
+ else if(@sneaksearch$ == "rekenber")
+ {
+ mes "^663300[Search Result]";
+ mes "Documents regarding";
+ mes "Rekenber are highly classified and cannot be accessed by this system.^000000";
+ next;
+ break;
+ }
+ else
+ {
+ mes "^663300[Search Result]";
+ mes "Keyword not found.";
+ mes "Please search another";
+ mes "archive or increase";
+ mes "access permissions.^000000";
+ close;
+ }
- case 2:
- mes "^663300[Search Engine Close]";
- mes "File search has been";
- mes "canceled. Please be aware";
- mes "that sudden shutdown may";
- mes "cause system errors.^000000";
- close;
+ case 2:
+ mes "^663300[Search Engine Close]";
+ mes "File search has been";
+ mes "canceled. Please be aware";
+ mes "that sudden shutdown may";
+ mes "cause system errors.^000000";
+ close;
+ }
}
}
mes "^3355FFThis machine can be";
diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt
index f2282106e..59baa6f04 100644
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -3817,7 +3817,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 4_F_TRAINEE,{
mes "wouldn't come here to pray...";
mes "Well, I hope you enjoy your";
mes "time here, adventurer.";
- goto L_End;
+ callsub L_End;
}
mes "[Priestess Nemma]";
mes "Oh! I'm glad to see that";
@@ -3870,7 +3870,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 4_F_TRAINEE,{
mes "all your journeys. May the";
mes "grace of the goddess always";
mes "support us in all that we do~";
- goto L_End;
+ callsub L_End;
}
mes "[Priestess Nemma]";
mes "Great! How much would you";
@@ -3899,7 +3899,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 4_F_TRAINEE,{
mes "protecting you, wherever you go~";
break;
}
- goto L_End;
+ callsub L_End;
}
else {
cutin "ra_nemma03",2;
@@ -3940,7 +3940,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 4_F_TRAINEE,{
mes "protecting you, wherever you go~";
break;
}
- goto L_End;
+ callsub L_End;
case 2:
mes "[Priestess Nemma]";
mes "Oh! If you'd like some";
@@ -3969,7 +3969,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 4_F_TRAINEE,{
mes "Oh, how sweet of you~";
break;
}
- goto L_End;
+ callsub L_End;
}
}
else {
@@ -3977,7 +3977,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 4_F_TRAINEE,{
cutin "ra_nemma01",2;
mes "[Priestess Nemma]";
mes "Welcome to our temple!";
- goto L_End;
+ callsub L_End;
}
if (ra_tem_q < 1) {
mes "[Priestess Nemma]";
@@ -4010,7 +4010,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 4_F_TRAINEE,{
mes "to go inside. ^333333*Sob*^000000 P-Panno!";
mes "Panno, I neeeed heeeeelp~!";
ra_tem_q = 1;
- goto L_End;
+ callsub L_End;
}
else if ((ra_tem_q >= 1) && (ra_tem_q < 10)) {
mes "[Priestess Nemma]";
@@ -4025,7 +4025,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 4_F_TRAINEE,{
mes "Panno would know";
mes "what to do... I think.";
mes "Ooh, Panno, help me!";
- goto L_End;
+ callsub L_End;
}
else if (ra_tem_q == 10) {
cutin "ra_nemma04",2;
@@ -4051,7 +4051,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 4_F_TRAINEE,{
mes "I'm outside. What if";
mes "the gate locks up again?";
mes "Oooh, what should I do?!";
- goto L_End;
+ callsub L_End;
}
else if (ra_tem_q == 11) {
emotion e_ho;
@@ -4063,7 +4063,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 4_F_TRAINEE,{
mes "longer asking for donations,";
mes "but you can still redeem your";
mes "Lottery Tickets inside, okay?";
- goto L_End;
+ callsub L_End;
}
else if (ra_tem_q == 12) {
mes "[Priestess Nemma]";
@@ -4090,7 +4090,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 4_F_TRAINEE,{
mes "like, ^FF000020 of them^000000! Thank";
mes "you thank you thank you!";
ra_tem_q = 13;
- goto L_End;
+ callsub L_End;
}
else if (ra_tem_q == 13) {
mes "[Priestess Nemma]";
@@ -4125,7 +4125,7 @@ ra_temple,116,174,3 script Nemma#ra_temple 4_F_TRAINEE,{
mes "to play! Hm, maybe";
mes "our pope would like";
mes "to see these too?";
- goto L_End;
+ callsub L_End;
}
cutin "ra_nemma02",2;
mes "[Priestess Nemma]";
@@ -4144,14 +4144,14 @@ ra_temple,116,174,3 script Nemma#ra_temple 4_F_TRAINEE,{
mes "have much to pay you";
mes "back with, anyway~";
}
- goto L_End;
+ callsub L_End;
}
else {
cutin "ra_nemma01",2;
mes "[Priestess Nemma]";
mes "Welcome to our temple!";
}
- goto L_End;
+ callsub L_End;
}
L_End:
@@ -6318,15 +6318,16 @@ ra_temin,170,46,3 script Panno#rachel 4_F_TRAINEE,{
mes "Have you come to";
mes "redeem Lottery Tickets?";
next;
- if (select("Yes", "No") == 1) goto L_Lottery;
- if (ra_tem_q == 12) {
- cutin "ra_fano01",2;
- mes "[Priestess Panno]";
- mes "I already told you";
- mes "everything I know.";
- mes "Remember to keep";
- mes "quiet about what I said.";
- goto L_End;
+ if (select("Yes", "No") == 2) {
+ if (ra_tem_q == 12) {
+ cutin "ra_fano01",2;
+ mes "[Priestess Panno]";
+ mes "I already told you";
+ mes "everything I know.";
+ mes "Remember to keep";
+ mes "quiet about what I said.";
+ callsub L_End;
+ }
}
}
else if (ra_tem_q < 2) {
@@ -6347,15 +6348,17 @@ ra_temin,170,46,3 script Panno#rachel 4_F_TRAINEE,{
mes "know, in case you were saving";
mes "them for some weird reason.";
next;
- if (select("Yes", "No") == 1) goto L_Lottery;
- cutin "ra_fano03",2;
- mes "[Priestess Panno]";
- mes "You can redeem your";
- mes "Lottery Tickets at any";
- mes "time, so please visit";
- mes "me at your leisure.";
- mes "Go with Freya.";
- goto L_End;
+ if (select("Yes", "No") == 2) {
+ cutin "ra_fano03",2;
+ mes "[Priestess Panno]";
+ mes "You can redeem your";
+ mes "Lottery Tickets at any";
+ mes "time, so please visit";
+ mes "me at your leisure.";
+ mes "Go with Freya.";
+ callsub L_End;
+ }
+ break;
case 2:
cutin "ra_fano01",2;
@@ -6394,14 +6397,14 @@ ra_temin,170,46,3 script Panno#rachel 4_F_TRAINEE,{
mes "side of the hallway. However,";
mes "you can only enter if you've";
mes "been permitted beforehand.";
- goto L_End;
+ callsub L_End;
case 3:
mes "[Priestess Panno]";
mes "......................";
mes "No chit-chat";
mes "inside the temple.";
- goto L_End;
+ callsub L_End;
}
}
else if (ra_tem_q == 10) {
@@ -6429,14 +6432,16 @@ ra_temin,170,46,3 script Panno#rachel 4_F_TRAINEE,{
mes "know, in case you were saving";
mes "them for some weird reason.";
next;
- if (select("Yes", "No") == 1) goto L_Lottery;
- mes "[Priestess Panno]";
- mes "You can redeem your";
- mes "Lottery Tickets at any";
- mes "time, so please visit";
- mes "me at your leisure.";
- mes "Go with Freya.";
- goto L_End;
+ if (select("Yes", "No") == 2) {
+ mes "[Priestess Panno]";
+ mes "You can redeem your";
+ mes "Lottery Tickets at any";
+ mes "time, so please visit";
+ mes "me at your leisure.";
+ mes "Go with Freya.";
+ callsub L_End;
+ }
+ break;
case 2:
cutin "ra_fano01",2;
@@ -6475,7 +6480,7 @@ ra_temin,170,46,3 script Panno#rachel 4_F_TRAINEE,{
mes "side of the hallway. However,";
mes "you can only enter if you've";
mes "been permitted beforehand.";
- goto L_End;
+ callsub L_End;
case 3:
cutin "ra_fano02",2;
@@ -6522,7 +6527,7 @@ ra_temin,170,46,3 script Panno#rachel 4_F_TRAINEE,{
mes "[Priestess Panno]";
mes ".........";
ra_tem_q = 11;
- goto L_End;
+ callsub L_End;
}
}
else if (ra_tem_q == 11) {
@@ -6657,17 +6662,17 @@ ra_temin,170,46,3 script Panno#rachel 4_F_TRAINEE,{
mes "Excuse me now, I need";
mes "to get back to work.";
ra_tem_q = 12;
- goto L_End;
+ callsub L_End;
+ }
+ else {
+ cutin "ra_fano02",2;
+ mes "[Priestess Panno]";
+ mes "This is a holy place";
+ mes "Behave yourself, and";
+ mes "respect those who have";
+ mes "come here just to worship.";
+ callsub L_End;
}
- cutin "ra_fano02",2;
- mes "[Priestess Panno]";
- mes "This is a holy place";
- mes "Behave yourself, and";
- mes "respect those who have";
- mes "come here just to worship.";
- goto L_End;
-
-L_Lottery:
if(checkweight(Yggdrasilberry,1) == 0){
cutin "ra_fano02",2;
mes "[Priestess Panno]";
@@ -6677,7 +6682,7 @@ L_Lottery:
mes "something large, unwieldy";
mes "and heavy? Put your junk";
mes "away in Storage first.";
- goto L_End;
+ callsub L_End;
}
mes "[Priestess Panno]";
mes "Here we go";
@@ -6713,7 +6718,7 @@ L_Lottery:
else if (.@bonus_donate > 5 && .@bonus_donate < 11) getitem Honey,1; //Honey 5%
else if (.@bonus_donate > 0 && .@bonus_donate < 6) getitem Royal_Jelly,1; //Royal Jelly 5%
else getitem White_Slim_Potion,1; //Condensed White Potion 39%
- goto L_End;
+ callsub L_End;
}
mes "[Priestess Panno]";
mes "You...";
@@ -6733,7 +6738,7 @@ L_Lottery:
cutin "ra_fano03",2;
mes "[Priestess Panno]";
mes "May Freya be with you.";
- goto L_End;
+ callsub L_End;
L_End:
close2;
@@ -7441,8 +7446,8 @@ OnTouch:
}
rachel,142,167,5 script Seeking Follower#rachel 4_F_MASK1,6,6,{
+OnTouch:
if ((lost_boy == 13) && (ra_tem_q == 20)) {
- L_Mes:
mes "[Arunafeltz Follower]";
mes "Excuse me, but";
mes "are you "+strcharinfo(PC_NAME)+"?";
@@ -7469,8 +7474,5 @@ rachel,142,167,5 script Seeking Follower#rachel 4_F_MASK1,6,6,{
mes "on your journeys...";
close;
}
-
-OnTouch:
- if ((lost_boy == 13) && (ra_tem_q == 20)) goto L_Mes;
end;
}
diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt
index 4c42f6b39..53c7b331f 100644
--- a/npc/quests/thana_quest.txt
+++ b/npc/quests/thana_quest.txt
@@ -265,7 +265,7 @@ tha_t01,149,78,4 script Guide 4_F_01,{
mes "to access the higher levels";
mes "here in Thanatos Tower.";
next;
- goto L_Contract;
+ break;
case 3:
mes "[Ditze]";
mes "To develop the floors above";
@@ -276,6 +276,7 @@ tha_t01,149,78,4 script Guide 4_F_01,{
mes "for us under a temp contract?";
close;
}
+ break;
case 2:
mes "[Ditze]";
mes "You may have already heard";
@@ -291,7 +292,7 @@ tha_t01,149,78,4 script Guide 4_F_01,{
mes "to access the higher levels";
mes "here in Thanatos Tower.";
next;
- goto L_Contract;
+ break;
case 3:
mes "[Ditze]";
mes "Well, if you have any";
@@ -300,16 +301,15 @@ tha_t01,149,78,4 script Guide 4_F_01,{
mes "Ditze Lappa. Have a good day!";
close;
}
+ } else {
+ mes "[Ditze]";
+ mes "For more detailed information";
+ mes "about monster exterminations,";
+ mes "please ask the 2nd Floor Guide";
+ mes "and the Guide next to me. Well,";
+ mes "we hope you enjoy your experience working with Rekenber Corporation~";
+ close;
}
- mes "[Ditze]";
- mes "For more detailed information";
- mes "about monster exterminations,";
- mes "please ask the 2nd Floor Guide";
- mes "and the Guide next to me. Well,";
- mes "we hope you enjoy your experience working with Rekenber Corporation~";
- close;
-
-L_Contract:
switch(select("Maybe next time", "Sure, I'd like to work for you.")) {
case 1:
mes "[Ditze]";
@@ -930,7 +930,6 @@ tha_t03,67,70,0 script Rune Device#tt1 HIDDEN_NPC,4,4,{
mes "field fizzles out with a soft,";
mes "gentle ''pzzzzzh'' sound.^000000";
next;
- goto L_Key;
}
else if (getequipweaponlv(4) == 4) {
mes "^3355FFWith your "+getequipname(4)+" in";
@@ -939,7 +938,6 @@ tha_t03,67,70,0 script Rune Device#tt1 HIDDEN_NPC,4,4,{
mes "field fizzles out with a soft,";
mes "gentle ''pzzzzzh'' sound.^000000";
next;
- goto L_Key;
}
else {
mes "^3355FFYou smash the energy";
@@ -951,21 +949,16 @@ tha_t03,67,70,0 script Rune Device#tt1 HIDDEN_NPC,4,4,{
mes "powerful weapon...^000000";
close;
}
+ break;
case 2:
mes "^3355FFYou decide to leave";
mes "the machine alone.^000000";
close;
}
+ } else {
+ mes "You've acquired everything you need from this rune device.";
+ close;
}
- mes "You've acquired everything you need from this rune device.";
- close;
-
-OnTouch:
- if ((countitem(Key_Red) == 0) && (countitem(Magic_Gem_Red) == 0))
- specialeffect EF_LEVEL99_4;
- end;
-
-L_Key:
specialeffect EF_BRANDISH2;
mes "After breaking the device, the exterior shatters.";
mes "The energy field begins to disappear,";
@@ -1024,6 +1017,11 @@ L_Key:
specialeffect2 EF_COMBOATTACK1;
close;
}
+
+OnTouch:
+ if ((countitem(Key_Red) == 0) && (countitem(Magic_Gem_Red) == 0))
+ specialeffect EF_LEVEL99_4;
+ end;
}
tha_t04,195,195,0 script Rune Device#tt2 HIDDEN_NPC,3,3,{