summaryrefslogtreecommitdiff
path: root/world/map/npc/019-1
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2013-07-07 12:51:32 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2013-07-07 12:51:32 +0200
commit0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch)
tree4a200c1eeb684039390959107a6f413e065384fd /world/map/npc/019-1
parenta89882b69d9f12499404ca9d471d5a735bc63988 (diff)
parent135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff)
downloadserverdata-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')
-rw-r--r--world/map/npc/019-1/_mobs.txt3
-rw-r--r--world/map/npc/019-1/mobmanager.txt6
-rw-r--r--world/map/npc/019-1/santa_helper.txt3
-rw-r--r--world/map/npc/019-1/snowman.txt3
4 files changed, 10 insertions, 5 deletions
diff --git a/world/map/npc/019-1/_mobs.txt b/world/map/npc/019-1/_mobs.txt
index fb76550e..c638f1b0 100644
--- a/world/map/npc/019-1/_mobs.txt
+++ b/world/map/npc/019-1/_mobs.txt
@@ -6,7 +6,8 @@
019-1.gat,0,0,0,0|monster|WhiteBell|1095,5,100000,30000,Mob019-1::On1095
-019-1.gat,0,0,0|script|Mob019-1|-1,{
+019-1.gat,0,0,0|script|Mob019-1|-1,
+{
On1020:
set @mobID, 1020;
callfunc "MobPoints";
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;
diff --git a/world/map/npc/019-1/santa_helper.txt b/world/map/npc/019-1/santa_helper.txt
index e0b7456d..758a1b0a 100644
--- a/world/map/npc/019-1/santa_helper.txt
+++ b/world/map/npc/019-1/santa_helper.txt
@@ -1,7 +1,8 @@
// Author: accoring to git history probably Jaxad
// quest made seasonal and adapted to new scripting standards by Jenalya
-019-1.gat,74,75,0|script|Santa's Helper|105,{
+019-1.gat,74,75,0|script|Santa's Helper|105,
+{
callfunc "ClearVariables";
if (FLAGS & FLAG_SANTAS_HELPER) goto L_Done;
if ((gettime(6) == 12) || ((gettime(6) == 1) && (gettime(5) < 7))) goto L_Quest;
diff --git a/world/map/npc/019-1/snowman.txt b/world/map/npc/019-1/snowman.txt
index b2c8a67d..261336f9 100644
--- a/world/map/npc/019-1/snowman.txt
+++ b/world/map/npc/019-1/snowman.txt
@@ -1,7 +1,8 @@
// Author: accoring to git history probably Jaxad
// quest made seasonal and adapted to new scripting standards by Jenalya
-019-1.gat,77,44,0|script|Snowman|129,{
+019-1.gat,77,44,0|script|Snowman|129,
+{
callfunc "ClearVariables";
if (FLAGS & FLAG_SNOWMAN) goto L_Done;
if (gettime(6) == 12 || gettime(6) == 1 || gettime(6) == 2) goto L_Quest;