Fix name of map 018-2

14 files changed, 36 insertions, 11 deletions

diff --git a/npc/001-1_Tulimshar/_mobs.txt b/npc/001-1_Tulimshar/_mobs.txt
index 731b17b1..a24fe7c5 100644
--- a/npc/001-1_Tulimshar/_mobs.txt
+++ b/npc/001-1_Tulimshar/_mobs.txt
@@ -1,5 +1,11 @@
 // 001-1 Tulimshar mobs
 
+001-1.gat,44,87,2,1	monster	Scorpion	1003,1,30000,0,Mob001-1::On1003
+001-1.gat,44,87,2,1	monster	Scorpion	1003,1,60000,0,Mob001-1::On1003
+001-1.gat,44,87,2,1	monster	Scorpion	1003,1,90000,0,Mob001-1::On1003
+001-1.gat,44,87,2,1	monster	Scorpion	1003,1,180000,0,Mob001-1::On1003
+001-1.gat,44,87,2,1	monster	Scorpion	1003,1,270000,0,Mob001-1::On1003
+001-1.gat,44,87,2,1	monster	Scorpion	1003,1,360000,0,Mob001-1::On1003
 001-1.gat,82,30,9,8	monster	Maggot	1002,5,0,0,Mob001-1::On1002
 001-1.gat,115,25,8,4	monster	Maggot	1002,3,0,0,Mob001-1::On1002
 001-1.gat,124,53,15,13	monster	Maggot	1002,10,0,0,Mob001-1::On1002
@@ -12,5 +18,10 @@ On1002:
 	callfunc "MobPoints";
 	break;
 
+On1003:
+	set @mobID, 1003;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/018-2_Woodland_mining_camp/_import.txt b/npc/018-2_Woodland_mining_camp/_import.txt
new file mode 100644
index 00000000..ebd519f8
--- /dev/null
+++ b/npc/018-2_Woodland_mining_camp/_import.txt
@@ -0,0 +1,8 @@
+map: 018-2.gat
+npc: npc/018-2_Woodland_mining_camp/_mobs.txt
+npc: npc/018-2_Woodland_mining_camp/_warps.txt
+npc: npc/018-2_Woodland_mining_camp/angus.txt
+npc: npc/018-2_Woodland_mining_camp/books.txt
+npc: npc/018-2_Woodland_mining_camp/caul.txt
+npc: npc/018-2_Woodland_mining_camp/miners.txt
+npc: npc/018-2_Woodland_mining_camp/receptionist.txt
diff --git a/npc/018-2_Woodland_minning_camp/_mobs.txt b/npc/018-2_Woodland_mining_camp/_mobs.txt
index 756b1956..836e0697 100644
--- a/npc/018-2_Woodland_minning_camp/_mobs.txt
+++ b/npc/018-2_Woodland_mining_camp/_mobs.txt
@@ -1,4 +1,4 @@
-// 018-2 Woodland minning camp mobs
+// 018-2 Woodland mining camp mobs
 
 018-2.gat,114,21,4,3	monster	Yellow Slime	1007,1,0,0,Mob018-2::On1007
 
diff --git a/npc/018-2_Woodland_minning_camp/_warps.txt b/npc/018-2_Woodland_mining_camp/_warps.txt
index a4252c53..772f1b40 100644
--- a/npc/018-2_Woodland_minning_camp/_warps.txt
+++ b/npc/018-2_Woodland_mining_camp/_warps.txt
@@ -1,4 +1,4 @@
-// 018-2 Woodland minning camp warps
+// 018-2 Woodland mining camp warps
 
 018-2.gat,50,29	warp	toOutside	-1,-1,018-1.gat,65,74
 018-2.gat,41,20	warp	toOutside	-1,-1,018-1.gat,65,69
diff --git a/npc/018-2_Woodland_minning_camp/angus.txt b/npc/018-2_Woodland_mining_camp/angus.txt
index bf9f725e..bf9f725e 100644
--- a/npc/018-2_Woodland_minning_camp/angus.txt
+++ b/npc/018-2_Woodland_mining_camp/angus.txt
diff --git a/npc/018-2_Woodland_minning_camp/books.txt b/npc/018-2_Woodland_mining_camp/books.txt
index 22364c6d..22364c6d 100644
--- a/npc/018-2_Woodland_minning_camp/books.txt
+++ b/npc/018-2_Woodland_mining_camp/books.txt
diff --git a/npc/018-2_Woodland_minning_camp/caul.txt b/npc/018-2_Woodland_mining_camp/caul.txt
index 1aeda920..1aeda920 100644
--- a/npc/018-2_Woodland_minning_camp/caul.txt
+++ b/npc/018-2_Woodland_mining_camp/caul.txt
diff --git a/npc/018-2_Woodland_minning_camp/miners.txt b/npc/018-2_Woodland_mining_camp/miners.txt
index caf8afcd..caf8afcd 100644
--- a/npc/018-2_Woodland_minning_camp/miners.txt
+++ b/npc/018-2_Woodland_mining_camp/miners.txt
diff --git a/npc/018-2_Woodland_minning_camp/receptionist.txt b/npc/018-2_Woodland_mining_camp/receptionist.txt
index ee735d14..ee735d14 100644
--- a/npc/018-2_Woodland_minning_camp/receptionist.txt
+++ b/npc/018-2_Woodland_mining_camp/receptionist.txt
diff --git a/npc/018-2_Woodland_minning_camp/_import.txt b/npc/018-2_Woodland_minning_camp/_import.txt
deleted file mode 100644
index 6b8cbc52..00000000
--- a/npc/018-2_Woodland_minning_camp/_import.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-map: 018-2.gat
-npc: npc/018-2_Woodland_minning_camp/_mobs.txt
-npc: npc/018-2_Woodland_minning_camp/_warps.txt
-npc: npc/018-2_Woodland_minning_camp/angus.txt
-npc: npc/018-2_Woodland_minning_camp/books.txt
-npc: npc/018-2_Woodland_minning_camp/caul.txt
-npc: npc/018-2_Woodland_minning_camp/miners.txt
-npc: npc/018-2_Woodland_minning_camp/receptionist.txt
diff --git a/npc/023-1_Beach_Cliffs/_import.txt b/npc/023-1_Beach_Cliffs/_import.txt
new file mode 100644
index 00000000..3d0bf1e4
--- /dev/null
+++ b/npc/023-1_Beach_Cliffs/_import.txt
@@ -0,0 +1,3 @@
+map: 023-1.gat
+npc: npc/023-1_Beach_Cliffs/_mobs.txt
+npc: npc/023-1_Beach_Cliffs/_warps.txt
diff --git a/npc/023-1_Beach_Cliffs/_mobs.txt b/npc/023-1_Beach_Cliffs/_mobs.txt
new file mode 100644
index 00000000..60725477
--- /dev/null
+++ b/npc/023-1_Beach_Cliffs/_mobs.txt
@@ -0,0 +1,7 @@
+// 023-1 Beach Cliffs mobs
+
+
+
+023-1.gat,0,0,0	script	Mob023-1	-1,{
+	end;
+}
diff --git a/npc/023-1_Beach_Cliffs/_warps.txt b/npc/023-1_Beach_Cliffs/_warps.txt
new file mode 100644
index 00000000..8c3827bd
--- /dev/null
+++ b/npc/023-1_Beach_Cliffs/_warps.txt
@@ -0,0 +1,4 @@
+// 023-1 Beach Cliffs warps
+
+023-1.gat,84,113	warp	ToSandstorm	1,-1,002-1.gat,29,15
+023-1.gat,37,111	warp	ToBeach	1,-1,003-1.gat,141,21
diff --git a/npc/_import.txt b/npc/_import.txt
index ca35201c..626ecc37 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -32,7 +32,7 @@ import: npc/015-1_Woodland/_import.txt
 import: npc/016-1_Woodland/_import.txt
 import: npc/017-1_Woodland_hills/_import.txt
 import: npc/018-1_Woodland_mining_camp/_import.txt
-import: npc/018-2_Woodland_minning_camp/_import.txt
+import: npc/018-2_Woodland_mining_camp/_import.txt
 import: npc/018-3_Cave/_import.txt
 import: npc/019-1_Snow_field/_import.txt
 import: npc/020-1_Nivalis/_import.txt