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/001-1 | |
| 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/001-1')
| -rw-r--r-- | world/map/npc/001-1/entertainer.txt | 3 | ||||
| -rw-r--r-- | world/map/npc/001-1/sarah.txt | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/world/map/npc/001-1/entertainer.txt b/world/map/npc/001-1/entertainer.txt index b57b97f8..5fe8cbc3 100644 --- a/world/map/npc/001-1/entertainer.txt +++ b/world/map/npc/001-1/entertainer.txt @@ -38,10 +38,9 @@ L_Close: close; OnTimer3000: - emotion rand(0,11); + emotion rand(EMOTE_DISGUST, EMOTE_PERTURBED); setnpctimer 0; OnInit: initnpctimer; - } diff --git a/world/map/npc/001-1/sarah.txt b/world/map/npc/001-1/sarah.txt index 57793ec9..8a84df47 100644 --- a/world/map/npc/001-1/sarah.txt +++ b/world/map/npc/001-1/sarah.txt @@ -60,7 +60,7 @@ L_Progress: mes "\"Whee!\""; next; mes "You brought me Cherry Cake! Here is your new hat, as promised.\""; - emotion 9; + emotion EMOTE_TONGUE; getinventorylist; if ((@inventorylist_count - (countitem("CherryCake") == 1)) > 99) goto L_TooMany; delitem "CherryCake", 1; @@ -76,7 +76,7 @@ L_NotEnough: L_Done: mes "[Sarah]"; mes "\"It was so tasty, I can't eat anything more... Thank you!\""; - emotion 9; + emotion EMOTE_TONGUE; goto L_Close; L_Close: |