summaryrefslogtreecommitdiff
path: root/world/map/npc
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/map/npc
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/map/npc')
-rw-r--r--world/map/npc/009-2/entertainer.txt10
1 files changed, 7 insertions, 3 deletions
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;