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/healer.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/healer.lua')
-rw-r--r-- | example/scripts/npcs/healer.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/example/scripts/npcs/healer.lua b/example/scripts/npcs/healer.lua index 35696736..3591c0c7 100644 --- a/example/scripts/npcs/healer.lua +++ b/example/scripts/npcs/healer.lua @@ -5,11 +5,11 @@ --]] function Healer(npc, ch) - npc_message(npc, ch, "Do you need healing?") - local c = npc_choice(npc, ch, "Heal me fully", "Heal 100 HP", "Don't heal me") + say("Do you need healing?") + local c = ask("Heal me fully", "Heal 100 HP", "Don't heal me") if c == 1 then - being_heal(ch) + ch:heal() elseif c == 2 then - being_heal(ch, 100) + ch:heal(100) end end |