summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2018-06-01 17:38:00 -0300
committerJesusaves <cpntb1@ymail.com>2018-06-01 17:38:00 -0300
commit802a3ad9f78c6e41da2c58c69062c56dc18e9ef6 (patch)
treee663e0c361db0856aeab4c928555fdd706debf71
parent452dbc811b649b6b5e5f4a7ba84df69def22574c (diff)
downloadserverdata-802a3ad9f78c6e41da2c58c69062c56dc18e9ef6.tar.gz
serverdata-802a3ad9f78c6e41da2c58c69062c56dc18e9ef6.tar.bz2
serverdata-802a3ad9f78c6e41da2c58c69062c56dc18e9ef6.tar.xz
serverdata-802a3ad9f78c6e41da2c58c69062c56dc18e9ef6.zip
Add Hurnscald
-rw-r--r--conf/map/maps.conf2
-rw-r--r--db/map_index.txt16
-rw-r--r--maps/re/012-1.mcachebin0 -> 965 bytes
-rw-r--r--maps/re/012-2.mcachebin0 -> 112 bytes
-rw-r--r--npc/012-1/_import.txt2
-rw-r--r--npc/012-2/_import.txt3
-rw-r--r--npc/012-2/_warps.txt3
-rw-r--r--npc/_import.txt2
8 files changed, 21 insertions, 7 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index e56b2ef10..3cc8c092b 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -46,6 +46,8 @@ map_list: (
"010-2",
"011-1",
"011-2",
+ "012-1",
+ "012-2",
"boss",
"botcheck",
"sec_pri",
diff --git a/db/map_index.txt b/db/map_index.txt
index 1dfbc128b..ef314c63f 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -43,10 +43,12 @@
010-2 43
011-1 44
011-2 45
-boss 46
-botcheck 47
-sec_pri 48
-soren-2 49
-soren 50
-test 51
-testbg 52
+012-1 46
+012-2 47
+boss 48
+botcheck 49
+sec_pri 50
+soren-2 51
+soren 52
+test 53
+testbg 54
diff --git a/maps/re/012-1.mcache b/maps/re/012-1.mcache
new file mode 100644
index 000000000..e2f05192a
--- /dev/null
+++ b/maps/re/012-1.mcache
Binary files differ
diff --git a/maps/re/012-2.mcache b/maps/re/012-2.mcache
new file mode 100644
index 000000000..fdf234c67
--- /dev/null
+++ b/maps/re/012-2.mcache
Binary files differ
diff --git a/npc/012-1/_import.txt b/npc/012-1/_import.txt
new file mode 100644
index 000000000..f1dd2b1b9
--- /dev/null
+++ b/npc/012-1/_import.txt
@@ -0,0 +1,2 @@
+// Map 012-1: Hurnscald
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
diff --git a/npc/012-2/_import.txt b/npc/012-2/_import.txt
new file mode 100644
index 000000000..e1584dc25
--- /dev/null
+++ b/npc/012-2/_import.txt
@@ -0,0 +1,3 @@
+// Map 012-2: Hurnscald Inn
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/012-2/_warps.txt",
diff --git a/npc/012-2/_warps.txt b/npc/012-2/_warps.txt
new file mode 100644
index 000000000..8daf4b9f3
--- /dev/null
+++ b/npc/012-2/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 012-2: Hurnscald Inn warps
+012-2,36,47,0 warp #012-2_36_47 0,0,012-1,65,56
diff --git a/npc/_import.txt b/npc/_import.txt
index 541b000a5..7a29506ee 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -45,6 +45,8 @@
@include "npc/010-2/_import.txt"
@include "npc/011-1/_import.txt"
@include "npc/011-2/_import.txt"
+@include "npc/012-1/_import.txt"
+@include "npc/012-2/_import.txt"
@include "npc/boss/_import.txt"
@include "npc/botcheck/_import.txt"
@include "npc/sec_pri/_import.txt"