Make 022-1 accessible

Update some other walk maps too.

8 files changed, 13 insertions, 23 deletions

diff --git a/npc/001-1_Tulimshar/_warps.txt b/npc/001-1_Tulimshar/_warps.txt
index ec36a41b..751b0df8 100644
--- a/npc/001-1_Tulimshar/_warps.txt
+++ b/npc/001-1_Tulimshar/_warps.txt
@@ -4,4 +4,4 @@
 001-1.gat,44,20	warp	toCentralTulimshar	3,-1,021-1.gat,55,145
 001-1.gat,125,20	warp	toCentralTulimshar	0,-1,021-1.gat,136,146
 001-1.gat,32,71	warp	ToInn	-1,-1,001-2.gat,25,34
-001-1.gat,75,41	warp	ToHouse	-1,-1,001-4.gat,71,72
+001-1.gat,75,41	warp	ToHouse	-1,-1,001-2.gat,71,72
diff --git a/npc/010-1_Woodland/_mobs.txt b/npc/010-1_Woodland/_mobs.txt
index 42ddea6f..674031f2 100644
--- a/npc/010-1_Woodland/_mobs.txt
+++ b/npc/010-1_Woodland/_mobs.txt
@@ -3,7 +3,7 @@
 010-1.gat,82,63,19,19	monster	Scorpion	1003,1,100000,30000,Mob010-1::On1003
 010-1.gat,49,71,31,19	monster	Shroom	1019,1,100000,30000,Mob010-1::On1019
 010-1.gat,0,0,0,0	monster	Flower	1014,30,50,0,Mob010-1::On1014
-010-1.gat,0,0,0,0	monster	Fluffy	1018,20,50,0,Mob010-1::On1018
+010-1.gat,0,0,0,0	monster	Fluffy	1020,20,50,0,Mob010-1::On1020
 010-1.gat,0,0,0,0	monster	SpikyMushroom	1019,45,50,0,Mob010-1::On1019
 010-1.gat,0,0,0,0	monster	LogHead	1025,40,100,0,Mob010-1::On1025
 010-1.gat,0,0,0,0	monster	Mouboo	1028,15,0,10,Mob010-1::On1028
@@ -25,13 +25,13 @@ On1014:
 	callfunc "MobPoints";
 	break;
 
-On1018:
-	set @mobID, 1018;
+On1019:
+	set @mobID, 1019;
 	callfunc "MobPoints";
 	break;
 
-On1019:
-	set @mobID, 1019;
+On1020:
+	set @mobID, 1020;
 	callfunc "MobPoints";
 	break;
 
diff --git a/npc/015-1_Woodland/_warps.txt b/npc/015-1_Woodland/_warps.txt
index 82120436..75e377a4 100644
--- a/npc/015-1_Woodland/_warps.txt
+++ b/npc/015-1_Woodland/_warps.txt
@@ -2,4 +2,3 @@
 
 015-1.gat,93,55	warp	ToWoodland	-1,0,010-1.gat,15,55
 015-1.gat,59,31	warp	to 015_3	-1,-1,015-3.gat,31,42
-015-1.gat,59,101	warp	toSwamp	2,-1,025-1.gat,89,20
diff --git a/npc/016-1_Woodland/_warps.txt b/npc/016-1_Woodland/_warps.txt
index c6f82f8c..a9c59657 100644
--- a/npc/016-1_Woodland/_warps.txt
+++ b/npc/016-1_Woodland/_warps.txt
@@ -1,4 +1,3 @@
 // 016-1 Woodland warps
 
 016-1.gat,56,20	warp	ToWoodland	1,-1,010-1.gat,56,103
-016-1.gat,19,53	warp	toSwamp	-1,1,025-1.gat,129,58
diff --git a/npc/021-1_Tulimshar/_warps.txt b/npc/021-1_Tulimshar/_warps.txt
index 160955ec..e790bf07 100644
--- a/npc/021-1_Tulimshar/_warps.txt
+++ b/npc/021-1_Tulimshar/_warps.txt
@@ -10,3 +10,5 @@
 021-1.gat,49,63	warp	toMagicSchool	3,-1,024-1.gat,86,72
 021-1.gat,53,99	warp	toTaylor	-1,-1,021-2.gat,25,66
 021-1.gat,52,95	warp	toTaylor	-1,-1,021-2.gat,23,98
+021-1.gat,73,20	warp	ToNorthTulimshar	3,-1,022-1.gat,73,107
+021-1.gat,113,20	warp	ToNorthTulimshar	3,-1,022-1.gat,113,107
diff --git a/npc/021-1_Tulimshar/workers.txt b/npc/021-1_Tulimshar/workers.txt
index 838d41df..24ea8f84 100644
--- a/npc/021-1_Tulimshar/workers.txt
+++ b/npc/021-1_Tulimshar/workers.txt
@@ -6,18 +6,6 @@
 	close;
 }
 
-021-1.gat,73,22,0	script	Construction Worker	155,{
-        mes "[Construction worker]";
-	mes "\"The port is closed for repairs. I can't let you in without a royal order.\"";
-	close;
-}
-
-021-1.gat,113,22,0	script	Construction Worker	155,{
-        mes "[Construction worker]";
-	mes "\"Move along.\"";
-	close;
-}
-
 021-1.gat,156,97,0	script	Construction Worker	155,{
         mes "[Construction worker]";
 	mes "\"East Tulimshar is closed for repairs.\"";
diff --git a/npc/022-1_Tulimshar/_warps.txt b/npc/022-1_Tulimshar/_warps.txt
index 543ca03a..efc172db 100644
--- a/npc/022-1_Tulimshar/_warps.txt
+++ b/npc/022-1_Tulimshar/_warps.txt
@@ -1,4 +1,4 @@
 // 022-1 Tulimshar warps
 
-022-1.gat,101,147	warp	ToCentralTulimshar	3,-1,021-1.gat,73,21
-022-1.gat,141,147	warp	ToCentralTulimshar	3,-1,021-1.gat,113,21
+022-1.gat,72,108	warp	ToCentralTulimshar	3,-1,021-1.gat,73,21
+022-1.gat,113,108	warp	ToCentralTulimshar	3,-1,021-1.gat,113,21
diff --git a/npc/_import.txt b/npc/_import.txt
index 624cac46..aa41757f 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -1,7 +1,7 @@
 import: npc/001-1_Tulimshar/_import.txt
 import: npc/001-2_Tulimshar/_import.txt
 import: npc/001-3_Tulimshar_arena/_import.txt
-import: npc/001-4_Omars_house/_import.txt
+import: npc/001-4_Tulimshar/_import.txt
 import: npc/002-1_Sandstorm/_import.txt
 import: npc/002-3_Desert_mines/_import.txt
 import: npc/002-4_Desert_mines/_import.txt
@@ -44,7 +44,9 @@ import: npc/020-3_Ice_cave/_import.txt
 import: npc/020-4_Ice_cave/_import.txt
 import: npc/021-1_Tulimshar/_import.txt
 import: npc/021-2_Tulimshar/_import.txt
+import: npc/021-8_Meeting_Rooms/_import.txt
 import: npc/022-1_Tulimshar/_import.txt
+import: npc/023-1_Beach_Cliffs/_import.txt
 import: npc/024-1_Tulimshar_Canyon/_import.txt
 import: npc/024-2_Tulimshar_Magic_School/_import.txt
 import: npc/025-1_Woodland_Swamp/_import.txt