Emergency fix

24 files changed, 28 insertions, 74 deletions

diff --git a/client-data b/client-data
-Subproject abbfb536508694927e4d0505eea19255f6d4245
+Subproject abd048f6272528e191cca805afcef38b395ef82
diff --git a/world/map/npc/002-4/_mobs.txt b/world/map/npc/002-4/_mobs.txt
index 0643fb93..49daf0ab 100644
--- a/world/map/npc/002-4/_mobs.txt
+++ b/world/map/npc/002-4/_mobs.txt
@@ -15,3 +15,4 @@
 002-4,67,91,11,12|monster|AngryScorpion|1057,4,100000ms,30000ms
 002-4,58,95,6,13|monster|CaveMaggot|1056,4,100000ms,30000ms
 002-4,63,100,2,5|monster|AngryScorpion|1057,3,100000ms,30000ms
+002-4,0,0,0,0|monster|Bif|1172,10,30000ms,15000ms
diff --git a/world/map/npc/002-5/_mobs.txt b/world/map/npc/002-5/_mobs.txt
index 700685c8..d9a69cb1 100644
--- a/world/map/npc/002-5/_mobs.txt
+++ b/world/map/npc/002-5/_mobs.txt
@@ -18,3 +18,4 @@
 002-5,99,38,1,5|monster|Archant|1060,1,100000ms,30000ms
 002-5,93,38,8,2|monster|YellowSlime|1007,2,100000ms,30000ms
 002-5,62,62,5,43|monster|AngryFireGoblin|1108,3,100000ms,30000ms
+002-5,0,0,0,0|monster|Bif|1172,10,30000ms,15000ms
diff --git a/world/map/npc/009-3/_mobs.txt b/world/map/npc/009-3/_mobs.txt
index 64c43145..6eafc709 100644
--- a/world/map/npc/009-3/_mobs.txt
+++ b/world/map/npc/009-3/_mobs.txt
@@ -5,3 +5,4 @@
 009-3,62,75,125,150|monster|BlackScorpion|1009,25,0ms,0ms
 009-3,63,75,126,150|monster|RedSlime|1008,35,0ms,0ms
 009-3,145,75,110,151|monster|CaveMaggot|1056,20,100000ms,30000ms
+009-3,0,0,0,0|monster|Bif|1172,20,30000ms,15000ms
diff --git a/world/map/npc/013-3/_mobs.txt b/world/map/npc/013-3/_mobs.txt
index b1456bc5..970a5172 100644
--- a/world/map/npc/013-3/_mobs.txt
+++ b/world/map/npc/013-3/_mobs.txt
@@ -29,3 +29,4 @@
 013-3,80,33,2,1|monster|FireSkull|1023,1,120000ms,60000ms
 013-3,75,46,2,1|monster|PoisonSkull|1024,1,120000ms,60000ms
 013-3,67,46,2,1|monster|FireSkull|1023,1,120000ms,60000ms
+013-3,0,0,0,0|monster|Bif|1172,20,30000ms,15000ms
diff --git a/world/map/npc/018-3/_mobs.txt b/world/map/npc/018-3/_mobs.txt
index 57c48654..91839b6a 100644
--- a/world/map/npc/018-3/_mobs.txt
+++ b/world/map/npc/018-3/_mobs.txt
@@ -22,5 +22,8 @@
 018-3,133,39,12,17|monster|Spider|1012,10,60000ms,30000ms
 018-3,111,33,30,16|monster|Snake|1010,15,60000ms,30000ms
 018-3,68,101,5,4|monster|CaveSnake|1021,4,60000ms,30000ms
-018-3,153,96,18,17|monster|CaveMaggot|1056,4,100000ms,30000ms
 018-3,99,99,17,17|monster|CaveMaggot|1056,4,100000ms,30000ms
+018-3,153,96,18,17|monster|CaveMaggot|1056,4,100000ms,30000ms
+018-3,99,75,2,2|monster|PoisonSkull|1024,1,120000ms,60000ms
+018-3,99,75,2,2|monster|FireSkull|1023,1,120000ms,60000ms
+018-3,0,0,0,0|monster|Bif|1172,30,30000ms,15000ms
diff --git a/world/map/npc/019-4/_mobs.txt b/world/map/npc/019-4/_mobs.txt
index 6a23a017..994e8e89 100644
--- a/world/map/npc/019-4/_mobs.txt
+++ b/world/map/npc/019-4/_mobs.txt
@@ -5,3 +5,4 @@
 019-4,47,67,15,9|monster|WhiteSlime|1093,5,45000ms,45000ms
 019-4,0,0,0,0|monster|Bat|1017,15,45000ms,25000ms
 019-4,0,0,0,0|monster|BlueSlime|1091,7,45000ms,30000ms
+019-4,0,0,0,0|monster|Bif|1172,10,30000ms,15000ms
diff --git a/world/map/npc/021-3/_mobs.txt b/world/map/npc/021-3/_mobs.txt
index 3775bd09..93a86a3e 100644
--- a/world/map/npc/021-3/_mobs.txt
+++ b/world/map/npc/021-3/_mobs.txt
@@ -6,7 +6,7 @@
 021-3,80,98,34,31|monster|CaveMaggot|1056,5,100000ms,30000ms
 021-3,129,82,8,3|monster|CaveMaggot|1056,5,100000ms,30000ms
 021-3,140,38,16,8|monster|AngryFireGoblin|1108,3,100000ms,30000ms
-021-3,79,98,33,31|monster|BlackScorpion|1009,4,100000ms,0ms
+021-3,79,98,33,31|monster|BlackScorpion|1009,4,100000ms,30000ms
 021-3,52,53,2,17|monster|GreenSlime|1005,4,40000ms,50000ms
 021-3,93,31,28,22|monster|SeaSlime|1033,6,100000ms,30000ms
 021-3,121,128,8,3|monster|CaveMaggot|1056,5,100000ms,30000ms
diff --git a/world/map/npc/043-3/_mobs.txt b/world/map/npc/043-3/_mobs.txt
index 772c8921..39154063 100644
--- a/world/map/npc/043-3/_mobs.txt
+++ b/world/map/npc/043-3/_mobs.txt
@@ -10,3 +10,4 @@
 043-3,116,78,25,19|monster|AngryFireGoblin|1108,8,30000ms,30000ms
 043-3,113,47,30,22|monster|RedSlime|1008,15,45000ms,35000ms
 043-3,94,44,40,18|monster|GreenSlime|1005,5,30000ms,15000ms
+043-3,0,0,0,0|monster|Bif|1172,15,30000ms,15000ms
diff --git a/world/map/npc/043-4/_mobs.txt b/world/map/npc/043-4/_mobs.txt
index 2d410126..047f0fa3 100644
--- a/world/map/npc/043-4/_mobs.txt
+++ b/world/map/npc/043-4/_mobs.txt
@@ -1,7 +1,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Troll Cave mobs
 
-043-4,139,163,7,6|monster|Terranite|1062,2,240000ms,120000ms
+043-4,139,163,7,6|monster|Terranite|1062,3,240000ms,120000ms
 043-4,133,45,14,16|monster|UndeadTroll|1117,4,100000ms,50000ms
 043-4,91,139,11,10|monster|UndeadTroll|1117,2,100000ms,50000ms
 043-4,35,120,10,11|monster|UndeadTroll|1117,2,100000ms,50000ms
@@ -23,3 +23,4 @@
 043-4,45,106,18,25|monster|Troll|1054,5,100000ms,50000ms
 043-4,39,138,19,17|monster|BlackScorpion|1009,5,100000ms,50000ms
 043-4,133,123,30,23|monster|Troll|1054,3,100000ms,50000ms
+043-4,101,96,143,147|monster|Bif|1172,25,30000ms,15000ms
diff --git a/world/map/npc/046-3/_mobs.txt b/world/map/npc/046-3/_mobs.txt
index d75b5f5a..cbdefc82 100644
--- a/world/map/npc/046-3/_mobs.txt
+++ b/world/map/npc/046-3/_mobs.txt
@@ -16,3 +16,4 @@
 046-3,84,53,14,9|monster|BlueSlime|1091,2,100000ms,30000ms
 046-3,47,23,15,10|monster|IceElement|1071,2,100000ms,30000ms
 046-3,113,48,12,8|monster|Yeti|1072,2,100000ms,30000ms
+046-3,0,0,0,0|monster|Bif|1172,15,30000ms,15000ms
diff --git a/world/map/npc/055-3/_mobs.txt b/world/map/npc/055-3/_mobs.txt
index 4ecf0465..c94a5ef3 100644
--- a/world/map/npc/055-3/_mobs.txt
+++ b/world/map/npc/055-3/_mobs.txt
@@ -4,9 +4,10 @@
 055-3,45,44,20,14|monster|RedSlime|1008,10,10000ms,60000ms
 055-3,0,0,1,1|monster|Bat|1017,20,10000ms,45000ms
 055-3,53,75,28,40|monster|YellowSlime|1007,10,10000ms,60000ms
-055-3,0,0,1,1|monster|BlackScorpion|1009,8,10000ms,35000ms
-055-3,0,0,1,1|monster|Spider|1012,8,10000ms,35000ms
-055-3,0,0,1,1|monster|Snake|1010,3,10000ms,20000ms
+055-3,0,0,0,0|monster|BlackScorpion|1009,8,10000ms,35000ms
+055-3,0,0,0,0|monster|Spider|1012,8,10000ms,35000ms
+055-3,0,0,0,0|monster|Snake|1010,3,10000ms,20000ms
 055-3,46,44,14,18|monster|Spider|1012,3,50000ms,100000ms
 055-3,52,78,36,23|monster|BlackScorpion|1009,3,50000ms,100000ms
 055-3,76,32,8,9|monster|EvilMushroom|1013,2,0ms,250ms
+055-3,0,0,0,0|monster|Bif|1172,15,30000ms,15000ms
diff --git a/world/map/npc/058-1/_warps.txt b/world/map/npc/058-1/_warps.txt
index 58196d47..bfbf011c 100644
--- a/world/map/npc/058-1/_warps.txt
+++ b/world/map/npc/058-1/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Pyramid B1F warps
 
-058-1,65,199|warp|-1,-1,001-1,99,99
+058-1,65,199|warp|-1,-1,043-1,68,114
diff --git a/world/map/npc/058-2/_warps.txt b/world/map/npc/058-2/_warps.txt
index 958f67b4..a115e5a8 100644
--- a/world/map/npc/058-2/_warps.txt
+++ b/world/map/npc/058-2/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Pyramid B1F warps
 
-058-2,65,199|warp|-1,-1,001-1,99,99
+058-2,65,199|warp|-1,-1,045-1,99,34
diff --git a/world/map/npc/099-3/.switches.txt b/world/map/npc/099-3/.switches.txt
deleted file mode 100644
index 96c23c5a..00000000
--- a/world/map/npc/099-3/.switches.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Keshlam's Adventurer's Guild Basement switches
-
-099-3,59,69,0|script|#099-3_59_69|422
-{
-// REPLACE ME
-}
-099-3,79,69,0|script|#099-3_79_69|422
-{
-// REPLACE ME
-}
-099-3,29,69,0|script|#099-3_29_69|422
-{
-// REPLACE ME
-}
-099-3,35,69,0|script|#099-3_35_69|422
-{
-// REPLACE ME
-}
-099-3,41,69,0|script|#099-3_41_69|422
-{
-// REPLACE ME
-}
-099-3,91,69,0|script|#099-3_91_69|422
-{
-// REPLACE ME
-}
-099-3,97,69,0|script|#099-3_97_69|422
-{
-// REPLACE ME
-}
-099-3,115,69,0|script|#099-3_115_69|422
-{
-// REPLACE ME
-}
diff --git a/world/map/npc/099-4/_import.txt b/world/map/npc/099-4/_import.txt
index 5d5cf671..c1087feb 100644
--- a/world/map/npc/099-4/_import.txt
+++ b/world/map/npc/099-4/_import.txt
@@ -1,4 +1,4 @@
-// Map 099-4: ?????
+// Map 099-4: Nu'Ram-Battle
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 map: 099-4
 npc: npc/099-4/_mobs.txt
diff --git a/world/map/npc/099-4/_mobs.txt b/world/map/npc/099-4/_mobs.txt
index a5c23fd3..0381696e 100644
--- a/world/map/npc/099-4/_mobs.txt
+++ b/world/map/npc/099-4/_mobs.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// ????? mobs
+// Nu'Ram-Battle mobs
 
diff --git a/world/map/npc/099-4/_nodes.txt b/world/map/npc/099-4/_nodes.txt
index baee98ad..22261608 100644
--- a/world/map/npc/099-4/_nodes.txt
+++ b/world/map/npc/099-4/_nodes.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// ????? nodes
+// Nu'Ram-Battle nodes
 
 // (no nodes)
diff --git a/world/map/npc/099-4/_warps.txt b/world/map/npc/099-4/_warps.txt
index 0d96e519..703b3ca9 100644
--- a/world/map/npc/099-4/_warps.txt
+++ b/world/map/npc/099-4/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// ????? warps
+// Nu'Ram-Battle warps
 
diff --git a/world/map/npc/099-5/_import.txt b/world/map/npc/099-5/_import.txt
index 651bffd4..81a454ca 100644
--- a/world/map/npc/099-5/_import.txt
+++ b/world/map/npc/099-5/_import.txt
@@ -1,4 +1,4 @@
-// Map 099-5: ?????
+// Map 099-5: Nu'Ram-Battle
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 map: 099-5
 npc: npc/099-5/_mobs.txt
diff --git a/world/map/npc/099-5/_mobs.txt b/world/map/npc/099-5/_mobs.txt
index a5c23fd3..0381696e 100644
--- a/world/map/npc/099-5/_mobs.txt
+++ b/world/map/npc/099-5/_mobs.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// ????? mobs
+// Nu'Ram-Battle mobs
 
diff --git a/world/map/npc/099-5/_nodes.txt b/world/map/npc/099-5/_nodes.txt
index baee98ad..22261608 100644
--- a/world/map/npc/099-5/_nodes.txt
+++ b/world/map/npc/099-5/_nodes.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// ????? nodes
+// Nu'Ram-Battle nodes
 
 // (no nodes)
diff --git a/world/map/npc/099-5/_warps.txt b/world/map/npc/099-5/_warps.txt
index 0d96e519..703b3ca9 100644
--- a/world/map/npc/099-5/_warps.txt
+++ b/world/map/npc/099-5/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// ????? warps
+// Nu'Ram-Battle warps
 
diff --git a/world/map/npc/099-6/.switches.txt b/world/map/npc/099-6/.switches.txt
deleted file mode 100644
index 84da29d3..00000000
--- a/world/map/npc/099-6/.switches.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Keshlam's Adventurer's Guild Quarters switches
-
-099-6,25,17,0|script|#099-6_25_17|422
-{
-// REPLACE ME
-}
-099-6,90,18,0|script|#099-6_90_18|422
-{
-// REPLACE ME
-}
-099-6,121,71,0|script|#099-6_121_71|422
-{
-// REPLACE ME
-}
-099-6,23,95,0|script|#099-6_23_95|422
-{
-// REPLACE ME
-}
-099-6,57,130,0|script|#099-6_57_130|422
-{
-// REPLACE ME
-}