* Speed updates for Anolian and Merman

* Fixed a warp in moc_pryd06

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

4 files changed, 9 insertions, 5 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 2ddfa9577..872c5c244 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -24,6 +24,8 @@
 	-----

 

 =========================

+07/18

+	* Speed updates for Anolian and Merman [Playtester]

 07/17

 	* Speed/Delay updates for Pasana, Rybio and Phendark [Playtester]

 	* Ooops, forgot to update packet_db [DracoRPG]

diff --git a/db/mob_db.txt b/db/mob_db.txt
index 14b3a040f..e8549b401 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -209,7 +209,7 @@
 1203,MYSTELTAINN,Mysteltainn,Mysteltainn,76,33350,0,6457,5159,2,1160,1440,30,30,1,139,80,35,159,65,10,12,2,0,87,1205,250,1152,500,240,0,0,0,0,0,0,0,0,7019,1,7297,1500,1152,70,1155,40,1163,2,999,120,984,243,0,0,0,0,4207,1

 1204,TIRFING,Tirfing,Ogretooth,71,29900,0,5412,4235,1,950,1146,30,35,1,87,55,35,132,65,10,12,1,0,67,1205,100,816,500,240,0,0,0,0,0,0,0,0,7022,1,638,50,7292,1500,1214,70,1217,40,999,120,984,189,0,0,0,0,4254,1

 1205,EXECUTIONER,Executioner,Executioner,65,28980,0,4730,3536,2,570,950,35,35,1,85,40,25,88,60,10,12,2,0,47,1205,200,768,500,384,0,0,0,0,0,0,0,0,7024,5,7290,1500,1111,80,1114,60,1125,40,999,120,984,145,0,0,0,0,4250,1

-1206,ANOLIAN,Anolian,Anolian,63,18960,0,5900,2907,1,640,760,15,15,1,43,58,25,97,65,10,12,1,5,41,1173,200,900,500,864,0,0,0,0,0,0,0,0,7003,4850,1754,2000,526,5,10019,10,943,5335,2625,1,984,134,0,0,0,0,4234,1

+1206,ANOLIAN,Anolian,Anolian,63,18960,0,5900,2907,1,640,760,15,15,1,43,58,25,97,65,10,12,1,5,41,1173,190,900,500,864,0,0,0,0,0,0,0,0,7003,4850,1754,2000,526,5,10019,10,943,5335,2625,1,984,134,0,0,0,0,4234,1

 1207,STING,Sting,Sting,61,9500,0,4081,2970,1,850,1032,5,30,1,45,55,5,120,85,10,12,1,0,62,1173,300,528,500,240,0,0,0,0,0,0,0,0,7004,4850,1756,1500,2624,1,1003,130,997,25,10007,10,719,3,0,0,0,0,4226,1

 1208,WANDER_MAN,Wander Man,Wanderer,74,8170,0,5786,4730,2,450,550,5,5,1,192,38,45,127,85,10,12,1,6,24,1173,100,672,500,192,0,0,0,0,0,0,0,0,7005,4850,616,1,723,500,2270,5,610,650,984,217,608,3,13015,1,0,0,4210,1

 1209,CRAMP,Cramp,Cramp,56,4720,0,2300,1513,1,395,465,0,5,1,85,35,5,65,60,10,12,0,2,45,149,100,1000,500,1000,0,0,0,0,0,0,0,0,7007,4656,528,1000,726,80,746,110,568,150,510,70,984,95,0,0,0,0,4296,1

@@ -265,7 +265,7 @@
 1261,WILD_ROSE,Wild Rose,Wild Rose,38,2980,0,1113,688,1,315,360,0,15,1,85,15,35,65,80,10,12,0,2,24,131,100,964,864,288,0,0,0,0,0,0,0,0,7053,5335,748,50,5037,120,1767,3000,624,35,528,600,2244,2,0,0,0,0,4257,1

 1262,MUTANT_DRAGON,Mutant Dragon,Mutant Dragonoid,65,62600,0,4730,3536,4,2400,3400,15,20,1,47,30,68,45,35,10,12,2,9,43,1205,250,1280,1080,240,0,0,0,0,0,0,0,0,7054,4850,1035,500,1036,500,930,500,1559,400,7296,1500,505,150,0,0,0,0,4203,1

 1263,WIND_GHOST,Wind Ghost,Wind Ghost,51,4820,0,2424,1488,2,489,639,0,45,1,89,15,90,85,25,10,12,1,6,64,1173,150,1056,1056,336,0,0,0,0,0,0,0,0,912,4559,932,6000,7005,500,693,100,1611,8,996,100,1615,1,0,0,0,0,4264,1

-1264,MERMAN,Merman,Merman,53,12300,0,4500,2054,2,482,603,10,35,1,45,46,15,85,55,10,12,1,7,41,1173,200,916,816,336,0,0,0,0,0,0,0,0,1054,1300,523,300,568,200,720,40,995,35,1460,3,756,203,0,0,0,0,4199,1

+1264,MERMAN,Merman,Merman,53,12300,0,4500,2054,2,482,603,10,35,1,45,46,15,85,55,10,12,1,7,41,1173,220,916,816,336,0,0,0,0,0,0,0,0,1054,1300,523,300,568,200,720,40,995,35,1460,3,756,203,0,0,0,0,4199,1

 1265,COOKIE,Cookie,Cookie,25,950,0,310,188,1,130,153,0,25,1,35,20,53,37,90,10,12,0,7,60,137,200,1036,936,240,0,0,0,0,0,0,0,0,538,1000,530,150,979,1,645,280,2402,30,12001,100,529,320,0,0,0,0,4293,1

 1266,ASTER,Aster,Aster,18,1452,0,122,78,1,56,64,0,10,1,19,15,1,34,5,10,12,0,5,22,145,400,1264,864,216,0,0,0,0,0,0,0,0,938,500,7013,40,1052,1200,508,200,912,60,512,100,0,0,0,0,0,0,4247,1

 1267,CARAT,Carat,Carat,51,5200,0,1926,1353,1,330,417,0,25,1,41,45,5,85,155,10,12,1,6,44,1173,200,1078,768,384,0,0,0,0,0,0,0,0,7054,3200,536,1000,2409,5,5003,1,0,0,0,0,509,450,0,0,0,0,4288,1

@@ -489,7 +489,7 @@
 1485,G_MYSTELTAINN,Mysteltainn,Mysteltainn,76,33350,0,0,0,2,1160,1440,30,30,1,139,80,35,159,65,10,12,2,0,87,2725,250,1152,500,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

 1486,G_TIRFING,Tirfing,Ogretooth,71,29900,0,0,0,1,950,1146,30,35,1,87,55,35,132,65,10,12,1,0,67,2213,100,816,500,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

 1487,G_EXECUTIONER,Executioner,Executioner,65,28980,0,0,0,2,570,950,35,35,1,85,40,25,88,60,10,12,2,0,47,2725,200,768,500,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

-1488,G_ANOLIAN,Anolian,Anolian,63,18960,0,0,0,1,640,760,15,15,1,43,58,25,97,65,10,12,1,5,41,2181,200,900,500,864,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

+1488,G_ANOLIAN,Anolian,Anolian,63,18960,0,0,0,1,640,760,15,15,1,43,58,25,97,65,10,12,1,5,41,2181,190,900,500,864,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

 1489,G_STING,Sting,Sting,61,9500,0,0,0,1,850,1032,5,30,1,45,55,5,120,85,10,12,1,0,62,2181,300,528,500,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

 1490,G_WANDER_MAN,Wander Man,Wanderer,74,8170,0,0,0,2,750,1000,5,5,1,192,38,45,127,85,10,12,1,6,24,2693,100,672,500,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

 1491,G_DOKEBI,Dokebi,Dokebi,33,2697,0,0,0,1,197,249,0,10,1,50,40,35,69,40,10,12,0,6,27,2181,250,1156,456,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index ef296192f..0569d7ee0 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -38,6 +38,8 @@ Playtester
 

 Date		Added

 ======

+07/18

+	* Fixed a warp in moc_pryd06 [Playtester]

 07/17

 	* Enchanting a Tiara now costs 2M [Playtester]

 	* Added slotted Running Shirt to Comobo Gambling [Playtester]

diff --git a/npc/warps/dungeons/morroc_duns.txt b/npc/warps/dungeons/morroc_duns.txt
index 0668196cd..bcdb56807 100644
--- a/npc/warps/dungeons/morroc_duns.txt
+++ b/npc/warps/dungeons/morroc_duns.txt
@@ -50,9 +50,9 @@ moc_pryd04.gat,12,15,0	warp	mocp04-1	3,2,moc_pryd03.gat,12,18
 moc_pryd04.gat,15,187,0	warp	mocp05-1	2,3,moc_pryd03.gat,18,187

 moc_pryd04.gat,184,11,0	warp	mocp06-1	2,3,moc_pryd03.gat,181,11

 moc_pryd04.gat,188,184,0	warp	mocp07-1	3,2,moc_pryd03.gat,188,181

-moc_pryd05.gat,223,9,0	warp	mocp08	2,2,moc_pryd06.gat,192,8

+moc_pryd05.gat,223,9,0	warp	mocp08	2,2,moc_pryd06.gat,192,10

 moc_pryd05.gat,94,98,0	warp	mocp09	2,1,moc_prydb1.gat,100,57

-moc_pryd06.gat,195,8,0	warp	mocp08-1	2,3,moc_pryd05.gat,220,9

+moc_pryd06.gat,197,10,0	warp	mocp08-1	2,3,moc_pryd05.gat,220,9

 moc_prydb1.gat,100,104,0	warp	mocp10	5,2,moc_prydb1.gat,100,74

 moc_prydb1.gat,100,191,0	warp	moco02-1	2,2,moc_pryd01.gat,90,105

 moc_prydb1.gat,100,55,0	warp	mocp09-1	2,1,moc_pryd05.gat,94,96