Merge branch 'master' into magicv2008.12.25

3 files changed, 2 insertions, 27 deletions

diff --git a/npc/004-1_Beach/_import.txt b/npc/004-1_Beach/_import.txt
index 0b1dba07..7bd39a8b 100644
--- a/npc/004-1_Beach/_import.txt
+++ b/npc/004-1_Beach/_import.txt
@@ -1,4 +1,3 @@
 map: 004-1.gat
 npc: npc/004-1_Beach/_mobs.txt
 npc: npc/004-1_Beach/_warps.txt
-npc: npc/004-1_Beach/monsters.txt
diff --git a/npc/004-1_Beach/_warps.txt b/npc/004-1_Beach/_warps.txt
index b6ccc7d0..97af769d 100644
--- a/npc/004-1_Beach/_warps.txt
+++ b/npc/004-1_Beach/_warps.txt
@@ -2,3 +2,5 @@
 
 004-1.gat,84,113	warp	ToSandstorm	1,-1,002-1.gat,29,15
 004-1.gat,37,111	warp	ToBeach	1,-1,003-1.gat,141,21
+004-1.gat,80,31	warp	ToHouse	-1,-1,004-2.gat,21,28
+004-1.gat,86,27	warp	To2ndFloor	-1,-1,004-2.gat,57,65
diff --git a/npc/004-1_Beach/monsters.txt b/npc/004-1_Beach/monsters.txt
deleted file mode 100644
index 8056eead..00000000
--- a/npc/004-1_Beach/monsters.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-// Map: 004-1
-// This is the Beach west of Tulimshar.
-//
-
-004-1.gat,0,0,0,0     monster SeaSlime        1033,30,0,0,Mob34::OnSeaSlime
-004-1.gat,0,0,0,0     monster GiantMaggot     1006,10,0,0,Mob34::OnGiantMaggot
-004-1.gat,0,0,0,0     monster RedScorpion     1004,12,0,0,Mob34::OnRedScorpion
-
-004-1.gat,0,0,0	script	Mob34	-1,{
-OnSeaSlime:
-	set @mobID, 1033;
-	callfunc "MobPoints";
-	break;
-
-OnGiantMaggot:
-	set @mobID, 1006;
-	callfunc "MobPoints";
-	break;
-
-OnRedScorpion:
-	set @mobID, 1004;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}