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/children.txt | |
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/children.txt')
-rw-r--r-- | npc/001-1_Tulimshar/children.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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; |