Merge commit 'origin/master' into magic

4 files changed, 3 insertions, 24 deletions

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;
-}