From b8a9a8f2919baeaeb8e8c2a65c13067d60b9100d Mon Sep 17 00:00:00 2001 From: mekolat Date: Mon, 2 Mar 2015 13:54:20 -0500 Subject: fix emote IDs --- world/map/db/const.txt | 86 +++++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'world') diff --git a/world/map/db/const.txt b/world/map/db/const.txt index 6ecbe0ad..b5ec19a9 100644 --- a/world/map/db/const.txt +++ b/world/map/db/const.txt @@ -261,49 +261,49 @@ 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 -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 +EMOTE_DISGUST 0 +EMOTE_SURPRISE 1 +EMOTE_HAPPY 2 +EMOTE_SAD 3 +EMOTE_EVIL 4 +EMOTE_WINK 5 +EMOTE_ANGEL 6 +EMOTE_BLUSH 7 +EMOTE_TONGUE 8 +EMOTE_GRIN 9 +EMOTE_UPSET 10 +EMOTE_PERTURBED 11 +EMOTE_SPEECH 12 +EMOTE_BLAH 13 +// ManaPlus Emotions +EMOTE_MEOW 100 +EMOTE_LAUGH 101 +EMOTE_CHEERFUL 102 +EMOTE_LOVE 103 +EMOTE_MONEY 104 +EMOTE_SLEEP 105 +EMOTE_REST 106 +EMOTE_BOTHERED 107 +EMOTE_AFRAID 108 +EMOTE_DEAD 109 +EMOTE_SUSPICIOUS 110 +EMOTE_MELANCHOLY 111 +EMOTE_FACEPALM 112 +EMOTE_ANGRY 113 +EMOTE_HEADACHE 114 +EMOTE_BORED 115 +EMOTE_SWEAR 116 +EMOTE_HEART 117 +EMOTE_EMPTY 118 +EMOTE_HALLOWEEN 119 +EMOTE_VICIOUS 120 +EMOTE_JOYFUL 121 +EMOTE_CLEVER 122 +EMOTE_SHY 123 +EMOTE_ALIEN 124 +EMOTE_TROLL 125 +EMOTE_PAIN 126 +EMOTE_TEARS 127 sfx_skillup 1 sfx_magic_generic 2 -- cgit v1.2.3-60-g2f50 From 60d232731232341707673e7d4ff0e4bc8b3ff8de Mon Sep 17 00:00:00 2001 From: meko Date: Sun, 29 Mar 2015 00:27:07 -0400 Subject: Update const.txt --- world/map/db/const.txt | 84 +++++++++++++++++++++++++------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) (limited to 'world') diff --git a/world/map/db/const.txt b/world/map/db/const.txt index b5ec19a9..c00773e2 100644 --- a/world/map/db/const.txt +++ b/world/map/db/const.txt @@ -261,49 +261,49 @@ sc_raiseattackspeed0 37 sc_raiseattackstrength 185 // Emotions -EMOTE_DISGUST 0 -EMOTE_SURPRISE 1 -EMOTE_HAPPY 2 -EMOTE_SAD 3 -EMOTE_EVIL 4 -EMOTE_WINK 5 -EMOTE_ANGEL 6 -EMOTE_BLUSH 7 -EMOTE_TONGUE 8 -EMOTE_GRIN 9 -EMOTE_UPSET 10 -EMOTE_PERTURBED 11 -EMOTE_SPEECH 12 -EMOTE_BLAH 13 +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 // ManaPlus Emotions -EMOTE_MEOW 100 -EMOTE_LAUGH 101 -EMOTE_CHEERFUL 102 -EMOTE_LOVE 103 -EMOTE_MONEY 104 -EMOTE_SLEEP 105 -EMOTE_REST 106 -EMOTE_BOTHERED 107 -EMOTE_AFRAID 108 -EMOTE_DEAD 109 -EMOTE_SUSPICIOUS 110 -EMOTE_MELANCHOLY 111 -EMOTE_FACEPALM 112 -EMOTE_ANGRY 113 -EMOTE_HEADACHE 114 -EMOTE_BORED 115 -EMOTE_SWEAR 116 -EMOTE_HEART 117 -EMOTE_EMPTY 118 -EMOTE_HALLOWEEN 119 -EMOTE_VICIOUS 120 -EMOTE_JOYFUL 121 -EMOTE_CLEVER 122 -EMOTE_SHY 123 -EMOTE_ALIEN 124 -EMOTE_TROLL 125 -EMOTE_PAIN 126 -EMOTE_TEARS 127 +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 -- cgit v1.2.3-60-g2f50 From a57e42d7cc3e014dd2ae2d87d2aa1ca3b1a01af9 Mon Sep 17 00:00:00 2001 From: meko Date: Sun, 29 Mar 2015 00:49:32 -0400 Subject: Update entertainer.txt --- world/map/npc/009-2/entertainer.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'world') 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; -- cgit v1.2.3-60-g2f50