summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/map/maps.conf2
-rw-r--r--db/map_index.txt50
-rw-r--r--maps/re/025-2-1.mcachebin0 -> 633 bytes
-rw-r--r--maps/re/025-2.mcachebin0 -> 1231 bytes
-rw-r--r--npc/025-2-1/_import.txt2
-rw-r--r--npc/025-2/_import.txt3
-rw-r--r--npc/025-2/main.txt31
-rw-r--r--npc/_import.txt2
8 files changed, 66 insertions, 24 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 80adc2447..8dc586ab8 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -172,6 +172,8 @@ map_list: (
"024-7",
"024-8",
"024-9",
+ "025-2-1",
+ "025-2",
"boss",
"botcheck",
"guilds",
diff --git a/db/map_index.txt b/db/map_index.txt
index 0d3f836ad..49f91ffde 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -169,27 +169,29 @@
024-7 169
024-8 170
024-9 171
-boss 172
-botcheck 173
-guilds 174
-maze0 175
-maze1 176
-maze10 177
-maze11 178
-maze12 179
-maze13 180
-maze14 181
-maze15 182
-maze2 183
-maze3 184
-maze4 185
-maze5 186
-maze6 187
-maze7 188
-maze8 189
-maze9 190
-sec_pri 191
-soren-2 192
-soren 193
-test 194
-testbg 195
+025-2-1 172
+025-2 173
+boss 174
+botcheck 175
+guilds 176
+maze0 177
+maze1 178
+maze10 179
+maze11 180
+maze12 181
+maze13 182
+maze14 183
+maze15 184
+maze2 185
+maze3 186
+maze4 187
+maze5 188
+maze6 189
+maze7 190
+maze8 191
+maze9 192
+sec_pri 193
+soren-2 194
+soren 195
+test 196
+testbg 197
diff --git a/maps/re/025-2-1.mcache b/maps/re/025-2-1.mcache
new file mode 100644
index 000000000..1242639e2
--- /dev/null
+++ b/maps/re/025-2-1.mcache
Binary files differ
diff --git a/maps/re/025-2.mcache b/maps/re/025-2.mcache
new file mode 100644
index 000000000..4d6ddf2ee
--- /dev/null
+++ b/maps/re/025-2.mcache
Binary files differ
diff --git a/npc/025-2-1/_import.txt b/npc/025-2-1/_import.txt
new file mode 100644
index 000000000..98b41ac94
--- /dev/null
+++ b/npc/025-2-1/_import.txt
@@ -0,0 +1,2 @@
+// Map 025-2-1: Fortress Island Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
diff --git a/npc/025-2/_import.txt b/npc/025-2/_import.txt
new file mode 100644
index 000000000..6d385567b
--- /dev/null
+++ b/npc/025-2/_import.txt
@@ -0,0 +1,3 @@
+// Map 025-2: Fortress Island - South
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/025-2/main.txt",
diff --git a/npc/025-2/main.txt b/npc/025-2/main.txt
new file mode 100644
index 000000000..2450eb867
--- /dev/null
+++ b/npc/025-2/main.txt
@@ -0,0 +1,31 @@
+// TMW-2 Script.
+// Author:
+// Jesusalva
+// Notes:
+// Fortress Island South (Lv 70~150 Area)
+
+025-2 mapflag mask 3
+
+025-2,97,122,0 script Airship NPC_AIRSHIP,{
+ mesc l(".:: Fortress Island ::."), 1;
+ mes "";
+ mesc l("Do you want to return to Land Of Fire Village?"), 1;
+ next;
+ if (askyesno() == ASK_YES) {
+ specialeffect FX_CIRCLE, SELF, getcharid(3);
+ sleep2(5000);
+ removespecialeffect(FX_CIRCLE, SELF, getcharid(3));
+ if (ispcdead()) end;
+ warp "017-10", 64, 25;
+ closeclientdialog;
+ }
+ close;
+
+OnInit:
+ .sex = G_OTHER;
+ .distance = 8;
+ end;
+
+}
+
+
diff --git a/npc/_import.txt b/npc/_import.txt
index 69b3b3add..c87435375 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -171,6 +171,8 @@
@include "npc/024-7/_import.txt"
@include "npc/024-8/_import.txt"
@include "npc/024-9/_import.txt"
+@include "npc/025-2-1/_import.txt"
+@include "npc/025-2/_import.txt"
@include "npc/boss/_import.txt"
@include "npc/botcheck/_import.txt"
@include "npc/guilds/_import.txt"