Merge commit 'mainline/master'

17 files changed, 100 insertions, 1 deletions

diff --git a/npc/007-1_Woodland/_mobs.txt b/npc/007-1_Woodland/_mobs.txt
index bc5aa9d1..62e588ab 100644
--- a/npc/007-1_Woodland/_mobs.txt
+++ b/npc/007-1_Woodland/_mobs.txt
@@ -3,6 +3,7 @@
 007-1.gat,53,46,67,53	monster	Flower	1014,15,0,0,Mob007-1::On1014
 007-1.gat,105,57,53,74	monster	Fluffy	1020,20,0,0,Mob007-1::On1020
 007-1.gat,105,48,55,51	monster	Spiky Mushroom	1019,10,0,0,Mob007-1::On1019
+007-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob007-1::On1037
 
 
 007-1.gat,0,0,0	script	Mob007-1	-1,{
@@ -21,5 +22,10 @@ On1020:
 	callfunc "MobPoints";
 	break;
 
+On1037:
+	set @mobID, 1037;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/008-1_Hurnscald_outskirts/_mobs.txt b/npc/008-1_Hurnscald_outskirts/_mobs.txt
index 2ae45fb9..45df49ae 100644
--- a/npc/008-1_Hurnscald_outskirts/_mobs.txt
+++ b/npc/008-1_Hurnscald_outskirts/_mobs.txt
@@ -1,7 +1,13 @@
 // 008-1 Hurnscald outskirts mobs
 
+008-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob008-1::On1037
 
 
 008-1.gat,0,0,0	script	Mob008-1	-1,{
+On1037:
+	set @mobID, 1037;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/009-1_Hurnscald/_mobs.txt b/npc/009-1_Hurnscald/_mobs.txt
index 8e5290ee..4f2d0f57 100644
--- a/npc/009-1_Hurnscald/_mobs.txt
+++ b/npc/009-1_Hurnscald/_mobs.txt
@@ -1,7 +1,19 @@
 // 009-1 Hurnscald mobs
 
+009-1.gat,74,32,2,1	monster	Clover patch	1037,1,0,120000,Mob009-1::On1037
+009-1.gat,29,44,9,13	monster	Flower	1014,2,0,250,Mob009-1::On1014
 
 
 009-1.gat,0,0,0	script	Mob009-1	-1,{
+On1014:
+	set @mobID, 1014;
+	callfunc "MobPoints";
+	break;
+
+On1037:
+	set @mobID, 1037;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/009-1_Hurnscald/old_woman.txt b/npc/009-1_Hurnscald/old_woman.txt
index 9f3d26ec..1df4229f 100644
--- a/npc/009-1_Hurnscald/old_woman.txt
+++ b/npc/009-1_Hurnscald/old_woman.txt
@@ -1,12 +1,22 @@
 // Old woman
 
 009-1.gat,29,43,0	script	Old Woman	154,{
+	if (BaseLevel < 40) goto L_Lower;
+
 	mes "[Old Woman]";
 	mes "\"Hello deary.\"";
 	next;
+
+L_Continue:
 	if ((Inspector >= 1  && Inspector <= 7) || Inspector == 9) goto L_NohMask;
 	close;
 
+L_Lower:
+	mes "[Old Woman]";
+	mes "\"Watch out for these flowers. They don't like to be messed with.\"";
+	next;
+	goto L_Continue;
+
 L_NohMask:
 	if (Inspector == 7) goto L_NohMask_Alibi;
 	callfunc "ProcessEquip";
diff --git a/npc/010-1_Woodland/_mobs.txt b/npc/010-1_Woodland/_mobs.txt
index c4b359db..efd7a0af 100644
--- a/npc/010-1_Woodland/_mobs.txt
+++ b/npc/010-1_Woodland/_mobs.txt
@@ -2,6 +2,7 @@
 
 010-1.gat,82,63,19,19	monster	Scorpion	1003,1,0,0,Mob010-1::On1003
 010-1.gat,49,71,31,19	monster	Shroom	1019,1,0,0,Mob010-1::On1019
+010-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob010-1::On1037
 
 
 010-1.gat,0,0,0	script	Mob010-1	-1,{
@@ -15,5 +16,10 @@ On1019:
 	callfunc "MobPoints";
 	break;
 
+On1037:
+	set @mobID, 1037;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/011-1_Woodland/_mobs.txt b/npc/011-1_Woodland/_mobs.txt
index 9d20aeaa..0d6971cf 100644
--- a/npc/011-1_Woodland/_mobs.txt
+++ b/npc/011-1_Woodland/_mobs.txt
@@ -1,7 +1,13 @@
 // 011-1 Woodland mobs
 
+011-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob011-1::On1037
 
 
 011-1.gat,0,0,0	script	Mob011-1	-1,{
+On1037:
+	set @mobID, 1037;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/012-1_Woodland_Hills/_mobs.txt b/npc/012-1_Woodland_Hills/_mobs.txt
index 8bb05fe9..a5159257 100644
--- a/npc/012-1_Woodland_Hills/_mobs.txt
+++ b/npc/012-1_Woodland_Hills/_mobs.txt
@@ -1,7 +1,13 @@
 // 012-1 Woodland Hills mobs
 
+012-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob012-1::On1037
 
 
 012-1.gat,0,0,0	script	Mob012-1	-1,{
+On1037:
+	set @mobID, 1037;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/013-1_Woodland_hills/_mobs.txt b/npc/013-1_Woodland_hills/_mobs.txt
index 159476a8..32aeb3f6 100644
--- a/npc/013-1_Woodland_hills/_mobs.txt
+++ b/npc/013-1_Woodland_hills/_mobs.txt
@@ -1,7 +1,13 @@
 // 013-1 Woodland hills mobs
 
+013-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob013-1::On1037
 
 
 013-1.gat,0,0,0	script	Mob013-1	-1,{
+On1037:
+	set @mobID, 1037;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/014-1_Woodland/_mobs.txt b/npc/014-1_Woodland/_mobs.txt
index 3fd75a93..4c86f12b 100644
--- a/npc/014-1_Woodland/_mobs.txt
+++ b/npc/014-1_Woodland/_mobs.txt
@@ -1,7 +1,13 @@
 // 014-1 Woodland mobs
 
+014-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob014-1::On1037
 
 
 014-1.gat,0,0,0	script	Mob014-1	-1,{
+On1037:
+	set @mobID, 1037;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/015-1_Woodland/_mobs.txt b/npc/015-1_Woodland/_mobs.txt
index 6ec8206f..da5ffd9a 100644
--- a/npc/015-1_Woodland/_mobs.txt
+++ b/npc/015-1_Woodland/_mobs.txt
@@ -1,7 +1,13 @@
 // 015-1 Woodland mobs
 
+015-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob015-1::On1037
 
 
 015-1.gat,0,0,0	script	Mob015-1	-1,{
+On1037:
+	set @mobID, 1037;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/016-1_Woodland/_mobs.txt b/npc/016-1_Woodland/_mobs.txt
index dd0a4eca..54580a42 100644
--- a/npc/016-1_Woodland/_mobs.txt
+++ b/npc/016-1_Woodland/_mobs.txt
@@ -1,7 +1,13 @@
 // 016-1 Woodland mobs
 
+016-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob016-1::On1037
 
 
 016-1.gat,0,0,0	script	Mob016-1	-1,{
+On1037:
+	set @mobID, 1037;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/017-1_Woodland_hills/_mobs.txt b/npc/017-1_Woodland_hills/_mobs.txt
index c14e5e2f..e8b7f270 100644
--- a/npc/017-1_Woodland_hills/_mobs.txt
+++ b/npc/017-1_Woodland_hills/_mobs.txt
@@ -1,7 +1,13 @@
 // 017-1 Woodland hills mobs
 
+017-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob017-1::On1037
 
 
 017-1.gat,0,0,0	script	Mob017-1	-1,{
+On1037:
+	set @mobID, 1037;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/018-1_Woodland_mining_camp/_mobs.txt b/npc/018-1_Woodland_mining_camp/_mobs.txt
index 0a7c1c47..8bab1d82 100644
--- a/npc/018-1_Woodland_mining_camp/_mobs.txt
+++ b/npc/018-1_Woodland_mining_camp/_mobs.txt
@@ -15,7 +15,7 @@
 018-1.gat,149,45,10,8	monster	Bat	1017,5,100000,30000,Mob018-1::On1017
 018-1.gat,169,47,20,10	monster	Red Slime	1008,4,120000,30000,Mob018-1::On1008
 018-1.gat,136,49,13,8	monster	Bat	1017,4,100000,30000,Mob018-1::On1017
-018-1.gat,136,49,13,8	monster	Silk Worm	1037,2,240000,120000,Mob018-1::On1037
+018-1.gat,136,49,13,9	monster	Clover Patch	1037,1,0,0,Mob018-1::On1037
 018-1.gat,111,62,5,2	monster	Silk Worm	1035,1,60000,30000,Mob018-1::On1035
 018-1.gat,117,50,4,3	monster	Sea Slime	1033,1,120000,60000,Mob018-1::On1033
 018-1.gat,96,47,18,11	monster	Red Slime	1008,3,100000,50000,Mob018-1::On1008
@@ -24,6 +24,7 @@
 018-1.gat,145,24,10,9	monster	Red Slime	1008,3,100000,50000,Mob018-1::On1008
 018-1.gat,68,89,14,17	monster	Bat	1017,3,100000,50000,Mob018-1::On1017
 018-1.gat,160,31,11,18	monster	Red Slime	1008,5,100000,50000,Mob018-1::On1008
+018-1.gat,0,0,0,0	monster	Clover	1037,2,0,1000,Mob018-1::On1037
 
 
 018-1.gat,0,0,0	script	Mob018-1	-1,{
diff --git a/npc/022-1_Tulimshar/_import.txt b/npc/022-1_Tulimshar/_import.txt
new file mode 100644
index 00000000..e3e6f0d8
--- /dev/null
+++ b/npc/022-1_Tulimshar/_import.txt
@@ -0,0 +1,3 @@
+map: 022-1.gat
+npc: npc/022-1_Tulimshar/_mobs.txt
+npc: npc/022-1_Tulimshar/_warps.txt
diff --git a/npc/022-1_Tulimshar/_mobs.txt b/npc/022-1_Tulimshar/_mobs.txt
new file mode 100644
index 00000000..22587c8c
--- /dev/null
+++ b/npc/022-1_Tulimshar/_mobs.txt
@@ -0,0 +1,7 @@
+// 022-1 Tulimshar mobs
+
+
+
+022-1.gat,0,0,0	script	Mob022-1	-1,{
+	end;
+}
diff --git a/npc/022-1_Tulimshar/_warps.txt b/npc/022-1_Tulimshar/_warps.txt
new file mode 100644
index 00000000..543ca03a
--- /dev/null
+++ b/npc/022-1_Tulimshar/_warps.txt
@@ -0,0 +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
diff --git a/npc/_import.txt b/npc/_import.txt
index 9b3acaf8..c9c7aaa8 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -42,6 +42,8 @@ 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