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/010-2_Dimonds_Cove | |
| 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/010-2_Dimonds_Cove')
| -rw-r--r-- | npc/010-2_Dimonds_Cove/doug.txt | 3 | ||||
| -rw-r--r-- | npc/010-2_Dimonds_Cove/workers.txt | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/npc/010-2_Dimonds_Cove/doug.txt b/npc/010-2_Dimonds_Cove/doug.txt index 146e2ffd..0caa0da0 100644 --- a/npc/010-2_Dimonds_Cove/doug.txt +++ b/npc/010-2_Dimonds_Cove/doug.txt @@ -1,3 +1,5 @@ +// + 010-2.gat,68,87,0 script Doug 113,{ if(CaveSnakeLamp == 1) goto L_State2; if(CaveSnakeLamp == 2) goto L_Done; @@ -98,4 +100,3 @@ L_Done: mes "\"Thanks for your help! Those snakes sure have bright lamps!\""; close; } - diff --git a/npc/010-2_Dimonds_Cove/workers.txt b/npc/010-2_Dimonds_Cove/workers.txt index 13704115..0d80f700 100644 --- a/npc/010-2_Dimonds_Cove/workers.txt +++ b/npc/010-2_Dimonds_Cove/workers.txt @@ -1,3 +1,5 @@ +// + 010-2.gat,23,70,0 script Josh 155,{ mes "[Josh]"; mes "\"We're working on getting the cellar pass open.\""; |