Merge branch 'master' into magic

3 files changed, 0 insertions, 21 deletions

diff --git a/data/018-1.wlk b/data/018-1.wlk
index 8d1e57ec..38c24166 100644
--- a/data/018-1.wlk
+++ b/data/018-1.wlk
diff --git a/npc/002-4_Desert_mines/_import.txt b/npc/002-4_Desert_mines/_import.txt
index cb715b3d..bad205b9 100644
--- a/npc/002-4_Desert_mines/_import.txt
+++ b/npc/002-4_Desert_mines/_import.txt
@@ -3,4 +3,3 @@ npc: npc/002-4_Desert_mines/_mobs.txt
 npc: npc/002-4_Desert_mines/_warps.txt
 npc: npc/002-4_Desert_mines/chest.txt
 npc: npc/002-4_Desert_mines/miners.txt
-npc: npc/002-4_Desert_mines/monsters.txt
diff --git a/npc/002-4_Desert_mines/monsters.txt b/npc/002-4_Desert_mines/monsters.txt
deleted file mode 100644
index 17d5cdee..00000000
--- a/npc/002-4_Desert_mines/monsters.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Map: 002-4
-// This is the Desert Mines south of Tulimshar -- level 2.
-//
-
-002-4.gat,0,0,0,0	monster	Spider		1012,10,2500,0,Mob5::OnSpider
-002-4.gat,0,0,0,0	monster	YellowSlime	1007,25,2500,0,Mob5::OnYellowSlime
-
-002-4.gat,0,0,0	script	Mob5	-1,{
-OnSpider:
-	set @mobID, 1012;
-	callfunc "MobPoints";
-	break;
-
-OnYellowSlime:
-	set @mobID, 1007;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}