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/018-1 | |
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/018-1')
-rw-r--r-- | world/map/npc/018-1/_import.txt | 2 | ||||
-rw-r--r-- | world/map/npc/018-1/_mobs.txt | 2 | ||||
-rw-r--r-- | world/map/npc/018-1/_warps.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/world/map/npc/018-1/_import.txt b/world/map/npc/018-1/_import.txt index b3ab9841..21971544 100644 --- a/world/map/npc/018-1/_import.txt +++ b/world/map/npc/018-1/_import.txt @@ -1,4 +1,4 @@ -// Map 018-1: Woodland mining camp +// Map 018-1: Woodland Mining Camp // This file is generated automatically. All manually changes will be removed when running the Converter. map: 018-1.gat npc: npc/018-1/_mobs.txt diff --git a/world/map/npc/018-1/_mobs.txt b/world/map/npc/018-1/_mobs.txt index 9f3cda84..b036bb7a 100644 --- a/world/map/npc/018-1/_mobs.txt +++ b/world/map/npc/018-1/_mobs.txt @@ -1,5 +1,5 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. -// Woodland mining camp mobs +// Woodland Mining Camp mobs 018-1.gat,136,79,9,41|monster|Sea Slime|1033,10,100000,30000,Mob018-1::On1033 018-1.gat,108,87,53,25|monster|Log Head|1025,10,100000,30000,Mob018-1::On1025 diff --git a/world/map/npc/018-1/_warps.txt b/world/map/npc/018-1/_warps.txt index a98bf483..dec3a6a7 100644 --- a/world/map/npc/018-1/_warps.txt +++ b/world/map/npc/018-1/_warps.txt @@ -1,5 +1,5 @@ // This file is generated automatically. All manually changes will be removed when running the Converter. -// Woodland mining camp warps +// Woodland Mining Camp warps 018-1.gat,79,59|warp|toMine|0,-1,018-3.gat,99,132 018-1.gat,112,61|warp|toCave|-1,-1,018-3.gat,44,36 |