summaryrefslogtreecommitdiff
path: root/npc/000-1
diff options
context:
space:
mode:
Diffstat (limited to 'npc/000-1')
-rw-r--r--npc/000-1/ale.txt10
-rw-r--r--npc/000-1/darlin.txt34
-rw-r--r--npc/000-1/fexil.txt1
-rw-r--r--npc/000-1/gugli.txt7
-rw-r--r--npc/000-1/gulukan.txt11
-rw-r--r--npc/000-1/lean.txt5
-rw-r--r--npc/000-1/max.txt7
-rw-r--r--npc/000-1/muller.txt9
-rw-r--r--npc/000-1/sapartan.txt9
-rw-r--r--npc/000-1/silvio.txt7
-rw-r--r--npc/000-1/tarlan.txt12
11 files changed, 66 insertions, 46 deletions
diff --git a/npc/000-1/ale.txt b/npc/000-1/ale.txt
index c7fe20e9..20f81379 100644
--- a/npc/000-1/ale.txt
+++ b/npc/000-1/ale.txt
@@ -22,7 +22,7 @@
menu
l("Gugli sent me down here to help you."), -,
l("What's that?"), l_Plushroom,
- l("See you aboard."), close;
+ l("See you aboard."), l_Quit;
mes "";
mesn;
@@ -63,9 +63,7 @@ l_CallFunc:
rif(getq(ShipQuests_Jalad) == 0, l("Jalad.")), l_Jalad,
rif(getq(ShipQuests_QMuller) == 0, l("QMuller.")), l_Bottom,
rif(getq(ShipQuests_Tibbo) == 0, l("Tibbo.")), l_Bottom,
- l("Nobody."), -;
-
- close;
+ l("Nobody."), l_Quit;
l_Bottom:
mes "";
@@ -83,6 +81,7 @@ l_Jalad:
next;
restorecam;
+
close;
l_Plushroom:
@@ -110,4 +109,7 @@ l_TaskDone:
close;
+l_Quit:
+ close;
+
}
diff --git a/npc/000-1/darlin.txt b/npc/000-1/darlin.txt
index 1ba7c98e..9cd2a384 100644
--- a/npc/000-1/darlin.txt
+++ b/npc/000-1/darlin.txt
@@ -12,9 +12,9 @@
// 3 Get back to Darlin.
000-1.gat,89,95,0,1 script Darlin 103;14,{
-
+
mesn;
- set @q, getq(ShipQuests_Darlin);
+ set @q, getq(ShipQuests_Darlin);
if (@q == 1 || @q == 2) goto OnQuestGiven;
if (@q > 2) goto l_QuestDone;
OnStart:
@@ -76,8 +76,8 @@ OnStart:
next;
l_Menu:
- set @q, getq(ShipQuests_Darlin);
-
+ set @q, getq(ShipQuests_Darlin);
+
menu
l("Maybe you can come down to talk?"), l_GoDown,
l("I'm looking for Gugli, where is he?"), -,
@@ -90,7 +90,7 @@ l_Menu:
next;
mesq l("HE IS AT THE BOTTOM OF THE SHIP, DOWN THE STAIRS. YOU CAN'T MISS HIM!");
restorecam;
-
+
close;
l_GoDown:
@@ -134,10 +134,7 @@ l_Bye:
mesn;
mesq l("FINE, BYE!");
-l_Quit:
- close;
-
-OnQuestGiven:
+OnQuestGiven:
mesq l("HEY @@!", strcharinfo(0));
next;
mesq l("DID YOU FIND OUT WHAT THE LIGHT WAS?!");
@@ -157,7 +154,7 @@ OnQuestGiven:
goto l_Menu;
l_Nothing:
- if (@q == 2) setq ShipQuests_Darlin, 3;
+ if (@q == 2) setq ShipQuests_Darlin, 3;
mes "";
mesn;
mesq l("OH, OK!");
@@ -170,19 +167,22 @@ l_Chest:
mesq l("SORRY, BUT WHAT DID YOU SAY? SPEAK LOUDER!");
next;
mesq l("IF YOU FIND SOMETHING, THEN IT'S GREAT!");
-
- setq ShipQuests_Darlin, 3;
+
+ setq ShipQuests_Darlin, 3;
goto l_Menu;
l_DangerAround:
mesq l("NOTHING ELSE OTHER THAN SHARKS AND AN ODD LIGHT!");
close;
-
+
l_QuestDone:
mesq l("HEY") + " " + strcharinfo(0) + "!";
- next;
-
- goto l_Menu;
+ next;
+
+ goto l_Menu;
+
+l_Quit:
+ close;
-}
+}
diff --git a/npc/000-1/fexil.txt b/npc/000-1/fexil.txt
index 234a947e..6c4b6b8f 100644
--- a/npc/000-1/fexil.txt
+++ b/npc/000-1/fexil.txt
@@ -30,6 +30,7 @@
l_Accepted:
shop "Bag";
+
close;
}
diff --git a/npc/000-1/gugli.txt b/npc/000-1/gugli.txt
index d5af9185..1f376271 100644
--- a/npc/000-1/gugli.txt
+++ b/npc/000-1/gugli.txt
@@ -83,13 +83,13 @@ l_Menu:
rif(countitem("AquadaBox") > 0 || countitem("CroconutBox") > 0 || countitem("PlushroomBox") > 0, l("I have some food for you.")), l_CollectSmthing,
l("Who should I search for?"), l_SailorNames,
l("Where can I find your crew?"), l_Location,
- l("See you!"), close;
+ l("See you!"), l_Quit;
l_MenuDone:
menu
rif(getq(ShipQuests_Couwan) == 1, l("Couwan gave me this box, it is for you.")), l_Couwan,
l("I have collected all the boxes you needed."), l_TaskDone,
- l("See you!"), close;
+ l("See you!"), l_Quit;
l_SailorNames:
mes "";
@@ -219,4 +219,7 @@ l_AllComplete:
doevent "Gugli::OnTalk";
close;
+l_Quit:
+ close;
+
}
diff --git a/npc/000-1/gulukan.txt b/npc/000-1/gulukan.txt
index c6742742..92693f26 100644
--- a/npc/000-1/gulukan.txt
+++ b/npc/000-1/gulukan.txt
@@ -23,7 +23,7 @@
menu
l("Wow, it seems everyone knows my name!"), -,
l("Well, it it's not bad to finally feel something beneath my feet."), l_Continue,
- l("Not so good actually... I would feel better on Nard's ship."), close;
+ l("Not so good actually... I would feel better on Nard's ship."), l_Quit;
l_Name:
@@ -44,7 +44,7 @@ l_Continue2:
menu
l("Actually Gugli asked me if I could help you bringing him some of your boxes."), -,
- l("Yes, indeed. I prefer to explore places I have never been to, before doing anything else."), close;
+ l("Yes, indeed. I prefer to explore places I have never been to, before doing anything else."), l_Quit;
mes "";
mesn;
@@ -125,9 +125,7 @@ l_RandomC:
rif(getq(ShipQuests_Jalad) == 0, l("Jalad.")), l_Top,
rif(getq(ShipQuests_QMuller) == 0, l("QMuller.")), l_Top,
rif(getq(ShipQuests_Tibbo) == 0, l("Tibbo.")), l_Bottom,
- l("Nobody."), -;
-
- close;
+ l("Nobody."), l_Quit;
l_Bottom:
mes "";
@@ -159,4 +157,7 @@ l_TaskDone:
close;
+l_Quit:
+ close;
+
}
diff --git a/npc/000-1/lean.txt b/npc/000-1/lean.txt
index 2164f2c8..7ff491e1 100644
--- a/npc/000-1/lean.txt
+++ b/npc/000-1/lean.txt
@@ -56,7 +56,7 @@ l_Sailors:
next;
menu
- l("Thank you for your help."), close,
+ l("Thank you for your help."), l_Quit,
l("Gugli mentioned six sailors. What about the others?"), -;
mes "";
@@ -67,4 +67,7 @@ l_Sailors:
close;
+l_Quit:
+ close;
+
}
diff --git a/npc/000-1/max.txt b/npc/000-1/max.txt
index 1e952860..ada5c14c 100644
--- a/npc/000-1/max.txt
+++ b/npc/000-1/max.txt
@@ -22,7 +22,7 @@
rif(@gugli == 1, l("Gugli asked me to help sailors with their food gatherings. Do you know where could I find them?")), l_Sailors,
rif(@gugli > 1, l("Seems I've helped everyone here. I don't know what to do now!")), l_Annoyed,
rif(@knife == 0, l("It looks like you are an expert of the life inside 'La Johanne'. Do you know any hidden secrets nobody knows?")), l_Secrets,
- l("No thanks, not at the moment."), close;
+ l("No thanks, not at the moment."), l_Quit;
l_Help:
mes "";
@@ -46,7 +46,7 @@ l_MenuSailors:
l("Do you know where can I find Gulukan?"), l_Gulukan,
l("Any clue on where Astapolos may be hidden?"), l_Astapolos,
l("What about Q'Muller? Where is he?"), l_Qmuller,
- l("Alright. I will go looking for them now."), close;
+ l("Alright. I will go looking for them now."), l_Quit;
l_Gulukan:
mes "";
@@ -96,4 +96,7 @@ l_Secrets:
close;
+l_Quit:
+ close;
+
}
diff --git a/npc/000-1/muller.txt b/npc/000-1/muller.txt
index 4dca2338..f9b64a25 100644
--- a/npc/000-1/muller.txt
+++ b/npc/000-1/muller.txt
@@ -27,7 +27,7 @@
next;
menu
- l("Indeed! Goodbye."), close,
+ l("Indeed! Goodbye."), l_Quit,
l("Yes, it is true! You are not able at all. Nard has been waiting for the food for too long already. Hurry up, you lazy sailors!"), -;
mes "";
@@ -75,9 +75,7 @@ l_CallFunc:
rif(getq(ShipQuests_Jalad) == 0, l("Jalad.")), l_Top,
rif(getq(ShipQuests_Gulukan) == 0, l("Gulukan.")), l_Bottom,
rif(getq(ShipQuests_Tibbo) == 0, l("Tibbo.")), l_Bottom,
- l("Nobody."), -;
-
- close;
+ l("Nobody."), l_Quit;
l_Bottom:
mes "";
@@ -120,4 +118,7 @@ l_TaskDone:
close;
+l_Quit:
+ close;
+
}
diff --git a/npc/000-1/sapartan.txt b/npc/000-1/sapartan.txt
index 43561501..d7f51803 100644
--- a/npc/000-1/sapartan.txt
+++ b/npc/000-1/sapartan.txt
@@ -27,7 +27,7 @@
menu
l("Thank you sir for you nice words. I am feeling better now."), -,
- lg("I'm still a bit weak at the moment. We should probably talk later."), close;
+ lg("I'm still a bit weak at the moment. We should probably talk later."), l_Quit;
mes "";
mesn;
@@ -59,7 +59,7 @@
menu
l("No, I don't, but I would like to know more about that."), -,
l("Well... I've only killed some little pious in the ship, that's all."), -,
- l("Yes, I feel strong enough for dangerous combats!"), close;
+ l("Yes, I feel strong enough for dangerous combats!"), l_Quit;
mes "";
mesn;
@@ -88,7 +88,7 @@
menu
l("Thank you for your tricks. I am going to try them now!"), -,
- l("I already know everything. Bye."), close;
+ l("I already know everything. Bye."), l_Quit;
mes "";
mesn;
@@ -97,4 +97,7 @@
close;
+l_Quit:
+ close;
+
}
diff --git a/npc/000-1/silvio.txt b/npc/000-1/silvio.txt
index 464bb3de..b9ce97dc 100644
--- a/npc/000-1/silvio.txt
+++ b/npc/000-1/silvio.txt
@@ -1,7 +1,7 @@
// Evol scripts.
// Author:
// Reid
-// Description:
+// Description:
// Pervert and arrogant sailor.
000-1.gat,86,99,0,1 script Silvio 312;2,{
@@ -166,7 +166,7 @@ l_Sailors:
next;
menu
- l("See you."), close,
+ l("See you."), l_Quit,
l("*Imitate a thunder's sound.*"), -;
mes "";
@@ -175,4 +175,7 @@ l_Sailors:
close;
+l_Quit:
+ close;
+
}
diff --git a/npc/000-1/tarlan.txt b/npc/000-1/tarlan.txt
index 3f687c28..26381d50 100644
--- a/npc/000-1/tarlan.txt
+++ b/npc/000-1/tarlan.txt
@@ -27,7 +27,7 @@
mesn;
mesq l("Ok, see you then!");
- goto l_Close;
+ goto l_Quit;
l_Food:
mes " ";
@@ -36,28 +36,28 @@ l_Food:
next;
mesq l("Yeye be careful with wild animal's food, some of them are yeyery dangerous, especially the blubs.");
- goto l_Close;
+ goto l_Quit;
l_HardToHit:
mesq l("These crocotrees are full of yaying @@, but they are so hard to hit...", getitemlink("Croconut"));
- goto l_Close;
+ goto l_Quit;
l_Aouch:
mesq l("Ayouyouch! My head...");
next;
mesq l("Damn @@.", getitemlink("Croconut"));
- goto l_Close;
+ goto l_Quit;
l_DoYou:
mesq l("Do you want to try?");
next;
mesq l("Just hit the trunk, and it will yeye a @@.", getitemlink("Croconut"));
- goto l_Close;
+ goto l_Quit;
-l_Close:
+l_Quit:
setnpcdir 4;
close;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-09-15 12:56:52 +0000