diff options
| author | Micksha <ms-shaman@gmx.de> | 2019-10-10 11:06:19 +0000 |
|---|---|---|
| committer | Micksha <ms-shaman@gmx.de> | 2019-10-10 11:06:19 +0000 |
| commit | af234f546317933cfaeac330ba233c42c84f490b (patch) | |
| tree | 41d3f164bfd395224055a10a86e6600133732ebe /npc | |
| parent | 87de0f8f42baa647ea15126e69f6cac28b4f5d92 (diff) | |
| parent | 43bfffe1fec74604e94961fa73e254f8a5ddc0e6 (diff) | |
| download | serverdata-af234f546317933cfaeac330ba233c42c84f490b.tar.gz serverdata-af234f546317933cfaeac330ba233c42c84f490b.tar.bz2 serverdata-af234f546317933cfaeac330ba233c42c84f490b.tar.xz serverdata-af234f546317933cfaeac330ba233c42c84f490b.zip | |
Merge branch 'merchanthouse' into 'master'
Merchanthouse
See merge request evol/serverdata!202
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/008-1-1/_warps.txt | 1 | ||||
| -rw-r--r-- | npc/008-1/_import.txt | 2 | ||||
| -rw-r--r-- | npc/008-2-32/_import.txt | 3 | ||||
| -rw-r--r-- | npc/008-2-32/_warps.txt | 3 | ||||
| -rw-r--r-- | npc/_import.txt | 1 |
5 files changed, 9 insertions, 1 deletions
diff --git a/npc/008-1-1/_warps.txt b/npc/008-1-1/_warps.txt index 56d9cc3f..11a32b86 100644 --- a/npc/008-1-1/_warps.txt +++ b/npc/008-1-1/_warps.txt @@ -2,3 +2,4 @@ // Map 008-1-1: Woodland warps 008-1-1,247,85,0 warp #008-1-1_247_85 0,1,008-1,21,85 008-1-1,202,47,0 warp #008-1-1_202_47 0,0,008-3-0,129,112 +008-1-1,51,57,0 warp #008-1-1_51_57 0,0,008-2-32,40,37 diff --git a/npc/008-1/_import.txt b/npc/008-1/_import.txt index 6d5f4bfa..018577b5 100644 --- a/npc/008-1/_import.txt +++ b/npc/008-1/_import.txt @@ -1,8 +1,8 @@ // Map 008-1: Hurnscald // This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/008-1/4144.txt", "npc/008-1/_mobs.txt", "npc/008-1/_warps.txt", -"npc/008-1/4144.txt", "npc/008-1/auldsbel.txt", "npc/008-1/banu.txt", "npc/008-1/blossom.txt", diff --git a/npc/008-2-32/_import.txt b/npc/008-2-32/_import.txt new file mode 100644 index 00000000..c9137dc7 --- /dev/null +++ b/npc/008-2-32/_import.txt @@ -0,0 +1,3 @@ +// Map 008-2-32: Merchant House +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/008-2-32/_warps.txt", diff --git a/npc/008-2-32/_warps.txt b/npc/008-2-32/_warps.txt new file mode 100644 index 00000000..99f22bd8 --- /dev/null +++ b/npc/008-2-32/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 008-2-32: Merchant House warps +008-2-32,40,38,0 warp #008-2-32_40_38 0,0,008-1-1,51,58 diff --git a/npc/_import.txt b/npc/_import.txt index c19f2e32..b821d9d9 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -83,6 +83,7 @@ @include "npc/008-2-29/_import.txt" @include "npc/008-2-3/_import.txt" @include "npc/008-2-30/_import.txt" +@include "npc/008-2-32/_import.txt" @include "npc/008-2-4/_import.txt" @include "npc/008-2-5/_import.txt" @include "npc/008-2-6/_import.txt" |