diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-15 22:15:31 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-04-15 22:15:31 +0200 |
| commit | c53bc90dbaa876a86f762a3d864b1f920e2b8071 (patch) | |
| tree | 1a8174f4d1745a4799210db970aa2230df622d34 /example/scripts/npcs/emotemaker.lua | |
| parent | b89e404f85358f2e3ff87d7731376dbeacdf9778 (diff) | |
| parent | 81be8dc99ba7558c8915310eed095df43e3bdbf7 (diff) | |
| download | manaserv-c53bc90dbaa876a86f762a3d864b1f920e2b8071.tar.gz manaserv-c53bc90dbaa876a86f762a3d864b1f920e2b8071.tar.bz2 manaserv-c53bc90dbaa876a86f762a3d864b1f920e2b8071.tar.xz manaserv-c53bc90dbaa876a86f762a3d864b1f920e2b8071.zip | |
Merge branch 'master' into lpc2012
Conflicts:
src/account-server/accounthandler.cpp
src/game-server/character.cpp
Diffstat (limited to 'example/scripts/npcs/emotemaker.lua')
| -rw-r--r-- | example/scripts/npcs/emotemaker.lua | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/example/scripts/npcs/emotemaker.lua b/example/scripts/npcs/emotemaker.lua index 0f546634..27abd45e 100644 --- a/example/scripts/npcs/emotemaker.lua +++ b/example/scripts/npcs/emotemaker.lua @@ -21,11 +21,10 @@ function emote_talk(npc, ch) elseif emo_state == EMOTE_HAPPY then state = "happy" end - npc_message(npc, ch, string.format("The emotional palm seems %s.", state)) - v = npc_choice(npc, ch, - "Stupid palm, you are ugly and everyone hates you!", - "You are such a nice palm, let me give you a hug.", - "Are you a cocos nucifera or a syagrus romanzoffiana?") + say(string.format("The emotional palm seems %s.", state)) + v = ask("Stupid palm, you are ugly and everyone hates you!", + "You are such a nice palm, let me give you a hug.", + "Are you a cocos nucifera or a syagrus romanzoffiana?") if (v == 1) then emo_state = EMOTE_SAD |