summaryrefslogtreecommitdiff
path: root/world/map/db
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2011-09-08 20:36:29 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2011-09-08 20:36:29 +0200
commit5ea6c568c86d9c0f76983705258951e2db9974fa (patch)
tree94a402b645140a7bb9fbfa467a73cfb30d880a56 /world/map/db
parent2629fa14c6f7e6a5a7a71f5c784424cf80189f17 (diff)
parentcba4de9a5f7b9de412b9f458c80904cee9764a85 (diff)
downloadserverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.gz
serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.bz2
serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.xz
serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.zip
Merge remote-tracking branch 'testing/master'v2011.09.08
Diffstat (limited to 'world/map/db')
-rw-r--r--world/map/db/const.txt17
1 files changed, 17 insertions, 0 deletions
diff --git a/world/map/db/const.txt b/world/map/db/const.txt
index e8ca1c31..dcabf7c6 100644
--- a/world/map/db/const.txt
+++ b/world/map/db/const.txt
@@ -214,6 +214,23 @@ sc_slowpoison 14
sc_raiseattackspeed0 37
sc_raiseattackstrength 185
+// emotions
+// note, client-data/emote.xml uses the wrong numbers
+EMOTE_DISGUST 1
+EMOTE_SURPRISE 2
+EMOTE_HAPPY 3
+EMOTE_SAD 4
+EMOTE_EVIL 5
+EMOTE_WINK 6
+EMOTE_ANGEL 7
+EMOTE_BLUSH 8
+EMOTE_TONGUE 9
+EMOTE_GRIN 10
+EMOTE_UPSET 11
+EMOTE_PERTURBED 12
+EMOTE_SPEECH 13
+EMOTE_BLAH 14
+
// Marriage-related
WEDDING_FEE 100
DIVORCE_FEE_PER_LEVEL 500