diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-24 20:46:52 +0100 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-24 20:46:52 +0100 |
| commit | a3be27ce7b045a22e53655fd7f639c9ddbe1f9c0 (patch) | |
| tree | 4b7885e259aeba5eea20c21dcb124d5b2b13bd0f /example/scripts | |
| parent | f93b4c25242370982715e1a83c11e667b17f20af (diff) | |
| parent | dd20c7f6148cc8b8b627028e25e817cc1cab063b (diff) | |
| download | manaserv-a3be27ce7b045a22e53655fd7f639c9ddbe1f9c0.tar.gz manaserv-a3be27ce7b045a22e53655fd7f639c9ddbe1f9c0.tar.bz2 manaserv-a3be27ce7b045a22e53655fd7f639c9ddbe1f9c0.tar.xz manaserv-a3be27ce7b045a22e53655fd7f639c9ddbe1f9c0.zip | |
Merge branch 'master' into lpc2012
Diffstat (limited to 'example/scripts')
| -rw-r--r-- | example/scripts/main.lua | 3 | ||||
| -rw-r--r-- | example/scripts/maps/desert.lua | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/example/scripts/main.lua b/example/scripts/main.lua index 34183850..b43dd420 100644 --- a/example/scripts/main.lua +++ b/example/scripts/main.lua @@ -13,3 +13,6 @@ require "scripts/attributes" require "scripts/items/candy" require "scripts/monster/testmonster" + +require "scripts/status/jump" +require "scripts/status/plague" diff --git a/example/scripts/maps/desert.lua b/example/scripts/maps/desert.lua index 96518ac9..782dd2b4 100644 --- a/example/scripts/maps/desert.lua +++ b/example/scripts/maps/desert.lua @@ -71,6 +71,7 @@ end -- Global variable used to know whether Harmony talked to someone. harmony_have_talked_to_someone = false function Harmony(npc, ch, list) + being_apply_status(ch, 1, 99999) -- Say all the messages in the messages list. for i = 1, #list do npc_message(npc, ch, list[i]) |