Merge commit 'origin/master' into magic

12 files changed, 84 insertions, 64 deletions

diff --git a/npc/001-1_Tulimshar/_mobs.txt b/npc/001-1_Tulimshar/_mobs.txt
index a24fe7c5..ef4c17be 100644
--- a/npc/001-1_Tulimshar/_mobs.txt
+++ b/npc/001-1_Tulimshar/_mobs.txt
@@ -10,6 +10,16 @@
 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
 001-1.gat,120,64,15,13	monster	Maggot	1002,11,0,0,Mob001-1::On1002
+001-1.gat,63,24,3,2	monster	Maggot	1002,2,0,0,Mob001-1::On1002
+001-1.gat,72,64,3,2	monster	Maggots	1002,2,0,0,Mob001-1::On1002
+001-1.gat,97,80,3,2	monster	Maggot	1002,2,0,0,Mob001-1::On1002
+001-1.gat,134,61,3,2	monster	Maggots	1002,2,0,0,Mob001-1::On1002
+001-1.gat,112,47,3,2	monster	Maggot	1002,2,0,0,Mob001-1::On1002
+001-1.gat,129,37,3,2	monster	Maggot	1002,2,0,0,Mob001-1::On1002
+001-1.gat,89,31,3,2	monster	Maggot	1002,2,0,0,Mob001-1::On1002
+001-1.gat,19,78,3,2	monster	Maggot	1002,2,0,0,Mob001-1::On1002
+001-1.gat,122,59,17,22	monster	Giant Maggot	1006,1,0,0,Mob001-1::On1006
+001-1.gat,130,22,1,1	monster	Fire Goblin	1011,1,61000,60000,Mob001-1::On1011
 
 
 001-1.gat,0,0,0	script	Mob001-1	-1,{
@@ -23,5 +33,15 @@ On1003:
 	callfunc "MobPoints";
 	break;
 
+On1006:
+	set @mobID, 1006;
+	callfunc "MobPoints";
+	break;
+
+On1011:
+	set @mobID, 1011;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/001-1_Tulimshar/merchant.txt b/npc/001-1_Tulimshar/merchant.txt
index cd7ecd02..a664e74a 100644
--- a/npc/001-1_Tulimshar/merchant.txt
+++ b/npc/001-1_Tulimshar/merchant.txt
@@ -1,3 +1,3 @@
 //
 
-001-1.gat,39,52,0	shop	Neko	101,501:50,502:60,1201:100,522:300,521:1000,656:250,1202:1000,523:8000,603:-1,724:3000
+001-1.gat,39,52,0	shop	Neko	101,501:50,502:60,1201:100,522:300,521:1000,656:250,1202:1000,523:8000,603:-1,724:3000,735:-1
diff --git a/npc/002-3_Desert_mines/_import.txt b/npc/002-3_Desert_mines/_import.txt
index 3e223b09..acb84bb4 100644
--- a/npc/002-3_Desert_mines/_import.txt
+++ b/npc/002-3_Desert_mines/_import.txt
@@ -2,4 +2,3 @@ map: 002-3.gat
 npc: npc/002-3_Desert_mines/_mobs.txt
 npc: npc/002-3_Desert_mines/_warps.txt
 npc: npc/002-3_Desert_mines/miners.txt
-npc: npc/002-3_Desert_mines/monsters.txt
diff --git a/npc/002-3_Desert_mines/_mobs.txt b/npc/002-3_Desert_mines/_mobs.txt
index 63150759..185351b5 100644
--- a/npc/002-3_Desert_mines/_mobs.txt
+++ b/npc/002-3_Desert_mines/_mobs.txt
@@ -1,7 +1,7 @@
 // 002-3 Desert mines mobs
 
-002-3.gat,38,38,9,9	monster	Red Slime	1008,1,0,0,Mob002-3::On1008
-002-3.gat,82,92,9,9	monster	Black Scorpion	1009,1,0,0,Mob002-3::On1009
+002-3.gat,38,38,9,9	monster	Red Slime	1008,10,0,0,Mob002-3::On1008
+002-3.gat,82,92,9,9	monster	Black Scorpion	1009,10,0,0,Mob002-3::On1009
 
 
 002-3.gat,0,0,0	script	Mob002-3	-1,{
diff --git a/npc/002-3_Desert_mines/miners.txt b/npc/002-3_Desert_mines/miners.txt
index 7f120598..8f69c47d 100644
--- a/npc/002-3_Desert_mines/miners.txt
+++ b/npc/002-3_Desert_mines/miners.txt
@@ -17,7 +17,7 @@ L_message:
 	close;
 }
 
-002-3-1.gat,85,97,6	script	Naem	109,{
+002-3.gat,85,97,6	script	Naem	109,{
 	mes "[Naem the Miner]";
 	mes "\"We discovered an underground palace.";
 	mes "You can get there using the passage on the left.\"";
diff --git a/npc/002-3_Desert_mines/monsters.txt b/npc/002-3_Desert_mines/monsters.txt
deleted file mode 100644
index 550b3d17..00000000
--- a/npc/002-3_Desert_mines/monsters.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Map: new_2-1
-// This is the Desert mines south of Tulimshar -- level 1.
-//
-
-002-3.gat,0,0,0,0	monster	RedSlime	1008,30,2500,0,Mob2::OnRedSlime
-002-3.gat,0,0,0,0	monster	BlackScorpion	1009,15,2500,0,Mob2::OnBlackScorpion
-
-002-3.gat,0,0,0	script	Mob2	-1,{
-OnRedSlime:
-	set @mobID, 1008;
-	callfunc "MobPoints";
-	break;
-
-OnBlackScorpion:
-	set @mobID, 1009;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/npc/002-4_Desert_mines/miners.txt b/npc/002-4_Desert_mines/miners.txt
index 9e67c1ec..90cf4068 100644
--- a/npc/002-4_Desert_mines/miners.txt
+++ b/npc/002-4_Desert_mines/miners.txt
@@ -1,7 +1,7 @@
 //
 
-002-4.gat,32,94,6	script	Naem	109,{
-	mes "[Naem the Miner]";
+002-4.gat,32,94,6	script	Sema	109,{
+	mes "[Sema the Miner]";
 	mes "\"This place is odd.\"";
 	close;
 }
diff --git a/npc/006-1_Desert_mountains/_mobs.txt b/npc/006-1_Desert_mountains/_mobs.txt
index 093bc3bc..f1f813d5 100644
--- a/npc/006-1_Desert_mountains/_mobs.txt
+++ b/npc/006-1_Desert_mountains/_mobs.txt
@@ -1,19 +1,19 @@
 // 006-1 Desert mountains mobs
 
-006-1.gat,25,34,12,31	monster	Snake	1010,5,0,0,Mob006-1::On1010
-006-1.gat,36,29,9,16	monster	Snake	1010,2,0,0,Mob006-1::On1010
-006-1.gat,34,41,4,6	monster	Mountain Snake	1026,1,0,0,Mob006-1::On1026
-006-1.gat,55,37,27,23	monster	Mountain Snake	1026,5,0,0,Mob006-1::On1026
-006-1.gat,89,26,33,13	monster	Mountain Snake	1026,10,0,0,Mob006-1::On1026
-006-1.gat,118,43,22,40	monster	Mountain Snake	1026,15,0,0,Mob006-1::On1026
-006-1.gat,115,49,6,3	monster	Mountain Snake	1026,5,0,0,Mob006-1::On1026
-006-1.gat,88,47,36,11	monster	Mountain Snake	1026,5,0,0,Mob006-1::On1026
-006-1.gat,105,72,25,16	monster	Mountain Snake	1026,6,0,0,Mob006-1::On1026
-006-1.gat,75,106,16,22	monster	Mountain Snake	1026,8,0,0,Mob006-1::On1026
-006-1.gat,102,97,36,29	monster	Mountain Snake	1026,15,0,0,Mob006-1::On1026
-006-1.gat,65,65,49,30	monster	Mountain Snake	1026,15,0,0,Mob006-1::On1026
-006-1.gat,95,120,38,13	monster	Mountain Snake	1026,10,0,0,Mob006-1::On1026
-006-1.gat,54,120,29,7	monster	Mountain Snake	1026,7,0,0,Mob006-1::On1026
+006-1.gat,25,34,12,31	monster	Snake	1010,3,0,0,Mob006-1::On1010
+006-1.gat,36,29,9,16	monster	Snake	1010,1,0,0,Mob006-1::On1010
+006-1.gat,34,41,4,6	monster	Mountain Snake	1026,1,15000,10000,Mob006-1::On1026
+006-1.gat,55,37,27,23	monster	Mountain Snake	1026,3,15000,10000,Mob006-1::On1026
+006-1.gat,89,26,33,13	monster	Mountain Snake	1026,5,15000,10000,Mob006-1::On1026
+006-1.gat,118,43,22,40	monster	Mountain Snake	1026,8,15000,10000,Mob006-1::On1026
+006-1.gat,115,49,6,3	monster	Mountain Snake	1026,3,15000,10000,Mob006-1::On1026
+006-1.gat,88,47,36,11	monster	Mountain Snake	1026,3,15000,10000,Mob006-1::On1026
+006-1.gat,105,72,25,16	monster	Mountain Snake	1026,3,15000,10000,Mob006-1::On1026
+006-1.gat,75,106,16,22	monster	Mountain Snake	1026,4,15000,10000,Mob006-1::On1026
+006-1.gat,102,97,36,29	monster	Mountain Snake	1026,8,15000,10000,Mob006-1::On1026
+006-1.gat,65,65,49,30	monster	Mountain Snake	1026,8,15000,10000,Mob006-1::On1026
+006-1.gat,95,120,38,13	monster	Mountain Snake	1026,5,15000,10000,Mob006-1::On1026
+006-1.gat,54,120,29,7	monster	Mountain Snake	1026,4,15000,10000,Mob006-1::On1026
 006-1.gat,36,98,33,35	monster	Scorpion	1003,10,0,0,Mob006-1::On1003
 
 
diff --git a/npc/006-3_Desert_mountain_caves/_mobs.txt b/npc/006-3_Desert_mountain_caves/_mobs.txt
index 1c7bf5e9..ca5996b9 100644
--- a/npc/006-3_Desert_mountain_caves/_mobs.txt
+++ b/npc/006-3_Desert_mountain_caves/_mobs.txt
@@ -1,32 +1,47 @@
 // 006-3 Desert mountain caves mobs
 
-006-3.gat,108,25,36,8	monster	Mountain Snake	1026,5,0,0,Mob006-3::On1026
-006-3.gat,99,50,14,13	monster	Mountain Snake	1026,2,0,0,Mob006-3::On1026
-006-3.gat,89,63,14,11	monster	Mountain Snake	1026,3,0,0,Mob006-3::On1026
-006-3.gat,86,90,29,9	monster	Mountain Snake	1026,5,0,0,Mob006-3::On1026
-006-3.gat,109,78,12,9	monster	Mountain Snake	1026,1,0,0,Mob006-3::On1026
-006-3.gat,119,117,15,14	monster	Mountain Snake	1026,7,0,0,Mob006-3::On1026
-006-3.gat,57,105,27,30	monster	Mountain Snake	1026,15,0,0,Mob006-3::On1026
-006-3.gat,73,120,16,5	monster	Mountain Snake	1026,6,0,0,Mob006-3::On1026
-006-3.gat,117,54,11,9	monster	Mountain Snake	1026,7,0,0,Mob006-3::On1026
-006-3.gat,123,62,10,5	monster	Mountain Snake	1026,5,0,0,Mob006-3::On1026
-006-3.gat,84,27,5,7	monster	Mountain Snake	1026,2,0,0,Mob006-3::On1026
-006-3.gat,40,40,36,28	monster	Mountain Snake	1026,15,0,0,Mob006-3::On1026
-006-3.gat,34,60,27,11	monster	Mountain Snake	1026,5,0,0,Mob006-3::On1026
-006-3.gat,87,74,26,9	monster	Red Slime	1008,1,0,0,Mob006-3::On1008
-006-3.gat,120,76,9,21	monster	Red Slime	1008,6,0,0,Mob006-3::On1008
-006-3.gat,101,85,14,8	monster	Red Slimes	1008,7,0,0,Mob006-3::On1008
-006-3.gat,44,124,29,7	monster	Mountain Snake	1026,10,0,0,Mob006-3::On1026
-006-3.gat,90,125,17,7	monster	Mountain Snake	1026,10,0,0,Mob006-3::On1026
-006-3.gat,30,88,13,20	monster	Red Slime	1008,5,0,0,Mob006-3::On1008
+006-3.gat,108,25,36,8	monster	Mountain Snake	1026,3,15000,10000,Mob006-3::On1026
+006-3.gat,99,50,14,13	monster	Mountain Snake	1026,1,15000,10000,Mob006-3::On1026
+006-3.gat,89,63,14,11	monster	Mountain Snake	1026,2,15000,10000,Mob006-3::On1026
+006-3.gat,86,90,29,9	monster	Mountain Snake	1026,3,15000,10000,Mob006-3::On1026
+006-3.gat,109,78,12,9	monster	Mountain Snake	1026,1,15000,10000,Mob006-3::On1026
+006-3.gat,119,117,15,14	monster	Mountain Snake	1026,4,15000,10000,Mob006-3::On1026
+006-3.gat,65,71,31,35	monster	Mountain Snake	1026,10,15000,10000,Mob006-3::On1026
+006-3.gat,57,105,27,30	monster	Mountain Snake	1026,8,15000,10000,Mob006-3::On1026
+006-3.gat,73,120,16,5	monster	Mountain Snake	1026,3,15000,10000,Mob006-3::On1026
+006-3.gat,117,54,11,9	monster	Mountain Snake	1026,4,15000,10000,Mob006-3::On1026
+006-3.gat,123,62,10,5	monster	Mountain Snake	1026,3,15000,10000,Mob006-3::On1026
+006-3.gat,84,27,5,7	monster	Mountain Snake	1026,1,15000,10000,Mob006-3::On1026
+006-3.gat,40,40,36,28	monster	Mountain Snake	1026,8,15000,10000,Mob006-3::On1026
+006-3.gat,34,60,27,11	monster	Mountain Snake	1026,3,15000,10000,Mob006-3::On1026
+006-3.gat,87,74,26,9	monster	Red Slime	1008,1,15000,10000,Mob006-3::On1008
+006-3.gat,120,76,9,21	monster	Red Slime	1008,3,15000,10000,Mob006-3::On1008
+006-3.gat,101,85,14,8	monster	Red Slimes	1008,4,15000,10000,Mob006-3::On1008
+006-3.gat,44,124,29,7	monster	Mountain Snake	1026,5,15000,10000,Mob006-3::On1026
+006-3.gat,90,125,17,7	monster	Mountain Snake	1026,5,15000,10000,Mob006-3::On1026
+006-3.gat,30,88,13,20	monster	Red Slime	1008,3,0,0,Mob006-3::On1008
+006-3.gat,122,98,10,16	monster	Spider	1012,3,0,0,Mob006-3::On1012
+006-3.gat,112,104,7,13	monster	Spider	1012,1,0,0,Mob006-3::On1012
+006-3.gat,103,108,9,9	monster	Spider	1012,1,0,0,Mob006-3::On1012
+006-3.gat,83,107,13,14	monster	Yellow slime	1007,6,0,0,Mob006-3::On1007
 
 
 006-3.gat,0,0,0	script	Mob006-3	-1,{
+On1007:
+	set @mobID, 1007;
+	callfunc "MobPoints";
+	break;
+
 On1008:
 	set @mobID, 1008;
 	callfunc "MobPoints";
 	break;
 
+On1012:
+	set @mobID, 1012;
+	callfunc "MobPoints";
+	break;
+
 On1026:
 	set @mobID, 1026;
 	callfunc "MobPoints";
diff --git a/npc/007-1_Woodland/_mobs.txt b/npc/007-1_Woodland/_mobs.txt
index b4653078..bc5aa9d1 100644
--- a/npc/007-1_Woodland/_mobs.txt
+++ b/npc/007-1_Woodland/_mobs.txt
@@ -1,7 +1,8 @@
 // 007-1 Woodland mobs
 
-007-1.gat,119,66,9,9	monster	Fluffy	1020,1,0,0,Mob007-1::On1020
-007-1.gat,96,35,9,9	monster	Sleep Flower	1014,1,0,0,Mob007-1::On1014
+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	script	Mob007-1	-1,{
@@ -10,6 +11,11 @@ On1014:
 	callfunc "MobPoints";
 	break;
 
+On1019:
+	set @mobID, 1019;
+	callfunc "MobPoints";
+	break;
+
 On1020:
 	set @mobID, 1020;
 	callfunc "MobPoints";
diff --git a/npc/010-2_Dimonds_Cove/dimonds.txt b/npc/010-2_Dimonds_Cove/dimonds.txt
index 713b0d69..8f82fc97 100644
--- a/npc/010-2_Dimonds_Cove/dimonds.txt
+++ b/npc/010-2_Dimonds_Cove/dimonds.txt
@@ -115,7 +115,7 @@
 
 010-2.gat,85,41,0	shop	Blacksmith	146,545:20000,529:5,625:20000,626:50000,603:-1
 
-010-2.gat,65,41,0	shop	General Store	137,586:1000,524:1600,544:10000,632:10000,528:1000
+010-2.gat,65,41,0	shop	General Store	137,586:1000,524:1600,544:10000,632:10000,528:1000,735:-1
 
 010-2.gat,75,68,0	script	Basil	107,{
 	set @npcName$, "[Basil the Inn Keeper]";
diff --git a/npc/functions/barber.txt b/npc/functions/barber.txt
index 57c3c598..ceba8fd8 100644
--- a/npc/functions/barber.txt
+++ b/npc/functions/barber.txt
@@ -20,8 +20,8 @@ L_Style:
 		"Center parting/Short and slick", -,
 		"Long and slick", -,
 		"Short and curly", -,
-		"Long and curly", -,
 		"Pigtails", -,
+		"Long and curly", -,
 		"Parted", -,
 		"Supprise me", -,
 		"Nah, I'm fine", L_Done;