diff options
| -rw-r--r-- | conf/map/maps.conf | 1 | ||||
| -rw-r--r-- | db/map_index.txt | 31 | ||||
| -rw-r--r-- | maps/re/020-1.mcache | bin | 615 -> 618 bytes | |||
| -rw-r--r-- | maps/re/020-2.mcache | bin | 0 -> 93 bytes | |||
| -rw-r--r-- | npc/020-1/_warps.txt | 1 | ||||
| -rw-r--r-- | npc/020-1/misc.txt | 3 | ||||
| -rw-r--r-- | npc/020-2/_import.txt | 3 | ||||
| -rw-r--r-- | npc/020-2/_warps.txt | 3 | ||||
| -rw-r--r-- | npc/_import.txt | 1 |
9 files changed, 26 insertions, 17 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf index 62cd3fe03..0b058eba6 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -112,6 +112,7 @@ map_list: ( "019-4-1", "019-4", "020-1", + "020-2", "021-1", "021-2", "021-3", diff --git a/db/map_index.txt b/db/map_index.txt index fee59eb4b..e72cc6bbc 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -109,18 +109,19 @@ 019-4-1 109 019-4 110 020-1 111 -021-1 112 -021-2 113 -021-3 114 -021-4 115 -022-1 116 -023-1 117 -023-2 118 -024-1 119 -boss 120 -botcheck 121 -sec_pri 122 -soren-2 123 -soren 124 -test 125 -testbg 126 +020-2 112 +021-1 113 +021-2 114 +021-3 115 +021-4 116 +022-1 117 +023-1 118 +023-2 119 +024-1 120 +boss 121 +botcheck 122 +sec_pri 123 +soren-2 124 +soren 125 +test 126 +testbg 127 diff --git a/maps/re/020-1.mcache b/maps/re/020-1.mcache Binary files differindex 9f6ef0cf5..7d801aeb3 100644 --- a/maps/re/020-1.mcache +++ b/maps/re/020-1.mcache diff --git a/maps/re/020-2.mcache b/maps/re/020-2.mcache Binary files differnew file mode 100644 index 000000000..c885e3f0c --- /dev/null +++ b/maps/re/020-2.mcache diff --git a/npc/020-1/_warps.txt b/npc/020-1/_warps.txt index f1ee0c18f..3a904e61a 100644 --- a/npc/020-1/_warps.txt +++ b/npc/020-1/_warps.txt @@ -1,4 +1,5 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. // Map 020-1: Nivalis warps +020-1,47,48,0 warp #020-1_47_48 0,0,020-2,30,36 020-1,70,128,0 warp #020-1_70_128 3,0,019-1,70,22 020-1,107,55,0 warp #020-1_107_55 0,0,019-2,38,55 diff --git a/npc/020-1/misc.txt b/npc/020-1/misc.txt index df5ce37e9..9c1188491 100644 --- a/npc/020-1/misc.txt +++ b/npc/020-1/misc.txt @@ -105,8 +105,7 @@ OnInit: // Description: // Banker. -// LOCATION TODO -020-1,58,65,0 script Ben#NivBanker NPC_LLOYD,{ +020-2,30,25,0 script Ben#NivBanker NPC_LLOYD,{ Banker(.name$, "Nivalis", 10000); close; diff --git a/npc/020-2/_import.txt b/npc/020-2/_import.txt new file mode 100644 index 000000000..f0970e091 --- /dev/null +++ b/npc/020-2/_import.txt @@ -0,0 +1,3 @@ +// Map 020-2: Nivalis Indoors +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/020-2/_warps.txt", diff --git a/npc/020-2/_warps.txt b/npc/020-2/_warps.txt new file mode 100644 index 000000000..796d67d41 --- /dev/null +++ b/npc/020-2/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 020-2: Nivalis Indoors warps +020-2,30,37,0 warp #020-2_30_37 0,0,020-2,47,49 diff --git a/npc/_import.txt b/npc/_import.txt index f7bcc8809..e08b5b56b 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -111,6 +111,7 @@ @include "npc/019-4-1/_import.txt" @include "npc/019-4/_import.txt" @include "npc/020-1/_import.txt" +@include "npc/020-2/_import.txt" @include "npc/021-1/_import.txt" @include "npc/021-2/_import.txt" @include "npc/021-3/_import.txt" |