Regenerate maps and add Terranite King to his cave

5 files changed, 53 insertions, 6 deletions

diff --git a/npc/014-5/_mobs.txt b/npc/014-5/_mobs.txt
index 6bf740b5f..e40b8d7eb 100644
--- a/npc/014-5/_mobs.txt
+++ b/npc/014-5/_mobs.txt
@@ -1,7 +1,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 014-5: North Woodlands mobs
 014-5,156,106,48,44	monster	Log Head	1066,21,20000,20000
-014-5,68,178,48,44	monster	Mouboo	1023,21,20000,20000
+014-5,68,178,48,44	monster	Mouboo	1023,16,20000,20000
 014-5,90,82,62,55	monster	Poison Spiky Mushroom	1043,21,20000,20000
 014-5,56,114,36,30	monster	Red Mushroom	1042,6,40000,20000
 014-5,130,132,48,44	monster	Forest Mushroom	1060,9,20000,20000
diff --git a/npc/015-3/_warps.txt b/npc/015-3/_warps.txt
index b703631e6..4373993db 100644
--- a/npc/015-3/_warps.txt
+++ b/npc/015-3/_warps.txt
@@ -1,7 +1,23 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 015-3: Butterfly Caves warps
-015-3,152,162,0	warp	#015-3_152_162	0,0,015-3,123,38
-015-3,171,161,0	warp	#015-3_171_161	0,0,015-3,147,39
+015-3,152,162,0	script	#015-3_152_162	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 123,38; end;
+}
+015-3,171,161,0	script	#015-3_171_161	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 147,39; end;
+}
 015-3,172,196,0	warp	#015-3_172_196	0,0,014-3,120,122
-015-3,123,39,0	warp	#015-3_123_39	0,0,015-3,152,163
-015-3,147,40,0	warp	#015-3_147_40	0,0,015-3,171,162
+015-3,123,39,0	script	#015-3_123_39	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 152,163; end;
+}
+015-3,147,40,0	script	#015-3_147_40	NPC_HIDDEN,0,0,{
+	end;
+OnTouch:
+	slide 171,162; end;
+}
diff --git a/npc/015-6/_import.txt b/npc/015-6/_import.txt
index 733918207..f75a7dd6c 100644
--- a/npc/015-6/_import.txt
+++ b/npc/015-6/_import.txt
@@ -2,5 +2,6 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/015-6/_mobs.txt",
 "npc/015-6/_warps.txt",
+"npc/015-6/boss.txt",
 "npc/015-6/mapflags.txt",
 "npc/015-6/treasure.txt",
diff --git a/npc/015-6/boss.txt b/npc/015-6/boss.txt
new file mode 100644
index 000000000..8345351a4
--- /dev/null
+++ b/npc/015-6/boss.txt
@@ -0,0 +1,30 @@
+// TMW2 Script
+// Author:
+//  Jesusalva
+// Description:
+//  Terranite King Boss
+
+015-6,0,0,0	script	#BossCtrl_015-6	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 "015-6", .xp[.@tg], .yp[.@tg], strmobinfo(1, TerraniteKing), TerraniteKing, 1, "#BossCtrl_015-6::OnBossDeath";
+    end;
+
+OnBossDeath:
+    initnpctimer;
+    .@party=getcharid(1);
+    if (.@party > 0) {
+        mapannounce "015-6", "Boss deafeated by Party: " + getpartyname(.@party), bc_all;
+    } else {
+        mapannounce "015-6", "Boss deafeated by: " + strcharinfo(0), bc_all;
+    }
+    end;
+
+}
diff --git a/npc/018-1-1/_mobs.txt b/npc/018-1-1/_mobs.txt
index cfe0515fc..11abac19a 100644
--- a/npc/018-1-1/_mobs.txt
+++ b/npc/018-1-1/_mobs.txt
@@ -9,4 +9,4 @@
 018-1-1,35,39,13,17	monster	Lavern	1175,6,30000,3000
 018-1-1,71,33,0,0	monster	Evil Mushroom	1042,3,40000,5000
 018-1-1,49,63,30,10	monster	Shadow Plant	1189,4,60000,10000
-018-1-1,49,50,30,30	monster	Mountain Snake	1123,8,60000,10000
+018-1-1,53,48,27,21	monster	Black Mamba	1174,4,60000,10000