diff options
| author | Jesusaves <cpntb1@ymail.com> | 2018-06-23 22:09:36 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2018-06-23 22:10:57 -0300 |
| commit | 5946460b3e6da69a54dec8300491381a2acb2df2 (patch) | |
| tree | 6223647fb453c410899f7f2f3fe63d380ec67540 /npc | |
| parent | abae4307e7f1a501c2e76674ccdd133f0e529dcf (diff) | |
| download | serverdata-5946460b3e6da69a54dec8300491381a2acb2df2.tar.gz serverdata-5946460b3e6da69a54dec8300491381a2acb2df2.tar.bz2 serverdata-5946460b3e6da69a54dec8300491381a2acb2df2.tar.xz serverdata-5946460b3e6da69a54dec8300491381a2acb2df2.zip | |
Move Luanna inside Halinarzo's Church
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/009-1/_import.txt | 1 | ||||
| -rw-r--r-- | npc/009-1/_warps.txt | 1 | ||||
| -rw-r--r-- | npc/009-5/_import.txt | 4 | ||||
| -rw-r--r-- | npc/009-5/_warps.txt | 3 | ||||
| -rw-r--r-- | npc/009-5/luanna.txt (renamed from npc/009-1/luanna.txt) | 4 | ||||
| -rw-r--r-- | npc/_import.txt | 1 |
6 files changed, 11 insertions, 3 deletions
diff --git a/npc/009-1/_import.txt b/npc/009-1/_import.txt index 15f7c47ae..0d482e907 100644 --- a/npc/009-1/_import.txt +++ b/npc/009-1/_import.txt @@ -6,7 +6,6 @@ "npc/009-1/fisherman.txt", "npc/009-1/foxhound.txt", "npc/009-1/guards.txt", -"npc/009-1/luanna.txt", "npc/009-1/lynnthetraveler.txt", "npc/009-1/mapflags.txt", "npc/009-1/soul-menhir.txt", diff --git a/npc/009-1/_warps.txt b/npc/009-1/_warps.txt index 13dbb0b1f..09a9baf36 100644 --- a/npc/009-1/_warps.txt +++ b/npc/009-1/_warps.txt @@ -6,3 +6,4 @@ 009-1,73,63,0 warp #009-1_73_63 0,0,009-2,28,65 009-1,86,34,0 warp #009-1_86_34 0,0,009-3,44,56 009-1,33,62,0 warp #009-1_33_62 0,0,009-4,48,53 +009-1,64,38,0 warp #009-1_64_38 1,0,009-5,32,41 diff --git a/npc/009-5/_import.txt b/npc/009-5/_import.txt new file mode 100644 index 000000000..20d4451b1 --- /dev/null +++ b/npc/009-5/_import.txt @@ -0,0 +1,4 @@ +// Map 009-5: Halinarzo Church +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/009-5/_warps.txt", +"npc/009-5/luanna.txt", diff --git a/npc/009-5/_warps.txt b/npc/009-5/_warps.txt new file mode 100644 index 000000000..ee7350c51 --- /dev/null +++ b/npc/009-5/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 009-5: Halinarzo Church warps +009-5,33,42,0 warp #009-5_33_42 1,0,009-1,63,39 diff --git a/npc/009-1/luanna.txt b/npc/009-5/luanna.txt index b1cdb5024..089062310 100644 --- a/npc/009-1/luanna.txt +++ b/npc/009-5/luanna.txt @@ -2,9 +2,9 @@ // Author: // Jesusalva, 4144 // Description: -// Luanna is responsible for marriage. Temporary location. Subject to change stuff later. +// Luanna is responsible for marriage. Subject to change stuff later. -009-1,107,32,0 script Luanna NPC_FEMALE,{ +009-5,32,29,0 script Luanna NPC_FEMALE,{ marriagemain(); close; diff --git a/npc/_import.txt b/npc/_import.txt index 2ef34ed29..2dca8f0b0 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -50,6 +50,7 @@ @include "npc/009-2/_import.txt" @include "npc/009-3/_import.txt" @include "npc/009-4/_import.txt" +@include "npc/009-5/_import.txt" @include "npc/010-1-1/_import.txt" @include "npc/010-1/_import.txt" @include "npc/010-2/_import.txt" |