diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-05-26 15:55:23 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-05-26 15:56:50 +0200 |
| commit | 3aa7d028d6ccd6b83143e1dc3349194b2ae63406 (patch) | |
| tree | 6ffb60e592cb356a9352b50a28403d0f4abdc915 /world/map/npc | |
| parent | cdf80879bbe7c1d023b915bab64001cd4af26ba0 (diff) | |
| download | serverdata-3aa7d028d6ccd6b83143e1dc3349194b2ae63406.tar.gz serverdata-3aa7d028d6ccd6b83143e1dc3349194b2ae63406.tar.bz2 serverdata-3aa7d028d6ccd6b83143e1dc3349194b2ae63406.tar.xz serverdata-3aa7d028d6ccd6b83143e1dc3349194b2ae63406.zip | |
Run make maps for map changes and npc position changes.
Update submodule pointer.
Diffstat (limited to 'world/map/npc')
| -rw-r--r-- | world/map/npc/021-1/_import.txt | 1 | ||||
| -rw-r--r-- | world/map/npc/021-1/_warps.txt | 4 | ||||
| -rw-r--r-- | world/map/npc/021-2/_import.txt | 4 | ||||
| -rw-r--r-- | world/map/npc/021-2/_warps.txt | 9 |
4 files changed, 15 insertions, 3 deletions
diff --git a/world/map/npc/021-1/_import.txt b/world/map/npc/021-1/_import.txt index 30acb5b8..1ec734c5 100644 --- a/world/map/npc/021-1/_import.txt +++ b/world/map/npc/021-1/_import.txt @@ -13,6 +13,5 @@ npc: npc/021-1/inac.txt npc: npc/021-1/mapflags.txt npc: npc/021-1/north_shops.txt npc: npc/021-1/npcs.txt -npc: npc/021-1/royal_guards.txt npc: npc/021-1/weellos.txt npc: npc/021-1/workers.txt diff --git a/world/map/npc/021-1/_warps.txt b/world/map/npc/021-1/_warps.txt index 5d620e74..99134134 100644 --- a/world/map/npc/021-1/_warps.txt +++ b/world/map/npc/021-1/_warps.txt @@ -14,3 +14,7 @@ 021-1.gat,73,22|warp|To Tulimshar Port|3,-1,022-1.gat,73,109 021-1.gat,113,22|warp|To Tulimshar Port|3,-1,022-1.gat,113,109 021-1.gat,43,110|warp|to Store|-1,-1,021-2.gat,28,129 +021-1.gat,132,31|warp|to Tulimshar Forge|-1,-1,021-2.gat,79,138 +021-1.gat,133,24|warp|to Tulimshar Forge|-1,-1,021-2.gat,75,91 +021-1.gat,125,27|warp|to Tulimshar Forge|-1,-1,021-2.gat,124,67 +021-1.gat,125,31|warp|to Tulimshar Forge|-1,-1,021-2.gat,72,138 diff --git a/world/map/npc/021-2/_import.txt b/world/map/npc/021-2/_import.txt index bb80fc32..7b955fb5 100644 --- a/world/map/npc/021-2/_import.txt +++ b/world/map/npc/021-2/_import.txt @@ -4,11 +4,13 @@ map: 021-2.gat npc: npc/021-2/_mobs.txt npc: npc/021-2/_warps.txt npc: npc/021-2/bakery.txt +npc: npc/021-2/bank.txt +npc: npc/021-2/barber.txt npc: npc/021-2/government_building.txt npc: npc/021-2/heathin.txt +npc: npc/021-2/hotel_receptionist.txt npc: npc/021-2/inya.txt npc: npc/021-2/jhedia.txt npc: npc/021-2/kylian.txt npc: npc/021-2/mapflags.txt -npc: npc/021-2/workshop.txt npc: npc/021-2/yanis.txt diff --git a/world/map/npc/021-2/_warps.txt b/world/map/npc/021-2/_warps.txt index ad18520c..9e910208 100644 --- a/world/map/npc/021-2/_warps.txt +++ b/world/map/npc/021-2/_warps.txt @@ -2,7 +2,6 @@ // North Tulimshar Indoor warps 021-2.gat,27,30|warp|To Outside|-1,-1,021-1.gat,53,135 -021-2.gat,33,30|warp|To Outside|-1,-1,021-1.gat,55,135 021-2.gat,39,30|warp|To Outside|-1,-1,021-1.gat,57,135 021-2.gat,91,28|warp|To Outside|-1,-1,021-1.gat,103,101 021-2.gat,122,24|warp|To Roof|-1,-1,021-1.gat,103,97 @@ -14,3 +13,11 @@ 021-2.gat,46,57|warp|To Second Floor|0,-1,021-2.gat,46,96 021-2.gat,70,58|warp|To Main Room|-1,-1,021-2.gat,42,54 021-2.gat,28,130|warp|to Outside|-1,-1,021-1.gat,43,111 +021-2.gat,28,130|warp|to Outside|-1,-1,021-1.gat,43,111 +021-2.gat,84,93|warp|To First Floor|-1,0,021-2.gat,80,125 +021-2.gat,84,123|warp|To Second Floor|-1,0,021-2.gat,81,95 +021-2.gat,79,139|warp|to Outside|-1,-1,021-1.gat,132,32 +021-2.gat,72,139|warp|to Outside|-1,-1,021-1.gat,125,32 +021-2.gat,124,69|warp|to Outside|1,-1,021-1.gat,126,28 +021-2.gat,75,93|warp|to Outside|-1,-1,021-1.gat,132,25 +021-2.gat,33,30|warp|To Outside|-1,-1,021-1.gat,55,135 |