summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjesusalva <cpntb1@ymail.com>2018-03-10 12:30:50 -0300
committerjesusalva <cpntb1@ymail.com>2018-03-10 12:34:00 -0300
commitf4594ce586593b73af97b5572615a660c578f580 (patch)
treeaeff3e9a5f2fea405a016762b4c7a3ed5f121d73
parentfbfa43743084b6db05b21c1a8454c7c9842e7008 (diff)
downloadserverdata-f4594ce586593b73af97b5572615a660c578f580.tar.gz
serverdata-f4594ce586593b73af97b5572615a660c578f580.tar.bz2
serverdata-f4594ce586593b73af97b5572615a660c578f580.tar.xz
serverdata-f4594ce586593b73af97b5572615a660c578f580.zip
Soren's maps
-rw-r--r--conf/map/maps.conf2
-rw-r--r--db/map_index.txt6
-rw-r--r--maps/re/soren-2.mcachebin0 -> 92 bytes
-rw-r--r--maps/re/soren.mcachebin0 -> 1351 bytes
-rw-r--r--npc/_import.txt2
-rw-r--r--npc/commands/warp.txt1
-rw-r--r--npc/soren-2/_import.txt3
-rw-r--r--npc/soren-2/_warps.txt3
-rw-r--r--npc/soren/_import.txt3
-rw-r--r--npc/soren/_warps.txt3
10 files changed, 21 insertions, 2 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 169563756..fdd131a7b 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -56,6 +56,8 @@ map_list: (
"boss",
"botcheck",
"sec_pri",
+ "soren-2",
+ "soren",
"test",
"testbg",
)
diff --git a/db/map_index.txt b/db/map_index.txt
index 357dd64c8..cc09f954c 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -53,5 +53,7 @@
boss 53
botcheck 54
sec_pri 55
-test 56
-testbg 57
+soren-2 56
+soren 57
+test 58
+testbg 59
diff --git a/maps/re/soren-2.mcache b/maps/re/soren-2.mcache
new file mode 100644
index 000000000..c0dba2c8e
--- /dev/null
+++ b/maps/re/soren-2.mcache
Binary files differ
diff --git a/maps/re/soren.mcache b/maps/re/soren.mcache
new file mode 100644
index 000000000..34deb73db
--- /dev/null
+++ b/maps/re/soren.mcache
Binary files differ
diff --git a/npc/_import.txt b/npc/_import.txt
index 8becbf4a2..acff10ad0 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -55,5 +55,7 @@
@include "npc/boss/_import.txt"
@include "npc/botcheck/_import.txt"
@include "npc/sec_pri/_import.txt"
+@include "npc/soren-2/_import.txt"
+@include "npc/soren/_import.txt"
@include "npc/test/_import.txt"
@include "npc/testbg/_import.txt"
diff --git a/npc/commands/warp.txt b/npc/commands/warp.txt
index 7e04970aa..0fca933ce 100644
--- a/npc/commands/warp.txt
+++ b/npc/commands/warp.txt
@@ -75,6 +75,7 @@ OnInit:
// GM Stuff
"^AEROS|^GM", "001-1 235 26", // Floating Island of Aeros (GM Events)
"^EASTER", "001-4 151 157", // Easter Event Map
+ "^SOREN", "soren 179 56", // Unimplemented map
"^JAIL|^PRISON", "sec_pri 28 25"; // Jesusalva's Prison (and last line)
diff --git a/npc/soren-2/_import.txt b/npc/soren-2/_import.txt
new file mode 100644
index 000000000..6c0936688
--- /dev/null
+++ b/npc/soren-2/_import.txt
@@ -0,0 +1,3 @@
+// Map soren-2: Soren House
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/soren-2/_warps.txt",
diff --git a/npc/soren-2/_warps.txt b/npc/soren-2/_warps.txt
new file mode 100644
index 000000000..a89e74edd
--- /dev/null
+++ b/npc/soren-2/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map soren-2: Soren House warps
+soren-2,32,37,0 warp #soren-2_32_37 0,0,soren,105,38
diff --git a/npc/soren/_import.txt b/npc/soren/_import.txt
new file mode 100644
index 000000000..9e8586cdf
--- /dev/null
+++ b/npc/soren/_import.txt
@@ -0,0 +1,3 @@
+// Map soren: Soren's Village
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/soren/_warps.txt",
diff --git a/npc/soren/_warps.txt b/npc/soren/_warps.txt
new file mode 100644
index 000000000..468ee5657
--- /dev/null
+++ b/npc/soren/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map soren: Soren's Village warps
+soren,105,37,0 warp #soren_105_37 0,0,soren-2,32,36