diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-01-24 21:59:25 +0000 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-01-24 21:59:25 +0000 |
| commit | 7ca6050f3f3d89180b7290c8c275894e053762e5 (patch) | |
| tree | 1a3ef8196682f6c47260d8b6a788a20067c5d580 | |
| parent | 385a06ecefcdb0eda161353c4a0d1f7e8daeb96d (diff) | |
| parent | a902c2458dae06b719e5608396421bc773a4ab2c (diff) | |
| download | serverdata-7ca6050f3f3d89180b7290c8c275894e053762e5.tar.gz serverdata-7ca6050f3f3d89180b7290c8c275894e053762e5.tar.bz2 serverdata-7ca6050f3f3d89180b7290c8c275894e053762e5.tar.xz serverdata-7ca6050f3f3d89180b7290c8c275894e053762e5.zip | |
Merge commit 'mainline/master'
| -rw-r--r-- | data/008-1.wlk | bin | 18484 -> 18484 bytes | |||
| -rw-r--r-- | data/013-3.wlk | bin | 40004 -> 40004 bytes | |||
| -rw-r--r-- | data/021-1.wlk | bin | 29908 -> 29908 bytes | |||
| -rw-r--r-- | npc/005-1_Snake_desert/_mobs.txt | 4 | ||||
| -rw-r--r-- | npc/008-1_Hurnscald_outskirts/_import.txt | 1 | ||||
| -rw-r--r-- | npc/008-1_Hurnscald_outskirts/dock_worker.txt | 7 | ||||
| -rw-r--r-- | npc/013-3_Cave/_warps.txt | 2 |
7 files changed, 11 insertions, 3 deletions
diff --git a/data/008-1.wlk b/data/008-1.wlk Binary files differindex b011a566..54e6bad7 100644 --- a/data/008-1.wlk +++ b/data/008-1.wlk diff --git a/data/013-3.wlk b/data/013-3.wlk Binary files differindex c9a3a1df..4a3e0e4d 100644 --- a/data/013-3.wlk +++ b/data/013-3.wlk diff --git a/data/021-1.wlk b/data/021-1.wlk Binary files differindex 742b008c..df422920 100644 --- a/data/021-1.wlk +++ b/data/021-1.wlk diff --git a/npc/005-1_Snake_desert/_mobs.txt b/npc/005-1_Snake_desert/_mobs.txt index e7d598e1..b215ff80 100644 --- a/npc/005-1_Snake_desert/_mobs.txt +++ b/npc/005-1_Snake_desert/_mobs.txt @@ -2,8 +2,8 @@ 005-1.gat,0,0,0,0 monster Maggot 1002,1,0,0,Mob005-1::On1002 005-1.gat,0,0,0,0 monster Snake 1010,1,0,0,Mob005-1::On1010 -005-1.gat,71,77,9,6 monster Snake 1010,4,0,0,Mob005-1::On1010 -005-1.gat,92,25,8,5 monster Snake 1010,3,0,0,Mob005-1::On1010 +005-1.gat,71,77,9,6 monster Snake 1010,2,4000,5000,Mob005-1::On1010 +005-1.gat,92,25,8,5 monster Snake 1010,3,4000,5000,Mob005-1::On1010 005-1.gat,98,54,95,52 monster Giant Maggot 1006,20,0,0,Mob005-1::On1006 005-1.gat,91,18,66,23 monster Black Scorpion 1009,7,0,0,Mob005-1::On1009 005-1.gat,99,87,85,32 monster Black Scorpion 1009,8,0,0,Mob005-1::On1009 diff --git a/npc/008-1_Hurnscald_outskirts/_import.txt b/npc/008-1_Hurnscald_outskirts/_import.txt index a5a1eec8..e3e92081 100644 --- a/npc/008-1_Hurnscald_outskirts/_import.txt +++ b/npc/008-1_Hurnscald_outskirts/_import.txt @@ -1,6 +1,7 @@ map: 008-1.gat npc: npc/008-1_Hurnscald_outskirts/_mobs.txt npc: npc/008-1_Hurnscald_outskirts/_warps.txt +npc: npc/008-1_Hurnscald_outskirts/dock_worker.txt npc: npc/008-1_Hurnscald_outskirts/george.txt npc: npc/008-1_Hurnscald_outskirts/hinnak.txt npc: npc/008-1_Hurnscald_outskirts/monsters.txt diff --git a/npc/008-1_Hurnscald_outskirts/dock_worker.txt b/npc/008-1_Hurnscald_outskirts/dock_worker.txt new file mode 100644 index 00000000..1da75718 --- /dev/null +++ b/npc/008-1_Hurnscald_outskirts/dock_worker.txt @@ -0,0 +1,7 @@ +// + +008-1.gat,136,65,0 script Construction Worker 155,{ + mes "[Construction worker]"; + mes "\"I'm builing a dock here. I don't know any details about how it will be used. Sorry.\""; + close; +} diff --git a/npc/013-3_Cave/_warps.txt b/npc/013-3_Cave/_warps.txt index 867c2610..44c2d8d7 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,40 -013-3.gat,28,41 warp toCave -1,-1,013-3.gat,71,21 +013-3.gat,28,40 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 |