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/021-1 | |
| parent | 2629fa14c6f7e6a5a7a71f5c784424cf80189f17 (diff) | |
| parent | cba4de9a5f7b9de412b9f458c80904cee9764a85 (diff) | |
| download | serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.gz serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.bz2 serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.tar.xz serverdata-5ea6c568c86d9c0f76983705258951e2db9974fa.zip | |
Merge remote-tracking branch 'testing/master'v2011.09.08
Diffstat (limited to 'world/map/npc/021-1')
| -rw-r--r-- | world/map/npc/021-1/_import.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/021-1/_mobs.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/021-1/_warps.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/world/map/npc/021-1/_import.txt b/world/map/npc/021-1/_import.txt index 9d7059d0..b9b886bc 100644 --- a/world/map/npc/021-1/_import.txt +++ b/world/map/npc/021-1/_import.txt @@ -1,4 +1,4 @@ -// Map 021-1: Tulimshar +// Map 021-1: North Tulimshar // This file is generated automatically. All manually changes will be removed when running the Converter. map: 021-1.gat npc: npc/021-1/_mobs.txt diff --git a/world/map/npc/021-1/_mobs.txt b/world/map/npc/021-1/_mobs.txt index 68822ace..f205507a 100644 --- a/world/map/npc/021-1/_mobs.txt +++ b/world/map/npc/021-1/_mobs.txt @@ -1,5 +1,5 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. -// Tulimshar mobs +// North Tulimshar mobs 021-1.gat,126,86,3,2|monster|Maggot|1002,2,100000,30000,Mob021-1::On1002 021-1.gat,90,65,3,2|monster|Maggot|1002,2,100000,30000,Mob021-1::On1002 diff --git a/world/map/npc/021-1/_warps.txt b/world/map/npc/021-1/_warps.txt index 7fd34f4d..e2baf549 100644 --- a/world/map/npc/021-1/_warps.txt +++ b/world/map/npc/021-1/_warps.txt @@ -1,5 +1,5 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. -// Tulimshar warps +// North Tulimshar warps 021-1.gat,55,146|warp|toBazaar|3,-1,001-1.gat,44,20 021-1.gat,136,146|warp|toSouthTulimshar|0,-1,001-1.gat,124,21 |