diff options
| author | alige Ali-G <aligetmw@hotmail.fr> | 2012-05-12 08:32:18 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2012-05-23 13:10:44 +0200 |
| commit | b8ad45f707b6a2639dd136c68f49268639ad3172 (patch) | |
| tree | 0bc1a05983489371ad3fe9738332b82c607177dd | |
| parent | eefa16b5a7b86fff1979a1445f3d77f36396c164 (diff) | |
| download | serverdata-b8ad45f707b6a2639dd136c68f49268639ad3172.tar.gz serverdata-b8ad45f707b6a2639dd136c68f49268639ad3172.tar.bz2 serverdata-b8ad45f707b6a2639dd136c68f49268639ad3172.tar.xz serverdata-b8ad45f707b6a2639dd136c68f49268639ad3172.zip | |
Added new emotes to const.txt.
| m--------- | client-data | 0 | ||||
| -rw-r--r-- | world/map/db/const.txt | 84 |
2 files changed, 70 insertions, 14 deletions
diff --git a/client-data b/client-data -Subproject f6c7455474327bf23c556f2005f43ad42689cec +Subproject a07dd8868945374222a917b75f037793dc5de25 diff --git a/world/map/db/const.txt b/world/map/db/const.txt index 13c6ccbd..3db7050e 100644 --- a/world/map/db/const.txt +++ b/world/map/db/const.txt @@ -218,20 +218,48 @@ 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 +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 +EMOTE_SWEAR 15 +EMOTE_MEOW 16 +EMOTE_LAUGH 17 +EMOTE_CHEERFUL 18 +EMOTE_LOVE 19 +EMOTE_MONEY 20 +EMOTE_SLEEP 21 +EMOTE_REST 22 +EMOTE_BOTHERED 23 +EMOTE_AFRAID 24 +EMOTE_DEAD 25 +EMOTE_SUSPICIOUS 26 +EMOTE_MELANCHOLY 27 +EMOTE_FACEPALM 28 +EMOTE_ANGRY 29 +EMOTE_HEADACHE 30 +EMOTE_BORED 31 +EMOTE_HEART 32 +EMOTE_EMPTY 33 +EMOTE_HALLOWEEN 34 +EMOTE_VICIOUS 35 +EMOTE_JOYFUL 36 +EMOTE_CLEVER 37 +EMOTE_SHY 38 +EMOTE_ALIEN 39 +EMOTE_CURIOUS 40 +EMOTE_PAIN 41 +EMOTE_TEARS 42 // Marriage-related WEDDING_FEE 100 @@ -295,6 +323,34 @@ FX_EMOTE_UPSET 10010 FX_EMOTE_PERTURBED 10011 FX_EMOTE_SPEECH 10012 FX_EMOTE_BLAH 10013 +FX_EMOTE_SWEAR 10014 +FX_EMOTE_MEOW 10015 +FX_EMOTE_LAUGH 10016 +FX_EMOTE_CHEERFUL 10017 +FX_EMOTE_LOVE 10018 +FX_EMOTE_MONEY 10019 +FX_EMOTE_SLEEP 10020 +FX_EMOTE_REST 10021 +FX_EMOTE_BOTHERED 10022 +FX_EMOTE_AFRAID 10023 +FX_EMOTE_DEAD 10024 +FX_EMOTE_SUSPICIOUS 10025 +FX_EMOTE_MELANCHOLY 10026 +FX_EMOTE_FACEPALM 10027 +FX_EMOTE_ANGRY 10028 +FX_EMOTE_HEADACHE 10029 +FX_EMOTE_BORED 10030 +FX_EMOTE_HEART 10031 +FX_EMOTE_EMPTY 10032 +FX_EMOTE_HALLOWEEN 10033 +FX_EMOTE_VICIOUS 10034 +FX_EMOTE_JOYFUL 10035 +FX_EMOTE_CLEVER 10036 +FX_EMOTE_SHY 10037 +FX_EMOTE_ALIEN 10038 +FX_EMOTE_CURIOUS 10039 +FX_EMOTE_PAIN 10040 +FX_EMOTE_TEARS 10041 NIBBLE_0_SHIFT 0 NIBBLE_0_MASK 15 |