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/019-1/mobmanager.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/019-1/mobmanager.txt')
| -rw-r--r-- | world/map/npc/019-1/mobmanager.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/world/map/npc/019-1/mobmanager.txt b/world/map/npc/019-1/mobmanager.txt index d0d4e498..22917bea 100644 --- a/world/map/npc/019-1/mobmanager.txt +++ b/world/map/npc/019-1/mobmanager.txt @@ -1,9 +1,10 @@ // Spawns mobs -019-1.gat,0,0,0|script|SpawnManager|-1,{ +019-1.gat,0,0,0|script|SpawnManager|-1, +{ end; // just to be secure -onInit: +OnInit: set $@019_1_SANTASLIME_MONSTER_MAX_NUMBER,15; set $@019_1_SANTASLIME_MOMSTER_ID,1015; set $@019_1_SANTASLIME_MONSTER_SPAWN_X1,32; @@ -12,6 +13,7 @@ onInit: set $@019_1_SANTASLIME_MONSTER_SPAWN_Y2,101; set $@019_1_SANTASLIME_month,gettime(6); set $@019_1_SANTASLIME_monster_number,0; + if (debug >= 2) end; initnpctimer; if ($@019_1_SANTASLIME_month == 12 || $@019_1_SANTASLIME_month == 1 || $@019_1_SANTASLIME_month == 2) goto L_Init_Spawn; end; |