diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-02-18 19:57:35 +0000 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-02-18 19:57:35 +0000 |
| commit | 7464175373616085130e0d2e3b9ddc8e0322f291 (patch) | |
| tree | 039d01f52f6b76af2d1c7526b1673d646ddf532c /npc/013-3_Cave | |
| parent | 60e20acf62941b81bd560c87a2cf161e16ea2277 (diff) | |
| parent | 291215cde58a739d13a5bfd519489b736d8302dc (diff) | |
| download | serverdata-7464175373616085130e0d2e3b9ddc8e0322f291.tar.gz serverdata-7464175373616085130e0d2e3b9ddc8e0322f291.tar.bz2 serverdata-7464175373616085130e0d2e3b9ddc8e0322f291.tar.xz serverdata-7464175373616085130e0d2e3b9ddc8e0322f291.zip | |
Merge commit 'mainline/master'
Conflicts:
npc/001-1_Tulimshar/elanore.txt
npc/013-3_Cave/barrier.txt
npc/015-3/katze.txt
Diffstat (limited to 'npc/013-3_Cave')
| -rw-r--r-- | npc/013-3_Cave/_warps.txt | 2 | ||||
| -rw-r--r-- | npc/013-3_Cave/barrier.txt | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/npc/013-3_Cave/_warps.txt b/npc/013-3_Cave/_warps.txt index f288bdd7..45ca26d2 100644 --- a/npc/013-3_Cave/_warps.txt +++ b/npc/013-3_Cave/_warps.txt @@ -20,7 +20,7 @@ 013-3.gat,109,64 warp toCave -1,-1,013-3.gat,75,50 013-3.gat,67,51 warp toCave -1,-1,018-3.gat,90,51 013-3.gat,71,20 warp toCave -1,-1,013-3.gat,28,39 -013-3.gat,28,40 warp toCave -1,-1,013-3.gat,71,21 +013-3.gat,28,39 warp toCave -1,-1,013-3.gat,71,21 013-3.gat,71,42 warp toCave -1,-1,013-3.gat,109,21 013-3.gat,109,20 warp toCave -1,-1,013-3.gat,71,41 013-3.gat,111,42 warp toCave -1,-1,018-3.gat,71,123 diff --git a/npc/013-3_Cave/barrier.txt b/npc/013-3_Cave/barrier.txt index 85a7fc72..95fb6383 100644 --- a/npc/013-3_Cave/barrier.txt +++ b/npc/013-3_Cave/barrier.txt @@ -14,4 +14,5 @@ L_Has_Jack_O_Soul: mes "The barrier around the opening allows you passage."; set QUEST_demon_mines, 2; delitem "JackOSoul", 1; + close; } |