summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/map/maps.conf4
-rw-r--r--db/map_index.txt44
-rw-r--r--maps/re/034-1.mcachebin0 -> 637 bytes
-rw-r--r--maps/re/034-2.mcachebin0 -> 459 bytes
-rw-r--r--maps/re/034-3.mcachebin0 -> 327 bytes
-rw-r--r--maps/re/034-4.mcachebin0 -> 449 bytes
-rw-r--r--npc/034-1/_import.txt3
-rw-r--r--npc/034-1/_mobs.txt4
-rw-r--r--npc/034-2/_import.txt3
-rw-r--r--npc/034-2/_mobs.txt18
-rw-r--r--npc/034-3/_import.txt3
-rw-r--r--npc/034-3/_mobs.txt3
-rw-r--r--npc/034-4/_import.txt2
-rw-r--r--npc/_import.txt4
14 files changed, 68 insertions, 20 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index dcfe7daae..34b745210 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -323,6 +323,10 @@ map_list: (
"033-3",
"033-4",
"033-5",
+ "034-1",
+ "034-2",
+ "034-3",
+ "034-4",
"042-0",
"042-1",
"042-10",
diff --git a/db/map_index.txt b/db/map_index.txt
index 617a12439..da6409fff 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -320,23 +320,27 @@
033-3 320
033-4 321
033-5 322
-042-0 323
-042-1 324
-042-10 325
-042-11 326
-042-2 327
-042-3 328
-042-4 329
-042-5 330
-042-6 331
-042-7 332
-042-8 333
-042-9 334
-boss 335
-botcheck 336
-guilds 337
-sec_pri 338
-soren-2 339
-soren 340
-test 341
-testbg 342
+034-1 323
+034-2 324
+034-3 325
+034-4 326
+042-0 327
+042-1 328
+042-10 329
+042-11 330
+042-2 331
+042-3 332
+042-4 333
+042-5 334
+042-6 335
+042-7 336
+042-8 337
+042-9 338
+boss 339
+botcheck 340
+guilds 341
+sec_pri 342
+soren-2 343
+soren 344
+test 345
+testbg 346
diff --git a/maps/re/034-1.mcache b/maps/re/034-1.mcache
new file mode 100644
index 000000000..4ccc14d50
--- /dev/null
+++ b/maps/re/034-1.mcache
Binary files differ
diff --git a/maps/re/034-2.mcache b/maps/re/034-2.mcache
new file mode 100644
index 000000000..d21013f3d
--- /dev/null
+++ b/maps/re/034-2.mcache
Binary files differ
diff --git a/maps/re/034-3.mcache b/maps/re/034-3.mcache
new file mode 100644
index 000000000..047f60ee2
--- /dev/null
+++ b/maps/re/034-3.mcache
Binary files differ
diff --git a/maps/re/034-4.mcache b/maps/re/034-4.mcache
new file mode 100644
index 000000000..53f2f4b97
--- /dev/null
+++ b/maps/re/034-4.mcache
Binary files differ
diff --git a/npc/034-1/_import.txt b/npc/034-1/_import.txt
new file mode 100644
index 000000000..d7b8ea9ef
--- /dev/null
+++ b/npc/034-1/_import.txt
@@ -0,0 +1,3 @@
+// Map 034-1: Outskirts
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/034-1/_mobs.txt",
diff --git a/npc/034-1/_mobs.txt b/npc/034-1/_mobs.txt
new file mode 100644
index 000000000..eb5927023
--- /dev/null
+++ b/npc/034-1/_mobs.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 034-1: Outskirts mobs
+034-1,42,35,21,12 monster LogHead 1025,30,100000,30000
+034-1,42,35,20,11 monster SpikyMushroom 1019,10,100000,30000
diff --git a/npc/034-2/_import.txt b/npc/034-2/_import.txt
new file mode 100644
index 000000000..77d11a7b2
--- /dev/null
+++ b/npc/034-2/_import.txt
@@ -0,0 +1,3 @@
+// Map 034-2: Bandit Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/034-2/_mobs.txt",
diff --git a/npc/034-2/_mobs.txt b/npc/034-2/_mobs.txt
new file mode 100644
index 000000000..a2577da6c
--- /dev/null
+++ b/npc/034-2/_mobs.txt
@@ -0,0 +1,18 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 034-2: Bandit Cave mobs
+034-2,31,52,10,6 monster RedSlime 1008,8,100000,30000
+034-2,31,52,9,7 monster CaveMaggot 1056,3,100000,30000
+034-2,56,102,1,1 monster Spider 1012,1,100000,250000
+034-2,61,102,1,1 monster Spider 1012,1,100000,250000
+034-2,65,102,1,1 monster Spider 1012,1,100000,250000
+034-2,71,109,2,1 monster BlackScorpion 1009,1,100000,250000
+034-2,59,56,6,18 monster Bandit 1064,37,100000,10000
+034-2,59,44,6,6 monster BanditLord 1065,4,100000,20000
+034-2,60,69,9,4 monster BanditLord 1065,4,100000,20000
+034-2,63,94,0,0 monster SleepingBandit 1099,1,100000,60000
+034-2,53,93,0,0 monster SleepingBandit 1099,1,100000,60000
+034-2,48,71,0,0 monster SleepingBandit 1099,1,100000,60000
+034-2,38,30,8,6 monster Bandit 1064,8,100000,10000
+034-2,39,33,5,4 monster BanditLord 1065,2,100000,20000
+034-2,80,101,5,6 monster CopperSlime 1098,7,100000,60000
+034-2,60,94,9,2 monster CopperSlime 1098,7,100000,60000
diff --git a/npc/034-3/_import.txt b/npc/034-3/_import.txt
new file mode 100644
index 000000000..7368b6519
--- /dev/null
+++ b/npc/034-3/_import.txt
@@ -0,0 +1,3 @@
+// Map 034-3: Archipelago
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/034-3/_mobs.txt",
diff --git a/npc/034-3/_mobs.txt b/npc/034-3/_mobs.txt
new file mode 100644
index 000000000..6b648eba7
--- /dev/null
+++ b/npc/034-3/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 034-3: Archipelago mobs
+034-3,55,29,21,19 monster AzulSlime 1100,18,100000,20000
diff --git a/npc/034-4/_import.txt b/npc/034-4/_import.txt
new file mode 100644
index 000000000..07d314849
--- /dev/null
+++ b/npc/034-4/_import.txt
@@ -0,0 +1,2 @@
+// Map 034-4: Forsaken Inn
+// 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 8ea37d6b2..f44fa165f 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -322,6 +322,10 @@
@include "npc/033-3/_import.txt"
@include "npc/033-4/_import.txt"
@include "npc/033-5/_import.txt"
+@include "npc/034-1/_import.txt"
+@include "npc/034-2/_import.txt"
+@include "npc/034-3/_import.txt"
+@include "npc/034-4/_import.txt"
@include "npc/042-0/_import.txt"
@include "npc/042-1/_import.txt"
@include "npc/042-10/_import.txt"