Ancient Cave - Pinkie Domains in Fortress Island

17 files changed, 130 insertions, 44 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index caf998127..98936d82e 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -192,6 +192,9 @@ map_list: (
     "024-9",
     "025-1",
     "025-2-1",
+    "025-2-2",
+    "025-2-3",
+    "025-2-4",
     "025-2",
     "025-3",
     "026-0",
diff --git a/db/map_index.txt b/db/map_index.txt
index 95f42fa3f..f951f1eae 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -189,47 +189,50 @@
 024-9 189
 025-1 190
 025-2-1 191
-025-2 192
-025-3 193
-026-0 194
-027-0 195
-027-1 196
-027-2 197
-027-3 198
-027-4 199
-042-0 200
-042-1 201
-042-10 202
-042-11 203
-042-2 204
-042-3 205
-042-4 206
-042-5 207
-042-6 208
-042-7 209
-042-8 210
-042-9 211
-boss 212
-botcheck 213
-guilds 214
-maze0 215
-maze1 216
-maze10 217
-maze11 218
-maze12 219
-maze13 220
-maze14 221
-maze15 222
-maze2 223
-maze3 224
-maze4 225
-maze5 226
-maze6 227
-maze7 228
-maze8 229
-maze9 230
-sec_pri 231
-soren-2 232
-soren 233
-test 234
-testbg 235
+025-2-2 192
+025-2-3 193
+025-2-4 194
+025-2 195
+025-3 196
+026-0 197
+027-0 198
+027-1 199
+027-2 200
+027-3 201
+027-4 202
+042-0 203
+042-1 204
+042-10 205
+042-11 206
+042-2 207
+042-3 208
+042-4 209
+042-5 210
+042-6 211
+042-7 212
+042-8 213
+042-9 214
+boss 215
+botcheck 216
+guilds 217
+maze0 218
+maze1 219
+maze10 220
+maze11 221
+maze12 222
+maze13 223
+maze14 224
+maze15 225
+maze2 226
+maze3 227
+maze4 228
+maze5 229
+maze6 230
+maze7 231
+maze8 232
+maze9 233
+sec_pri 234
+soren-2 235
+soren 236
+test 237
+testbg 238
diff --git a/maps/re/025-2-2.mcache b/maps/re/025-2-2.mcache
new file mode 100644
index 000000000..6f95cae14
--- /dev/null
+++ b/maps/re/025-2-2.mcache
diff --git a/maps/re/025-2-3.mcache b/maps/re/025-2-3.mcache
new file mode 100644
index 000000000..704f3d67e
--- /dev/null
+++ b/maps/re/025-2-3.mcache
diff --git a/maps/re/025-2-4.mcache b/maps/re/025-2-4.mcache
new file mode 100644
index 000000000..d5f827467
--- /dev/null
+++ b/maps/re/025-2-4.mcache
diff --git a/npc/025-2-2/_import.txt b/npc/025-2-2/_import.txt
new file mode 100644
index 000000000..a2adedfe3
--- /dev/null
+++ b/npc/025-2-2/_import.txt
@@ -0,0 +1,4 @@
+// Map 025-2-2: Ancient Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/025-2-2/_mobs.txt",
+"npc/025-2-2/_warps.txt",
diff --git a/npc/025-2-2/_mobs.txt b/npc/025-2-2/_mobs.txt
new file mode 100644
index 000000000..a72cee74d
--- /dev/null
+++ b/npc/025-2-2/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 025-2-2: Ancient Cave mobs
+025-2-2,47,44,17,18	monster	Archant	1026,5,32000,8000
+025-2-2,47,47,23,18	monster	Cave Maggot	1027,8,2000,8000
+025-2-2,41,30,13,6	monster	Azul Skull Slime	1402,3,75000,20000
+025-2-2,51,56,15,7	monster	Black Scorpion	1074,1,4000,8000
+025-2-2,60,48,11,14	monster	Crafty	1018,3,50000,2500
+025-2-2,36,43,11,7	monster	Crafty	1018,2,50000,2500
diff --git a/npc/025-2-2/_warps.txt b/npc/025-2-2/_warps.txt
new file mode 100644
index 000000000..b81fa28ba
--- /dev/null
+++ b/npc/025-2-2/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 025-2-2: Ancient Cave warps
+025-2-2,43,44,0	warp	#025-2-2_43_44	1,0,025-2-4,44,97
+025-2-2,68,62,0	warp	#025-2-2_68_62	0,2,025-2-3,22,45
+025-2-2,37,41,0	warp	#025-2-2_37_41	2,0,025-2,25,43
diff --git a/npc/025-2-3/_import.txt b/npc/025-2-3/_import.txt
new file mode 100644
index 000000000..a33523005
--- /dev/null
+++ b/npc/025-2-3/_import.txt
@@ -0,0 +1,5 @@
+// Map 025-2-3: Pinkie Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/025-2-3/_mobs.txt",
+"npc/025-2-3/_warps.txt",
+"npc/025-2-3/boss.txt",
diff --git a/npc/025-2-3/_mobs.txt b/npc/025-2-3/_mobs.txt
new file mode 100644
index 000000000..62a562acc
--- /dev/null
+++ b/npc/025-2-3/_mobs.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 025-2-3: Pinkie Cave mobs
+025-2-3,55,39,13,14	monster	Pinkie	1132,15,4000,8000
+025-2-3,54,41,15,12	monster	Pinkie Suseran	1419,15,4000,8000
+025-2-3,56,41,17,10	monster	Pinkie Maximus	1249,13,20000,2500
+025-2-3,48,40,26,6	monster	Cave Maggot	1027,6,2000,20000
diff --git a/npc/025-2-3/_warps.txt b/npc/025-2-3/_warps.txt
new file mode 100644
index 000000000..ab1920396
--- /dev/null
+++ b/npc/025-2-3/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 025-2-3: Pinkie Cave warps
+025-2-3,21,46,0	warp	#025-2-3_21_46	0,1,025-2-2,67,61
diff --git a/npc/025-2-3/boss.txt b/npc/025-2-3/boss.txt
new file mode 100644
index 000000000..30d374c2b
--- /dev/null
+++ b/npc/025-2-3/boss.txt
@@ -0,0 +1,30 @@
+// TMW2 Script
+// Author:
+//  Jesusalva
+// Description:
+//  Pinkie Emperor Boss
+
+025-2-3,0,0,0	script	#BossCtrl_025-2-3	NPC_HIDDEN,{
+    end;
+
+// Respawn every hour
+OnTimer3600000:
+    stopnpctimer;
+OnInit:
+    setarray .xp, 268, 55, 371, 482, 212;
+    setarray .yp,  90, 45,  38, 114, 148;
+    .@tg=rand(getarraysize(.xp)-1);
+    monster "025-2-3", .xp[.@tg], .yp[.@tg], strmobinfo(1, PinkieEmperor), PinkieEmperor, 1, "#BossCtrl_025-2-3::OnBossDeath";
+    end;
+
+OnBossDeath:
+    initnpctimer;
+    .@party=getcharid(1);
+    if (.@party > 0) {
+        mapannounce "025-2-3", "Boss deafeated by Party: " + getpartyname(.@party), bc_all;
+    } else {
+        mapannounce "025-2-3", "Boss deafeated by: " + strcharinfo(0), bc_all;
+    }
+    end;
+
+}
diff --git a/npc/025-2-4/_import.txt b/npc/025-2-4/_import.txt
new file mode 100644
index 000000000..da4aaf708
--- /dev/null
+++ b/npc/025-2-4/_import.txt
@@ -0,0 +1,4 @@
+// Map 025-2-4: Mana Tree Cave
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/025-2-4/_mobs.txt",
+"npc/025-2-4/_warps.txt",
diff --git a/npc/025-2-4/_mobs.txt b/npc/025-2-4/_mobs.txt
new file mode 100644
index 000000000..378075eb4
--- /dev/null
+++ b/npc/025-2-4/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 025-2-4: Mana Tree Cave mobs
+025-2-4,40,28,13,3	monster	Red Skull Slime	1404,4,20000,75000
+025-2-4,41,53,15,31	monster	Crafty	1018,7,25000,35000
+025-2-4,36,35,9,7	monster	Azul Slime Mother	1243,5,40000,10000
+025-2-4,42,39,8,12	monster	Moubi	1038,5,300000,6000
+025-2-4,40,36,13,3	monster	Yellow Skull Slime	1403,4,20000,75000
+025-2-4,44,30,9,7	monster	Great Mouboo Slime	1247,3,80000,10000
diff --git a/npc/025-2-4/_warps.txt b/npc/025-2-4/_warps.txt
new file mode 100644
index 000000000..a9c38f2ae
--- /dev/null
+++ b/npc/025-2-4/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 025-2-4: Mana Tree Cave warps
+025-2-4,44,98,0	warp	#025-2-4_44_98	0,0,025-2-2,42,45
diff --git a/npc/025-2/_warps.txt b/npc/025-2/_warps.txt
index 2d002c675..105619b96 100644
--- a/npc/025-2/_warps.txt
+++ b/npc/025-2/_warps.txt
@@ -1,4 +1,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 025-2: Fortress Island - South warps
+025-2,25,42,0	warp	#025-2_25_42	0,0,025-2-2,37,40
 025-2,158,98,0	warp	#025-2_158_98	0,0,025-2-1,29,106
 025-2,148,85,0	warp	#025-2_148_85	0,0,025-2-1,23,66
diff --git a/npc/_import.txt b/npc/_import.txt
index 26383a46d..7f00400ed 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -191,6 +191,9 @@
 @include "npc/024-9/_import.txt"
 @include "npc/025-1/_import.txt"
 @include "npc/025-2-1/_import.txt"
+@include "npc/025-2-2/_import.txt"
+@include "npc/025-2-3/_import.txt"
+@include "npc/025-2-4/_import.txt"
 @include "npc/025-2/_import.txt"
 @include "npc/025-3/_import.txt"
 @include "npc/026-0/_import.txt"