summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjesusalva <cpntb1@ymail.com>2018-02-26 22:41:18 -0300
committerjesusalva <cpntb1@ymail.com>2018-02-26 22:41:18 -0300
commit7eab67074fdcdcb8e23c3bdd46e1507a0ac0086a (patch)
treeb389e0a9989be7a91588c9b39290d6b30022e100
parent734e9d74d9ab2c1b6650c08993e0e98de9273d01 (diff)
downloadserverdata-7eab67074fdcdcb8e23c3bdd46e1507a0ac0086a.tar.gz
serverdata-7eab67074fdcdcb8e23c3bdd46e1507a0ac0086a.tar.bz2
serverdata-7eab67074fdcdcb8e23c3bdd46e1507a0ac0086a.tar.xz
serverdata-7eab67074fdcdcb8e23c3bdd46e1507a0ac0086a.zip
Include prision (and a Soul Menhir to leave Aeros)
-rw-r--r--conf/map/maps.conf1
-rw-r--r--db/map_index.txt5
-rw-r--r--maps/re/sec_pri.mcachebin0 -> 68 bytes
-rw-r--r--npc/001-1/_import.txt1
-rw-r--r--npc/001-1/portal.txt15
-rw-r--r--npc/_import.txt1
-rw-r--r--npc/sec_pri/_import.txt2
7 files changed, 23 insertions, 2 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index c4a98ae81..3a60f4270 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -49,6 +49,7 @@ map_list: (
"008-2-7",
"008-2-8",
"008-2-9",
+ "sec_pri",
"test",
"testbg",
)
diff --git a/db/map_index.txt b/db/map_index.txt
index cda6249bc..b42856fa8 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -46,5 +46,6 @@
008-2-7 46
008-2-8 47
008-2-9 48
-test 49
-testbg 50
+sec_pri 49
+test 50
+testbg 51
diff --git a/maps/re/sec_pri.mcache b/maps/re/sec_pri.mcache
new file mode 100644
index 000000000..dbbb57e1d
--- /dev/null
+++ b/maps/re/sec_pri.mcache
Binary files differ
diff --git a/npc/001-1/_import.txt b/npc/001-1/_import.txt
index 1c524da11..aba3f649d 100644
--- a/npc/001-1/_import.txt
+++ b/npc/001-1/_import.txt
@@ -1,3 +1,4 @@
// Map 001-1: Floating Island of Aeros
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/001-1/mapflags.txt",
+"npc/001-1/portal.txt",
diff --git a/npc/001-1/portal.txt b/npc/001-1/portal.txt
new file mode 100644
index 000000000..a8c459963
--- /dev/null
+++ b/npc/001-1/portal.txt
@@ -0,0 +1,15 @@
+001-1,301,43,0 script Soul Menhir NPC_SOUL_CLEAN,0,0,{
+ mesn;
+ mes l("This Soul Menhir can send your soul and body back to the ground.");
+ mes l("Would you like to leave this place?");
+ menu
+ "Yes.", L_Leave,
+ "No.", L_Close;
+
+L_Leave:
+ warp getsavepoint(0), getsavepoint(1), getsavepoint(2);
+ goto L_Close;
+
+L_Close:
+ close;
+}
diff --git a/npc/_import.txt b/npc/_import.txt
index cca29abf5..ed26e28cc 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -48,5 +48,6 @@
@include "npc/008-2-7/_import.txt"
@include "npc/008-2-8/_import.txt"
@include "npc/008-2-9/_import.txt"
+@include "npc/sec_pri/_import.txt"
@include "npc/test/_import.txt"
@include "npc/testbg/_import.txt"
diff --git a/npc/sec_pri/_import.txt b/npc/sec_pri/_import.txt
new file mode 100644
index 000000000..84983cda7
--- /dev/null
+++ b/npc/sec_pri/_import.txt
@@ -0,0 +1,2 @@
+// Map sec_pri: Jesusalva's Jail
+// This file is generated automatically. All manually added changes will be removed when running the Converter.