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/013-3 | |
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/013-3')
-rw-r--r-- | world/map/npc/013-3/_mobs.txt | 3 | ||||
-rw-r--r-- | world/map/npc/013-3/barrier.txt | 3 | ||||
-rw-r--r-- | world/map/npc/013-3/mask_chest.txt | 3 | ||||
-rw-r--r-- | world/map/npc/013-3/misc.txt | 3 | ||||
-rw-r--r-- | world/map/npc/013-3/sword_chest.txt | 3 |
5 files changed, 10 insertions, 5 deletions
diff --git a/world/map/npc/013-3/_mobs.txt b/world/map/npc/013-3/_mobs.txt index 574a9d54..c2b44828 100644 --- a/world/map/npc/013-3/_mobs.txt +++ b/world/map/npc/013-3/_mobs.txt @@ -31,7 +31,8 @@ 013-3.gat,67,46,2,1|monster|FireSkull|1023,1,120000,60000,Mob013-3::On1023 -013-3.gat,0,0,0|script|Mob013-3|-1,{ +013-3.gat,0,0,0|script|Mob013-3|-1, +{ On1002: set @mobID, 1002; callfunc "MobPoints"; diff --git a/world/map/npc/013-3/barrier.txt b/world/map/npc/013-3/barrier.txt index 63c5eae9..a0d5ec7e 100644 --- a/world/map/npc/013-3/barrier.txt +++ b/world/map/npc/013-3/barrier.txt @@ -1,6 +1,7 @@ // -013-3.gat,71,21,0|script|#DemonMineBarrier1#_M|45,1,1,{ +013-3.gat,71,21,0|script|#DemonMineBarrier1#_M|45,1,1, +{ callfunc "ClearVariables"; set @state, ((QUEST_Hurnscald & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT); diff --git a/world/map/npc/013-3/mask_chest.txt b/world/map/npc/013-3/mask_chest.txt index 4a15bc0b..87b90878 100644 --- a/world/map/npc/013-3/mask_chest.txt +++ b/world/map/npc/013-3/mask_chest.txt @@ -1,6 +1,7 @@ // -013-3.gat,28,27,0|script|Chest#DemonMask|111,{ +013-3.gat,28,27,0|script|Chest#DemonMask|111, +{ callfunc "ClearVariables"; set @state, ((QUEST_Hurnscald & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT); diff --git a/world/map/npc/013-3/misc.txt b/world/map/npc/013-3/misc.txt index 116adef5..eadfef13 100644 --- a/world/map/npc/013-3/misc.txt +++ b/world/map/npc/013-3/misc.txt @@ -1,6 +1,7 @@ // -013-3.gat,127,68,0|script|Chest|111,{ +013-3.gat,127,68,0|script|Chest|111, +{ mes "You can't see any way to open this chest."; close; } diff --git a/world/map/npc/013-3/sword_chest.txt b/world/map/npc/013-3/sword_chest.txt index 8c89b52d..f6b9836e 100644 --- a/world/map/npc/013-3/sword_chest.txt +++ b/world/map/npc/013-3/sword_chest.txt @@ -1,6 +1,7 @@ // -013-3.gat,177,22,0|script|Chest|111,{ +013-3.gat,177,22,0|script|Chest|111, +{ callfunc "ClearVariables"; if (FLAGS & FLAG_HURNSMINE_CHEST) goto L_Finished; |