diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-08 20:36:29 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-08 20:36:29 +0200 |
| commit | 5ea6c568c86d9c0f76983705258951e2db9974fa (patch) | |
| tree | 94a402b645140a7bb9fbfa467a73cfb30d880a56 /world/map/npc/031-3 | |
| parent | 2629fa14c6f7e6a5a7a71f5c784424cf80189f17 (diff) | |
| parent | cba4de9a5f7b9de412b9f458c80904cee9764a85 (diff) | |
| download | serverdata-2011.09.08.tar.gz serverdata-2011.09.08.tar.bz2 serverdata-2011.09.08.tar.xz serverdata-2011.09.08.zip | |
Merge remote-tracking branch 'testing/master'v2011.09.08
Diffstat (limited to 'world/map/npc/031-3')
| -rw-r--r-- | world/map/npc/031-3/_import.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/031-3/_mobs.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/031-3/_warps.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/031-3/labyrinth.txt | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/world/map/npc/031-3/_import.txt b/world/map/npc/031-3/_import.txt index 2cb30906..d2d83387 100644 --- a/world/map/npc/031-3/_import.txt +++ b/world/map/npc/031-3/_import.txt @@ -1,4 +1,4 @@ -// Map 031-3: Cave +// Map 031-3: Ice Caves // This file is generated automatically. All manually changes will be removed when running the Converter. map: 031-3.gat npc: npc/031-3/_mobs.txt diff --git a/world/map/npc/031-3/_mobs.txt b/world/map/npc/031-3/_mobs.txt index b2aa1d0d..4ab99cfd 100644 --- a/world/map/npc/031-3/_mobs.txt +++ b/world/map/npc/031-3/_mobs.txt @@ -1,5 +1,5 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. -// Cave mobs +// Ice Caves mobs 031-3.gat,39,276,42,16|monster|Santa Slime|1015,5,100000,30000,Mob031-3::On1015 031-3.gat,230,279,25,26|monster|IceGoblin|1058,5,100000,30000,Mob031-3::On1058 diff --git a/world/map/npc/031-3/_warps.txt b/world/map/npc/031-3/_warps.txt index bcc4e966..2aea5e67 100644 --- a/world/map/npc/031-3/_warps.txt +++ b/world/map/npc/031-3/_warps.txt @@ -1,5 +1,5 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. -// Cave warps +// Ice Caves warps 031-3.gat,212,300|warp|toOutside|-1,-1,031-1.gat,76,26 031-3.gat,205,264|warp|toCave|-1,-1,031-3.gat,149,261 diff --git a/world/map/npc/031-3/labyrinth.txt b/world/map/npc/031-3/labyrinth.txt index feef9c1d..b1b5543a 100644 --- a/world/map/npc/031-3/labyrinth.txt +++ b/world/map/npc/031-3/labyrinth.txt @@ -8,10 +8,10 @@ //# //################################################################################# -031-3.gat,46,24,0 script #YetiBarrier 127,1,1,{ +031-3.gat,46,24,0|script|#YetiBarrier|127,1,1,{ if ($@FIGHT_YETI_STATUS == 1) goto L_Blocked; warp "031-4.gat", 40, 69; - end; + end; L_Blocked: message strcharinfo(0), "A force field seems to be blocking you from entering."; end; |