diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2011-09-06 22:31:42 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2011-09-06 22:33:07 -0700 |
| commit | 0ad99072c594ba4bae6c1477488ba8322b22ec02 (patch) | |
| tree | 8dbe1cf56d1cec0bdce467da75ed17a3b387840b /world/map/npc/031-2 | |
| parent | 62662676eb8ba15812b6f526bfe8d3a818634dcb (diff) | |
| download | serverdata-0ad99072c594ba4bae6c1477488ba8322b22ec02.tar.gz serverdata-0ad99072c594ba4bae6c1477488ba8322b22ec02.tar.bz2 serverdata-0ad99072c594ba4bae6c1477488ba8322b22ec02.tar.xz serverdata-0ad99072c594ba4bae6c1477488ba8322b22ec02.zip | |
Add EMOTE_ constants
Also fix an off-by-one error in the entertainer
Diffstat (limited to 'world/map/npc/031-2')
| -rw-r--r-- | world/map/npc/031-2/cindyHouse.txt | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/world/map/npc/031-2/cindyHouse.txt b/world/map/npc/031-2/cindyHouse.txt index d92da10b..79b8704c 100644 --- a/world/map/npc/031-2/cindyHouse.txt +++ b/world/map/npc/031-2/cindyHouse.txt @@ -31,7 +31,8 @@ L_Happy_Random: "Did you ever meet Santa? He's very kind! He always gives me some candy when we go to see him.", strcharinfo(0) + ", you are sooo strong! Amazing! But my dad is strong too!"; set @random, rand(9); - if (@random != 5) emotion 3; + if (@random != 5) + emotion EMOTE_HAPPY; set @quote$, "\"" + @quote_Cindy$[@random] + "\""; mes "[Cindy]"; mes @quote$; @@ -49,16 +50,3 @@ S_Update_Mask: | (@rescue_Cindy << @Q_Nivalis_state_SHIFT); return; } - - - - - - - - - - - - - |