diff options
| -rw-r--r-- | conf/map/maps.conf | 2 | ||||
| -rw-r--r-- | db/map_index.txt | 30 | ||||
| -rw-r--r-- | maps/re/019-3.mcache | bin | 0 -> 1317 bytes | |||
| -rw-r--r-- | maps/re/023-2.mcache | bin | 0 -> 476 bytes | |||
| -rw-r--r-- | npc/019-3/_import.txt | 4 | ||||
| -rw-r--r-- | npc/019-3/_mobs.txt | 5 | ||||
| -rw-r--r-- | npc/019-3/_warps.txt | 3 | ||||
| -rw-r--r-- | npc/023-2/_import.txt | 4 | ||||
| -rw-r--r-- | npc/023-2/_mobs.txt | 6 | ||||
| -rw-r--r-- | npc/023-2/_warps.txt | 23 | ||||
| -rw-r--r-- | npc/_import.txt | 2 | ||||
| -rw-r--r-- | npc/functions/weather.txt | 1 |
12 files changed, 66 insertions, 14 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf index 9ec428c0f..fa3bd5c39 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -104,12 +104,14 @@ map_list: ( "019-1-1", "019-1", "019-2", + "019-3", "021-1", "021-2", "021-3", "021-4", "022-1", "023-1", + "023-2", "024-1", "boss", "botcheck", diff --git a/db/map_index.txt b/db/map_index.txt index 3e4bc61f5..60f96d342 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -101,17 +101,19 @@ 019-1-1 101 019-1 102 019-2 103 -021-1 104 -021-2 105 -021-3 106 -021-4 107 -022-1 108 -023-1 109 -024-1 110 -boss 111 -botcheck 112 -sec_pri 113 -soren-2 114 -soren 115 -test 116 -testbg 117 +019-3 104 +021-1 105 +021-2 106 +021-3 107 +021-4 108 +022-1 109 +023-1 110 +023-2 111 +024-1 112 +boss 113 +botcheck 114 +sec_pri 115 +soren-2 116 +soren 117 +test 118 +testbg 119 diff --git a/maps/re/019-3.mcache b/maps/re/019-3.mcache Binary files differnew file mode 100644 index 000000000..6d184701b --- /dev/null +++ b/maps/re/019-3.mcache diff --git a/maps/re/023-2.mcache b/maps/re/023-2.mcache Binary files differnew file mode 100644 index 000000000..f8947d8b1 --- /dev/null +++ b/maps/re/023-2.mcache diff --git a/npc/019-3/_import.txt b/npc/019-3/_import.txt new file mode 100644 index 000000000..ad92da952 --- /dev/null +++ b/npc/019-3/_import.txt @@ -0,0 +1,4 @@ +// Map 019-3: Snow Forest +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/019-3/_mobs.txt", +"npc/019-3/_warps.txt", diff --git a/npc/019-3/_mobs.txt b/npc/019-3/_mobs.txt new file mode 100644 index 000000000..15df646f4 --- /dev/null +++ b/npc/019-3/_mobs.txt @@ -0,0 +1,5 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 019-3: Snow Forest mobs +019-3,88,63,88,63 monster Fluffy 1022,50,100000,30000 +019-3,74,61,55,42 monster Wolvern 1037,35,100000,30000 +019-3,76,46,71,34 monster Santa Slime 1096,40,100000,30000 diff --git a/npc/019-3/_warps.txt b/npc/019-3/_warps.txt new file mode 100644 index 000000000..76a024511 --- /dev/null +++ b/npc/019-3/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 019-3: Snow Forest warps +019-3,58,84,0 warp #019-3_58_84 0,0,023-2,121,37 diff --git a/npc/023-2/_import.txt b/npc/023-2/_import.txt new file mode 100644 index 000000000..e0c2f3ee9 --- /dev/null +++ b/npc/023-2/_import.txt @@ -0,0 +1,4 @@ +// Map 023-2: Magic Cave +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/023-2/_mobs.txt", +"npc/023-2/_warps.txt", diff --git a/npc/023-2/_mobs.txt b/npc/023-2/_mobs.txt new file mode 100644 index 000000000..3173a20fb --- /dev/null +++ b/npc/023-2/_mobs.txt @@ -0,0 +1,6 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 023-2: Magic Cave mobs +023-2,96,52,17,27 monster Moggun 1070,15,0,0 +023-2,38,77,11,27 monster Water Fairy 1184,4,0,0 +023-2,54,44,21,6 monster Yeti 1064,5,0,0 +023-2,81,61,39,16 monster Angry Bat 1194,8,0,0 diff --git a/npc/023-2/_warps.txt b/npc/023-2/_warps.txt new file mode 100644 index 000000000..8fe76da09 --- /dev/null +++ b/npc/023-2/_warps.txt @@ -0,0 +1,23 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 023-2: Magic Cave warps +023-2,86,80,0 script #023-2_86_80 NPC_HIDDEN,0,0,{ + end; +OnTouch: + slide 86,124; end; +} +023-2,86,82,0 script #023-2_86_82 NPC_HIDDEN,0,0,{ + end; +OnTouch: + slide 86,120; end; +} +023-2,30,108,0 script #023-2_30_108 NPC_HIDDEN,0,0,{ + end; +OnTouch: + slide 30,146; end; +} +023-2,30,106,0 script #023-2_30_106 NPC_HIDDEN,0,0,{ + end; +OnTouch: + slide 30,150; end; +} +023-2,121,38,0 warp #023-2_121_38 0,0,019-3,58,85 diff --git a/npc/_import.txt b/npc/_import.txt index e1f171b7b..7799578b0 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -103,12 +103,14 @@ @include "npc/019-1-1/_import.txt" @include "npc/019-1/_import.txt" @include "npc/019-2/_import.txt" +@include "npc/019-3/_import.txt" @include "npc/021-1/_import.txt" @include "npc/021-2/_import.txt" @include "npc/021-3/_import.txt" @include "npc/021-4/_import.txt" @include "npc/022-1/_import.txt" @include "npc/023-1/_import.txt" +@include "npc/023-2/_import.txt" @include "npc/024-1/_import.txt" @include "npc/boss/_import.txt" @include "npc/botcheck/_import.txt" diff --git a/npc/functions/weather.txt b/npc/functions/weather.txt index 882b46c00..a89cd2b65 100644 --- a/npc/functions/weather.txt +++ b/npc/functions/weather.txt @@ -80,6 +80,7 @@ OnInit: htput(.wcore, "001-7", "iceland"); htput(.wcore, "019-1", "iceland"); htput(.wcore, "019-2", "iceland"); + htput(.wcore, "019-3", "iceland"); htput(.wcore, "022-1", "iceland"); debugmes "[Weather.sys] Total Maps = " + htsize(.wcore); |