Regenerate map data/cache for 099-3 fixes in clientdata. Remove deprecated info.

6 files changed, 36 insertions, 33 deletions

diff --git a/npc/099-1/_warps.txt b/npc/099-1/_warps.txt
index 1416158a..d2c87956 100644
--- a/npc/099-1/_warps.txt
+++ b/npc/099-1/_warps.txt
@@ -6,7 +6,7 @@
 099-1,111,150,0	warp	#099-1_111_150	0,0,099-2,141,36
 099-1,40,129,0	warp	#099-1_40_129	0,0,099-2,45,64
 099-1,117,99,0	warp	#099-1_117_99	0,0,099-2,79,64
-099-1,139,131,0	warp	#099-1_139_131	0,0,099-3,92,41
+099-1,139,131,0	warp	#099-1_139_131	0,0,099-3,72,26
 099-1,132,140,0	warp	#099-1_132_140	0,0,099-2,111,64
 099-1,84,128,0	warp	#099-1_84_128	0,0,099-2,141,64
 099-1,84,86,0	warp	#099-1_84_86	0,0,099-2,45,90
diff --git a/npc/099-1/main.txt b/npc/099-1/main.txt
index 61ee1c65..0d315a40 100644
--- a/npc/099-1/main.txt
+++ b/npc/099-1/main.txt
@@ -1,5 +1,5 @@
 
-099-1,35,28,0	script	Note#DD5Core	NPC400,{
+099-1,55,43,0	script	Note#DD5Core	NPC400,{
     // Default distance is 4 tiles - all we need
     callfunc "PCtoNPCRange";
     if(@npc_check) end;
@@ -16,10 +16,10 @@
     mes "You should have known me for long enough to know I do not take chances.";
     mes "I've put the docks where I'm waiting for you in an overlapping dimension.";
     mes "This should be enough to stop any Sparron who makes back to here.";
-    next;
+    //next;
     mes "My dimension, my rules.";
-    mes "I've set a rule that anything dying here should not respawn.";
-    mes "I'm not sure if it'll work, but I did enough tests on that.";
+    //mes "I've set a rule that anything dying here should not respawn.";
+    //mes "I'm not sure if it'll work, but I did enough tests on that.";
     next;
     mes "In case you forgot, this is an, *ahem*, \"deleted\" dimension.";
     mes "You'll see notes from the adventurers who used to inhabit here.";
diff --git a/npc/099-2/logic.txt b/npc/099-2/logic.txt
index 33525492..66390270 100644
--- a/npc/099-2/logic.txt
+++ b/npc/099-2/logic.txt
@@ -10,14 +10,14 @@
     end;
 
 OnTrial1:
-    monster "099-1", 35, 27, "", 1140, 1, strnpcinfo(0)+"::OnTrial2";
-    monster "099-1", 35, 27, "", 1141, 1, strnpcinfo(0)+"::OnTrial2";
+    monster "099-1", 55, 42, "", 1140, 1, strnpcinfo(0)+"::OnTrial2";
+    monster "099-1", 55, 42, "", 1141, 1, strnpcinfo(0)+"::OnTrial2";
     getexp 10000, 0;
     getitem TreasureKey, 1;
     end;
 
 OnTrial2:
-    monster "099-1", 35, 27, "", 1143, 1, strnpcinfo(0)+"::OnTrial3";
+    monster "099-1", 55, 42, "", 1143, 1, strnpcinfo(0)+"::OnTrial3";
     getexp 10000, 0;
     getitem "DarkConcentrationPotion", 1;
     end;
@@ -65,22 +65,18 @@ OnInit:
     areamonster "099-2", 20, 20, 130, 130, "", 1160, 10;
     areamonster "099-6", 20, 20, 130, 130, "", 1159, 10;
     areamonster "099-6", 20, 20, 130, 130, "", 1160, 10;
-    areamonster "099-3", 20, 20, 120,  80, "", 1159, 15;
-    areamonster "099-3", 20, 20, 120,  80, "", 1160, 15;
 
     // The small fry
-    areamonster "099-1", 20, 20, 130, 130, "", 1156, 30;
+    areamonster "099-1", 20, 20, 150, 145, "", 1156, 30;
     areamonster "099-2", 20, 20, 130, 130, "", 1156, 20;
     areamonster "099-6", 20, 20, 130, 130, "", 1156, 20;
-    areamonster "099-3", 20, 20, 120,  80, "", 1156, 60;
     // The advanced mobs
-    areamonster "099-1", 20, 20, 130, 130, "", 1152, 15;
+    areamonster "099-1", 20, 20, 150, 145, "", 1152, 15;
     areamonster "099-2", 20, 20, 130, 130, "", 1152, 5;
     areamonster "099-6", 20, 20, 130, 130, "", 1152, 5;
-    areamonster "099-3", 20, 20, 120,  80, "", 1152, 20;
 
     // The boss. Used to be 1137 Tormenta but... Well... Better not.
-    monster "099-1", 35, 27, "", 1147, 1, "#099-2_Prestart::OnTrial1";
+    monster "099-1", 55, 42, "", 1147, 1, "#099-2_Prestart::OnTrial1";
     end;
 
 OnJanitor:
@@ -614,7 +610,7 @@ OnJanitor:
 
 
 
-099-1,43,14,0	script	Painting#099-1	NPC400,{
+099-1,63,29,0	script	Painting#099-1	NPC400,{
     // Default distance is 4 tiles - all we need
     callfunc "PCtoNPCRange";
     if(@npc_check) end;
@@ -665,7 +661,7 @@ L_UseLens:
     close;
 }
 
-099-1,35,22,0	script	Fireplace#099-1	NPC400,{
+099-1,55,37,0	script	Fireplace#099-1	NPC400,{
     // Default distance is 4 tiles - all we need
     callfunc "PCtoNPCRange";
     if(@npc_check) end;
@@ -679,7 +675,7 @@ L_UseLens:
 	close;
 }
 
-099-1,20,22,0	script	Bookcase#099-1	NPC400,{
+099-1,40,37,0	script	Bookcase#099-1	NPC400,{
     // Default distance is 4 tiles - all we need
     callfunc "PCtoNPCRange";
     if(@npc_check) end;
@@ -695,7 +691,7 @@ L_UseLens:
 	close;
 }
 
-099-1,45,22,0	script	Bookcase#099-1b	NPC400,{
+099-1,65,37,0	script	Bookcase#099-1b	NPC400,{
     // Default distance is 4 tiles - all we need
     callfunc "PCtoNPCRange";
     if(@npc_check) end;
diff --git a/npc/099-3/_import.txt b/npc/099-3/_import.txt
index 24ad4ebf..f213d8be 100644
--- a/npc/099-3/_import.txt
+++ b/npc/099-3/_import.txt
@@ -1,3 +1,4 @@
 // Map 099-3: Keshlam's Adventurer's Guild Basement
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/099-3/_mobs.txt",
 "npc/099-3/_warps.txt",
diff --git a/npc/099-3/_mobs.txt b/npc/099-3/_mobs.txt
new file mode 100644
index 00000000..50371954
--- /dev/null
+++ b/npc/099-3/_mobs.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 099-3: Keshlam's Adventurer's Guild Basement mobs
+099-3,69,49,49,29	monster	Void Scorpion	1159,15,60000,60000
+099-3,69,50,49,29	monster	Void Shroom	1160,15,60000,60000
+099-3,69,51,49,29	monster	Void Maggot	1156,20,60000,60000
+099-3,69,52,49,29	monster	Void Archant	1152,20,60000,60000
diff --git a/npc/099-3/_warps.txt b/npc/099-3/_warps.txt
index 1396e822..4943af0f 100644
--- a/npc/099-3/_warps.txt
+++ b/npc/099-3/_warps.txt
@@ -1,16 +1,16 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 099-3: Keshlam's Adventurer's Guild Basement warps
-099-3,72,25,0	warp	#099-3_72_25	0,0,099-1,119,115
-099-3,29,61,0	warp	#099-3_29_61	0,0,099-1,48,17
-099-3,35,61,0	warp	#099-3_35_61	0,0,099-1,76,26
-099-3,41,61,0	warp	#099-3_41_61	0,0,099-1,128,18
-099-3,47,61,0	warp	#099-3_47_61	0,0,099-1,110,45
-099-3,53,61,0	warp	#099-3_53_61	0,0,099-1,120,79
-099-3,59,61,0	warp	#099-3_59_61	0,0,099-1,113,98
-099-3,79,61,0	warp	#099-3_79_61	0,0,099-1,125,98
-099-3,85,61,0	warp	#099-3_85_61	0,0,099-1,60,93
-099-3,91,61,0	warp	#099-3_91_61	0,0,099-1,20,55
-099-3,97,61,0	warp	#099-3_97_61	0,0,099-1,14,55
-099-3,103,61,0	warp	#099-3_103_61	0,0,099-1,15,68
-099-3,109,61,0	warp	#099-3_109_61	0,0,099-1,19,94
-099-3,115,61,0	warp	#099-3_115_61	0,0,099-1,57,52
+099-3,72,25,0	warp	#099-3_72_25	0,0,099-1,139,130
+099-3,29,61,0	warp	#099-3_29_61	0,0,099-1,68,32
+099-3,35,61,0	warp	#099-3_35_61	0,0,099-1,96,41
+099-3,41,61,0	warp	#099-3_41_61	0,0,099-1,148,33
+099-3,47,61,0	warp	#099-3_47_61	0,0,099-1,130,60
+099-3,53,61,0	warp	#099-3_53_61	0,0,099-1,140,94
+099-3,59,61,0	warp	#099-3_59_61	0,0,099-1,133,113
+099-3,79,61,0	warp	#099-3_79_61	0,0,099-1,145,113
+099-3,85,61,0	warp	#099-3_85_61	0,0,099-1,80,108
+099-3,91,61,0	warp	#099-3_91_61	0,0,099-1,40,70
+099-3,97,61,0	warp	#099-3_97_61	0,0,099-1,34,70
+099-3,103,61,0	warp	#099-3_103_61	0,0,099-1,35,83
+099-3,109,61,0	warp	#099-3_109_61	0,0,099-1,39,109
+099-3,115,61,0	warp	#099-3_115_61	0,0,099-1,77,67