diff options
| author | Reid <reidyaro@gmail.com> | 2016-06-27 00:26:57 +0200 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2016-06-27 00:27:46 +0200 |
| commit | 80f546fcb99bd70a5e48dca646f561ab3c3d8f2c (patch) | |
| tree | 5d77b3f090b2513c05d300e4fb79862a44c7360f /npc/functions | |
| parent | 7f40fa08e57e077ea161b12f385a88798d752794 (diff) | |
| download | serverdata-80f546fcb99bd70a5e48dca646f561ab3c3d8f2c.tar.gz serverdata-80f546fcb99bd70a5e48dca646f561ab3c3d8f2c.tar.bz2 serverdata-80f546fcb99bd70a5e48dca646f561ab3c3d8f2c.tar.xz serverdata-80f546fcb99bd70a5e48dca646f561ab3c3d8f2c.zip | |
Replace emotion() arguments with constants instead of ID.
Diffstat (limited to 'npc/functions')
| -rw-r--r-- | npc/functions/asleep.txt | 2 | ||||
| -rw-r--r-- | npc/functions/legiontalk.txt | 2 | ||||
| -rw-r--r-- | npc/functions/villagertalk.txt | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/npc/functions/asleep.txt b/npc/functions/asleep.txt index b6bdf738..7443e904 100644 --- a/npc/functions/asleep.txt +++ b/npc/functions/asleep.txt @@ -15,7 +15,7 @@ function script asleep { else if (.@rand == 1) npctalk3 l("Rrrr... Pchhhh..."); else if (.@rand == 2) npctalk3 l("Ggrmm... Grmmmm..."); else if (.@rand == 3) npctalk3 l("Hm... Shhhh..."); - else emotion 106; // Sleepy + else emotion E_SLEEPY; // Sleepy close; } diff --git a/npc/functions/legiontalk.txt b/npc/functions/legiontalk.txt index 20e4235a..3dc69dae 100644 --- a/npc/functions/legiontalk.txt +++ b/npc/functions/legiontalk.txt @@ -50,7 +50,7 @@ function script legiontalk { npctalk3 l("Out of my way."); break; case 12: - emotion 111; + emotion E_LOOKAWAY; break; } diff --git a/npc/functions/villagertalk.txt b/npc/functions/villagertalk.txt index 99803621..f8c239d1 100644 --- a/npc/functions/villagertalk.txt +++ b/npc/functions/villagertalk.txt @@ -14,12 +14,12 @@ function script villagertalk { if (.@darn < 26) { - emotion 103; // ^.^ + emotion E_JOY; // ^.^ hello; } else if (.@darn > 26) { - emotion 111; // Look away + emotion E_LOOKAWAY; // Look away goodbye; } else @@ -45,7 +45,7 @@ function script villagertalk { npctalk3 l("I just want to live my life in peace."); break; default: - emotion 3; + emotion E_HAPPY; break; } |