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/monster | |
| 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/monster')
| -rw-r--r-- | example/scripts/monster/testmonster.lua | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/example/scripts/monster/testmonster.lua b/example/scripts/monster/testmonster.lua index 86d1592f..21b6a7b2 100644 --- a/example/scripts/monster/testmonster.lua +++ b/example/scripts/monster/testmonster.lua @@ -10,17 +10,17 @@ local function update(mob) local r = math.random(0, 200); if r == 0 then - being_say(mob, "Roar! I am a boss") + mob:say("Roar! I am a boss") end end local function strike(mob, victim, hit) if hit > 0 then - being_say(mob, "Take this! "..hit.." damage!") - being_say(victim, "Oh Noez!") + mob:say("Take this! "..hit.." damage!") + victim:say("Oh Noez!") else - being_say(mob, "Oh no, my attack missed!") - being_say(victim, "Whew...") + mob:say("Oh no, my attack missed!") + victim:say("Whew...") end end |