summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-05-24 01:42:21 -0300
committerJesusaves <cpntb1@ymail.com>2020-05-24 01:42:21 -0300
commit28b5642e4cf13e55d65ca4ef1f339ff9280f2ecc (patch)
treed55d6a92d649344135d12ac9e3f22fef92d73797
parent0d2c9e23e8820a6ba7fa28a2f18c3097c263559a (diff)
downloadserverdata-28b5642e4cf13e55d65ca4ef1f339ff9280f2ecc.tar.gz
serverdata-28b5642e4cf13e55d65ca4ef1f339ff9280f2ecc.tar.bz2
serverdata-28b5642e4cf13e55d65ca4ef1f339ff9280f2ecc.tar.xz
serverdata-28b5642e4cf13e55d65ca4ef1f339ff9280f2ecc.zip
025-1 is now officially a map
-rw-r--r--conf/map/maps.conf1
-rw-r--r--db/map_index.txt81
-rw-r--r--maps/re/025-1.mcachebin0 -> 1936 bytes
-rw-r--r--npc/025-1/_import.txt4
-rw-r--r--npc/025-1/_mobs.txt13
-rw-r--r--npc/_import.txt1
6 files changed, 60 insertions, 40 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 7bec7f5d1..75283bd41 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -186,6 +186,7 @@ map_list: (
"024-7",
"024-8",
"024-9",
+ "025-1",
"025-2-1",
"025-2",
"027-1",
diff --git a/db/map_index.txt b/db/map_index.txt
index 4302060d7..30a2034a3 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -183,43 +183,44 @@
024-7 183
024-8 184
024-9 185
-025-2-1 186
-025-2 187
-027-1 188
-027-2 189
-042-0 190
-042-1 191
-042-10 192
-042-11 193
-042-2 194
-042-3 195
-042-4 196
-042-5 197
-042-6 198
-042-7 199
-042-8 200
-042-9 201
-boss 202
-botcheck 203
-guilds 204
-maze0 205
-maze1 206
-maze10 207
-maze11 208
-maze12 209
-maze13 210
-maze14 211
-maze15 212
-maze2 213
-maze3 214
-maze4 215
-maze5 216
-maze6 217
-maze7 218
-maze8 219
-maze9 220
-sec_pri 221
-soren-2 222
-soren 223
-test 224
-testbg 225
+025-1 186
+025-2-1 187
+025-2 188
+027-1 189
+027-2 190
+042-0 191
+042-1 192
+042-10 193
+042-11 194
+042-2 195
+042-3 196
+042-4 197
+042-5 198
+042-6 199
+042-7 200
+042-8 201
+042-9 202
+boss 203
+botcheck 204
+guilds 205
+maze0 206
+maze1 207
+maze10 208
+maze11 209
+maze12 210
+maze13 211
+maze14 212
+maze15 213
+maze2 214
+maze3 215
+maze4 216
+maze5 217
+maze6 218
+maze7 219
+maze8 220
+maze9 221
+sec_pri 222
+soren-2 223
+soren 224
+test 225
+testbg 226
diff --git a/maps/re/025-1.mcache b/maps/re/025-1.mcache
new file mode 100644
index 000000000..7936de761
--- /dev/null
+++ b/maps/re/025-1.mcache
Binary files differ
diff --git a/npc/025-1/_import.txt b/npc/025-1/_import.txt
new file mode 100644
index 000000000..47899d4b6
--- /dev/null
+++ b/npc/025-1/_import.txt
@@ -0,0 +1,4 @@
+// Map 025-1: Fortress Town - Holy Land
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/025-1/_mobs.txt",
+"npc/025-1/ctrl.txt",
diff --git a/npc/025-1/_mobs.txt b/npc/025-1/_mobs.txt
new file mode 100644
index 000000000..a82116a67
--- /dev/null
+++ b/npc/025-1/_mobs.txt
@@ -0,0 +1,13 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 025-1: Fortress Town - Holy Land mobs
+025-1,39,96,15,6 monster Croc 1006,6,60000,30000
+025-1,35,41,10,15 monster Croc 1006,6,60000,30000
+025-1,78,33,12,11 monster Croc 1006,6,60000,30000
+025-1,120,30,12,8 monster Croc 1006,6,60000,30000
+025-1,136,30,1,8 monster Croc 1006,6,60000,30000
+025-1,142,77,7,11 monster Croc 1006,6,60000,30000
+025-1,161,86,11,15 monster Croc 1006,6,60000,30000
+025-1,79,97,12,6 monster Croc 1006,6,60000,30000
+025-1,42,115,15,4 monster Croc 1006,6,60000,30000
+025-1,45,116,20,3 monster Croc 1006,6,60000,30000
+025-1,154,116,20,3 monster Croc 1006,6,60000,30000
diff --git a/npc/_import.txt b/npc/_import.txt
index 759af378e..17e35fbd9 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -185,6 +185,7 @@
@include "npc/024-7/_import.txt"
@include "npc/024-8/_import.txt"
@include "npc/024-9/_import.txt"
+@include "npc/025-1/_import.txt"
@include "npc/025-2-1/_import.txt"
@include "npc/025-2/_import.txt"
@include "npc/027-1/_import.txt"