Merge branch 'master' into magic

37 files changed, 246 insertions, 222 deletions

diff --git a/data/001-1.wlk b/data/001-1.wlk
index 05b6c7aa..cf612ae7 100644
--- a/data/001-1.wlk
+++ b/data/001-1.wlk
diff --git a/data/021-1.wlk b/data/021-1.wlk
index 0a56c731..742b008c 100644
--- a/data/021-1.wlk
+++ b/data/021-1.wlk
diff --git a/db/skill_db.txt b/db/skill_db.txt
index 721fa755..818e1d3a 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -1,24 +1,22 @@
-//skill_db.txt＠AthenaDB計画 2004/06/06 14:27:11 +0900 (JST)
-//id,range,hit,inf,pl,nk,max,list_num,castcancel,cast_defence_rate,inf2,maxcount,skill_type,blow_count
-1,0,0,0,0,0,9,0,no,0,0,0,none,0	//NV_BASIC
-2,0,0,0,0,0,10,0,no,0,0,0,weapon,0	//SM_SWORD
-4,0,0,0,0,0,10,0,no,0,0,0,none,0	//SM_RECOVERY
-9,0,0,0,0,0,10,0,no,0,0,0,none,0	//MG_SRECOVERY
-36,0,0,0,0,0,10,0,no,0,0,0,none,0	//MC_INCCARRY
-37,0,0,0,0,0,10,0,no,0,0,0,none,0	//MC_DISCOUNT
-38,0,0,0,0,0,10,0,no,0,0,0,none,0	//MC_OVERCHARGE
-48,0,0,0,0,0,10,0,no,0,0,0,weapon,0	//TF_DOUBLE
-49,0,0,0,0,0,10,0,no,0,0,0,weapon,0	//TF_MISS
-142,0,6,4,0,1,1,1,no,0,1,0,none,0	//NV_FIRSTAID
-144,0,0,0,0,0,1,0,no,0,1,0,none,0	//SM_MOVINGRECOVERY
-146,0,0,0,0,0,1,0,no,0,1,0,weapon,0	//SM_AUTOBERSERK
-150,0,6,4,0,1,1,1,no,0,1,0,weapon,5	//TF_BACKSLIDING
-//NPC Skills
-196,0,0,4,0,1,10,1,no,0,2,0,magic,0	//NPC_SUMMONSLAVE
-197,0,0,4,0,1,10,1,no,0,2,0,none,0	//NPC_EMOTION
-340,0,0,0,0,0,5,0,no,0,0,0,magic,0	//TMW_MAGIC
-341,0,0,0,0,0,5,0,no,0,0,0,magic,0	//TMW_MAGIC_LIFE
-342,0,0,0,0,0,5,0,no,0,0,0,magic,0	//TMW_MAGIC_WAR
-343,0,0,0,0,0,5,0,no,0,0,0,magic,0	//TMW_MAGIC_TRANSMUTE
-344,0,0,0,0,0,5,0,no,0,0,0,magic,0	//TMW_MAGIC_NATURE
-345,0,0,0,0,0,5,0,no,0,0,0,magic,0	//TMW_MAGIC_ASTRAL
+//id,	range,	hit,	inf,	pl,	nk,	max,	list_num,	castcancel,	cast_defence_rate,	inf2,	maxcount,	skill_type,	blow_count
+1,	0,	0,	0,	0,	0,	9,	0,		no,		0,			0,	0,		none,		0	//NV_BASIC
+2,	0,	0,	0,	0,	0,	10,	0,		no,		0,			0,	0,		weapon,		0	//SM_SWORD
+4,	0,	0,	0,	0,	0,	10,	0,		no,		0,			0,	0,		none,		0	//SM_RECOVERY
+9,	0,	0,	0,	0,	0,	10,	0,		no,		0,			0,	0,		none,		0	//MG_SRECOVERY
+36,	0,	0,	0,	0,	0,	10,	0,		no,		0,			0,	0,		none,		0	//MC_INCCARRY
+37,	0,	0,	0,	0,	0,	10,	0,		no,		0,			0,	0,		none,		0	//MC_DISCOUNT
+38,	0,	0,	0,	0,	0,	10,	0,		no,		0,			0,	0,		none,		0	//MC_OVERCHARGE
+48,	0,	0,	0,	0,	0,	10,	0,		no,		0,			0,	0,		weapon,		0	//TF_DOUBLE
+49,	0,	0,	0,	0,	0,	10,	0,		no,		0,			0,	0,		weapon,		0	//TF_MISS
+142,	0,	6,	4,	0,	1,	1,	1,		no,		0,			1,	0,		none,		0	//NV_FIRSTAID
+144,	0,	0,	0,	0,	0,	1,	0,		no,		0,			1,	0,		none,		0	//SM_MOVINGRECOVERY
+146,	0,	0,	0,	0,	0,	1,	0,		no,		0,			1,	0,		weapon,		0	//SM_AUTOBERSERK
+150,	0,	6,	4,	0,	1,	1,	1,		no,		0,			1,	0,		weapon,		5	//TF_BACKSLIDING
+196,	0,	0,	4,	0,	1,	10,	1,		no,		0,			2,	0,		magic,		0	//NPC_SUMMONSLAVE
+197,	0,	0,	4,	0,	1,	10,	1,		no,		0,			2,	0,		none,		0	//NPC_EMOTION
+340,	0,	0,	0,	0,	0,	5,	0,		no,		0,			0,	0,		magic,		0	//TMW_MAGIC
+341,	0,	0,	0,	0,	0,	5,	0,		no,		0,			0,	0,		magic,		0	//TMW_MAGIC_LIFE
+342,	0,	0,	0,	0,	0,	5,	0,		no,		0,			0,	0,		magic,		0	//TMW_MAGIC_WAR
+343,	0,	0,	0,	0,	0,	5,	0,		no,		0,			0,	0,		magic,		0	//TMW_MAGIC_TRANSMUTE
+344,	0,	0,	0,	0,	0,	5,	0,		no,		0,			0,	0,		magic,		0	//TMW_MAGIC_NATURE
+345,	0,	0,	0,	0,	0,	5,	0,		no,		0,			0,	0,		magic,		0	//TMW_MAGIC_ASTRAL
diff --git a/db/skill_require_db.txt b/db/skill_require_db.txt
index a7c63141..006310ce 100644
--- a/db/skill_require_db.txt
+++ b/db/skill_require_db.txt
@@ -1,5 +1,3 @@
-//skill_require_db.txt＠AthenaDB計画 2004/06/16 02:45:31 +0900 (JST)
-//id,list_hp,list_sp,list_hp_rate,list_sp_rate,list_zeny,list_weapon,state,spiritball,itemid1,amount1,itemid2,amount2,itemid3,amount3,itemid4,amount4,itemid5,amount5,itemid6,amount6,itemid7,amount7,itemid8,amount8,itemid9,amount9,itemid10,amount10
-
-142,0,3,0,0,0,99,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NV_FIRSTAID#応急手当#
-150,0,7,0,0,0,99,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//TF_BACKSLIDING#バックステップ#
\ No newline at end of file
+//id,	list_hp,	list_sp,	list_hp_rate,	list_sp_rate,	list_zeny,	list_weapon,	state,	spiritball,	itemid1,	amount1,	itemid2,	amount2,	itemid3,	amount3,	itemid4,	amount4,	itemid5,	amount5,	itemid6,	amount6,	itemid7,	amount7,	itemid8,	amount8,	itemid9,	amount9,	itemid10,	amount10
+142,	0,		3,		0,		0,		0,		99,		none,	0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0	//NV_FIRSTAID#応急手当#
+150,	0,		7,		0,		0,		0,		99,		none,	0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0	//TF_BACKSLIDING#バックステップ#
\ No newline at end of file
diff --git a/npc/001-1_Tulimshar/_import.txt b/npc/001-1_Tulimshar/_import.txt
index 31adafe1..8fe3add8 100644
--- a/npc/001-1_Tulimshar/_import.txt
+++ b/npc/001-1_Tulimshar/_import.txt
@@ -13,7 +13,6 @@ npc: npc/001-1_Tulimshar/guide.txt
 npc: npc/001-1_Tulimshar/man.txt
 npc: npc/001-1_Tulimshar/merchant.txt
 npc: npc/001-1_Tulimshar/monster_guide.txt
-npc: npc/001-1_Tulimshar/monsters.txt
 npc: npc/001-1_Tulimshar/rewards_master.txt
 npc: npc/001-1_Tulimshar/rules.txt
 npc: npc/001-1_Tulimshar/sandra.txt
diff --git a/npc/001-1_Tulimshar/_mobs.txt b/npc/001-1_Tulimshar/_mobs.txt
index db1ae2e8..a24fe7c5 100644
--- a/npc/001-1_Tulimshar/_mobs.txt
+++ b/npc/001-1_Tulimshar/_mobs.txt
@@ -1,7 +1,27 @@
 // 001-1 Tulimshar mobs
 
+001-1.gat,44,87,2,1	monster	Scorpion	1003,1,30000,0,Mob001-1::On1003
+001-1.gat,44,87,2,1	monster	Scorpion	1003,1,60000,0,Mob001-1::On1003
+001-1.gat,44,87,2,1	monster	Scorpion	1003,1,90000,0,Mob001-1::On1003
+001-1.gat,44,87,2,1	monster	Scorpion	1003,1,180000,0,Mob001-1::On1003
+001-1.gat,44,87,2,1	monster	Scorpion	1003,1,270000,0,Mob001-1::On1003
+001-1.gat,44,87,2,1	monster	Scorpion	1003,1,360000,0,Mob001-1::On1003
+001-1.gat,82,30,9,8	monster	Maggot	1002,5,0,0,Mob001-1::On1002
+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,0,0,0	script	Mob001-1	-1,{
+On1002:
+	set @mobID, 1002;
+	callfunc "MobPoints";
+	break;
+
+On1003:
+	set @mobID, 1003;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/001-1_Tulimshar/monsters.txt b/npc/001-1_Tulimshar/monsters.txt
deleted file mode 100644
index e5e19a0d..00000000
--- a/npc/001-1_Tulimshar/monsters.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-// Map: 001-1
-// This is Tulimshar the city -- southern part with market and casino/inn.
-//
-
-001-1.gat,0,0,0,0	monster	Maggot		1002,35,2000,0,Mob3::OnMaggot
-001-1.gat,0,0,0,0	monster	Scorpion	1003,25,2500,0,Mob3::OnScorpion
-001-1.gat,0,0,0,0	monster	Firegoblin	1011,20,2500,0,Mob3::OnFireGoblin
-
-001-1.gat,0,0,0	script	Mob3	-1,{
-OnMaggot:
-	set @mobID, 1002;
-	callfunc "MobPoints";
-	break;
-
-OnScorpion:
-	set @mobID, 1003;
-	callfunc "MobPoints";
-	break;
-
-OnFireGoblin:
-	set @mobID, 1011;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/npc/002-1_Sandstorm/_import.txt b/npc/002-1_Sandstorm/_import.txt
index 14adaccf..cb6b0a78 100644
--- a/npc/002-1_Sandstorm/_import.txt
+++ b/npc/002-1_Sandstorm/_import.txt
@@ -3,6 +3,5 @@ npc: npc/002-1_Sandstorm/_mobs.txt
 npc: npc/002-1_Sandstorm/_warps.txt
 npc: npc/002-1_Sandstorm/dark_mage.txt
 npc: npc/002-1_Sandstorm/merchant.txt
-npc: npc/002-1_Sandstorm/monsters.txt
 npc: npc/002-1_Sandstorm/nomads.txt
 npc: npc/002-1_Sandstorm/rogue.txt
diff --git a/npc/002-1_Sandstorm/_mobs.txt b/npc/002-1_Sandstorm/_mobs.txt
index 2ef2a902..de8532e1 100644
--- a/npc/002-1_Sandstorm/_mobs.txt
+++ b/npc/002-1_Sandstorm/_mobs.txt
@@ -1,6 +1,19 @@
 // 002-1 Sandstorm mobs
 
 002-1.gat,0,0,0,0	monster	Maggot	1002,20,1000,500,Mob002-1::On1002
+002-1.gat,97,98,18,12	monster	Maggot	1002,10,0,0,Mob002-1::On1002
+002-1.gat,90,36,3,2	monster	Maggot	1002,3,0,0,Mob002-1::On1002
+002-1.gat,70,57,3,2	monster	Maggot	1002,3,0,0,Mob002-1::On1002
+002-1.gat,63,83,3,2	monster	Maggot	1002,3,0,0,Mob002-1::On1002
+002-1.gat,16,97,3,2	monster	Maggot	1002,3,0,0,Mob002-1::On1002
+002-1.gat,44,35,3,2	monster	Maggot	1002,3,0,0,Mob002-1::On1002
+002-1.gat,38,29,3,2	monster	Maggot	1002,3,0,0,Mob002-1::On1002
+002-1.gat,72,89,3,2	monster	Maggot	1002,3,0,0,Mob002-1::On1002
+002-1.gat,61,74,41,43	monster	Fire Goblin	1011,15,0,0,Mob002-1::On1011
+002-1.gat,82,24,34,15	monster	Scorpion	1003,8,0,0,Mob002-1::On1003
+002-1.gat,32,35,34,33	monster	Scorpion	1003,8,0,0,Mob002-1::On1003
+002-1.gat,29,81,22,43	monster	Scorpion	1003,8,0,0,Mob002-1::On1003
+002-1.gat,100,76,6,6	monster	Black Scorpion	1009,1,0,1800000,Mob002-1::On1009
 
 
 002-1.gat,0,0,0	script	Mob002-1	-1,{
@@ -9,5 +22,20 @@ On1002:
 	callfunc "MobPoints";
 	break;
 
+On1003:
+	set @mobID, 1003;
+	callfunc "MobPoints";
+	break;
+
+On1009:
+	set @mobID, 1009;
+	callfunc "MobPoints";
+	break;
+
+On1011:
+	set @mobID, 1011;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/002-1_Sandstorm/monsters.txt b/npc/002-1_Sandstorm/monsters.txt
deleted file mode 100644
index 39783382..00000000
--- a/npc/002-1_Sandstorm/monsters.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-// Map: 002-2
-// This is the Desert (Sandstorm) south of Tulimshar.
-//
-
-002-1.gat,0,0,0,0	monster	GreenSlime	1005,50,0,0,Mob1::OnGreenSlime
-002-1.gat,0,0,0,0	monster	GiantMaggot	1006,30,0,0,Mob1::OnGiantMaggot
-002-1.gat,0,0,0,0	monster	RedScorpion	1004,20,0,0,Mob1::OnRedScorpion
-
-002-1.gat,0,0,0	script	Mob1	-1,{
-OnGreenSlime:
-	set @mobID, 1005;
-	callfunc "MobPoints";
-	break;
-
-OnGiantMaggot:
-	set @mobID, 1006;
-	callfunc "MobPoints";
-	break;
-
-OnRedScorpion:
-	set @mobID, 1004;
-	callfunc "MobPoints";
-	break;
-}
diff --git a/npc/003-1_Beach/_import.txt b/npc/003-1_Beach/_import.txt
index 58b5145e..93b04845 100644
--- a/npc/003-1_Beach/_import.txt
+++ b/npc/003-1_Beach/_import.txt
@@ -1,4 +1,3 @@
 map: 003-1.gat
 npc: npc/003-1_Beach/_mobs.txt
 npc: npc/003-1_Beach/_warps.txt
-npc: npc/003-1_Beach/monsters.txt
diff --git a/npc/003-1_Beach/_mobs.txt b/npc/003-1_Beach/_mobs.txt
index c7daca33..6378cd4e 100644
--- a/npc/003-1_Beach/_mobs.txt
+++ b/npc/003-1_Beach/_mobs.txt
@@ -1,17 +1,24 @@
 // 003-1 Beach mobs
 
-003-1.gat,117,48,19,19	monster	Black Scorpion	1009,10,0,0,Mob003-1::On1009
-003-1.gat,105,64,19,19	monster	Snake	1010,10,0,0,Mob003-1::On1010
+003-1.gat,59,69,97,90	monster	Sea Slime	1033,15,0,0,Mob003-1::On1033
+003-1.gat,120,31,22,22	monster	Sea Slime	1033,5,0,0,Mob003-1::On1033
+003-1.gat,119,68,105,101	monster	Green Slime	1005,35,0,0,Mob003-1::On1005
+003-1.gat,134,69,76,71	monster	Red Scorpion	1004,20,0,0,Mob003-1::On1004
 
 
 003-1.gat,0,0,0	script	Mob003-1	-1,{
-On1009:
-	set @mobID, 1009;
+On1004:
+	set @mobID, 1004;
 	callfunc "MobPoints";
 	break;
 
-On1010:
-	set @mobID, 1010;
+On1005:
+	set @mobID, 1005;
+	callfunc "MobPoints";
+	break;
+
+On1033:
+	set @mobID, 1033;
 	callfunc "MobPoints";
 	break;
 
diff --git a/npc/003-1_Beach/monsters.txt b/npc/003-1_Beach/monsters.txt
deleted file mode 100644
index 248cc968..00000000
--- a/npc/003-1_Beach/monsters.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Map: 003-1
-// This is the Desert Beach.
-//
-
-003-1.gat,0,0,0,0	monster	BlackScorpion	1009,20,0,0,Mob15::OnBlackScorpion
-003-1.gat,0,0,0,0	monster	Snake		1010,10,0,0,Mob15::OnSnake
-
-003-1.gat,0,0,0	script	Mob15	-1,{
-OnBlackScorpion:
-	set @mobID, 1009;
-	callfunc "MobPoints";
-	break;
-
-OnSnake:
-	set @mobID, 1010;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/npc/005-1_Snake_desert/_import.txt b/npc/005-1_Snake_desert/_import.txt
index 0259ed1e..3174cc31 100644
--- a/npc/005-1_Snake_desert/_import.txt
+++ b/npc/005-1_Snake_desert/_import.txt
@@ -1,5 +1,4 @@
 map: 005-1.gat
 npc: npc/005-1_Snake_desert/_mobs.txt
 npc: npc/005-1_Snake_desert/_warps.txt
-npc: npc/005-1_Snake_desert/monsters.txt
 npc: npc/005-1_Snake_desert/npcs.txt
diff --git a/npc/005-1_Snake_desert/_mobs.txt b/npc/005-1_Snake_desert/_mobs.txt
index 79d958db..e7d598e1 100644
--- a/npc/005-1_Snake_desert/_mobs.txt
+++ b/npc/005-1_Snake_desert/_mobs.txt
@@ -2,6 +2,15 @@
 
 005-1.gat,0,0,0,0	monster	Maggot	1002,1,0,0,Mob005-1::On1002
 005-1.gat,0,0,0,0	monster	Snake	1010,1,0,0,Mob005-1::On1010
+005-1.gat,71,77,9,6	monster	Snake	1010,4,0,0,Mob005-1::On1010
+005-1.gat,92,25,8,5	monster	Snake	1010,3,0,0,Mob005-1::On1010
+005-1.gat,98,54,95,52	monster	Giant Maggot	1006,20,0,0,Mob005-1::On1006
+005-1.gat,91,18,66,23	monster	Black Scorpion	1009,7,0,0,Mob005-1::On1009
+005-1.gat,99,87,85,32	monster	Black Scorpion	1009,8,0,0,Mob005-1::On1009
+005-1.gat,30,42,20,23	monster	Green Slime	1005,3,0,0,Mob005-1::On1005
+005-1.gat,118,70,3,2	monster	Green Slime	1005,2,0,0,Mob005-1::On1005
+005-1.gat,163,71,32,65	monster	Snake	1010,8,0,0,Mob005-1::On1010
+005-1.gat,96,49,103,48	monster	Maggot	1002,20,0,0,Mob005-1::On1002
 
 
 005-1.gat,0,0,0	script	Mob005-1	-1,{
@@ -10,6 +19,21 @@ On1002:
 	callfunc "MobPoints";
 	break;
 
+On1005:
+	set @mobID, 1005;
+	callfunc "MobPoints";
+	break;
+
+On1006:
+	set @mobID, 1006;
+	callfunc "MobPoints";
+	break;
+
+On1009:
+	set @mobID, 1009;
+	callfunc "MobPoints";
+	break;
+
 On1010:
 	set @mobID, 1010;
 	callfunc "MobPoints";
diff --git a/npc/005-1_Snake_desert/monsters.txt b/npc/005-1_Snake_desert/monsters.txt
deleted file mode 100644
index b2334f11..00000000
--- a/npc/005-1_Snake_desert/monsters.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-// Map: 005-1
-// This is the Snake Desert.
-//
-
-005-1.gat,0,0,0,0	monster	Maggot	1002,20,0,0,Mob7::OnMaggot
-005-1.gat,0,0,0,0	monster	Snake	1010,20,0,0,Mob7::OnSnake
-
-005-1.gat,0,0,0	script	Mob7	-1,{
-OnMaggot:
-	set @mobID, 1002;
-	callfunc "MobPoints";
-	break;
-
-OnSnake:
-	set @mobID, 1010;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/npc/006-1_Desert_mountains/_import.txt b/npc/006-1_Desert_mountains/_import.txt
index aa3a86de..4b1bddea 100644
--- a/npc/006-1_Desert_mountains/_import.txt
+++ b/npc/006-1_Desert_mountains/_import.txt
@@ -2,5 +2,4 @@ map: 006-1.gat
 npc: npc/006-1_Desert_mountains/_mobs.txt
 npc: npc/006-1_Desert_mountains/_warps.txt
 npc: npc/006-1_Desert_mountains/mika.txt
-npc: npc/006-1_Desert_mountains/monsters.txt
 npc: npc/006-1_Desert_mountains/pachua.txt
diff --git a/npc/006-1_Desert_mountains/_mobs.txt b/npc/006-1_Desert_mountains/_mobs.txt
index 0225efff..093bc3bc 100644
--- a/npc/006-1_Desert_mountains/_mobs.txt
+++ b/npc/006-1_Desert_mountains/_mobs.txt
@@ -1,7 +1,37 @@
 // 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,36,98,33,35	monster	Scorpion	1003,10,0,0,Mob006-1::On1003
 
 
 006-1.gat,0,0,0	script	Mob006-1	-1,{
+On1003:
+	set @mobID, 1003;
+	callfunc "MobPoints";
+	break;
+
+On1010:
+	set @mobID, 1010;
+	callfunc "MobPoints";
+	break;
+
+On1026:
+	set @mobID, 1026;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/006-1_Desert_mountains/_warps.txt b/npc/006-1_Desert_mountains/_warps.txt
index 6bc6e86c..823e937e 100644
--- a/npc/006-1_Desert_mountains/_warps.txt
+++ b/npc/006-1_Desert_mountains/_warps.txt
@@ -1,34 +1,34 @@
 // 006-1 Desert mountains warps
 
-006-1.gat,28,21	warp	ToSnakeDesert	-1,-1,005-1.gat,175,96
-006-1.gat,27,22	warp	ToSnakeDesert	-1,-1,005-1.gat,174,97
-006-1.gat,30,19	warp	ToSnakeDesert	-1,-1,005-1.gat,177,94
-006-1.gat,29,20	warp	ToSnakeDesert	-1,-1,005-1.gat,176,95
-006-1.gat,26,23	warp	ToSnakeDesert	-1,-1,005-1.gat,173,98
-006-1.gat,25,24	warp	ToSnakeDesert	-1,-1,005-1.gat,172,99
-006-1.gat,23,26	warp	ToSnakeDesert	-1,-1,005-1.gat,170,101
-006-1.gat,24,25	warp	ToSnakeDesert	-1,-1,005-1.gat,171,100
-006-1.gat,22,27	warp	ToSnakeDesert	-1,-1,005-1.gat,169,102
-006-1.gat,21,28	warp	ToSnakeDesert	-1,-1,005-1.gat,168,103
-006-1.gat,20,29	warp	ToSnakeDesert	-1,-1,005-1.gat,167,104
-006-1.gat,19,30	warp	ToSnakeDesert	-1,-1,005-1.gat,166,105
-006-1.gat,18,31	warp	ToSnakeDesert	-1,-1,005-1.gat,165,106
-006-1.gat,40,26	warp	ToDesertMountainCaves	-1,-1,006-3.gat,40,27
-006-1.gat,60,58	warp	ToDesertMountainCaves	-1,-1,006-3.gat,60,69
-006-1.gat,62,30	warp	ToDesertMountainCaves	-1,-1,006-3.gat,62,31
-006-1.gat,55,27	warp	ToDesertMountainCaves	-1,-1,006-3.gat,55,28
-006-1.gat,77,44	warp	ToDesertMountainCaves	-1,-1,006-3.gat,77,45
-006-1.gat,86,24	warp	ToDesertMountainCaves	-1,-1,006-3.gat,86,25
-006-1.gat,91,24	warp	ToDesertMountainCaves	-1,-1,006-3.gat,91,25
-006-1.gat,104,44	warp	ToDesertMountainCaves	-1,-1,006-3.gat,104,45
-006-1.gat,122,24	warp	ToDesertMountainCaves	-1,-1,006-3.gat,122,25
-006-1.gat,114,49	warp	ToDesertMountainCaves	-1,-1,006-3.gat,114,50
-006-1.gat,110,56	warp	ToDesertMountainCaves	-1,-1,006-3.gat,110,57
-006-1.gat,125,59	warp	ToDesertMountainCaves	-1,-1,006-3.gat,125,60
-006-1.gat,92,63	warp	ToDesertMountainCaves	-1,-1,006-3.gat,92,64
-006-1.gat,112,74	warp	ToDesertMountainCaves	-1,-1,006-3.gat,112,75
-006-1.gat,121,110	warp	ToDesertMountainCaves	-1,-1,006-3.gat,121,111
-006-1.gat,79,120	warp	ToDesertMountainCaves	-1,-1,006-3.gat,79,121
-006-1.gat,38,121	warp	ToDesertMountainCaves	-1,-1,006-3.gat,38,122
-006-1.gat,74,90	warp	ToDesertMountainCaves	-1,-1,006-3.gat,74,91
-006-1.gat,51,90	warp	ToDesertMountainCaves	-1,-1,006-3.gat,51,91
+006-1.gat,28,21	warp	ToDesert	-1,-1,005-1.gat,175,96
+006-1.gat,27,22	warp	ToDesert	-1,-1,005-1.gat,174,97
+006-1.gat,30,19	warp	ToDesert	-1,-1,005-1.gat,177,94
+006-1.gat,29,20	warp	ToDesert	-1,-1,005-1.gat,176,95
+006-1.gat,26,23	warp	ToDesert	-1,-1,005-1.gat,173,98
+006-1.gat,25,24	warp	ToDesert	-1,-1,005-1.gat,172,99
+006-1.gat,23,26	warp	ToDesert	-1,-1,005-1.gat,170,101
+006-1.gat,24,25	warp	ToDesert	-1,-1,005-1.gat,171,100
+006-1.gat,22,27	warp	ToDesert	-1,-1,005-1.gat,169,102
+006-1.gat,21,28	warp	ToDesert	-1,-1,005-1.gat,168,103
+006-1.gat,20,29	warp	ToDesert	-1,-1,005-1.gat,167,104
+006-1.gat,19,30	warp	ToDesert	-1,-1,005-1.gat,166,105
+006-1.gat,18,31	warp	ToDesert	-1,-1,005-1.gat,165,106
+006-1.gat,40,26	warp	ToCave	-1,-1,006-3.gat,40,27
+006-1.gat,60,58	warp	ToCave	-1,-1,006-3.gat,60,69
+006-1.gat,62,30	warp	ToCave	-1,-1,006-3.gat,62,31
+006-1.gat,55,27	warp	ToCave	-1,-1,006-3.gat,55,28
+006-1.gat,77,44	warp	ToCave	-1,-1,006-3.gat,77,45
+006-1.gat,86,24	warp	ToCave	-1,-1,006-3.gat,86,25
+006-1.gat,91,24	warp	ToCave	-1,-1,006-3.gat,91,25
+006-1.gat,104,44	warp	ToCave	-1,-1,006-3.gat,104,45
+006-1.gat,122,24	warp	ToCave	-1,-1,006-3.gat,122,25
+006-1.gat,114,49	warp	ToCave	-1,-1,006-3.gat,114,50
+006-1.gat,110,56	warp	ToCave	-1,-1,006-3.gat,110,57
+006-1.gat,125,59	warp	ToCave	-1,-1,006-3.gat,125,60
+006-1.gat,92,63	warp	ToCave	-1,-1,006-3.gat,92,64
+006-1.gat,112,74	warp	ToCave	-1,-1,006-3.gat,112,75
+006-1.gat,121,110	warp	ToCave	-1,-1,006-3.gat,121,111
+006-1.gat,79,120	warp	ToCave	-1,-1,006-3.gat,79,121
+006-1.gat,38,121	warp	ToCave	-1,-1,006-3.gat,38,122
+006-1.gat,74,90	warp	ToCave	-1,-1,006-3.gat,74,91
+006-1.gat,51,90	warp	ToCave	-1,-1,006-3.gat,51,91
diff --git a/npc/006-1_Desert_mountains/monsters.txt b/npc/006-1_Desert_mountains/monsters.txt
deleted file mode 100644
index 6942d2cf..00000000
--- a/npc/006-1_Desert_mountains/monsters.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-// Map: 006-1
-// This is the Desert Mountains.
-//
-
-006-1.gat,0,0,0,0	monster	MountainSnake	1026,60,0,0,Mob24::OnMountainSnake
-
-006-1.gat,0,0,0	script	Mob24	-1,{
-OnMountainSnake:
-	set @mobID, 1026;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/npc/006-3_Desert_mountain_caves/_import.txt b/npc/006-3_Desert_mountain_caves/_import.txt
index f3a4690c..36f898bc 100644
--- a/npc/006-3_Desert_mountain_caves/_import.txt
+++ b/npc/006-3_Desert_mountain_caves/_import.txt
@@ -1,4 +1,3 @@
 map: 006-3.gat
 npc: npc/006-3_Desert_mountain_caves/_mobs.txt
 npc: npc/006-3_Desert_mountain_caves/_warps.txt
-npc: npc/006-3_Desert_mountain_caves/monsters.txt
diff --git a/npc/006-3_Desert_mountain_caves/_mobs.txt b/npc/006-3_Desert_mountain_caves/_mobs.txt
index fd6e317b..1c7bf5e9 100644
--- a/npc/006-3_Desert_mountain_caves/_mobs.txt
+++ b/npc/006-3_Desert_mountain_caves/_mobs.txt
@@ -1,7 +1,36 @@
 // 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,0,0,0	script	Mob006-3	-1,{
+On1008:
+	set @mobID, 1008;
+	callfunc "MobPoints";
+	break;
+
+On1026:
+	set @mobID, 1026;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/006-3_Desert_mountain_caves/_warps.txt b/npc/006-3_Desert_mountain_caves/_warps.txt
index 25e7ee54..bbcc2492 100644
--- a/npc/006-3_Desert_mountain_caves/_warps.txt
+++ b/npc/006-3_Desert_mountain_caves/_warps.txt
@@ -1,21 +1,21 @@
 // 006-3 Desert mountain caves warps
 
-006-3.gat,40,26	warp	CavesExit	-1,-1,006-1.gat,40,27
-006-3.gat,55,27	warp	CavesExit	-1,-1,006-1.gat,55,28
-006-3.gat,62,30	warp	CavesExit	-1,-1,006-1.gat,62,31
-006-3.gat,86,24	warp	CavesExit	-1,-1,006-1.gat,86,25
-006-3.gat,91,24	warp	CavesExit	-1,-1,006-1.gat,91,25
-006-3.gat,122,24	warp	CavesExit	-1,-1,006-1.gat,122,25
-006-3.gat,114,49	warp	CavesExit	-1,-1,006-1.gat,114,50
-006-3.gat,104,44	warp	CavesExit	-1,-1,006-1.gat,104,45
-006-3.gat,77,44	warp	CavesExit	-1,-1,006-1.gat,77,45
-006-3.gat,60,68	warp	CavesExit	-1,-1,006-1.gat,60,59
-006-3.gat,92,63	warp	CavesExit	-1,-1,006-1.gat,92,64
-006-3.gat,112,74	warp	CavesExit	-1,-1,006-1.gat,112,75
-006-3.gat,110,56	warp	CavesExit	-1,-1,006-1.gat,110,57
-006-3.gat,125,59	warp	CavesExit	-1,-1,006-1.gat,125,60
-006-3.gat,74,90	warp	CavesExit	-1,-1,006-1.gat,74,91
-006-3.gat,51,90	warp	CavesExit	-1,-1,006-1.gat,51,91
-006-3.gat,38,121	warp	CavesExit	-1,-1,006-1.gat,38,122
-006-3.gat,79,120	warp	CavesExit	-1,-1,006-1.gat,79,121
-006-3.gat,121,110	warp	CavesExit	-1,-1,006-1.gat,121,111
+006-3.gat,40,26	warp	ToOutside	-1,-1,006-1.gat,40,27
+006-3.gat,55,27	warp	ToOutside	-1,-1,006-1.gat,55,28
+006-3.gat,62,30	warp	ToOutside	-1,-1,006-1.gat,62,31
+006-3.gat,86,24	warp	ToOutside	-1,-1,006-1.gat,86,25
+006-3.gat,91,24	warp	ToOutside	-1,-1,006-1.gat,91,25
+006-3.gat,122,24	warp	ToOutside	-1,-1,006-1.gat,122,25
+006-3.gat,114,49	warp	ToOutside	-1,-1,006-1.gat,114,50
+006-3.gat,104,44	warp	ToOutside	-1,-1,006-1.gat,104,45
+006-3.gat,77,44	warp	ToOutside	-1,-1,006-1.gat,77,45
+006-3.gat,60,68	warp	ToOutside	-1,-1,006-1.gat,60,59
+006-3.gat,92,63	warp	ToOutside	-1,-1,006-1.gat,92,64
+006-3.gat,112,74	warp	ToOutside	-1,-1,006-1.gat,112,75
+006-3.gat,110,56	warp	ToOutside	-1,-1,006-1.gat,110,57
+006-3.gat,125,59	warp	ToOutside	-1,-1,006-1.gat,125,60
+006-3.gat,74,90	warp	ToOutside	-1,-1,006-1.gat,74,91
+006-3.gat,51,90	warp	ToOutside	-1,-1,006-1.gat,51,91
+006-3.gat,38,121	warp	ToOutside	-1,-1,006-1.gat,38,122
+006-3.gat,79,120	warp	ToOutside	-1,-1,006-1.gat,79,121
+006-3.gat,121,110	warp	ToOutside	-1,-1,006-1.gat,121,111
diff --git a/npc/006-3_Desert_mountain_caves/monsters.txt b/npc/006-3_Desert_mountain_caves/monsters.txt
deleted file mode 100644
index 5aee03a4..00000000
--- a/npc/006-3_Desert_mountain_caves/monsters.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-// Map: 006-3
-// This is the Desert Mountains Caves.
-//
-
-006-3.gat,0,0,0,0	monster	MountainSnake	1026,50,0,0,Mob25::OnMountainSnake
-
-006-3.gat,0,0,0	script	Mob25	-1,{
-OnMountainSnake:
-	set @mobID, 1026;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/npc/018-2_Woodland_mining_camp/_import.txt b/npc/018-2_Woodland_mining_camp/_import.txt
new file mode 100644
index 00000000..ebd519f8
--- /dev/null
+++ b/npc/018-2_Woodland_mining_camp/_import.txt
@@ -0,0 +1,8 @@
+map: 018-2.gat
+npc: npc/018-2_Woodland_mining_camp/_mobs.txt
+npc: npc/018-2_Woodland_mining_camp/_warps.txt
+npc: npc/018-2_Woodland_mining_camp/angus.txt
+npc: npc/018-2_Woodland_mining_camp/books.txt
+npc: npc/018-2_Woodland_mining_camp/caul.txt
+npc: npc/018-2_Woodland_mining_camp/miners.txt
+npc: npc/018-2_Woodland_mining_camp/receptionist.txt
diff --git a/npc/018-2_Woodland_minning_camp/_mobs.txt b/npc/018-2_Woodland_mining_camp/_mobs.txt
index 756b1956..836e0697 100644
--- a/npc/018-2_Woodland_minning_camp/_mobs.txt
+++ b/npc/018-2_Woodland_mining_camp/_mobs.txt
@@ -1,4 +1,4 @@
-// 018-2 Woodland minning camp mobs
+// 018-2 Woodland mining camp mobs
 
 018-2.gat,114,21,4,3	monster	Yellow Slime	1007,1,0,0,Mob018-2::On1007
 
diff --git a/npc/018-2_Woodland_minning_camp/_warps.txt b/npc/018-2_Woodland_mining_camp/_warps.txt
index a4252c53..772f1b40 100644
--- a/npc/018-2_Woodland_minning_camp/_warps.txt
+++ b/npc/018-2_Woodland_mining_camp/_warps.txt
@@ -1,4 +1,4 @@
-// 018-2 Woodland minning camp warps
+// 018-2 Woodland mining camp warps
 
 018-2.gat,50,29	warp	toOutside	-1,-1,018-1.gat,65,74
 018-2.gat,41,20	warp	toOutside	-1,-1,018-1.gat,65,69
diff --git a/npc/018-2_Woodland_minning_camp/angus.txt b/npc/018-2_Woodland_mining_camp/angus.txt
index bf9f725e..bf9f725e 100644
--- a/npc/018-2_Woodland_minning_camp/angus.txt
+++ b/npc/018-2_Woodland_mining_camp/angus.txt
diff --git a/npc/018-2_Woodland_minning_camp/books.txt b/npc/018-2_Woodland_mining_camp/books.txt
index 22364c6d..22364c6d 100644
--- a/npc/018-2_Woodland_minning_camp/books.txt
+++ b/npc/018-2_Woodland_mining_camp/books.txt
diff --git a/npc/018-2_Woodland_minning_camp/caul.txt b/npc/018-2_Woodland_mining_camp/caul.txt
index 1aeda920..1aeda920 100644
--- a/npc/018-2_Woodland_minning_camp/caul.txt
+++ b/npc/018-2_Woodland_mining_camp/caul.txt
diff --git a/npc/018-2_Woodland_minning_camp/miners.txt b/npc/018-2_Woodland_mining_camp/miners.txt
index caf8afcd..caf8afcd 100644
--- a/npc/018-2_Woodland_minning_camp/miners.txt
+++ b/npc/018-2_Woodland_mining_camp/miners.txt
diff --git a/npc/018-2_Woodland_minning_camp/receptionist.txt b/npc/018-2_Woodland_mining_camp/receptionist.txt
index ee735d14..ee735d14 100644
--- a/npc/018-2_Woodland_minning_camp/receptionist.txt
+++ b/npc/018-2_Woodland_mining_camp/receptionist.txt
diff --git a/npc/018-2_Woodland_minning_camp/_import.txt b/npc/018-2_Woodland_minning_camp/_import.txt
deleted file mode 100644
index 6b8cbc52..00000000
--- a/npc/018-2_Woodland_minning_camp/_import.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-map: 018-2.gat
-npc: npc/018-2_Woodland_minning_camp/_mobs.txt
-npc: npc/018-2_Woodland_minning_camp/_warps.txt
-npc: npc/018-2_Woodland_minning_camp/angus.txt
-npc: npc/018-2_Woodland_minning_camp/books.txt
-npc: npc/018-2_Woodland_minning_camp/caul.txt
-npc: npc/018-2_Woodland_minning_camp/miners.txt
-npc: npc/018-2_Woodland_minning_camp/receptionist.txt
diff --git a/npc/023-1_Beach_Cliffs/_import.txt b/npc/023-1_Beach_Cliffs/_import.txt
new file mode 100644
index 00000000..3d0bf1e4
--- /dev/null
+++ b/npc/023-1_Beach_Cliffs/_import.txt
@@ -0,0 +1,3 @@
+map: 023-1.gat
+npc: npc/023-1_Beach_Cliffs/_mobs.txt
+npc: npc/023-1_Beach_Cliffs/_warps.txt
diff --git a/npc/023-1_Beach_Cliffs/_mobs.txt b/npc/023-1_Beach_Cliffs/_mobs.txt
new file mode 100644
index 00000000..60725477
--- /dev/null
+++ b/npc/023-1_Beach_Cliffs/_mobs.txt
@@ -0,0 +1,7 @@
+// 023-1 Beach Cliffs mobs
+
+
+
+023-1.gat,0,0,0	script	Mob023-1	-1,{
+	end;
+}
diff --git a/npc/023-1_Beach_Cliffs/_warps.txt b/npc/023-1_Beach_Cliffs/_warps.txt
new file mode 100644
index 00000000..8c3827bd
--- /dev/null
+++ b/npc/023-1_Beach_Cliffs/_warps.txt
@@ -0,0 +1,4 @@
+// 023-1 Beach Cliffs warps
+
+023-1.gat,84,113	warp	ToSandstorm	1,-1,002-1.gat,29,15
+023-1.gat,37,111	warp	ToBeach	1,-1,003-1.gat,141,21
diff --git a/npc/_import.txt b/npc/_import.txt
index 74464305..626ecc37 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -32,7 +32,7 @@ import: npc/015-1_Woodland/_import.txt
 import: npc/016-1_Woodland/_import.txt
 import: npc/017-1_Woodland_hills/_import.txt
 import: npc/018-1_Woodland_mining_camp/_import.txt
-import: npc/018-2_Woodland_minning_camp/_import.txt
+import: npc/018-2_Woodland_mining_camp/_import.txt
 import: npc/018-3_Cave/_import.txt
 import: npc/019-1_Snow_field/_import.txt
 import: npc/020-1_Nivalis/_import.txt
@@ -41,4 +41,4 @@ 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/022-1_Beach_Cliffs/_import.txt
+import: npc/023-1_Beach_Cliffs/_import.txt