summaryrefslogtreecommitdiff
path: root/world
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2015-04-13 21:25:58 -0500
committerWushin <pasekei@gmail.com>2015-04-13 21:25:58 -0500
commit654edaa6863ad41bf8e734ada1ba727fc6d8a1d7 (patch)
tree26f07fe86037777d26b146bb070897a0c9463d56 /world
parent99d73066bf2a7fb4911e79b52a48ba913a2aa459 (diff)
parenta57e42d7cc3e014dd2ae2d87d2aa1ca3b1a01af9 (diff)
downloadserverdata-654edaa6863ad41bf8e734ada1ba727fc6d8a1d7.tar.gz
serverdata-654edaa6863ad41bf8e734ada1ba727fc6d8a1d7.tar.bz2
serverdata-654edaa6863ad41bf8e734ada1ba727fc6d8a1d7.tar.xz
serverdata-654edaa6863ad41bf8e734ada1ba727fc6d8a1d7.zip
Merge pull request #291 from mekolat/emotes
fix emote IDs
Diffstat (limited to 'world')
-rw-r--r--world/map/db/const.txt58
-rw-r--r--world/map/npc/009-2/entertainer.txt10
2 files changed, 36 insertions, 32 deletions
diff --git a/world/map/db/const.txt b/world/map/db/const.txt
index 6ecbe0ad..c00773e2 100644
--- a/world/map/db/const.txt
+++ b/world/map/db/const.txt
@@ -261,7 +261,6 @@ sc_raiseattackspeed0 37
sc_raiseattackstrength 185
// Emotions
-// Note: client-data/emotes.xml uses the wrong numbers.
EMOTE_DISGUST 1
EMOTE_SURPRISE 2
EMOTE_HAPPY 3
@@ -276,34 +275,35 @@ 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
+// ManaPlus Emotions
+EMOTE_MEOW 101
+EMOTE_LAUGH 102
+EMOTE_CHEERFUL 103
+EMOTE_LOVE 104
+EMOTE_MONEY 105
+EMOTE_SLEEP 106
+EMOTE_REST 107
+EMOTE_BOTHERED 108
+EMOTE_AFRAID 109
+EMOTE_DEAD 110
+EMOTE_SUSPICIOUS 111
+EMOTE_MELANCHOLY 112
+EMOTE_FACEPALM 113
+EMOTE_ANGRY 114
+EMOTE_HEADACHE 115
+EMOTE_BORED 116
+EMOTE_SWEAR 117
+EMOTE_HEART 118
+EMOTE_EMPTY 119
+EMOTE_HALLOWEEN 120
+EMOTE_VICIOUS 121
+EMOTE_JOYFUL 122
+EMOTE_CLEVER 123
+EMOTE_SHY 124
+EMOTE_ALIEN 125
+EMOTE_TROLL 126
+EMOTE_PAIN 127
+EMOTE_TEARS 128
sfx_skillup 1
sfx_magic_generic 2
diff --git a/world/map/npc/009-2/entertainer.txt b/world/map/npc/009-2/entertainer.txt
index 57119894..61306b25 100644
--- a/world/map/npc/009-2/entertainer.txt
+++ b/world/map/npc/009-2/entertainer.txt
@@ -27,9 +27,13 @@ L_Close:
close;
OnTimer3000:
- emotion rand(EMOTE_DISGUST, EMOTE_TEARS);
- setnpctimer 0;
- end;
+ if(rand(0,1) == 1) goto L_manaplus;
+ emotion rand(EMOTE_DISGUST, EMOTE_BLAH);
+ goto OnInit;
+
+L_manaplus:
+ emotion rand(EMOTE_MEOW, EMOTE_TEARS);
+ goto OnInit;
OnInit:
if (debug >= 2) end;