summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2018-05-30 22:48:42 -0300
committerJesusaves <cpntb1@ymail.com>2018-05-30 22:48:42 -0300
commit25d7855e5ba1a24a605c223ab9375ba62c6c7cf3 (patch)
tree35772bca98b0a7d0aed156096348c4067380f574 /npc
parent94dc3d9944e7b3163440c9e759c1a8941e14816c (diff)
downloadserverdata-25d7855e5ba1a24a605c223ab9375ba62c6c7cf3.tar.gz
serverdata-25d7855e5ba1a24a605c223ab9375ba62c6c7cf3.tar.bz2
serverdata-25d7855e5ba1a24a605c223ab9375ba62c6c7cf3.tar.xz
serverdata-25d7855e5ba1a24a605c223ab9375ba62c6c7cf3.zip
Move another random talk from its file to random-talk
Diffstat (limited to 'npc')
-rw-r--r--npc/functions/asleep.txt19
-rw-r--r--npc/functions/random-talk.txt12
-rw-r--r--npc/scripts.conf1
3 files changed, 11 insertions, 21 deletions
diff --git a/npc/functions/asleep.txt b/npc/functions/asleep.txt
deleted file mode 100644
index aa5abd635..000000000
--- a/npc/functions/asleep.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-// Evol functions.
-// Authors:
-// Alige
-// Reid
-// Description:
-// Tell a random sleeping sound.
-// Variables:
-// .@rand = Random number between the number of "sleeping" choice.
-
-function script asleep {
- switch(rand(5)) {
- case 0: npctalkonce(l("Zzzzzzzzz...")); break;
- case 1: npctalkonce(l("Rrrr... Pchhhh...")); break;
- case 2: npctalkonce(l("Ggrmm... Grmmmm...")); break;
- case 3: npctalkonce(l("Hm... Shhhh...")); break;
- default: emotion(E_SLEEPY);
- }
- end;
-}
diff --git a/npc/functions/random-talk.txt b/npc/functions/random-talk.txt
index 5ebb5a2fb..5d975a214 100644
--- a/npc/functions/random-talk.txt
+++ b/npc/functions/random-talk.txt
@@ -10,6 +10,7 @@
// villagertalk
// sailortalk
// legiontalk
+// asleep
// Evol authors (some strings and code):
// Reid
@@ -171,4 +172,13 @@ function script legiontalk {
return;
}
-
+function script asleep {
+ switch(rand(5)) {
+ case 0: npctalkonce(l("Zzzzzzzzz...")); break;
+ case 1: npctalkonce(l("Rrrr... Pchhhh...")); break;
+ case 2: npctalkonce(l("Ggrmm... Grmmmm...")); break;
+ case 3: npctalkonce(l("Hm... Shhhh...")); break;
+ default: emotion(E_SLEEPY);
+ }
+ end;
+}
diff --git a/npc/scripts.conf b/npc/scripts.conf
index 026eb7193..9ab99c24d 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -15,7 +15,6 @@
"npc/functions/math.txt",
// Misc functions
-"npc/functions/asleep.txt",
"npc/functions/barber.txt",
"npc/functions/bank.txt",
"npc/functions/clientversion.txt",