diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
| commit | 0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch) | |
| tree | 4a200c1eeb684039390959107a6f413e065384fd /world/map/npc/052-2/janitor.txt | |
| parent | a89882b69d9f12499404ca9d471d5a735bc63988 (diff) | |
| parent | 135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff) | |
| download | serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2 serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/mob_db.txt
Diffstat (limited to 'world/map/npc/052-2/janitor.txt')
| -rw-r--r-- | world/map/npc/052-2/janitor.txt | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/world/map/npc/052-2/janitor.txt b/world/map/npc/052-2/janitor.txt index 9c78d638..7ee68955 100644 --- a/world/map/npc/052-2/janitor.txt +++ b/world/map/npc/052-2/janitor.txt @@ -1,5 +1,6 @@ // Lobby janitor -052-2.gat,1,1,0|script|#IlliaJanitor5|127,{ +052-2.gat,1,1,0|script|#IlliaJanitor5|127, +{ end; OnCommandClean: @@ -11,23 +12,25 @@ OnCommandClean: } // Storage janitor -052-2.gat,1,1,0|script|#IlliaJanitor6|127,{ +052-2.gat,1,1,0|script|#IlliaJanitor6|127, +{ end; OnCommandClean: - killmonster "052-2.gat", "#ItemsInvoker::onDeath"; + killmonster "052-2.gat", "#ItemsInvoker::OnDeath"; npcwarp 1, 1, "#ItemsInvoker"; end; } // Final boss janitor -052-2.gat,1,1,0|script|#IlliaJanitor7|127,{ +052-2.gat,1,1,0|script|#IlliaJanitor7|127, +{ end; OnCommandClean: - killmonster "052-2.gat", "#LuviaDaemon::onDeath"; - killmonster "052-2.gat", "#LuviaDaemon::onWGD"; + killmonster "052-2.gat", "#LuviaDaemon::OnDeath"; + killmonster "052-2.gat", "#LuviaDaemon::OnWGD"; npcwarp 83, 28, "#LuviaDaemon"; npcwarp 88, 15, "Luvia"; end; |