diff options
| author | Micksha <ms-shaman@gmx.de> | 2018-11-09 15:13:08 +0000 |
|---|---|---|
| committer | Micksha <ms-shaman@gmx.de> | 2018-11-09 15:13:08 +0000 |
| commit | 599b671eb4abc3834124c5e904b92afbcd131b6d (patch) | |
| tree | f7620e4e32e19c90b5fa3b59347a499bd931da75 | |
| parent | bd89e48964bac42e63cdd40cb39b40caa0008a2f (diff) | |
| parent | c9ebfcd202b15b9eb9754696656a808df3ce12ea (diff) | |
| download | serverdata-599b671eb4abc3834124c5e904b92afbcd131b6d.tar.gz serverdata-599b671eb4abc3834124c5e904b92afbcd131b6d.tar.bz2 serverdata-599b671eb4abc3834124c5e904b92afbcd131b6d.tar.xz serverdata-599b671eb4abc3834124c5e904b92afbcd131b6d.zip | |
Merge branch 'maps' into 'master'
Map merge request
See merge request evol/serverdata!137
| -rw-r--r-- | conf/map/maps.conf | 1 | ||||
| -rw-r--r-- | db/map_index.txt | 7 | ||||
| -rw-r--r-- | maps/re/008-1-1.mcache | bin | 1501 -> 2010 bytes | |||
| -rw-r--r-- | maps/re/008-3-0.mcache | bin | 0 -> 2511 bytes | |||
| -rw-r--r-- | npc/008-3-0/_import.txt | 2 | ||||
| -rw-r--r-- | npc/_import.txt | 1 |
6 files changed, 8 insertions, 3 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf index 58cf9446..f9cb4cad 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -89,6 +89,7 @@ map_list: ( "008-2-7", "008-2-8", "008-2-9", + "008-3-0", "008-3-1", "test", "testbg", diff --git a/db/map_index.txt b/db/map_index.txt index 547afb0b..599d54b0 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -86,6 +86,7 @@ 008-2-7 86 008-2-8 87 008-2-9 88 -008-3-1 89 -test 90 -testbg 91 +008-3-0 89 +008-3-1 90 +test 91 +testbg 92 diff --git a/maps/re/008-1-1.mcache b/maps/re/008-1-1.mcache Binary files differindex 389c1412..5362c3e6 100644 --- a/maps/re/008-1-1.mcache +++ b/maps/re/008-1-1.mcache diff --git a/maps/re/008-3-0.mcache b/maps/re/008-3-0.mcache Binary files differnew file mode 100644 index 00000000..321ece09 --- /dev/null +++ b/maps/re/008-3-0.mcache diff --git a/npc/008-3-0/_import.txt b/npc/008-3-0/_import.txt new file mode 100644 index 00000000..2a9fe448 --- /dev/null +++ b/npc/008-3-0/_import.txt @@ -0,0 +1,2 @@ +// Map 008-3-0: Rossy Cave +// This file is generated automatically. All manually added changes will be removed when running the Converter. diff --git a/npc/_import.txt b/npc/_import.txt index ff79ccb8..fe81168d 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -88,6 +88,7 @@ @include "npc/008-2-7/_import.txt" @include "npc/008-2-8/_import.txt" @include "npc/008-2-9/_import.txt" +@include "npc/008-3-0/_import.txt" @include "npc/008-3-1/_import.txt" @include "npc/test/_import.txt" @include "npc/testbg/_import.txt" |