Fixed inconsistencies with nob_skill_db, and mosk_dun spawns. (bugreport:2148 and bugreport:2165)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13188 54d463be-8e91-2dee-dedb-b68131a5f0ec

4 files changed, 37 insertions, 32 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 2ce220389..409c338ff 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -40,8 +40,10 @@
 	2385 Recuvative_Armor		Should trigger HP/SP return with magical kills as well.
 
 =======================
+2008/09/03
+	* Fixed minor inconsistencies with mob_skill_db. (bugreport:2148) [L0ne_W0lf]
 2008/08/31
-	* Rev. 13160 Added item effects for Mercenary potions. [L0ne_W0lf] 
+	* Rev. 13160 Added item effects for Mercenary potions. [L0ne_W0lf]
 2008/08/29
 	* Rev. 13153 Couple small corrections to the mob database. [L0ne_W0lf]
 2008/08/25
diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt
index e5f0838e9..c0b9531ea 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -4645,12 +4645,12 @@
 1880,Leshij@AL_HEAL,attack,28,9,9000,0,5000,yes,self,always,0,,,,,,,
 1880,Leshij@AL_HEAL,idle,28,9,9000,3,5000,yes,self,always,0,,,,,,,
 1880,Leshij@AL_HEAL,idle,28,9,9000,3,5000,yes,friend,friendhpltmaxrate,99,0,,,,,,
-1881,Mavka@AL_HEAL,idle,28,5,2000,3,5000,no,self,myhpltmaxrate,50,0,,,,,,2
-1881,Mavka@AL_HEAL,attack,28,5,2000,3,5000,no,self,myhpltmaxrate,50,0,,,,,,2
-1881,Mavka@TF_POISON,attack,52,5,5000,0,8000,no,target,always,0,,,,,,29,
-1881,Mavka@AL_TELEPORT,idle,26,1,10000,0,5000,yes,self,rudeattacked,0,,,,,,,
-1881,Mavka@AL_TELEPORT,walk,26,1,10000,0,5000,yes,self,rudeattacked,0,,,,,,,
-1881,Mavka@MO_BODYRELOCATION,chase,264,1,3000,500,5000,yes,target,always,0,,,,,,,
+1881,Lesavka@AL_HEAL,idle,28,5,2000,3,5000,no,self,myhpltmaxrate,50,0,,,,,,2
+1881,Lesavka@AL_HEAL,attack,28,5,2000,3,5000,no,self,myhpltmaxrate,50,0,,,,,,2
+1881,Lesavkaa@TF_POISON,attack,52,5,5000,0,8000,no,target,always,0,,,,,,29,
+1881,Lesavka@AL_TELEPORT,idle,26,1,10000,0,5000,yes,self,rudeattacked,0,,,,,,,
+1881,Lesavka@AL_TELEPORT,walk,26,1,10000,0,5000,yes,self,rudeattacked,0,,,,,,,
+1881,Lesavka@MO_BODYRELOCATION,chase,264,1,3000,500,5000,yes,target,always,0,,,,,,,
 1882,Baba-Yaga@AS_SONICBLOW,attack,136,3,6000,100,5000,no,target,always,0,,,,,,,
 1882,Baba-Yaga@WZ_WATERBALL,chase,86,2,3000,600,5000,yes,target,always,0,,,,,,,
 1882,Baba-Yaga@WZ_WATERBALL,attack,86,2,3000,600,5000,yes,target,always,0,,,,,,,
@@ -4658,14 +4658,14 @@
 1883,Kikimora@WZ_WATERBALL,attack,86,4,4000,500,7000,yes,target,always,0,,,,,,,
 1883,Kikimora@WZ_WATERBALL,chase,86,4,4000,500,7000,yes,target,always,0,,,,,,,
 1883,Kikimora@NPC_CURSEATTACK,attack,181,2,2000,0,5000,yes,target,always,0,,,,,,,
-1884,Lesavka@NPC_SILENCEATTACK,attack,178,5,5000,0,5000,no,target,always,0,,,,,,,
-1884,Lesavka@NPC_SILENCEATTACK,chase,178,5,5000,0,5000,no,target,always,0,,,,,,,
-1884,Lesavka@WZ_EARTHSPIKE,attack,90,6,2500,200,5000,no,target,always,0,,,,,,,
-1884,Lesavka@WZ_EARTHSPIKE,chase,90,6,2500,200,5000,no,target,always,0,,,,,,,
-1884,Lesavka@WZ_HEAVENDRIVE,attack,91,5,2000,400,6500,no,target,always,0,,,,,,,
-1884,Lesavka@WZ_HEAVENDRIVE,chase,91,5,2000,400,6500,no,target,always,0,,,,,,,
-1884,Lesavka@AL_HEAL,idle,28,10,6000,0,5000,no,self,always,0,,,,,,,
-1884,Lesavka@AL_HEAL,attack,28,10,6000,0,5000,no,self,always,0,,,,,,,
+1884,Mavka@NPC_SILENCEATTACK,attack,178,5,5000,0,5000,no,target,always,0,,,,,,,
+1884,Mavka@NPC_SILENCEATTACK,chase,178,5,5000,0,5000,no,target,always,0,,,,,,,
+1884,Mavka@WZ_EARTHSPIKE,attack,90,6,2500,200,5000,no,target,always,0,,,,,,,
+1884,Mavka@WZ_EARTHSPIKE,chase,90,6,2500,200,5000,no,target,always,0,,,,,,,
+1884,Mavka@WZ_HEAVENDRIVE,attack,91,5,2000,400,6500,no,target,always,0,,,,,,,
+1884,Mavka@WZ_HEAVENDRIVE,chase,91,5,2000,400,6500,no,target,always,0,,,,,,,
+1884,Mavka@AL_HEAL,idle,28,10,6000,0,5000,no,self,always,0,,,,,,,
+1884,Mavka@AL_HEAL,attack,28,10,6000,0,5000,no,self,always,0,,,,,,,
 1885,Zmey Gorynych@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1885,Zmey Gorynych@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
 1885,Zmey Gorynych@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
@@ -4680,15 +4680,15 @@
 1885,Zmey Gorynych@NPC_SUMMONSLAVE,attack,196,7,10000,700,10000,no,self,slavele,5,1886,,,,,,
 1885,Zmey Gorynych@NPC_SUMMONSLAVE,idle,196,7,10000,700,10000,no,self,slavele,5,1886,,,,,,
 1885,Zmey Gorynych@AL_HEAL,idle,28,11,10000,0,10000,yes,self,myhpltmaxrate,50,,,,,,,
-1886,Lesavka@NPC_SILENCEATTACK,attack,178,5,5000,0,5000,no,target,always,0,,,,,,,
-1886,Lesavka@NPC_SILENCEATTACK,chase,178,5,5000,0,5000,no,target,always,0,,,,,,,
-1886,Lesavka@WZ_EARTHSPIKE,attack,90,6,2500,200,5000,no,target,always,0,,,,,,,
-1886,Lesavka@WZ_EARTHSPIKE,chase,90,6,2500,200,5000,no,target,always,0,,,,,,,
-1886,Lesavka@WZ_HEAVENDRIVE,attack,91,5,2000,400,6500,no,target,always,0,,,,,,,
-1886,Lesavka@WZ_HEAVENDRIVE,chase,91,5,2000,400,6500,no,target,always,0,,,,,,,
-1886,Lesavka@AL_HEAL,idle,28,10,6000,0,5000,no,self,always,0,,,,,,,
-1886,Lesavka@AL_HEAL,attack,28,10,6000,0,5000,no,self,always,0,,,,,,,
-//
+1886,Mavka@NPC_SILENCEATTACK,attack,178,5,5000,0,5000,no,target,always,0,,,,,,,
+1886,Mavka@NPC_SILENCEATTACK,chase,178,5,5000,0,5000,no,target,always,0,,,,,,,
+1886,Mavka@WZ_EARTHSPIKE,attack,90,6,2500,200,5000,no,target,always,0,,,,,,,
+1886,Mavka@WZ_EARTHSPIKE,chase,90,6,2500,200,5000,no,target,always,0,,,,,,,
+1886,Mavka@WZ_HEAVENDRIVE,attack,91,5,2000,400,6500,no,target,always,0,,,,,,,
+1886,Mavka@WZ_HEAVENDRIVE,chase,91,5,2000,400,6500,no,target,always,0,,,,,,,
+1886,Mavka@AL_HEAL,idle,28,10,6000,0,5000,no,self,always,0,,,,,,,
+1886,Mavka@AL_HEAL,attack,28,10,6000,0,5000,no,self,always,0,,,,,,,
+
 1891,Valkyrie@AL_HEAL,idle,28,11,10000,500,5000,yes,friend,friendhpltmaxrate,60,,,,,,3
 1891,Valkyrie@AL_HEAL,attack,28,11,10000,500,10000,yes,friend,friendhpltmaxrate,60,,,,,,3
 1891,Valkyrie@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index f75746bd5..174073200 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
 Date		Added
 ======
 2008/09/03
+	* Rev. 13187 Fixed inconsitencies in mosk_dun spawns. (bugreport:2165) [L0ne_W0lf]
 	* Rev. 13187 Fixed bug in refiner merchants. (bugreport:2168) [L0ne_W0lf]
 2008/09/01
 	* Rev. 13181 Fixed item requirements for PH D. Hat again. [L0ne_W0lf]
diff --git a/npc/mobs/dungeons/mosk_dun.txt b/npc/mobs/dungeons/mosk_dun.txt
index 1b5c8ccb1..7dc6f9eaf 100644
--- a/npc/mobs/dungeons/mosk_dun.txt
+++ b/npc/mobs/dungeons/mosk_dun.txt
@@ -3,25 +3,27 @@
 //===== By: ==================================================
 //= Athena (1.0)
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Additional Comments: =================================
 //= 1.0 Added spawns [Playtester]
+//= 1.1 Swapped named according to mob db. [L0ne_W0lf]
+//============================================================
 
 //==================================================
 // mosk_dun01 - Moscovia Dungeon 1
 //==================================================
 mosk_dun01,64,236,100,100	monster	Leshij	1880,15,10000,0,1
-mosk_dun01,64,236,100,100	monster	Mavka	1881,7,10000,0,1
+mosk_dun01,64,236,100,100	monster	Lesavka	1881,7,10000,0,1
 mosk_dun01,86,183,100,100	monster	Leshij	1880,15,10000,0,1
-mosk_dun01,86,183,100,100	monster	Mavka	1881,7,10000,0,1
+mosk_dun01,86,183,100,100	monster	Lesavka	1881,7,10000,0,1
 mosk_dun01,150,80,100,5	monster	Leshij	1880,30,10000,0,1
-mosk_dun01,150,80,100,5	monster	Mavka	1881,15,10000,0,1
+mosk_dun01,150,80,100,5	monster	Lesavka	1881,15,10000,0,1
 mosk_dun01,241,177,10,10	monster	Leshij	1880,3,10000,0,1
-mosk_dun01,241,177,10,10	monster	Mavka	1881,2,10000,0,1
+mosk_dun01,241,177,10,10	monster	Lesavka	1881,2,10000,0,1
 mosk_dun01,198,223,10,10	monster	Leshij	1880,3,10000,0,1
-mosk_dun01,198,223,10,10	monster	Mavka	1881,2,10000,0,1
+mosk_dun01,198,223,10,10	monster	Lesavka	1881,2,10000,0,1
 mosk_dun01,0,0,0,0	monster	Poporing	1031,20,10000,0,1
 mosk_dun01,0,0,0,0	monster	Mantis	1139,10,20000,0,0
 
@@ -29,7 +31,7 @@ mosk_dun01,0,0,0,0	monster	Mantis	1139,10,20000,0,0
 // mosk_dun02 - Moscovia Dungeon 2
 //==================================================
 mosk_dun02,0,0,0,0	monster	Leshij	1880,30,10000,10000,1
-mosk_dun02,0,0,0,0	monster	Mavka	1881,40,10000,10000,1
+mosk_dun02,0,0,0,0	monster	Lesavka	1881,40,10000,10000,1
 mosk_dun02,0,0,0,0	monster	Baba-Yaga	1882,20,20000,10000,1
 mosk_dun02,0,0,0,0	monster	Kikimora	1883,5,20000,10000,1
 
@@ -38,7 +40,7 @@ mosk_dun02,0,0,0,0	monster	Kikimora	1883,5,20000,10000,1
 //==================================================
 mosk_dun03,0,0,0,0	monster	Baba-Yaga	1882,60,10000,10000,1
 mosk_dun03,0,0,0,0	monster	Kikimora	1883,35,20000,10000,1
-mosk_dun03,0,0,0,0	monster	Lesavka	1884,15,20000,10000,1
+mosk_dun03,0,0,0,0	monster	Mavka	1884,15,20000,10000,1
 mosk_dun03,0,0,0,0	monster	Yellow Plant	1081,10,0,0,0
 mosk_dun03,0,0,0,0	monster	White Plant	1082,10,0,0,0
 mosk_dun03,0,0,0,0	monster	Shining Plant	1083,5,10000,0,0