Updated npctalk strings and added an asleep script, doing basically the same thing as the goodbye script.

13 files changed, 39 insertions, 54 deletions

diff --git a/npc/000-0-0/q'onan.txt b/npc/000-0-0/q'onan.txt
index 18fc05d1..4276342f 100644
--- a/npc/000-0-0/q'onan.txt
+++ b/npc/000-0-0/q'onan.txt
@@ -1,22 +1,12 @@
 // Evol scripts.
-// Author:
+// Authors:
+//    Alige
 //    Vasily_Makarov
 // Description:
 //    Sleeping and snoring NPC.
 
 000-0-0.gat,29,28,0,1	script	Q'Onan	302,{
 
-    set @q, rand(2);
-    if (@q == 0) goto l_Zzz;
-
-    npctalk3 "Rrrr... Pchhhh...";
-
-    close;
-
-l_Zzz:
-
-    npctalk3 "Zzzzzzzzz";
-
-    close;
+    callfunc "Asleep";
 
 }
diff --git a/npc/000-1/astapolos.txt b/npc/000-1/astapolos.txt
index ab677af9..7492a7e6 100644
--- a/npc/000-1/astapolos.txt
+++ b/npc/000-1/astapolos.txt
@@ -135,7 +135,7 @@ l_Top:
     close;
 
 l_NoTask:
-    npctalk "Just leave me alone.";
+    npctalk3 l("Just leave me alone.");
 
     closedialog;
     close;
@@ -148,7 +148,7 @@ l_TaskDone:
     close;
 
 l_Whyning:
-    npctalk3 "Then leave me alone.";
+    npctalk3 l("Then leave me alone.");
 
     closedialog;
     close;
diff --git a/npc/000-1/chest.txt b/npc/000-1/chest.txt
index 1ae22bdb..06dfb3e4 100644
--- a/npc/000-1/chest.txt
+++ b/npc/000-1/chest.txt
@@ -30,7 +30,7 @@ l_Give:
 
     set zeny, zeny + 100;
     getitem "OldBook", 1;
-    npctalk3 "You open the treasure chest.";
+    npctalk3 l("You open the treasure chest.");
 
 l_Close:
     setnpcdir 6;
diff --git a/npc/000-1/darlin.txt b/npc/000-1/darlin.txt
index a9ae6dd7..32d58413 100644
--- a/npc/000-1/darlin.txt
+++ b/npc/000-1/darlin.txt
@@ -125,7 +125,7 @@ l_GoDown:
 
 l_Bye:
     setcamnpc;
-    npctalk3 "FINE, BYE!";
+    npctalk3 l("FINE, BYE!");
 
     closedialog;
     close;
diff --git a/npc/000-1/silvio.txt b/npc/000-1/silvio.txt
index dcd00bfb..a378d0c5 100644
--- a/npc/000-1/silvio.txt
+++ b/npc/000-1/silvio.txt
@@ -182,7 +182,7 @@ l_Sailors:
 l_Quit:
     closedialog;
 
-    npctalk3 "Give me a kiss before you say goodbye!";
+    npctalk3 l("Give me a kiss before you say goodbye!");
 
     close;
 }
diff --git a/npc/000-2-0/billybons.txt b/npc/000-2-0/billybons.txt
index 5a2439d3..00671f8b 100644
--- a/npc/000-2-0/billybons.txt
+++ b/npc/000-2-0/billybons.txt
@@ -72,7 +72,7 @@ l_Secret:
     close;
 
 l_Hic:
-    npctalk3 "*hic*";
+    npctalk3 l("*Hic*");
 
     close;
 
diff --git a/npc/000-2-0/doors.txt b/npc/000-2-0/doors.txt
index 0bf32e55..5dacbea9 100644
--- a/npc/000-2-0/doors.txt
+++ b/npc/000-2-0/doors.txt
@@ -49,7 +49,7 @@ l_GotoNard:
     close;
 
 l_End:
-    npctalk3 "The door is locked.";
+    npctalk3 l("This door is locked.");
 
     close;
 }
diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index 240ded58..69383cd8 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -267,8 +267,5 @@ l_Rumors:
     close;
 
 l_Quit:
-    npctalk3 "Bye!";
-
-    closedialog;
-    close;
+    callfunc "GoodBye";
 }
diff --git a/npc/000-2-1/chest.txt b/npc/000-2-1/chest.txt
index bc57dcac..e409fa7d 100644
--- a/npc/000-2-1/chest.txt
+++ b/npc/000-2-1/chest.txt
@@ -30,7 +30,7 @@ l_Give:
     setq ShipQuests_Arpan, 2;
     getitem "CreasedShirt", 1;
     getitem "CreasedShorts", 1;
-    npctalk3 "You take the clothes from the chest.";
+    npctalk3 l("You take the clothes from the chest.");
     goto l_Quit;
 
 OnTimer220:
@@ -40,7 +40,7 @@ OnTimer220:
     end;
 
 l_Talk:
-    npctalk3 "You should talk to Magic Arpan first.";
+    npctalk3 l("You should talk to Magic Arpan first.");
 
     close;
 
diff --git a/npc/000-2-1/devis.txt b/npc/000-2-1/devis.txt
index 6973735a..3e782cf8 100644
--- a/npc/000-2-1/devis.txt
+++ b/npc/000-2-1/devis.txt
@@ -1,5 +1,6 @@
 // Evol scripts.
 // Authors:
+//    Alige
 //    Reid
 //    Vasily_Makarov
 // Description:
@@ -7,18 +8,6 @@
 
 000-2-1.gat,32,38,0,1	script	Devis	310;2,{
 
-    set @q, rand(2);
-    if (@q == 0) goto l_Zzz;
+    callfunc "Asleep";
 
-    goto l_Grm;
-
-l_Zzz:
-    npctalk3 "Zzzzzzzzz";
-
-    close;
-
-l_Grm:
-    npctalk3 "Ggrmm... Grmmmm...";
-
-    close;
 }
diff --git a/npc/000-2-1/q'onan.txt b/npc/000-2-1/q'onan.txt
index 8f5dbb03..a2bf4546 100644
--- a/npc/000-2-1/q'onan.txt
+++ b/npc/000-2-1/q'onan.txt
@@ -1,22 +1,12 @@
 // Evol scripts.
-// Author:
+// Authors:
+//    Alige
 //    Vasily_Makarov
 // Description:
 //    Sleeping and snoring NPC.
 
 000-2-1.gat,53,38,0,1	script	Q'Onan	302;2,{
 
-    set @q, rand(2);
-    if (@q == 0) goto l_Zzz;
-
-    npctalk "Rrrr... Pchhhh...";
-
-    close;
-
-l_Zzz:
-
-    npctalk3 "Zzzzzzzzz";
-
-    close;
+    callfunc "Asleep";
 
 }
diff --git a/npc/functions/asleep.txt b/npc/functions/asleep.txt
new file mode 100644
index 00000000..b1d81b5b
--- /dev/null
+++ b/npc/functions/asleep.txt
@@ -0,0 +1,19 @@
+// Evol functions.
+// Authors:
+//    Alige
+//    Reid
+// Description:
+//    Tell a random sleeping sound.
+// Variables:
+//    @rand = Random number between the number of "sleeping" choice.
+
+function	script	Asleep	{
+    closedialog;
+
+    set @rand, rand(2);
+    if (@rand == 0) npctalk3 l("Zzzzzzzzz...");
+    if (@rand == 1) npctalk3 l("Rrrr... Pchhhh...");
+    if (@rand == 2) npctalk3 l("Ggrmm... Grmmmm...");
+
+    close;
+}
diff --git a/npc/functions/goodbye.txt b/npc/functions/goodbye.txt
index e5895422..fe382c0e 100644
--- a/npc/functions/goodbye.txt
+++ b/npc/functions/goodbye.txt
@@ -2,9 +2,9 @@
 // Author:
 //    Reid
 // Description:
-//    Tell a random goodbye.
+//    Tell a random goodbye sentence.
 // Variables:
-//    @rand = Random number between the number of "good bye" choice.
+//    @rand = Random number between the number of "goodbye" choice.
 
 function	script	GoodBye	{
     closedialog;