Add basic npctalk3 goodbye function (still in wip, but working).

9 files changed, 27 insertions, 26 deletions

diff --git a/npc/000-1/jalad.txt b/npc/000-1/jalad.txt
index 7d70259a..d229819c 100644
--- a/npc/000-1/jalad.txt
+++ b/npc/000-1/jalad.txt
@@ -48,7 +48,7 @@ l_Continue:
     mesn;
     mesq l("They are so tasty when cooked together with some @@. Don't drop any of them!", getitemlink("PiouLegs"));
 
-    close;
+    goto l_Close;
 
 l_CallFunc:
     callfunc "SailorFood";
@@ -115,5 +115,6 @@ l_TaskDone:
     mesn;
     mesq l("Perfect!");
 
-    close;
+l_Close:
+    callfunc "GoodBye";
 }
diff --git a/npc/000-1/lean.txt b/npc/000-1/lean.txt
index 0547da25..bf21be4d 100644
--- a/npc/000-1/lean.txt
+++ b/npc/000-1/lean.txt
@@ -30,7 +30,7 @@ l_Artis:
     next;
     mesq l("If you're looking for us there, mostly all of us will be at Pedro's restaurant and in the Inn for Silvio's case...");
 
-    close;
+    goto l_Close;
 
 l_Sailors:
     mes "";
@@ -45,7 +45,7 @@ l_Sailors:
     next;
 
     menu
-        l("Thank you for your help."), l_Quit,
+        l("Thank you for your help."), l_Close,
         l("Gugli mentioned six sailors. What about the others?"), -;
 
     mes "";
@@ -56,7 +56,6 @@ l_Sailors:
 
     close;
 
-l_Quit:
-    closedialog;
-    close;
+l_Close:
+    callfunc "GoodBye";
 }
diff --git a/npc/000-1/max.txt b/npc/000-1/max.txt
index 0a91bfd2..4041d52f 100644
--- a/npc/000-1/max.txt
+++ b/npc/000-1/max.txt
@@ -96,6 +96,5 @@ l_Secrets:
     close;
 
 l_Quit:
-    closedialog;
-    close;
+    callfunc "GoodBye";
 }
diff --git a/npc/000-1/muller.txt b/npc/000-1/muller.txt
index 4ec728d8..bb3c76e1 100644
--- a/npc/000-1/muller.txt
+++ b/npc/000-1/muller.txt
@@ -112,8 +112,9 @@ l_TaskDone:
     mes "";
     mesn;
     mesq l("Good to hear!");
+    next;
 
-    close;
+    callfunc "GoodBye";
 
 l_Quit:
     closedialog;
diff --git a/npc/000-1/sapartan.txt b/npc/000-1/sapartan.txt
index 769bfaeb..ce64e981 100644
--- a/npc/000-1/sapartan.txt
+++ b/npc/000-1/sapartan.txt
@@ -91,9 +91,6 @@
     mesq l("You're welcome. If you can't remember something, just come back here!");
     next;
 
-    close;
-
 l_Quit:
-    closedialog;
-    close;
+    callfunc "GoodBye";
 }
diff --git a/npc/000-1/silvio.txt b/npc/000-1/silvio.txt
index b19e75a6..dcd00bfb 100644
--- a/npc/000-1/silvio.txt
+++ b/npc/000-1/silvio.txt
@@ -132,7 +132,7 @@ l_Artis:
     next;
     mesq l("You should look at them once we arrive at the port, they are worth it, hehe...");
 
-    close;
+    callfunc "GoodBye";
 
 l_ForeverAlone:
     mes "";
@@ -173,15 +173,16 @@ l_Sailors:
         l("See you."), l_Quit,
         l("*Imitate a thunder's sound.*"), -;
 
-    mes "";
-    mesn;
-    mesq l("Aaaaaahhhhhh!");
+    closedialog;
+
+    npctalk3 l("Aaaaaahhhhhh!");
 
     close;
 
 l_Quit:
+    closedialog;
+
     npctalk3 "Give me a kiss before you say goodbye!";
 
-    closedialog;
     close;
 }
diff --git a/npc/000-1/tarlan.txt b/npc/000-1/tarlan.txt
index 26137301..3d60504d 100644
--- a/npc/000-1/tarlan.txt
+++ b/npc/000-1/tarlan.txt
@@ -22,10 +22,8 @@
         l("Some food."), l_Food,
         l("Nothing, just hanging around."), -;
 
-    mes " ";
-    mesn;
-    mesq l("Ok, see you then!");
-
+    closedialog;
+    npctalk3 l("Ok, see you then!");
     goto l_Quit;
 
 l_Food:
diff --git a/npc/000-1/tibbo.txt b/npc/000-1/tibbo.txt
index 96eeae6a..5c268fe6 100644
--- a/npc/000-1/tibbo.txt
+++ b/npc/000-1/tibbo.txt
@@ -47,7 +47,8 @@
     mes "";
     mesn;
     mesq l("Thank you and be careful with that box. I have worked really hard to fill it!");
-    close;
+
+    goto l_Close;
 
 l_CallFunc:
     callfunc "SailorFood";
@@ -70,8 +71,7 @@ l_CallFunc:
         rif(getq(ShipQuests_QMuller) == 0, l("Q'Muller.")), l_Top,
         l("Nobody."), -;
 
-    closedialog;
-    close;
+    goto l_Close;
 
 l_Top:
     mes "";
@@ -97,6 +97,7 @@ l_NoTask:
     mes "";
     mesn;
     mesq l("I'm sorry but I have no time to chat with you.");
+
     close;
 
 l_TaskDone:
@@ -105,4 +106,7 @@ l_TaskDone:
     mesq l("Awesome!");
 
     close;
+
+l_Close:
+    callfunc "GoodBye";
 }
diff --git a/npc/scripts.conf b/npc/scripts.conf
index 9dc36b3b..5404a413 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -10,5 +10,6 @@ npc: npc/items/oldbook.txt
 // Script functions
 npc: npc/functions/clientversion.txt
 npc: npc/functions/inventoryplace.txt
+npc: npc/functions/goodbye.txt
 npc: npc/functions/sailordialogue.txt
 npc: npc/functions/savepoint.txt