* Implemented remaining Brasilis NPCs.

* Added remaining database modifications for Brasilis.
- Added the skills for the Brasilis monsters.
- Added remaining entries for Bathroom Ghost quest.
- Added stats for the Suspicious Hydra monsters.
- Corrected the capture rate for Suspicious Hydra.


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

5 files changed, 107 insertions, 15 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index d83ab555e..18e53ad38 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -8,6 +8,12 @@
 	1475 Equestrian's Spear:	NEED INFO.
 	13005 Angelic Wing Dagger:	NEED INFO.
 =======================
+2011/08/09
+	* Rev. 14928 Added remaining database modifications for Brasilis.
+	- Added the skills for the Brasilis monsters.
+	- Added remaining entries for Bathroom Ghost quest.
+	- Added stats for the Suspicious Hydra monsters.
+	- Corrected the capture rate for Suspicious Hydra.
 2011/08/07
 	* Rev. 14926 Minor item-related updates, and a couple quest database updates. [L0ne_W0lf]
 2011/07/11
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 27f49ce34..f49eae46c 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -1134,7 +1134,7 @@
 //2078,S_SUCCUBUS,Succubus,Succubus,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,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
 //2079,CRYSTAL_H,Crystal,Crystal,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,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
 //2080,CRYSTAL_L,Crystal,Crystal,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,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
-2081,E_HYDRA,Hydra,Hydra,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,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
+2081,E_HYDRA,Suspicious Hydra,Strange Hydra,34,854,1,0,0,7,1,2,100,100,1,1,1,1,1,1,10,12,0,3,41,0x0,1000,800,432,600,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
 2082,G_PIRANHA,Piranha,Piranha,75,4522,0,0,0,1,182,223,2,10,69,45,30,30,66,35,10,12,1,5,61,0x3295,200,768,768,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
 //2083,HORN_SCARABA,Scaraba,Scaraba,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,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
 //2084,HORN_SCARABA2,Scaraba,Scaraba,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,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
diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt
index cdd7789a4..c0dacc9c3 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -4859,8 +4859,9 @@
 1894,Pouring@WZ_WATERBALL,attack,86,10,10000,500,5000,no,target,always,0,,,,,,,
 1894,Pouring@WZ_WATERBALL,chase,86,10,10000,500,5000,no,target,always,0,,,,,,,
 
-1904,Bomb Poring@NPC_SELFDESTRUCTION,attack,173,2,10000,3000,0,no,self,always,0,,,,,,,
-1904,Bomb Poring@NPC_SELFDESTRUCTION,chase,173,2,10000,3000,0,no,self,always,0,,,,,,,
+1904,Bomb Poring@NPC_SELFDESTRUCTION,idle,173,1,1000,3000,0,no,self,always,0,,,,,,,
+1904,Bomb Poring@NPC_SELFDESTRUCTION,attack,173,1,1000,3000,0,no,self,always,0,,,,,,,
+1904,Bomb Poring@NPC_SELFDESTRUCTION,chase,173,1,1000,3000,0,no,self,always,0,,,,,,,
 
 // Satan Morroc (12.1)
 //5% HP - Dragon Fear
@@ -5702,3 +5703,81 @@
 2027,Dark Shadow@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,9,,,,,,
 2027,Dark Shadow@NPC_FIREATTACK,attack,186,3,500,500,5000,no,target,always,0,,,,,,,
 2027,Dark Shadow@NPC_DARKNESSBREATH,attack,658,1,500,1000,5000,no,target,always,0,,,,,,,
+
+// Brasilis
+2068,Boitata@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
+2068,Boitata@MG_FIREBALL,idle,17,5,10000,0,5000,yes,randomtarget,always,0,,,,,,,
+2068,Boitata@MG_FIREBALL,chase,17,5,10000,0,5000,yes,target,always,0,,,,,,,
+2068,Boitata@CR_REFLECTSHIELD,idle,252,3,1000,0,200000,no,self,always,0,,,,,,,
+2068,Boitata@CR_REFLECTSHIELD,attack,252,3,1000,0,200000,no,self,always,0,,,,,,,
+2068,Boitata@NPC_FIREATTACK,attack,186,5,2000,1000,200000,no,target,always,0,,,,,,,
+2068,Boitata@NPC_BLEEDING,attack,660,3,500,500,10000,no,target,always,0,,,,,,,
+2068,Boitata@AS_SONICBLOW,attack,136,10,1000,0,10000,yes,target,always,0,,,,,,,
+2068,Boitata@SM_MAGNUM,attack,7,7,1000,0,10000,yes,self,attackpcge,2,,,,,,,
+2068,Boitata@KN_TWOHANDQUICKEN,attack,60,20,2000,0,300000,yes,self,myhpltmaxrate,40,,,,,,,
+2068,Boitata@NPC_CRITICALSLASH,attack,170,1,2000,0,5000,yes,target,always,0,,,,,,,
+2068,Boitata@NPC_WIDEBLEEDING,attack,665,2,10000,500,100000,no,self,myhpltmaxrate,20,,,,,,,
+2068,Boitata@NPC_POWERUP,attack,349,5,10000,0,30000,yes,self,myhpltmaxrate,20,,,,,,6,
+2068,Boitata@NPC_SUMMONSLAVE,attack,196,5,10000,1000,30000,no,self,slavele,1,2082,,,,,,
+2068,Boitata@NPC_SUMMONSLAVE,idle,196,5,10000,1000,30000,no,self,slavele,1,2082,,,,,,
+2068,Boitata@NPC_SUMMONSLAVE,chase,196,5,10000,1000,30000,no,self,slavele,1,2082,,,,,,
+2068,Boitata@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,,
+2068,Boitata@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,,
+2069,Iara@NPC_WATERATTACK,attack,184,3,500,0,5000,no,target,always,0,,,,,,6,
+2069,Iara@PR_LEXDIVINA,attack,76,5,500,1000,5000,yes,target,always,0,,,,,,2,
+2069,Iara@PR_LEXDIVINA,chase,76,5,500,1000,5000,yes,target,always,0,,,,,,2,
+2069,Iara@NPC_EMOTION,chase,197,1,2000,0,5000,yes,self,always,0,3,,,,,,
+2069,Iara@WZ_WATERBALL,attack,86,3,500,1000,5000,yes,target,always,0,,,,,,6,
+2069,Iara@SM_BASH,attack,5,5,500,800,5000,no,target,always,0,,,,,,,
+2069,Iara@NPC_STOP,attack,342,1,500,0,30000,yes,target,always,0,,,,,,,
+2069,Iara@MG_FROSTDIVER,attack,15,5,500,1000,5000,yes,target,always,0,,,,,,,
+2069,Iara@MG_FROSTDIVER,chase,15,10,500,1000,5000,yes,target,always,0,,,,,,,
+2070,Piranha@NPC_WATERATTACK,attack,184,2,500,0,5000,no,target,always,0,,,,,,6,
+2070,Piranha@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
+2070,Piranha@NPC_CRITICALSLASH,angry,170,1,500,500,5000,no,target,always,0,,,,,,6,
+2070,Piranha@NPC_CRITICALWOUND,attack,673,1,50,0,10000,yes,target,always,0,,,,,,,
+2070,Piranha@NPC_BLEEDING,attack,660,3,500,0,5000,yes,target,always,0,,,,,,,
+2070,Piranha@MG_COLDBOLT,attack,14,3,500,1000,5000,yes,target,always,0,,,,,,,
+2070,Piranha@MG_COLDBOLT,chase,14,3,500,1000,5000,yes,target,always,0,,,,,,,
+2070,Piranha@WZ_WATERBALL,attack,86,3,500,1000,5000,yes,target,always,0,,,,,,6,
+2070,Piranha@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,0,,,,,,,
+2071,Headless Mule@NPC_CURSEATTACK,attack,181,1,1000,800,5000,yes,target,always,0,,,,,,,
+2071,Headless Mule@NPC_CURSEATTACK,chase,181,1,1000,800,5000,yes,target,always,0,,,,,,,
+2071,Headless Mule@NPC_FIREATTACK,attack,186,3,500,500,5000,no,target,always,0,,,,,,7,
+2071,Headless Mule@MG_FIREBOLT,attack,19,5,2000,1500,5000,yes,target,always,0,,,,,,,
+2071,Headless Mule@MG_FIREBOLT,chase,19,5,2000,1500,5000,yes,target,always,0,,,,,,,
+2071,Headless Mule@NPC_BLEEDING,attack,660,3,500,0,5000,yes,target,always,0,,,,,,,
+2071,Headless Mule@NPC_SILENCEATTACK,attack,178,3,500,700,5000,no,target,always,0,,,,,,,
+2071,Headless Mule@MG_FIREWALL,chase,18,5,500,500,5000,yes,target,always,0,,,,,,,
+2071,Headless Mule@SM_BASH,attack,5,5,500,800,5000,no,target,always,0,,,,,,,
+2072,Jaguar@NPC_GROUNDATTACK,attack,185,3,500,500,5000,no,target,always,0,,,,,,,
+2072,Jaguar@NPC_COMBOATTACK,attack,171,1,500,500,5000,no,target,always,0,,,,,,6,
+2072,Jaguar@AS_SONICBLOW,attack,136,3,500,800,5000,no,target,always,0,,,,,,0,
+2072,Jaguar@NPC_DARKNESSATTACK,attack,190,1,2000,0,5000,yes,target,always,0,,,,,,,
+2072,Jaguar@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,7,0x3195,,,,,
+2072,Jaguar@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
+2073,Toucan@NPC_EMOTION,walk,197,1,2000,0,5000,yes,self,always,0,2,,,,,,
+2073,Toucan@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x81,,,,,
+2073,Toucan@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,7,0x3195,,,,,
+2073,Toucan@NPC_TELEKINESISATTACK,chase,191,5,500,0,5000,yes,target,always,0,,,,,,,
+2073,Toucan@NPC_WINDATTACK,attack,187,3,500,500,5000,no,target,always,0,,,,,,6,
+2073,Toucan@NPC_STOP,attack,342,1,500,500,5000,no,target,always,0,,,,,,30,
+2073,Toucan@NPC_SILENCEATTACK,attack,178,3,500,700,5000,no,target,always,0,,,,,,,
+2074,Curupira@NPC_GROUNDATTACK,attack,185,2,500,500,5000,no,target,always,0,,,,,,6,
+2074,Curupira@SA_REVERSEORCISH,attack,294,1,50,0,30000,yes,target,always,0,,,,,,18,
+2074,Curupira@SA_REVERSEORCISH,chase,294,1,50,0,30000,yes,target,always,0,,,,,,18,
+2074,Curupira@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,,
+2074,Curupira@MG_STONECURSE,idle,16,5,10000,0,5000,yes,target,always,0,,,,,,11,
+2074,Curupira@MG_STONECURSE,attack,16,5,10000,0,5000,yes,target,always,0,,,,,,11,
+2074,Curupira@AL_INCAGI,chase,29,1,500,700,60000,no,self,always,0,,,,,,6,
+//2080,Crystal@AL_TELEPORT,attack,26,1,3000,0,10000,yes,self,always,0,,,,,,29,
+//2080,Crystal@AL_TELEPORT,idle,26,1,4000,0,10000,yes,self,always,0,,,,,,29,
+2082,Piranha@NPC_WATERATTACK,attack,184,2,500,0,5000,no,target,always,0,,,,,,6,
+2082,Piranha@NPC_CRITICALSLASH,attack,170,1,500,500,5000,no,target,always,0,,,,,,6,
+2082,Piranha@NPC_CRITICALSLASH,angry,170,1,500,500,5000,no,target,always,0,,,,,,6,
+2082,Piranha@NPC_CRITICALWOUND,attack,673,1,50,0,10000,yes,target,always,0,,,,,,,
+2082,Piranha@NPC_BLEEDING,attack,660,3,500,0,5000,yes,target,always,0,,,,,,,
+2082,Piranha@MG_COLDBOLT,attack,14,3,500,1000,5000,yes,target,always,0,,,,,,,
+2082,Piranha@MG_COLDBOLT,chase,14,3,500,1000,5000,yes,target,always,0,,,,,,,
+2082,Piranha@WZ_WATERBALL,attack,86,3,500,1000,5000,yes,target,always,0,,,,,,6,
+2082,Piranha@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,0,,,,,,,
diff --git a/db/pet_db.txt b/db/pet_db.txt
index c5c888c78..df1b6a003 100644
--- a/db/pet_db.txt
+++ b/db/pet_db.txt
@@ -121,5 +121,5 @@
 1837,IMP,Fire Imp,12374,9056,10038,6114,80,60,10,100,250,20,200,150,0,0,300,300,800,{},{ bonus2 bSubEle,Ele_Fire,2; bonus2 bAddEle,Ele_Fire,2; }
 
 // Brasilis Quest - Suspicious Beach [UNHATCHABLE]
-2057,E_CRAMP,Strange Cramp,12408,6221,0,0,0,0,0,0,0,50,0,0,0,0,350,400,800,{},{} // kRO version
-2081,E_HYDRA,Strange Hydra,12408,6221,0,0,0,0,0,0,0,50,0,0,0,0,350,400,800,{},{} // iRO/cRO version
+2057,E_CRAMP,Strange Cramp,12408,6221,0,0,0,0,0,0,0,0,50,0,0,0,350,400,800,{},{} // kRO version
+2081,E_HYDRA,Strange Hydra,12408,6221,0,0,0,0,0,0,0,0,50,0,0,0,350,400,800,{},{} // iRO/cRO version
diff --git a/db/quest_db.txt b/db/quest_db.txt
index 4e0cff4dc..000e7f1de 100644
--- a/db/quest_db.txt
+++ b/db/quest_db.txt
@@ -189,14 +189,14 @@
 2198,0,0,0,0,0,0,0,"Guarana quest"
 2199,0,0,0,0,0,0,0,"Guarana quest"
 2200,0,0,0,0,0,0,0,"Guarana quest"
-2201,0,0,0,0,0,0,0,"Fortunate training"
-2202,0,0,0,0,0,0,0,"Fortunate training"
-2203,0,0,0,0,0,0,0,"Fortunate training"
-2204,0,0,0,0,0,0,0,"Fortunate training"
-2205,0,0,0,0,0,0,0,"Fortunate training"
-2206,0,0,0,0,0,0,0,"Fortunate training"
-2207,0,0,0,0,0,0,0,"Fortunate training"
-2208,0,0,0,0,0,0,0,"Ghost of bathroom"
+2201,0,0,0,0,0,0,0,"Brasilis Water Lily"
+2202,0,0,0,0,0,0,0,"Brasilis Water Lily"
+2203,0,0,0,0,0,0,0,"Brasilis Water Lily"
+2204,0,0,0,0,0,0,0,"Brasilis Water Lily"
+2205,0,0,0,0,0,0,0,"Brasilis Water Lily"
+2206,0,0,0,0,0,0,0,"Brasilis Water Lily"
+2207,0,0,0,0,0,0,0,"Brasilis Water Lily"
+2208,0,0,0,0,0,0,0,"Bathroom Ghost"
 
 2209,0,0,0,0,0,0,0,"Generic Job Change Quest"
 2210,0,0,0,0,0,0,0,"Generic Job Change Quest"
@@ -487,8 +487,8 @@
 7051,0,0,0,0,0,0,0,"Thanatos Tower - Sealed Tower"
 7052,0,0,0,0,0,0,0,"Thanatos Tower - Sealed Tower"
 7053,0,0,0,0,0,0,0,"Thanatos Tower - What they want is.."
-7054,0,0,0,0,0,0,0,"Myu's Favor - Teach them a lesson!"
-7055,0,0,0,0,0,0,0,"Myu's Favor - Not the cat!"
+7054,0,1282,1000,0,0,0,0,"Myu's Favor - Teach them a lesson!"
+7055,0,1261,1,0,0,0,0,"Myu's Favor - Not the cat!"
 7056,0,0,0,0,0,0,0,"Messenger - Arc's Favor"
 7057,0,0,0,0,0,0,0,"Messenger - Arc's Favor"
 7058,0,0,0,0,0,0,0,"Messenger - Arc's Favor"
@@ -1776,3 +1776,10 @@
 60308,0,1713,200,0,0,0,0,"Dragon Hunting"
 60309,0,1716,100,0,0,0,0,"Dragon Hunting"
 60310,0,1716,200,0,0,0,0,"Dragon Hunting"
+
+// iRO expanded upon the log entries of this quest.
+60351,0,0,0,0,0,0,0,"Bathroom Ghost"
+60352,0,0,0,0,0,0,0,"Bathroom Ghost"
+60353,0,0,0,0,0,0,0,"Bathroom Ghost"
+60354,0,0,0,0,0,0,0,"Bathroom Ghost"
+60355,0,0,0,0,0,0,0,"Bathroom Ghost"