Text changes and ran tmx_converter

21 files changed, 80 insertions, 23 deletions

diff --git a/world/map/data/027-5.wlk b/world/map/data/027-5.wlk
index daba44e7..b3e2a37d 100644
--- a/world/map/data/027-5.wlk
+++ b/world/map/data/027-5.wlk
diff --git a/world/map/npc/001-2/_nodes.txt b/world/map/npc/001-2/_nodes.txt
index 2bf62e74..33eaa51b 100644
--- a/world/map/npc/001-2/_nodes.txt
+++ b/world/map/npc/001-2/_nodes.txt
@@ -6,8 +6,8 @@
     end;
 OnInit:
     setarray .m$, "_N-Alchemy", "001-2", "001-2", "001-2", "001-2";
-    setarray .x1, "_N-Alchemy", 92, 92, 98, 98;
-    setarray .y1, "_N-Alchemy", 76, 89, 76, 89;
+    setarray .x1, "_N-Alchemy", 92, 98, 92, 98;
+    setarray .y1, "_N-Alchemy", 89, 76, 76, 89;
     setarray .x2, "_N-Alchemy", 0, 0, 0, 0;
     setarray .y2, "_N-Alchemy", 0, 0, 0, 0;
     setarray .id, "_N-Alchemy", 0, 0, 0, 0;
diff --git a/world/map/npc/018-3/_mobs.txt b/world/map/npc/018-3/_mobs.txt
index 0065e354..57c48654 100644
--- a/world/map/npc/018-3/_mobs.txt
+++ b/world/map/npc/018-3/_mobs.txt
@@ -24,5 +24,3 @@
 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,98,75,1,2|monster|FireSkull|1023,1,120000ms,60000ms
-018-3,100,75,1,2|monster|PoisonSkull|1024,1,120000ms,60000ms
diff --git a/world/map/npc/021-3/_mobs.txt b/world/map/npc/021-3/_mobs.txt
index 75449889..3775bd09 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,1800000ms
+021-3,79,98,33,31|monster|BlackScorpion|1009,4,100000ms,0ms
 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/027-3/_warps.txt b/world/map/npc/027-3/_warps.txt
index 3b589a77..d2f23685 100644
--- a/world/map/npc/027-3/_warps.txt
+++ b/world/map/npc/027-3/_warps.txt
@@ -2,4 +2,4 @@
 // Crypt Basement warps
 
 027-3,26,67|warp|2,-1,027-2,36,77
-027-3,127,99|warp|1,-1,027-4,125,18
+027-3,126,98|warp|1,-1,027-4,125,18
diff --git a/world/map/npc/027-5/_mobs.txt b/world/map/npc/027-5/_mobs.txt
index 750163ad..97c66e24 100644
--- a/world/map/npc/027-5/_mobs.txt
+++ b/world/map/npc/027-5/_mobs.txt
@@ -1,10 +1,13 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Crypt Sub-Basement Two mobs
 
+027-5,55,156,2,2|monster|Fallen|1045,1,30000ms,4000ms
+027-5,65,143,3,1|monster|Fallen|1045,1,30000ms,4000ms
+027-5,57,143,3,1|monster|Fallen|1045,1,30000ms,4000ms
+027-5,62,141,2,1|monster|TheLost|1073,1,300000ms,8000ms
+027-5,21,136,7,5|monster|Stalker|1075,4,60000ms,4000ms
 027-5,69,42,97,41|monster|Wight|1124,6,60000ms,8000ms
 027-5,69,56,97,69|monster|VampireBat|1066,30,100000ms,30000ms
-027-5,69,42,98,40|monster|Skeleton|1043,8,60000ms,8000ms
-027-5,69,41,98,39|monster|LadySkeleton|1044,8,60000ms,8000ms
 027-5,68,42,97,40|monster|RedBone|1074,6,60000ms,8000ms
-027-5,70,80,98,34|monster|Skeleton|1043,8,60000ms,8000ms
-027-5,69,80,99,36|monster|LadySkeleton|1044,8,60000ms,8000ms
+027-5,70,80,98,34|monster|PoisonSkull|1024,8,60000ms,8000ms
+027-5,69,80,99,36|monster|FireSkull|1023,8,60000ms,8000ms
diff --git a/world/map/npc/027-5/_warps.txt b/world/map/npc/027-5/_warps.txt
index 95289446..89ca595b 100644
--- a/world/map/npc/027-5/_warps.txt
+++ b/world/map/npc/027-5/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Crypt Sub-Basement Two warps
 
-027-5,125,17|warp|3,-1,027-4,21,97
+027-5,126,17|warp|2,-1,027-4,21,97
diff --git a/world/map/npc/043-3/_mobs.txt b/world/map/npc/043-3/_mobs.txt
index 39154063..772c8921 100644
--- a/world/map/npc/043-3/_mobs.txt
+++ b/world/map/npc/043-3/_mobs.txt
@@ -10,4 +10,3 @@
 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 a9ad2eb1..2d410126 100644
--- a/world/map/npc/043-4/_mobs.txt
+++ b/world/map/npc/043-4/_mobs.txt
@@ -23,4 +23,3 @@
 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,0,0,0,0|monster|Bif|1172,25,30000ms,15000ms
diff --git a/world/map/npc/058-1/_warps.txt b/world/map/npc/058-1/_warps.txt
index bfbf011c..58196d47 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,043-1,68,114
+058-1,65,199|warp|-1,-1,001-1,99,99
diff --git a/world/map/npc/058-2/_warps.txt b/world/map/npc/058-2/_warps.txt
index a115e5a8..958f67b4 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,045-1,99,34
+058-2,65,199|warp|-1,-1,001-1,99,99
diff --git a/world/map/npc/099-3/.switches.txt b/world/map/npc/099-3/.switches.txt
new file mode 100644
index 00000000..96c23c5a
--- /dev/null
+++ b/world/map/npc/099-3/.switches.txt
@@ -0,0 +1,35 @@
+// 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 c1087feb..5d5cf671 100644
--- a/world/map/npc/099-4/_import.txt
+++ b/world/map/npc/099-4/_import.txt
@@ -1,4 +1,4 @@
-// Map 099-4: Nu'Ram-Battle
+// Map 099-4: ?????
 // 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 0381696e..a5c23fd3 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.
-// Nu'Ram-Battle mobs
+// ????? mobs
 
diff --git a/world/map/npc/099-4/_nodes.txt b/world/map/npc/099-4/_nodes.txt
index 22261608..baee98ad 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.
-// Nu'Ram-Battle nodes
+// ????? nodes
 
 // (no nodes)
diff --git a/world/map/npc/099-4/_warps.txt b/world/map/npc/099-4/_warps.txt
index 703b3ca9..0d96e519 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.
-// Nu'Ram-Battle warps
+// ????? warps
 
diff --git a/world/map/npc/099-5/_import.txt b/world/map/npc/099-5/_import.txt
index 81a454ca..651bffd4 100644
--- a/world/map/npc/099-5/_import.txt
+++ b/world/map/npc/099-5/_import.txt
@@ -1,4 +1,4 @@
-// Map 099-5: Nu'Ram-Battle
+// Map 099-5: ?????
 // 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 0381696e..a5c23fd3 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.
-// Nu'Ram-Battle mobs
+// ????? mobs
 
diff --git a/world/map/npc/099-5/_nodes.txt b/world/map/npc/099-5/_nodes.txt
index 22261608..baee98ad 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.
-// Nu'Ram-Battle nodes
+// ????? nodes
 
 // (no nodes)
diff --git a/world/map/npc/099-5/_warps.txt b/world/map/npc/099-5/_warps.txt
index 703b3ca9..0d96e519 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.
-// Nu'Ram-Battle warps
+// ????? warps
 
diff --git a/world/map/npc/099-6/.switches.txt b/world/map/npc/099-6/.switches.txt
new file mode 100644
index 00000000..84da29d3
--- /dev/null
+++ b/world/map/npc/099-6/.switches.txt
@@ -0,0 +1,23 @@
+// 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
+}