finalize changes in boss.txt, update TF_POISON a bit (note to self: add particles and icon for poison skill)

8 files changed, 31 insertions, 32 deletions

diff --git a/npc/008-1/_warps.txt b/npc/008-1/_warps.txt
index 3464da48..500ad1ae 100644
--- a/npc/008-1/_warps.txt
+++ b/npc/008-1/_warps.txt
@@ -25,6 +25,6 @@
 008-1,233,131,0	warp	#008-1_233_131	0,0,008-2-29,36,24
 008-1,287,133,0	warp	#008-1_287_133	0,0,008-2-30,52,39
 008-1,20,85,0	warp	#008-1_20_85	0,1,008-1-1,246,85
-008-1,165,171,0	warp	#008-1_165_171	0,0,008-4-1,175,19
+008-1,165,171,0	warp	#008-1_165_171	0,0,008-3-2,175,19
 008-1,289,125,0	warp	#008-1_289_125	0,0,008-2-31,29,25
 008-1,22,216,0	warp	#008-1_22_216	0,0,008-1-2,248,48
diff --git a/npc/008-4-1/_warps.txt b/npc/008-3-2/_import.txt
index b1a26ad0..3249121c 100644
--- a/npc/008-4-1/_warps.txt
+++ b/npc/008-3-2/_import.txt
@@ -1,3 +1,4 @@
+// Map 008-3-2: Calamity Dungeon
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 008-4-1: Cave Of Trials warps
-008-4-1,175,18,0	warp	#008-4-1_175_18	2,0,008-1,165,170
+"npc/008-3-2/_mobs.txt",
+"npc/008-3-2/_warps.txt",
diff --git a/npc/008-3-2/_mobs.txt b/npc/008-3-2/_mobs.txt
new file mode 100644
index 00000000..4c0dfbd0
--- /dev/null
+++ b/npc/008-3-2/_mobs.txt
@@ -0,0 +1,7 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-3-2: Calamity Dungeon mobs
+008-3-2,106,73,73,63	monster	Cave Maggot	1027,80,30000,2500
+008-3-2,136,71,47,50	monster	Thief Slime	1105,35,50000,2500
+008-3-2,101,83,73,30	monster	AngryCrafty	1103,60,50000,2500
+008-3-2,100,79,32,31	monster	Black Scorpion	1104,14,45000,2500
+008-3-2,94,98,11,9	monster	Green Slime	1024,4,500,2500
diff --git a/npc/008-4-1/_import.txt b/npc/008-3-2/_warps.txt
index 0f706bbc..e69305bc 100644
--- a/npc/008-4-1/_import.txt
+++ b/npc/008-3-2/_warps.txt
@@ -1,5 +1,3 @@
-// Map 008-4-1: Cave Of Trials
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-"npc/008-4-1/_mobs.txt",
-"npc/008-4-1/_warps.txt",
-"npc/008-4-1/boss.txt",
+// Map 008-3-2: Calamity Dungeon warps
+008-3-2,175,19,0	warp	#008-3-2_175_19	2,0,008-1,165,170
diff --git a/npc/008-4-1/boss.txt b/npc/008-3-2/boss.txt
index fda71fff..5a296ce9 100644
--- a/npc/008-4-1/boss.txt
+++ b/npc/008-3-2/boss.txt
@@ -2,10 +2,10 @@
 // Author:
 //  Jesusalva
 // Description:
-//  Controls the boss on 008-4-1 and the Master Book Learning
+//  Controls the boss on 008-3-2 and the Master Book Learning
 // see npc/items/master_skillbook.txt for explanation about variables
 
-008-4-1,0,0,0	script	#BossCtrl_008-4-1	NPC_HIDDEN,{
+008-3-2,0,0,0	script	#BossCtrl_008-3-2	NPC_HIDDEN,{
     end;
 
 // Test server: 15 minutes only
@@ -17,8 +17,8 @@ OnTimer900000:
 OnTimer3600000:
     stopnpctimer;
 OnInit:
-    $@MB_00841=0;
-    monster "008-4-1", 67, 30, strmobinfo(1, GameBalance), GameBalance, 1, "#BossCtrl_008-4-1::OnBossDeath";
+    $@MB_00832=0;
+    monster "008-3-2", 67, 30, strmobinfo(1, SpiderQueen), SpiderQueen, 1, "#BossCtrl_008-3-2::OnBossDeath";
     end;
 
 OnBossDeath:
@@ -28,16 +28,16 @@ OnBossDeath:
     .@party=getcharid(1);
     if (.@party > 0)
     {
-        $@MB_00841=.@party;
-        areatimer("008-4-1", .@x-15, .@y-15, .@x+15, .@y+15, 10, "#BossCtrl_008-4-1::OnBossCheck");
-        mapannounce "008-4-1", "Boss deafeated by Party: " + getpartyname(.@party), bc_all;
+        $@MB_00832=.@party;
+        areatimer("008-3-2", .@x-15, .@y-15, .@x+15, .@y+15, 10, "#BossCtrl_008-3-2::OnBossCheck");
+        mapannounce "008-3-2", "Boss deafeated by Party: " + getpartyname(.@party), bc_all;
     }
     else
     {
-        $@MB_00841=-2;
-        areatimer("008-4-1", .@x-15, .@y-15, .@x+15, .@y+15, 10, "#BossCtrl_008-4-1::OnBossCheck");
-        addtimer(20, "#BossCtrl_008-4-1::OnBegin");
-        mapannounce "008-4-1", "Boss deafeated by: " + strcharinfo(0), bc_all;
+        $@MB_00832=-2;
+        areatimer("008-3-2", .@x-15, .@y-15, .@x+15, .@y+15, 10, "#BossCtrl_008-3-2::OnBossCheck");
+        addtimer(20, "#BossCtrl_008-3-2::OnBegin");
+        mapannounce "008-3-2", "Boss deafeated by: " + strcharinfo(0), bc_all;
     }
     end;
 
@@ -45,14 +45,14 @@ OnBossCheck:
     @mb_BossId=-1;
     // TODO: Check if you really fought or was just lurking
     // Check if party is correct
-    if (getcharid(1) != $@MB_00841)
+    if (getcharid(1) != $@MB_00832)
         end;
 OnBegin:
-    @mb_BossId=GameBalance;
-    @mb_SkillId=MG_COLDBOLT;
+    @mb_BossId=SpiderQueen;
+    @mb_SkillId=TF_POISON;
     @mb_ItemId=MagicFeather; // Placeholder
     @mb_ItemAm=1;
-    addtimer(15000, "#BossCtrl_008-4-1::OnFinish");
+    addtimer(15000, "#BossCtrl_008-3-2::OnFinish");
     end;
 
 OnFinish:
diff --git a/npc/008-4-1/_mobs.txt b/npc/008-4-1/_mobs.txt
deleted file mode 100644
index ad992a8d..00000000
--- a/npc/008-4-1/_mobs.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 008-4-1: Cave Of Trials mobs
-008-4-1,106,73,73,63	monster	Cave Maggot	1027,80,30000,2500
-008-4-1,136,71,47,50	monster	Thief Slime	1105,35,50000,2500
-008-4-1,101,83,73,30	monster	AngryCrafty	1103,60,50000,2500
-008-4-1,100,79,32,31	monster	Black Scorpion	1104,14,45000,2500
-008-4-1,94,98,11,9	monster	Green Slime	1024,4,500,2500
diff --git a/npc/_import.txt b/npc/_import.txt
index f982d3dd..7203a413 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -94,7 +94,7 @@
 @include "npc/008-2-9/_import.txt"
 @include "npc/008-3-0/_import.txt"
 @include "npc/008-3-1/_import.txt"
-@include "npc/008-4-1/_import.txt"
+@include "npc/008-3-2/_import.txt"
 @include "npc/012-1/_import.txt"
 @include "npc/012-2-1/_import.txt"
 @include "npc/012-2-2/_import.txt"
diff --git a/npc/functions/spotlight.txt b/npc/functions/spotlight.txt
index 11ca565a..fb0c697e 100644
--- a/npc/functions/spotlight.txt
+++ b/npc/functions/spotlight.txt
@@ -87,6 +87,6 @@ OnTouch:
 // npc/008-3-1/_warps.txt
 008-3-1,34,34,0	duplicate(#SpotlightMaster)	#SPOT008-3-1_34_34	NPC_HIDDEN,2,2
 
-// npc/008-4-1/_warps.txt
-008-4-1,175,18,0	duplicate(#SpotlightMaster)	#SPOT008-4-1_175_18	NPC_HIDDEN,2,2
+// npc/008-3-2/_warps.txt
+008-3-2,175,18,0	duplicate(#SpotlightMaster)	#SPOT008-3-2_175_18	NPC_HIDDEN,2,2