diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-02-14 20:13:09 +0000 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-02-14 20:13:09 +0000 |
| commit | 481d1eca66e38154063b078b84fe76a830e5ac0d (patch) | |
| tree | 936e79882218d32d4075f46ad85aff7cec199d2a /npc/001-1_Tulimshar | |
| parent | fe02011f477c57c7461b2bc25456bd9426e98cd7 (diff) | |
| parent | ef7a69afc170e8c60af91583d7c1488a7590fcab (diff) | |
| download | serverdata-481d1eca66e38154063b078b84fe76a830e5ac0d.tar.gz serverdata-481d1eca66e38154063b078b84fe76a830e5ac0d.tar.bz2 serverdata-481d1eca66e38154063b078b84fe76a830e5ac0d.tar.xz serverdata-481d1eca66e38154063b078b84fe76a830e5ac0d.zip | |
Merge commit 'mainline/master'
Conflicts:
db/item_db.txt
Diffstat (limited to 'npc/001-1_Tulimshar')
| -rw-r--r-- | npc/001-1_Tulimshar/_import.txt | 1 | ||||
| -rw-r--r-- | npc/001-1_Tulimshar/_warps.txt | 2 | ||||
| -rw-r--r-- | npc/001-1_Tulimshar/children.txt | 2 | ||||
| -rw-r--r-- | npc/001-1_Tulimshar/workers.txt | 13 |
4 files changed, 3 insertions, 15 deletions
diff --git a/npc/001-1_Tulimshar/_import.txt b/npc/001-1_Tulimshar/_import.txt index 8fe3add8..b66c4168 100644 --- a/npc/001-1_Tulimshar/_import.txt +++ b/npc/001-1_Tulimshar/_import.txt @@ -18,4 +18,3 @@ npc: npc/001-1_Tulimshar/rules.txt npc: npc/001-1_Tulimshar/sandra.txt npc: npc/001-1_Tulimshar/soul-menhir.txt npc: npc/001-1_Tulimshar/vincent.txt -npc: npc/001-1_Tulimshar/workers.txt diff --git a/npc/001-1_Tulimshar/_warps.txt b/npc/001-1_Tulimshar/_warps.txt index 7e8af69d..751b0df8 100644 --- a/npc/001-1_Tulimshar/_warps.txt +++ b/npc/001-1_Tulimshar/_warps.txt @@ -1,5 +1,7 @@ // 001-1 Tulimshar warps 001-1.gat,44,88 warp ToSandstorm 3,-1,002-1.gat,58,17 +001-1.gat,44,20 warp toCentralTulimshar 3,-1,021-1.gat,55,145 +001-1.gat,125,20 warp toCentralTulimshar 0,-1,021-1.gat,136,146 001-1.gat,32,71 warp ToInn -1,-1,001-2.gat,25,34 001-1.gat,75,41 warp ToHouse -1,-1,001-2.gat,71,72 diff --git a/npc/001-1_Tulimshar/children.txt b/npc/001-1_Tulimshar/children.txt index 3f3ec522..1b62953d 100644 --- a/npc/001-1_Tulimshar/children.txt +++ b/npc/001-1_Tulimshar/children.txt @@ -1,6 +1,6 @@ // -001-1.gat,94,27,0 script Aisha 108,{ +001-1.gat,95,29,0 script Aisha 108,{ set @TEMP,rand(9); if(@TEMP == 0) goto L_1; if(@TEMP == 1) goto L_1; diff --git a/npc/001-1_Tulimshar/workers.txt b/npc/001-1_Tulimshar/workers.txt deleted file mode 100644 index 43ee9795..00000000 --- a/npc/001-1_Tulimshar/workers.txt +++ /dev/null @@ -1,13 +0,0 @@ -// - -001-1.gat,45,21,0 script Construction Worker 155,{ - mes "[Construction worker]"; - mes "\"I can't let you beyond this gate. The area is closed for renovation; most of it was destroyed during the earthquake.\""; - close; -} - -001-1.gat,124,21,0 script Construction Worker 155,{ - mes "[Construction worker]"; - mes "\"Move along.\""; - close; -} |