Merge pull request #464 from wushin/reworked-caves

Tulimshar Cave Changes by Cassy

15 files changed, 34 insertions, 26 deletions

diff --git a/world/map/data/005-3.wlk b/world/map/data/005-3.wlk
index a1dcecee..26dc436d 100644
--- a/world/map/data/005-3.wlk
+++ b/world/map/data/005-3.wlk
diff --git a/world/map/data/006-1.wlk b/world/map/data/006-1.wlk
index f2de1da0..8bfc19ee 100644
--- a/world/map/data/006-1.wlk
+++ b/world/map/data/006-1.wlk
diff --git a/world/map/data/043-4.wlk b/world/map/data/043-4.wlk
index f88880f8..04f2c2a0 100644
--- a/world/map/data/043-4.wlk
+++ b/world/map/data/043-4.wlk
diff --git a/world/map/npc/001-2/_nodes.txt b/world/map/npc/001-2/_nodes.txt
index 5a5cdeac..9d4b5dab 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", 98, 92, 98, 92;
-    setarray .y1, "_N-Alchemy", 76, 76, 89, 89;
+    setarray .x1, "_N-Alchemy", 92, 98, 92, 98;
+    setarray .y1, "_N-Alchemy", 76, 89, 89, 76;
     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/002-1/_warps.txt b/world/map/npc/002-1/_warps.txt
index 4350dc94..55271d57 100644
--- a/world/map/npc/002-1/_warps.txt
+++ b/world/map/npc/002-1/_warps.txt
@@ -14,6 +14,6 @@
 002-1,73,35|warp|-1,-1,002-2,44,33
 002-1,57,35|warp|-1,-1,002-2,120,94
 002-1,67,29|warp|-1,-1,002-2,23,109
-002-1,113,107|warp|-1,-1,005-3,52,35
+002-1,113,107|warp|-1,-1,005-3,52,37
 002-1,49,20|warp|-1,-1,004-3,24,94
 002-1,57,26|warp|-1,-1,002-2,119,131
diff --git a/world/map/npc/005-3/_mobs.txt b/world/map/npc/005-3/_mobs.txt
index 79168aba..2bcda8e6 100644
--- a/world/map/npc/005-3/_mobs.txt
+++ b/world/map/npc/005-3/_mobs.txt
@@ -1,6 +1,8 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Snake Pit mobs
 
-005-3,58,57,62,57|monster|Snake|1010,50,100000ms,30000ms
-005-3,58,57,62,57|monster|BlackScorpion|1009,15,100000ms,30000ms
-005-3,58,57,62,57|monster|GiantMaggot|1006,20,100000ms,30000ms
+005-3,59,63,48,57|monster|Snake|1010,50,100000ms,30000ms
+005-3,56,64,53,49|monster|BlackScorpion|1009,15,100000ms,30000ms
+005-3,59,68,58,42|monster|GiantMaggot|1006,20,100000ms,30000ms
+005-3,95,52,10,61|monster|Troll|1054,7,100000ms,30000ms
+005-3,53,26,64,12|monster|Troll|1054,5,100000ms,30000ms
diff --git a/world/map/npc/005-3/_warps.txt b/world/map/npc/005-3/_warps.txt
index 02894dc8..c1877197 100644
--- a/world/map/npc/005-3/_warps.txt
+++ b/world/map/npc/005-3/_warps.txt
@@ -1,10 +1,14 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Snake Pit warps
 
-005-3,52,33|warp|-1,-1,002-1,113,109
-005-3,63,46|warp|-1,-1,006-3,89,45
-005-3,85,49|warp|-1,-1,006-3,125,65
-005-3,86,30|warp|-1,-1,006-1,55,47
-005-3,73,60|warp|-1,-1,006-1,51,69
-005-3,78,88|warp|-1,-1,043-3,116,37
-005-3,33,82|warp|-1,-1,043-3,31,35
+005-3,52,35|warp|-1,-1,002-1,113,109
+005-3,63,48|warp|-1,-1,006-3,89,45
+005-3,85,51|warp|-1,-1,006-3,125,65
+005-3,86,32|warp|-1,-1,006-1,55,47
+005-3,73,62|warp|-1,-1,006-1,51,69
+005-3,78,90|warp|-1,-1,043-3,116,37
+005-3,33,84|warp|-1,-1,043-3,31,35
+005-3,107,102|warp|-1,-1,006-1,64,78
+005-3,27,41|warp|-1,-1,043-5,126,27
+005-3,101,30|warp|-1,-1,005-3,101,35
+005-3,110,79|warp|-1,-1,005-3,110,75
diff --git a/world/map/npc/006-1/_warps.txt b/world/map/npc/006-1/_warps.txt
index c1d32cc9..1a2b0169 100644
--- a/world/map/npc/006-1/_warps.txt
+++ b/world/map/npc/006-1/_warps.txt
@@ -27,6 +27,7 @@
 006-1,21,108|warp|-1,-1,006-2,65,72
 006-1,37,26|warp|-1,-1,006-1,37,23
 006-1,37,24|warp|-1,-1,006-1,37,27
-006-1,55,46|warp|-1,-1,005-3,86,31
+006-1,55,46|warp|-1,-1,005-3,86,33
 006-1,20,48|warp|-1,0,002-1,118,95
-006-1,51,68|warp|-1,-1,005-3,73,59
+006-1,51,68|warp|-1,-1,005-3,73,61
+006-1,64,77|warp|-1,-1,005-3,107,101
diff --git a/world/map/npc/006-3/_warps.txt b/world/map/npc/006-3/_warps.txt
index 67c33574..7ecb5a5b 100644
--- a/world/map/npc/006-3/_warps.txt
+++ b/world/map/npc/006-3/_warps.txt
@@ -19,5 +19,5 @@
 006-3,51,90|warp|-1,-1,006-1,51,92
 006-3,38,121|warp|-1,-1,006-1,38,123
 006-3,79,120|warp|-1,-1,006-1,83,119
-006-3,125,66|warp|-1,-1,005-3,85,50
-006-3,89,46|warp|-1,-1,005-3,63,47
+006-3,125,66|warp|-1,-1,005-3,85,52
+006-3,89,46|warp|-1,-1,005-3,63,49
diff --git a/world/map/npc/043-3/_warps.txt b/world/map/npc/043-3/_warps.txt
index bb55583c..da8eed49 100644
--- a/world/map/npc/043-3/_warps.txt
+++ b/world/map/npc/043-3/_warps.txt
@@ -4,4 +4,4 @@
 043-3,31,26|warp|-1,-1,002-3,22,86
 043-3,77,30|warp|-1,-1,043-4,47,67
 043-3,116,36|warp|-1,-1,005-3,78,87
-043-3,32,37|warp|0,-1,005-3,33,83
+043-3,32,37|warp|0,-1,005-3,33,85
diff --git a/world/map/npc/043-4/_import.txt b/world/map/npc/043-4/_import.txt
index 83403eaf..4f3ccd45 100644
--- a/world/map/npc/043-4/_import.txt
+++ b/world/map/npc/043-4/_import.txt
@@ -1,4 +1,4 @@
-// Map 043-4: Sandy Dungeon Level 2
+// Map 043-4: Troll Cave
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 map: 043-4
 npc: npc/043-4/_mobs.txt
diff --git a/world/map/npc/043-4/_mobs.txt b/world/map/npc/043-4/_mobs.txt
index ae7678e6..2d410126 100644
--- a/world/map/npc/043-4/_mobs.txt
+++ b/world/map/npc/043-4/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Sandy Dungeon Level 2 mobs
+// Troll Cave mobs
 
 043-4,139,163,7,6|monster|Terranite|1062,2,240000ms,120000ms
 043-4,133,45,14,16|monster|UndeadTroll|1117,4,100000ms,50000ms
diff --git a/world/map/npc/043-4/_nodes.txt b/world/map/npc/043-4/_nodes.txt
index f334a483..2e89bc1e 100644
--- a/world/map/npc/043-4/_nodes.txt
+++ b/world/map/npc/043-4/_nodes.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Sandy Dungeon Level 2 nodes
+// Troll Cave nodes
 
 // (no nodes)
diff --git a/world/map/npc/043-4/_warps.txt b/world/map/npc/043-4/_warps.txt
index e10f3bfb..27f75e1c 100644
--- a/world/map/npc/043-4/_warps.txt
+++ b/world/map/npc/043-4/_warps.txt
@@ -1,6 +1,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Sandy Dungeon Level 2 warps
+// Troll Cave warps
 
 043-4,47,68|warp|-1,-1,043-3,77,31
 043-4,153,27|warp|-1,-1,043-4,193,32
 043-4,193,33|warp|-1,-1,043-4,153,28
+043-4,194,24|warp|-1,-1,043-5,30,107
diff --git a/world/map/npc/055-1/_nodes.txt b/world/map/npc/055-1/_nodes.txt
index e6da33ea..4abefb02 100644
--- a/world/map/npc/055-1/_nodes.txt
+++ b/world/map/npc/055-1/_nodes.txt
@@ -6,10 +6,10 @@
     end;
 OnInit:
     setarray .m$, "_N-Pumpkin", "055-1", "055-1", "055-1";
-    setarray .x1, "_N-Pumpkin", 129, 133, 41;
-    setarray .y1, "_N-Pumpkin", 23, 27, 22;
-    setarray .x2, "_N-Pumpkin", 135, 139, 47;
-    setarray .y2, "_N-Pumpkin", 26, 33, 30;
+    setarray .x1, "_N-Pumpkin", 129, 41, 133;
+    setarray .y1, "_N-Pumpkin", 23, 22, 27;
+    setarray .x2, "_N-Pumpkin", 135, 47, 139;
+    setarray .y2, "_N-Pumpkin", 26, 30, 33;
     setarray .id, "_N-Pumpkin", 0, 0, 0;
     donpcevent "_N-Pumpkin::OnMaybeStart";
     destroy;