summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2021-12-18 07:00:48 -0300
committerJesusaves <cpntb1@ymail.com>2021-12-18 07:00:48 -0300
commitc99143bb4f2b346093eca1ce59dbf52f08c6ef81 (patch)
tree5556dd73d57299b6fb9c9d4ecc5dc8c8a7721f55
parent3f0c57863ff3287eadbe99437b5ebcb7ea82e97b (diff)
downloadserverdata-c99143bb4f2b346093eca1ce59dbf52f08c6ef81.tar.gz
serverdata-c99143bb4f2b346093eca1ce59dbf52f08c6ef81.tar.bz2
serverdata-c99143bb4f2b346093eca1ce59dbf52f08c6ef81.tar.xz
serverdata-c99143bb4f2b346093eca1ce59dbf52f08c6ef81.zip
Acknowledge new maps (poppet's DLC)
-rw-r--r--conf/map/maps.conf2
-rw-r--r--db/map_index.txt24
-rw-r--r--maps/pre-re/082-2.mcachebin0 -> 151 bytes
-rw-r--r--maps/pre-re/082-3.mcachebin0 -> 1081 bytes
-rw-r--r--npc/081-1/_warps.txt1
-rw-r--r--npc/082-2/_import.txt3
-rw-r--r--npc/082-2/_warps.txt4
-rw-r--r--npc/082-3/_import.txt3
-rw-r--r--npc/082-3/_warps.txt3
-rw-r--r--npc/_import.txt2
10 files changed, 31 insertions, 11 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 1fc1e11b..35f8979b 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -127,6 +127,8 @@ map_list: (
"081-1",
"081-2",
"081-3",
+ "082-2",
+ "082-3",
"099-1",
"099-2",
"099-3",
diff --git a/db/map_index.txt b/db/map_index.txt
index be37ef1b..a7b53599 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -124,14 +124,16 @@
081-1 124
081-2 125
081-3 126
-099-1 127
-099-2 128
-099-3 129
-099-4 130
-099-5 131
-099-6 132
-099-7 133
-099-8 134
-botcheck 135
-fermi 136
-sec_pri 137
+082-2 127
+082-3 128
+099-1 129
+099-2 130
+099-3 131
+099-4 132
+099-5 133
+099-6 134
+099-7 135
+099-8 136
+botcheck 137
+fermi 138
+sec_pri 139
diff --git a/maps/pre-re/082-2.mcache b/maps/pre-re/082-2.mcache
new file mode 100644
index 00000000..0108349e
--- /dev/null
+++ b/maps/pre-re/082-2.mcache
Binary files differ
diff --git a/maps/pre-re/082-3.mcache b/maps/pre-re/082-3.mcache
new file mode 100644
index 00000000..eab0abd1
--- /dev/null
+++ b/maps/pre-re/082-3.mcache
Binary files differ
diff --git a/npc/081-1/_warps.txt b/npc/081-1/_warps.txt
index 23e20359..ef049ca9 100644
--- a/npc/081-1/_warps.txt
+++ b/npc/081-1/_warps.txt
@@ -1,3 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 081-1: Aethyr warps
081-1,58,104,0 warp #081-1_58_104 0,0,020-1,84,75
+081-1,44,89,0 warp #081-1_44_89 0,0,082-2,88,25
diff --git a/npc/082-2/_import.txt b/npc/082-2/_import.txt
new file mode 100644
index 00000000..6284508f
--- /dev/null
+++ b/npc/082-2/_import.txt
@@ -0,0 +1,3 @@
+// Map 082-2: Porthos - Frontier
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/082-2/_warps.txt",
diff --git a/npc/082-2/_warps.txt b/npc/082-2/_warps.txt
new file mode 100644
index 00000000..5ccaa5af
--- /dev/null
+++ b/npc/082-2/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 082-2: Porthos - Frontier warps
+082-2,88,26,0 warp #082-2_88_26 0,0,081-1,44,90
+082-2,28,16,0 warp #082-2_28_16 0,0,082-3,97,94
diff --git a/npc/082-3/_import.txt b/npc/082-3/_import.txt
new file mode 100644
index 00000000..4f78dc32
--- /dev/null
+++ b/npc/082-3/_import.txt
@@ -0,0 +1,3 @@
+// Map 082-3: Aether Caves
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/082-3/_warps.txt",
diff --git a/npc/082-3/_warps.txt b/npc/082-3/_warps.txt
new file mode 100644
index 00000000..9ca06476
--- /dev/null
+++ b/npc/082-3/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 082-3: Aether Caves warps
+082-3,111,34,0 warp #082-3_111_34 0,0,082-2,28,17
diff --git a/npc/_import.txt b/npc/_import.txt
index 7ac2d194..71259d5a 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -126,6 +126,8 @@
@include "npc/081-1/_import.txt"
@include "npc/081-2/_import.txt"
@include "npc/081-3/_import.txt"
+@include "npc/082-2/_import.txt"
+@include "npc/082-3/_import.txt"
@include "npc/099-1/_import.txt"
@include "npc/099-2/_import.txt"
@include "npc/099-3/_import.txt"