summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2016-01-17 16:29:43 +0100
committerReid <reidyaro@gmail.com>2016-01-17 16:30:45 +0100
commitee14c12f9bad863bd7ec119abfcbe7b82468ebaa (patch)
treeabc982275c921f9ac1291f13a252b514e01bb74a
parent036d394071300a03b717391611e118f13c669327 (diff)
downloadserverdata-ee14c12f9bad863bd7ec119abfcbe7b82468ebaa.tar.gz
serverdata-ee14c12f9bad863bd7ec119abfcbe7b82468ebaa.tar.bz2
serverdata-ee14c12f9bad863bd7ec119abfcbe7b82468ebaa.tar.xz
serverdata-ee14c12f9bad863bd7ec119abfcbe7b82468ebaa.zip
Fix emotes ID on various scripts.
-rw-r--r--npc/001-1/katja.txt2
-rw-r--r--npc/functions/asleep.txt2
-rw-r--r--npc/functions/villagertalk.txt4
3 files changed, 4 insertions, 4 deletions
diff --git a/npc/001-1/katja.txt b/npc/001-1/katja.txt
index f53d3a8d..2e5454dd 100644
--- a/npc/001-1/katja.txt
+++ b/npc/001-1/katja.txt
@@ -75,7 +75,7 @@
mes "";
mesn;
mesq l("Great!");
- emotion 17;
+ emotion 103;
next;
break;
case 2:
diff --git a/npc/functions/asleep.txt b/npc/functions/asleep.txt
index 0f981148..e67dc21d 100644
--- a/npc/functions/asleep.txt
+++ b/npc/functions/asleep.txt
@@ -15,7 +15,7 @@ function script asleep {
else if (.@rand == 1) npctalk3 l("Rrrr... Pchhhh...");
else if (.@rand == 2) npctalk3 l("Ggrmm... Grmmmm...");
else if (.@rand == 3) npctalk3 l("Hm...");
- else emotion 105; // Sleepy
+ else emotion 106; // Sleepy
close;
}
diff --git a/npc/functions/villagertalk.txt b/npc/functions/villagertalk.txt
index 094d485d..95f70c87 100644
--- a/npc/functions/villagertalk.txt
+++ b/npc/functions/villagertalk.txt
@@ -18,12 +18,12 @@ function script villagertalk {
{
if (.@darn < 26)
{
- emotion 102; // ^.^
+ emotion 103; // ^.^
goodbye;
}
else if (.@darn > 26)
{
- emotion 107; // -.-
+ emotion 111; // Look away
goodbye;
}
else