diff options
| author | jesusalva <cpntb1@ymail.com> | 2018-02-28 02:11:21 -0300 |
|---|---|---|
| committer | jesusalva <cpntb1@ymail.com> | 2018-02-28 02:11:21 -0300 |
| commit | 251aa913a4f31be4970241e0cc7638c8b87a6d47 (patch) | |
| tree | 31ef6b7aaadda06288af409e4a2571adc3b7450d | |
| parent | 0d593d6d6a25ff807c675ab045c646a98c6a88d6 (diff) | |
| download | serverdata-251aa913a4f31be4970241e0cc7638c8b87a6d47.tar.gz serverdata-251aa913a4f31be4970241e0cc7638c8b87a6d47.tar.bz2 serverdata-251aa913a4f31be4970241e0cc7638c8b87a6d47.tar.xz serverdata-251aa913a4f31be4970241e0cc7638c8b87a6d47.zip | |
Include new maps (server-side). Traps and warps from TMW-BR 012 not included.
| -rw-r--r-- | conf/map/maps.conf | 2 | ||||
| -rw-r--r-- | db/map_index.txt | 8 | ||||
| -rw-r--r-- | maps/re/012.mcache | bin | 0 -> 5536 bytes | |||
| -rw-r--r-- | maps/re/botcheck.mcache | bin | 0 -> 106 bytes | |||
| -rw-r--r-- | npc/005-1/_mobs.txt | 4 | ||||
| -rw-r--r-- | npc/012/_import.txt | 2 | ||||
| -rw-r--r-- | npc/_import.txt | 2 | ||||
| -rw-r--r-- | npc/botcheck/_import.txt | 2 |
8 files changed, 15 insertions, 5 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf index 3a60f4270..3becd2f32 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -49,6 +49,8 @@ map_list: ( "008-2-7", "008-2-8", "008-2-9", + "012", + "botcheck", "sec_pri", "test", "testbg", diff --git a/db/map_index.txt b/db/map_index.txt index b42856fa8..18198d15b 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -46,6 +46,8 @@ 008-2-7 46 008-2-8 47 008-2-9 48 -sec_pri 49 -test 50 -testbg 51 +012 49 +botcheck 50 +sec_pri 51 +test 52 +testbg 53 diff --git a/maps/re/012.mcache b/maps/re/012.mcache Binary files differnew file mode 100644 index 000000000..1581c1877 --- /dev/null +++ b/maps/re/012.mcache diff --git a/maps/re/botcheck.mcache b/maps/re/botcheck.mcache Binary files differnew file mode 100644 index 000000000..42bceb6d2 --- /dev/null +++ b/maps/re/botcheck.mcache diff --git a/npc/005-1/_mobs.txt b/npc/005-1/_mobs.txt index d7f349937..58784977d 100644 --- a/npc/005-1/_mobs.txt +++ b/npc/005-1/_mobs.txt @@ -3,8 +3,8 @@ 005-1,36,40,2,1 monster CloverPatch 1028,1,35000,300000 005-1,23,56,1,0 monster IronFragments 1058,1,35000,300000 005-1,63,84,7,6 monster Maggot 1030,8,35000,300000,Trainer::OnKillMaggot -005-1,82,87,8,9 monster CandorScorpion 1073,8,35000,300000,Trainer::OnKillCandorScorpion +005-1,82,87,8,9 monster Candor Scorpion 1073,8,35000,300000,Trainer::OnKillCandorScorpion 005-1,36,105,6,3 monster Piou 1002,1,35000,300000 -005-1,80,33,16,15 monster CandorScorpion 1073,16,35000,300000,Trainer::OnKillCandorScorpion +005-1,80,33,16,15 monster Candor Scorpion 1073,16,35000,300000,Trainer::OnKillCandorScorpion 005-1,71,39,28,10 monster ManaBug 1075,4,35000,300000 005-1,30,39,12,14 monster Scorpion 1071,2,35000,300000,Trainer::OnKillScorpion diff --git a/npc/012/_import.txt b/npc/012/_import.txt new file mode 100644 index 000000000..7e97eab7e --- /dev/null +++ b/npc/012/_import.txt @@ -0,0 +1,2 @@ +// Map 012: Enchanted Forest +// 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 ed26e28cc..e85098266 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -48,6 +48,8 @@ @include "npc/008-2-7/_import.txt" @include "npc/008-2-8/_import.txt" @include "npc/008-2-9/_import.txt" +@include "npc/012/_import.txt" +@include "npc/botcheck/_import.txt" @include "npc/sec_pri/_import.txt" @include "npc/test/_import.txt" @include "npc/testbg/_import.txt" diff --git a/npc/botcheck/_import.txt b/npc/botcheck/_import.txt new file mode 100644 index 000000000..44cc9580c --- /dev/null +++ b/npc/botcheck/_import.txt @@ -0,0 +1,2 @@ +// Map botcheck: Area Botcheck +// This file is generated automatically. All manually added changes will be removed when running the Converter. |