Merge pull request #200 from mekolat/tulim-collision-fix

fix noob area collision

9 files changed, 16 insertions, 16 deletions

diff --git a/world/map/data/001-1.wlk b/world/map/data/001-1.wlk
index 9050ad38..05f949c1 100644
--- a/world/map/data/001-1.wlk
+++ b/world/map/data/001-1.wlk
diff --git a/world/map/data/021-1.wlk b/world/map/data/021-1.wlk
index e7afe900..af614879 100644
--- a/world/map/data/021-1.wlk
+++ b/world/map/data/021-1.wlk
diff --git a/world/map/data/022-1.wlk b/world/map/data/022-1.wlk
index f84df1d7..643a8714 100644
--- a/world/map/data/022-1.wlk
+++ b/world/map/data/022-1.wlk
diff --git a/world/map/data/024-1.wlk b/world/map/data/024-1.wlk
index 26d6e3fc..c15f1d51 100644
--- a/world/map/data/024-1.wlk
+++ b/world/map/data/024-1.wlk
diff --git a/world/map/data/042-1.wlk b/world/map/data/042-1.wlk
index ccd506c8..bd22d8db 100644
--- a/world/map/data/042-1.wlk
+++ b/world/map/data/042-1.wlk
diff --git a/world/map/npc/001-1/_warps.txt b/world/map/npc/001-1/_warps.txt
index a15050cf..d113ba85 100644
--- a/world/map/npc/001-1/_warps.txt
+++ b/world/map/npc/001-1/_warps.txt
@@ -4,5 +4,5 @@
 001-1.gat,44,87|warp|To Sandstorm Desert|3,-1,002-1.gat,58,14
 001-1.gat,44,20|warp|To North Tulimshar|3,-1,021-1.gat,55,145
 001-1.gat,125,21|warp|To North Tulimshar|0,-1,021-1.gat,136,146
-001-1.gat,32,71|warp|To Tulimshar Indoor|-1,-1,001-2.gat,25,34
-001-1.gat,75,41|warp|To Tulimshar Indoor|-1,-1,001-2.gat,71,72
+001-1.gat,32,70|warp|To Tulimshar Indoor|-1,-1,001-2.gat,25,34
+001-1.gat,75,40|warp|To Tulimshar Indoor|-1,-1,001-2.gat,71,72
diff --git a/world/map/npc/021-1/_warps.txt b/world/map/npc/021-1/_warps.txt
index 429a522f..daa1a89d 100644
--- a/world/map/npc/021-1/_warps.txt
+++ b/world/map/npc/021-1/_warps.txt
@@ -8,18 +8,18 @@
 021-1.gat,135,119|warp|To Tulimshar Musuem|-1,-1,021-2.gat,90,177
 021-1.gat,55,146|warp|To South Tulimshar|3,-1,001-1.gat,44,21
 021-1.gat,136,147|warp|To South Tulimshar|0,-1,001-1.gat,125,22
-021-1.gat,53,134|warp|To Government Building|-1,-1,021-2.gat,27,29
-021-1.gat,55,134|warp|To Government Building|-1,-1,021-2.gat,33,29
-021-1.gat,57,134|warp|To Government Building|-1,-1,021-2.gat,39,29
-021-1.gat,103,100|warp|To Tulimshar Bakery|-1,-1,021-2.gat,91,27
+021-1.gat,53,133|warp|To Government Building|-1,-1,021-2.gat,27,29
+021-1.gat,55,133|warp|To Government Building|-1,-1,021-2.gat,33,29
+021-1.gat,57,133|warp|To Government Building|-1,-1,021-2.gat,39,29
+021-1.gat,103,99|warp|To Tulimshar Bakery|-1,-1,021-2.gat,91,27
 021-1.gat,103,96|warp|To Bakery|-1,-1,021-2.gat,122,23
 021-1.gat,49,64|warp|To Tulimshar Canyon|3,-1,024-1.gat,86,73
-021-1.gat,53,99|warp|To Wizard's Rest|-1,-1,021-2.gat,25,66
+021-1.gat,53,98|warp|To Wizard's Rest|-1,-1,021-2.gat,25,66
 021-1.gat,52,95|warp|To Wizard's Rest|-1,-1,021-2.gat,70,63
 021-1.gat,73,22|warp|To Tulimshar Port|3,-1,022-1.gat,73,109
 021-1.gat,113,22|warp|To Tulimshar Port|3,-1,022-1.gat,113,109
-021-1.gat,132,31|warp|To Tulimshar Forge|-1,-1,021-2.gat,79,138
+021-1.gat,132,30|warp|To Tulimshar Forge|-1,-1,021-2.gat,79,138
 021-1.gat,133,24|warp|To Tulimshar Forge|-1,-1,021-2.gat,75,92
 021-1.gat,125,27|warp|To Tulimshar Forge|-1,-1,021-2.gat,124,68
-021-1.gat,125,31|warp|To Tulimshar Forge|-1,-1,021-2.gat,72,138
-021-1.gat,43,110|warp|To Store|-1,-1,021-2.gat,28,129
+021-1.gat,125,30|warp|To Tulimshar Forge|-1,-1,021-2.gat,72,138
+021-1.gat,43,109|warp|To Store|-1,-1,021-2.gat,28,129
diff --git a/world/map/npc/022-1/_warps.txt b/world/map/npc/022-1/_warps.txt
index 45899c50..f5f26146 100644
--- a/world/map/npc/022-1/_warps.txt
+++ b/world/map/npc/022-1/_warps.txt
@@ -5,4 +5,4 @@
 022-1.gat,30,20|warp|To Lighthouse Beach|0,-1,023-1.gat,107,146
 022-1.gat,73,110|warp|To North Tulimshar|3,-1,021-1.gat,73,23
 022-1.gat,113,110|warp|To North Tulimshar|3,-1,021-1.gat,113,23
-022-1.gat,46,82|warp|To Tulimshar Suburbs|-1,-1,042-1.gat,115,85
+022-1.gat,40,82|warp|To Tulimshar Suburbs|-1,-1,042-1.gat,116,85
diff --git a/world/map/npc/042-1/_warps.txt b/world/map/npc/042-1/_warps.txt
index 8c1043ea..87690e5d 100644
--- a/world/map/npc/042-1/_warps.txt
+++ b/world/map/npc/042-1/_warps.txt
@@ -3,13 +3,13 @@
 
 042-1.gat,97,41|warp|To Tulismhar Docks|-1,2,022-1.gat,21,37
 042-1.gat,65,20|warp|To Lighthouse Beach|0,-1,023-1.gat,64,143
-042-1.gat,91,73|warp|To Store House|-1,-1,042-2.gat,22,92
-042-1.gat,104,73|warp|To Store House|-1,-1,042-2.gat,44,92
-042-1.gat,65,75|warp|To Tulimshar Suburbs House|-1,-1,042-2.gat,29,61
+042-1.gat,91,72|warp|To Store House|-1,-1,042-2.gat,22,92
+042-1.gat,104,72|warp|To Store House|-1,-1,042-2.gat,44,92
+042-1.gat,65,74|warp|To Tulimshar Suburbs House|-1,-1,042-2.gat,29,61
 042-1.gat,62,42|warp|To Sorfina's Dinner|-1,-1,042-2.gat,112,85
 042-1.gat,51,43|warp|To Sorfina's House|-1,-1,042-2.gat,44,30
-042-1.gat,117,102|warp|To Magic School Research|-1,-1,042-2.gat,103,62
+042-1.gat,117,101|warp|To Magic School Research|-1,-1,042-2.gat,103,62
 042-1.gat,112,95|warp|To Magic School Research|-1,-1,042-2.gat,94,54
 042-1.gat,120,95|warp|To Magic School Research|-1,-1,042-2.gat,112,54
-042-1.gat,117,85|warp|To Tulismhar Docks|-1,-1,022-1.gat,49,82
+042-1.gat,117,85|warp|To Tulismhar Docks|-1,-1,022-1.gat,41,82
 042-1.gat,44,115|warp|To Tulismhar Outskirts|1,-1,041-1.gat,58,6