* Changed Solace's and Retribution's skills so they feel like on official servers

* Fire Pillar's aftercast delay is 1 second now
* Updated Abyss Lake and Rachel mobs

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

4 files changed, 32 insertions, 30 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index c028915e4..2737ddc99 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -20,6 +20,9 @@
 

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

 08/01

+	* Changed Solace's and Retribution's skills so they feel like on official servers [Playtester]

+	* Fire Pillar's aftercast delay is 1 second now [Playtester]

+	* Updated Abyss Lake and Rachel mobs [Playtester]

 	* Some minor monster skill changes [Playtester]

 	* Made Deluge/volcano/v. gale be castable on top of each other again

 	  [Skotlex]

diff --git a/db/mob_db.txt b/db/mob_db.txt
index 7674a941a..a04649030 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -730,20 +730,20 @@
 1701,SHELTER,Shelter,Shelter,80,38000,0,29010,25110,1,1871,1971,22,63,1,67,34,167,157,120,10,12,1,8,86,165,150,584,576,480,0,0,0,0,0,0,0,0,7440,4000,7104,3000,12040,12,722,35,7442,1200,603,18,7005,1000,0,0,0,0,4393,1

 1702,RETRIBUTION,Retribution,Retribution,79,46666,0,28332,33120,1,2022,2288,35,35,1,142,66,72,133,39,10,12,1,8,87,165,150,584,576,480,0,0,0,0,0,0,0,0,7440,6000,7442,3000,12040,25,723,40,2506,20,1158,4,603,28,2621,3,0,0,4391,1

 1703,SOLACE,Solace,Solace,77,25252,0,21000,25110,1,1392,1462,21,67,1,76,29,145,99,100,10,12,1,8,86,165,150,584,576,480,0,0,0,0,0,0,0,0,7441,5500,7442,2800,2621,1,12040,30,718,45,1910,5,1909,30,603,32,0,0,4394,1

-1704,THANA_ODIUM,Thanatos Odium,Thanatos Odium,92,72389,0,86420,63880,1,2100,2800,68,30,1,52,165,62,185,90,10,12,2,1,88,165,150,396,384,480,0,0,0,0,0,0,0,0,7054,7000,731,250,732,200,7438,500,616,10,0,0,0,0,2419,5,0,0,4396,1

+1704,THANA_ODIUM,Thanatos Odium,Thanatos Odium,92,72389,0,86420,63880,7,2100,2800,68,30,1,52,165,62,185,90,10,12,2,1,88,165,150,396,384,480,0,0,0,0,0,0,0,0,7054,7000,731,250,732,200,7438,500,616,10,0,0,0,0,2419,5,0,0,4396,1

 1705,THANA_DESPERO,Thanatos Despero,Thanatos Despero,88,86666,0,62001,51220,1,2182,3082,38,39,1,167,79,92,151,120,10,12,2,1,88,165,150,584,576,480,0,0,0,0,0,0,0,0,7054,7000,731,280,732,170,7439,500,616,8,0,0,0,0,2520,5,0,0,4397,1

 1706,THANA_MAERO,Thanatos Maero,Thanatos Maero,83,62000,0,56699,63880,1,2022,2288,29,72,1,176,30,200,122,29,10,12,1,1,88,165,150,584,576,480,0,0,0,0,0,0,0,0,7054,7000,731,320,732,130,7437,500,616,7,0,0,0,0,5128,5,0,0,4395,1

 1707,THANA_DOLOR,Thanatos Dolor,Thanatos Dolor,83,59922,0,43200,51220,1,1392,2092,21,80,1,76,29,206,139,44,10,12,0,1,88,165,150,584,576,480,0,0,0,0,0,0,0,0,7054,7000,731,300,732,150,7436,500,616,5,0,0,0,0,2354,5,0,0,4398,1

 1708,THANATOS,Thanatos,Thanatos,99,445660,0,3666000,2145060,1,3812,7483,35,35,1,108,122,86,147,32,10,10,2,6,88,1461,100,584,576,480,1833000,10000,603,5000,732,3000,616,4000,2412,2000,2342,2000,7450,4000,617,4000,12103,1500,7444,6500,732,1000,644,2500,2655,500,4399,1

-1709,G_THANA_ODIUM,Thanatos Odium,Thanatos Odium,92,72389,0,10000,5000,1,2100,2800,68,30,1,52,165,62,185,90,10,12,2,1,88,165,150,396,384,480,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

+1709,G_THANA_ODIUM,Thanatos Odium,Thanatos Odium,92,72389,0,10000,5000,7,2100,2800,68,30,1,52,165,62,185,90,10,12,2,1,88,165,150,396,384,480,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

 1710,G_THANA_DESPERO,Thanatos Despero,Thanatos Despero,88,86666,0,10000,5000,1,2182,3082,38,39,1,167,79,92,151,120,10,12,2,1,88,165,150,584,576,480,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

 1711,G_THANA_MAERO,Thanatos Maero,Thanatos Maero,83,62000,0,10000,5000,1,2022,2288,29,72,1,176,30,200,122,29,10,12,1,1,88,165,150,584,576,480,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

 1712,G_THANA_DOLOR,Thanatos Dolor,Thanatos Dolor,83,59922,0,10000,5000,1,1392,2092,21,80,1,76,29,206,139,44,10,12,0,1,88,165,150,584,576,480,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

-1713,ACIDUS,Acidus,Acidus,80,51112,0,28043,8023,1,1289,2109,39,69,1,71,55,135,103,69,10,12,2,9,46,133,155,800,672,480,0,0,0,0,0,0,0,0,582,1200,1036,5500,1035,3000,7444,2,715,800,714,25,7448,1,5122,1,0,0,4378,1

-1714,FERUS,Ferus,Ferus,70,29218,0,8093,3952,1,1056,1496,34,45,1,80,100,110,70,70,10,12,2,9,43,133,120,480,472,480,0,0,0,0,0,0,0,0,7123,2100,1035,2750,994,25,578,200,0,0,0,0,7447,1,0,0,0,0,4380,1

+1713,ACIDUS,Acidus,Acidus,80,51112,0,28043,8023,1,1289,2109,39,69,1,71,55,135,103,69,10,12,2,9,46,133,155,800,672,480,0,0,0,0,0,0,0,0,582,1200,1036,5500,1035,3000,7444,2,715,800,714,25,7448,10,2114,1,0,0,4378,1

+1714,FERUS,Ferus,Ferus,70,29218,0,8093,3952,1,1056,1496,34,45,1,80,100,110,70,70,10,12,2,9,43,133,120,480,472,480,0,0,0,0,0,0,0,0,7123,2100,1035,2750,994,25,578,200,0,0,0,0,7447,10,5122,1,0,0,4380,1

 1715,NOVUS,Novus,Novus,42,5430,0,1320,1002,1,284,384,20,28,1,56,43,45,124,43,10,12,0,9,20,133,120,396,384,480,0,0,0,0,0,0,0,0,1036,5500,511,2000,7053,2500,512,800,0,0,0,0,0,0,0,0,0,0,4383,1

-1716,ACIDUS_,Acidus,Acidus,76,39111,0,14392,4203,1,1180,2000,31,47,1,78,31,93,88,52,10,12,2,9,41,133,155,800,672,480,0,0,0,0,0,0,0,0,505,400,1036,6000,1035,3200,510,750,717,800,996,120,7446,1,2114,1,0,0,4379,1

-1717,FERUS_,Ferus,Ferus,69,21182,0,6750,2230,1,930,1170,24,38,1,90,100,100,80,70,10,12,2,9,42,133,120,480,472,480,0,0,0,0,0,0,0,0,7123,2100,1035,2750,997,25,579,200,0,0,0,0,7445,1,0,0,0,0,4381,1

+1716,ACIDUS_,Acidus,Acidus,76,39111,0,14392,4203,1,1180,2000,31,47,1,78,31,93,88,52,10,12,2,9,41,133,155,800,672,480,0,0,0,0,0,0,0,0,505,400,1036,6000,1035,3200,510,750,717,800,996,120,7446,10,0,0,0,0,4379,1

+1717,FERUS_,Ferus,Ferus,69,21182,0,6750,2230,1,930,1170,24,38,1,90,100,100,80,70,10,12,2,9,42,133,120,480,472,480,0,0,0,0,0,0,0,0,7123,2100,1035,2750,997,25,579,200,0,0,0,0,7445,10,0,0,0,0,4381,1

 1718,NOVUS_,Novus,Novus,43,5830,0,1411,1100,1,314,414,24,28,1,60,43,39,119,43,10,12,0,9,20,133,120,584,576,480,0,0,0,0,0,0,0,0,1036,6000,508,1200,7053,2200,512,600,0,0,0,0,0,0,0,0,0,0,4382,1

 1719,DETALE,Detale,Detale,90,480000,0,291850,123304,1,4560,5548,66,59,1,90,112,136,140,56,10,12,2,9,67,1461,400,750,672,480,145925,10000,617,3000,969,2500,732,5000,7444,1500,7451,4500,12080,2000,1417,3,2231,300,617,800,0,0,2648,15,2649,15,4386,1

 1720,HYDRO,Hydro,Hydro,89,308230,0,83450,2480,1,2554,3910,52,62,1,96,110,86,94,32,10,12,2,9,47,165,150,800,672,480,41725,10000,603,5000,617,1500,607,2000,7443,4500,7123,3000,12040,80,7444,60,12085,300,1166,4,5124,5,5127,5,5126,5,4384,1

@@ -807,17 +807,17 @@
 1772,ISILLA,Isilla,Isilla,1,50,0,2,1,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,131,400,1872,672,480,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

 1773,HODREMLIN,Hodremlin,Hodremlin,1,50,0,2,1,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,131,400,1872,672,480,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

 1774,SEEKER,Seeker,Seeker,1,50,0,2,1,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,131,400,1872,672,480,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

-1775,SNOWIER,Snowier,Snowier,60,19230,0,5882,961,1,750,1375,39,26,1,60,78,51,120,60,10,12,2,0,41,133,200,584,576,480,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

+1775,SNOWIER,Snowier,Snowier,60,19230,0,5882,961,1,750,1375,39,26,1,60,78,51,120,60,10,12,2,0,61,133,200,584,576,480,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

 1776,SIROMA,Siroma,Siroma,42,6800,0,2230,340,1,300,550,12,19,1,42,24,37,84,42,10,12,0,0,61,131,400,584,576,480,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

 1777,ICE_TITAN,Ice Titan,Ice Titan,60,28900,0,13872,1445,1,1750,3450,51,27,1,60,101,54,120,60,10,12,2,0,41,133,200,584,576,480,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

 1778,GAZETI,Gazeti,Gazeti,55,12300,0,5758,615,9,575,600,31,25,1,55,62,50,110,55,10,12,1,6,21,133,200,584,576,480,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

-1779,KTULLANUX,Ktullanux,Ktullanux,98,4409579,0,440000,220000,1,6000,10000,44,83,1,98,88,166,196,98,10,12,2,2,81,165,150,396,384,480,220000,10000,603,1000,617,1000,0,0,2509,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

-1780,MUSCIPULAR,Muscipular,Muscipular,57,4332,0,1706,216,3,550,700,20,22,1,57,39,44,114,57,10,12,1,3,24,132,400,584,576,480,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

-1781,DROSERA,Drosera,Drosera,46,7221,0,2612,361,7,400,600,14,15,1,50,27,30,80,46,10,12,1,3,24,132,400,672,672,480,0,0,0,0,0,0,0,0,905,1000,938,500,7565,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0

-1782,ROWEEN,Roween,Roween,31,3009,0,1669,150,1,300,400,25,21,1,40,50,42,70,31,10,12,1,2,24,133,200,872,672,480,0,0,0,0,0,0,0,0,7564,300,919,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

-1783,GALION,Galion,Galion,44,32240,0,3224,1612,1,400,500,31,27,1,44,61,54,156,44,10,12,1,2,64,165,140,672,672,480,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

-1784,STAPO,Stapo,Stapo,23,666,0,332,39,1,125,225,8,10,1,10,15,19,40,30,10,12,0,0,42,131,400,872,672,480,0,0,0,0,0,0,0,0,7126,250,7312,2500,909,750,512,5,0,0,0,0,0,0,0,0,0,0,0,0

-1785,ATROS,Atros,Atros,82,643221,0,64322,32161,1,2500,5000,30,39,1,82,59,77,164,82,10,12,2,2,67,165,150,396,384,480,32161,10000,617,1000,607,1000,0,0,617,100,607,100,5123,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0

+1779,KTULLANUX,Ktullanux,Ktullanux,98,4409579,0,440000,220000,1,6000,10000,44,83,1,98,88,166,196,98,10,12,2,2,81,165,150,396,384,480,220000,10000,603,1000,617,1000,0,0,2509,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

+1780,MUSCIPULAR,Muscipular,Muscipular,57,4332,0,1507,1614,3,550,700,20,22,1,57,39,44,114,57,10,12,1,3,22,132,400,584,576,480,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

+1781,DROSERA,Drosera,Drosera,46,7221,0,2612,993,7,380,580,14,15,1,50,27,30,80,46,10,12,1,3,22,132,400,672,672,480,0,0,0,0,0,0,0,0,905,1000,938,500,7565,300,0,0,0,0,0,0,0,0,0,0,0,0,0,0

+1782,ROWEEN,Roween,Roween,31,5716,0,1670,285,1,300,400,25,21,1,40,50,42,70,31,10,12,1,2,24,133,200,872,672,480,0,0,0,0,0,0,0,0,7564,300,919,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

+1783,GALION,Galion,Galion,44,32240,0,10020,1612,1,400,700,31,27,1,44,62,54,156,44,10,12,0,2,64,165,140,396,384,480,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

+1784,STAPO,Stapo,Stapo,23,666,0,399,33,1,125,225,8,10,1,10,15,19,40,30,10,12,0,0,42,131,400,872,672,480,0,0,0,0,0,0,0,0,7126,250,7312,2500,909,750,512,5,0,0,0,0,0,0,0,0,0,0,0,0

+1785,ATROS,Atros,Atros,82,1008420,0,295550,50421,1,2500,5000,30,39,1,82,59,77,164,82,10,12,2,2,67,165,150,396,384,480,147775,10000,617,1000,607,1000,0,0,7563,2500,5123,15,607,100,617,100,2621,5,0,0,0,0,0,0,0,0,0,0

 1786,G_AGAV,Agav,Agav,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,131,400,1872,672,480,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

 1787,G_ECHIO,Echio,Echio,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,131,400,1872,672,480,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

 1788,G_ICE_TITAN,Ice Titan,Ice Titan,60,28900,0,0,0,1,1750,3450,51,27,1,60,101,54,120,60,10,12,2,0,41,133,200,584,576,480,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/db/mob_skill_db.txt b/db/mob_skill_db.txt
index 3634519f0..67310157e 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -3437,22 +3437,21 @@
 1701,Shelter@NPC_BLINDATTACK,angry,177,3,500,0,5000,yes,target,always,0,,,,,,

 1701,Shelter@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,

 1701,Shelter@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,

-1702,Retribution@NPC_GRANDDARKNESS,attack,339,1,2000,0,0,yes,self,myhpltmaxrate,50,,,,,,

-1702,Retribution@NPC_DARKCROSS,attack,338,5,500,1500,5000,no,target,always,0,,,,,,

-1702,Retribution@NPC_DARKNESSATTACK,attack,190,3,500,0,5000,yes,target,always,0,,,,,,

-1702,Retribution@NPC_DARKBREATH,attack,202,2,500,800,5000,no,target,always,0,,,,,,

-1702,Retribution@NPC_CURSEATTACK,attack,181,3,500,800,5000,no,target,always,0,,,,,,

-1702,Retribution@NPC_CURSEATTACK,follow,181,3,500,800,5000,no,target,always,0,,,,,,

-1702,Retribution@NPC_CURSEATTACK,chase,181,3,500,800,5000,no,target,always,0,,,,,,

-1702,Retribution@KN_BOWLINGBASH,attack,62,5,500,800,5000,no,target,always,0,,,,,,

+1702,Retribution@NPC_GRANDDARKNESS,attack,339,1,2000,0,10000,yes,self,myhpltmaxrate,50,,,,,,

+1702,Retribution@NPC_DARKCROSS,attack,338,5,2000,0,10000,no,target,always,0,,,,,,

+1702,Retribution@NPC_DARKNESSATTACK,attack,190,3,2000,0,10000,yes,target,always,0,,,,,,

+1702,Retribution@NPC_DARKBREATH,attack,202,2,2000,0,10000,no,target,always,0,,,,,,

+1702,Retribution@NPC_CURSEATTACK,attack,181,3,2000,0,10000,no,target,always,0,,,,,,

+1702,Retribution@NPC_CURSEATTACK,chase,181,3,2000,0,10000,no,target,always,0,,,,,,

+1702,Retribution@KN_BOWLINGBASH,attack,62,5,500,0,10000,no,target,always,0,,,,,,

 1702,Retribution@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,

-1703,Solace@CR_GRANDCROSS,attack,254,1,2000,0,0,yes,self,myhpltmaxrate,50,,,,,,

-1703,Solace@PR_LEXAETERNA,chase,78,1,10000,1000,5000,yes,target,always,0,,,,,,

-1703,Solace@PR_LEXAETERNA,attack,78,1,1000,1000,5000,yes,target,always,0,,,,,,

-1703,Solace@PR_LEXDIVINA,angry,76,5,500,1000,5000,yes,target,always,0,,,,,,

-1703,Solace@PR_LEXDIVINA,attack,76,5,500,1000,5000,yes,target,always,0,,,,,,

-1703,Solace@MG_NAPALMBEAT,attack,11,10,50,1500,1500,no,target,always,0,,,,,,

-1703,Solace@MG_NAPALMBEAT,chase,11,10,5000,1500,1500,no,target,always,0,,,,,,

+1703,Solace@CR_GRANDCROSS,attack,254,1,2000,0,10000,yes,self,myhpltmaxrate,50,,,,,,

+1703,Solace@PR_LEXAETERNA,attack,78,1,2000,0,10000,yes,target,always,0,,,,,,

+1703,Solace@PR_LEXAETERNA,chase,78,1,2000,0,10000,yes,target,always,0,,,,,,

+1703,Solace@PR_LEXDIVINA,attack,76,5,2000,0,10000,yes,target,always,0,,,,,,

+1703,Solace@PR_LEXDIVINA,chase,76,5,2000,0,10000,yes,target,always,0,,,,,,

+1703,Solace@MG_NAPALMBEAT,attack,11,10,2000,0,10000,no,target,always,0,,,,,,

+1703,Solace@MG_NAPALMBEAT,chase,11,10,2000,0,10000,no,target,always,0,,,,,,

 1703,Solace@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,

 1704,Thanatos Odium@NPC_POWERUP,attack,349,5,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,

 1704,Thanatos Odium@NPC_PIERCINGATT,attack,158,3,500,0,5000,yes,target,always,0,,,,,,

diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index 2b3ae151b..ce8738621 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -169,7 +169,7 @@
 

 //===== Wizard =============================

 //-- WZ_FIREPILLAR

-80,3000:2700:2400:2100:1800:1500:1200:900:600:300,2000,0,30000,0

+80,3000:2700:2400:2100:1800:1500:1200:900:600:300,1000,0,30000,0

 //-- WZ_SIGHTRASHER

 81,700,2000,0,500,0