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/055-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/055-3')
| -rw-r--r-- | world/map/npc/055-3/_mobs.txt | 3 | ||||
| -rw-r--r-- | world/map/npc/055-3/_warps.txt | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/world/map/npc/055-3/_mobs.txt b/world/map/npc/055-3/_mobs.txt index d7be296c..0710492f 100644 --- a/world/map/npc/055-3/_mobs.txt +++ b/world/map/npc/055-3/_mobs.txt @@ -9,7 +9,8 @@ 055-3.gat,0,0,1,1|monster|Snake|1010,3,10000,20000,Mob055-3::On1010 -055-3.gat,0,0,0|script|Mob055-3|-1,{ +055-3.gat,0,0,0|script|Mob055-3|-1, +{ On1007: set @mobID, 1007; callfunc "MobPoints"; diff --git a/world/map/npc/055-3/_warps.txt b/world/map/npc/055-3/_warps.txt index cc320f4e..2440e161 100644 --- a/world/map/npc/055-3/_warps.txt +++ b/world/map/npc/055-3/_warps.txt @@ -2,8 +2,8 @@ // Cave warps 055-3.gat,77,40|warp|To Woodland Hills|0,-1,055-1.gat,137,97 -055-3.gat,30,26|warp|To Woodland Hills|-1,-1,055-1.gat,100,81 -055-3.gat,50,42|warp|To Outside|-1,-1,055-1.gat,100,90 +055-3.gat,30,26|warp|To Woodland Hills|-1,-1,055-1.gat,100,82 +055-3.gat,50,43|warp|To Outside|-1,-1,055-1.gat,100,90 055-3.gat,96,71|warp|To Woodland Hills|0,-1,055-1.gat,60,94 055-3.gat,58,96|warp|To Cave|0,-1,055-3.gat,98,115 -055-3.gat,98,114|warp|To Cave|-1,-1,055-3.gat,57,94 +055-3.gat,98,114|warp|To Cave|-1,-1,055-3.gat,57,95 |