* Raised MAX_MERCENARY_CLASS to 44 for new mercenaries.

* Raised max_lv to allow values up to 150 in battle.conf.
* Raised MAX_SKILL_TREE 77 in prep for 3rd class skill trees.
* Upped max_lv and max_aura to 150, and max_aspd to 193.
* Added Brasilis database updates from trunk r14928.
* Added scripts and NPC Brasilis updates from trunk r14928.

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

6 files changed, 149 insertions, 59 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 5633aad84..fe9c20ff9 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -9,6 +9,8 @@
 	13005 Angelic Wing Dagger:	NEED INFO.
 =======================
 
+2011/08/10
+	* Rev. 14931 Added Brasilis database updates from trunk r14928. [L0ne_W0lf]
 2011/08/07
 	* Rev. 14927 Merged database changes from trunk r14927. [L0ne_W0lf]
 2011/04/16
diff --git a/db/item_db.txt b/db/item_db.txt
index e9e15f41f..0d88b1f0a 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -5099,13 +5099,13 @@
 12392,RepairA,Repair A,2,220,,100,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12393,RepairB,Repair B,2,500,,140,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12394,RepairC,Repair C,2,1100,,180,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12395,Tantanmen,Tantan Noodle,2,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12395,Tantanmen,Tantan Noodle,2,20,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1519; },{},{}
 12396,Fools_Day_Box,Gift Box?,11,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if(rand(1,10)==1) itemskill "AL_TELEPORT",1; else if(rand(1,10)==2) itemskill "AL_TELEPORT",3; else if(rand(1,10)==3) percentheal 50,0; else if(rand(1,10)==4) percentheal 0,50; else if(rand(1,10)==5) end; else if(rand(1,10)==6) getitem 512,1; else if(rand(1,10)==7) itemskill "ALL_REVERSEORCISH",1; else if(rand(1,10)==8) specialeffect2 247; else if(rand(1,10)==9) specialeffect2 338; else specialeffect2 10; },{},{}
 12397,Fools_Day_Box2,Gift Box?,11,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ if(rand(1,10)==1) itemskill "TF_DETOXIFY",1; else if(rand(1,10)==2) itemskill "TF_PICKSTONE",1; else if(rand(1,10)==3) itemskill "BA_FROSTJOKER",1; else if(rand(1,10)==4) itemskill "DC_SCREAM",1; else if(rand(1,10)==5) end; else if(rand(1,10)==6) getitem 909,1; else if(rand(1,10)==7) itemskill "AL_RUWACH",1; else if(rand(1,10)==8) specialeffect2 328; else if(rand(1,10)==9) specialeffect2 68; else specialeffect2 196; },{},{}
 12398,PCBang_Gift_Box,PCBang Gift Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12399,Castle_Treasure_Box,Castle Treasure Box,2,20,,1000,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12400,Water_Of_Blessing_,Water Of Blessing ,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12401,Rune_Kn_Test_Int,Rune Kn Test Int,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12401,Rune_Kn_Test_Int,Rune Kn Test Int,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCINT,300000,40; },{},{}
 12402,29Fruit,29Fruit,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12403,Lucky_Egg2,Lucky Egg2,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12404,Acti_Potion,Acti Potion,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 6cf017e93..a72ee417d 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -1110,7 +1110,7 @@
 //2054,E_BATHORY,Bathory,Bathory,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
 //2055,E_INCUBUS,Incubus,Incubus,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
 //2056,E_ZHERLTHSH,Zherlthsh,Zealotus,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
-//2057,E_CRAMP,Cramp,Cramp,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
+2057,E_CRAMP,Cramp,Cramp,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x181,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
 //2058,M_MIMIC,Mimic,Mimic,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
 //2059,M_DISGUISE,Disguise,Disguise,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
 //2060,M_ALICE,Alice,Alice,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
@@ -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 6bba81d28..c0dacc9c3 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -250,8 +250,8 @@
 1046,Doppelganger@NPC_CRITICALSLASH,attack,170,1,2000,0,5000,yes,target,always,0,,,,,,,
 1046,Doppelganger@CR_AUTOGUARD,attack,249,10,2000,500,300000,no,self,always,0,,,,,,29,
 1046,Doppelganger@CR_AUTOGUARD,chase,249,10,2000,500,300000,no,self,longrangeattacked,,,,,,,29,
-1046,Doppelganger@AL_DECAGI,attack,30,10,500,0,20000,no,target,always,0,,,,,,5,
-1046,Doppelganger@AL_DECAGI,chase,30,10,500,0,20000,no,target,always,0,,,,,,5,
+1046,Doppelganger@AL_DECAGI,attack,30,48,500,0,20000,no,target,always,0,,,,,,5,
+1046,Doppelganger@AL_DECAGI,chase,30,48,500,0,20000,no,target,always,0,,,,,,5,
 1046,Doppelganger@NPC_SUMMONSLAVE,attack,196,1,10000,700,10000,no,self,slavele,3,1427,,,,,,
 1046,Doppelganger@NPC_SUMMONSLAVE,idle,196,1,10000,700,10000,no,self,slavele,3,1427,,,,,,
 1046,Doppelganger@BS_HAMMERFALL,chase,110,11,10000,0,5000,yes,target,skillused,18,,,,,,,
@@ -399,7 +399,7 @@
 1086,Golden Thief Bug@NPC_SUMMONSLAVE,idle,196,10,10000,0,0,no,self,onspawn,0,1054,,,,,,
 1086,Golden Thief Bug@TF_HIDING,attack,51,1,1000,0,5000,no,self,myhpltmaxrate,20,,,,,,19,
 1086,Golden Thief Bug@AL_HEAL,idle,28,11,10000,0,5000,yes,self,mystatuson,hiding,,,,,,,
-1087,Orc Hero@AL_DECAGI,chase,30,10,2000,0,300000,no,target,always,0,,,,,,6,
+1087,Orc Hero@AL_DECAGI,chase,30,48,2000,0,300000,no,target,always,0,,,,,,6,
 1087,Orc Hero@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1087,Orc Hero@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
 1087,Orc Hero@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
@@ -551,7 +551,7 @@
 1111,Drainliar@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,,
 1111,Drainliar@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,0,,,,,,,
 1111,Drainliar@NPC_DARKNESSATTACK,attack,190,1,2000,0,5000,yes,target,always,0,,,,,,,
-1112,Drake@AL_DECAGI,chase,30,10,2000,0,60000,no,target,always,0,,,,,,29,
+1112,Drake@AL_DECAGI,chase,30,48,2000,0,60000,no,target,always,0,,,,,,29,
 1112,Drake@NPC_ARMORBRAKE,attack,344,10,2000,0,60000,no,target,always,0,,,,,,,
 1112,Drake@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1112,Drake@BS_MAXIMIZE,attack,114,1,500,0,5000,no,self,always,0,,,,,,,
@@ -1151,7 +1151,7 @@
 1251,Stormy Knight@WZ_STORMGUST,chase,89,10,2000,500,5000,no,target,always,0,,,,,,21,
 1251,Stormy Knight@WZ_STORMGUST,chase,89,10,10000,500,5000,no,target,skillused,18,,,,,,21,
 1251,Stormy Knight@AL_HEAL,idle,28,11,10000,0,10000,yes,self,myhpltmaxrate,50,,,,,,,
-1252,Garm@AL_DECAGI,chase,30,10,2000,0,300000,no,target,always,0,,,,,,6,
+1252,Garm@AL_DECAGI,chase,30,48,2000,0,300000,no,target,always,0,,,,,,6,
 1252,Garm@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1252,Garm@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
 1252,Garm@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
@@ -1618,7 +1618,7 @@
 1372,Goat@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x1089,,,,,
 1372,Goat@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
 1372,Goat@NPC_STUNATTACK,attack,179,3,500,1500,5000,no,target,always,0,,,,,,6,
-1373,Lord of Death@AL_DECAGI,chase,30,10,2000,0,60000,no,target,always,0,,,,,,,
+1373,Lord of Death@AL_DECAGI,chase,30,48,2000,0,60000,no,target,always,0,,,,,,,
 1373,Lord of Death@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1373,Lord of Death@NPC_POWERUP,attack,349,5,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,6,
 1373,Lord of Death@NPC_HELLJUDGEMENT,chase,662,10,10000,1000,10000,no,self,always,0,,,,,,36,
@@ -1774,7 +1774,7 @@
 1388,Arc Angeling@NPC_SUMMONSLAVE,attack,196,7,10000,700,60000,no,self,slavele,3,1443,1246,1742,1743,1744,18,
 1388,Arc Angeling@NPC_SUMMONSLAVE,idle,196,7,10000,700,60000,no,self,slavele,3,1443,1246,1742,1743,1744,18,
 1388,Arc Angeling@RG_INTIMIDATE,attack,219,5,2000,0,5000,yes,target,always,0,,,,,,,
-1389,Dracula@AL_DECAGI,chase,30,10,2000,0,5000,no,target,always,0,,,,,,,
+1389,Dracula@AL_DECAGI,chase,30,48,2000,0,5000,no,target,always,0,,,,,,,
 1389,Dracula@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1389,Dracula@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
 1389,Dracula@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
@@ -2675,10 +2675,10 @@
 1584,Tamruan@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,9,,,,,,
 1584,Tamruan@NPC_SILENCEATTACK,attack,178,5,2000,700,5000,no,target,always,0,,,,,,9,
 1584,Tamruan@NPC_EMOTION,chase,197,1,2000,0,5000,yes,self,always,0,9,,,,,,
-1585,Mime Monkey@NPC_HALLUCINATION,chase,207,1,500,500,5000,yes,target,always,0,,,,,,18,
-1585,Mime Monkey@SM_PROVOKE,chase,6,10,500,600,5000,no,target,always,0,,,,,,18,
-1585,Mime Monkey@NPC_HALLUCINATION,attack,207,1,500,500,5000,yes,target,always,0,,,,,,18,
-1585,Mime Monkey@SM_PROVOKE,attack,6,10,500,600,5000,no,target,always,0,,,,,,18,
+//1585,Mime Monkey@NPC_HALLUCINATION,chase,207,1,500,500,5000,yes,target,always,0,,,,,,18,
+//1585,Mime Monkey@SM_PROVOKE,chase,6,10,500,600,5000,no,target,always,0,,,,,,18,
+//1585,Mime Monkey@NPC_HALLUCINATION,attack,207,1,500,500,5000,yes,target,always,0,,,,,,18,
+//1585,Mime Monkey@SM_PROVOKE,attack,6,10,500,600,5000,no,target,always,0,,,,,,18,
 1586,Leaf Cat@AL_HEAL,attack,28,1,10000,500,5000,no,friend,friendhpltmaxrate,60,,,,,,18,
 1586,Leaf Cat@AL_HEAL,attack,28,1,10000,500,5000,no,self,myhpltmaxrate,30,,,,,,18,
 1586,Leaf Cat@AL_HEAL,chase,28,1,10000,500,5000,no,friend,friendhpltmaxrate,60,,,,,,18,
@@ -2882,7 +2882,7 @@
 1637,Margaretha Sorin@AL_PNEUMA,idle,25,1,10000,0,0,yes,self,longrangeattacked,,,,,,,,
 1637,Margaretha Sorin@AL_INCAGI,attack,29,10,2000,0,240000,yes,self,always,0,,,,,,2,
 1637,Margaretha Sorin@AL_INCAGI,chase,29,10,2000,0,240000,yes,self,always,0,,,,,,2,
-1637,Margaretha Sorin@AL_DECAGI,chase,30,10,2000,0,10000,yes,target,always,0,,,,,,,
+1637,Margaretha Sorin@AL_DECAGI,chase,30,48,2000,0,10000,yes,target,always,0,,,,,,,
 1637,Margaretha Sorin@MG_SAFETYWALL,attack,12,10,1000,0,5000,yes,self,always,0,,,,,,,
 1637,Margaretha Sorin@AL_PNEUMA,attack,25,1,5000,0,10000,yes,self,longrangeattacked,,,,,,,19,
 1637,Margaretha Sorin@AL_PNEUMA,chase,25,1,5000,0,10000,yes,self,longrangeattacked,,,,,,,19,
@@ -3031,7 +3031,7 @@
 1643,High Priest Margaretha@AL_PNEUMA,idle,25,1,10000,0,0,yes,self,longrangeattacked,,,,,,,,
 1643,High Priest Margaretha@AL_INCAGI,attack,29,10,2000,0,240000,yes,self,always,0,,,,,,2,
 1643,High Priest Margaretha@AL_INCAGI,chase,29,10,2000,0,240000,yes,self,always,0,,,,,,2,
-1643,High Priest Margaretha@AL_DECAGI,chase,30,10,2000,0,10000,yes,target,always,0,,,,,,,
+1643,High Priest Margaretha@AL_DECAGI,chase,30,48,2000,0,10000,yes,target,always,0,,,,,,,
 1643,High Priest Margaretha@MG_SAFETYWALL,attack,12,10,1000,0,5000,yes,self,always,0,,,,,,,
 1643,High Priest Margaretha@AL_PNEUMA,attack,25,1,5000,0,10000,yes,self,longrangeattacked,,,,,,,19,
 1643,High Priest Margaretha@AL_PNEUMA,chase,25,1,5000,0,10000,yes,self,longrangeattacked,,,,,,,19,
@@ -3196,7 +3196,7 @@
 1649,High Priest Margaretha@AL_PNEUMA,idle,25,1,10000,0,0,yes,self,longrangeattacked,,,,,,,,
 1649,High Priest Margaretha@AL_INCAGI,attack,29,10,2000,0,240000,yes,self,always,0,,,,,,2,
 1649,High Priest Margaretha@AL_INCAGI,chase,29,10,2000,0,240000,yes,self,always,0,,,,,,2,
-1649,High Priest Margaretha@AL_DECAGI,chase,30,10,2000,0,10000,yes,target,always,0,,,,,,,
+1649,High Priest Margaretha@AL_DECAGI,chase,30,48,2000,0,10000,yes,target,always,0,,,,,,,
 1649,High Priest Margaretha@MG_SAFETYWALL,attack,12,10,1000,0,5000,yes,self,always,0,,,,,,,
 1649,High Priest Margaretha@AL_PNEUMA,attack,25,1,5000,0,10000,yes,self,longrangeattacked,,,,,,,19,
 1649,High Priest Margaretha@AL_PNEUMA,chase,25,1,5000,0,10000,yes,self,longrangeattacked,,,,,,,19,
@@ -3382,8 +3382,8 @@
 1661,Errende Ebecee@AL_HEAL,chase,28,11,10000,500,5000,yes,self,myhpltmaxrate,30,,,,,,3,
 1661,Errende Ebecee@NPC_HOLYATTACK,attack,189,3,1000,0,5000,yes,target,always,0,,,,,,,
 1661,Errende Ebecee@NPC_SILENCEATTACK,attack,178,4,1000,700,5000,no,target,always,0,,,,,,,
-1661,Errende Ebecee@AL_DECAGI,attack,30,10,500,1000,5000,no,target,always,0,,,,,,29,
-1661,Errende Ebecee@AL_DECAGI,chase,30,10,500,1000,5000,no,target,always,0,,,,,,29,
+1661,Errende Ebecee@AL_DECAGI,attack,30,48,500,1000,5000,no,target,always,0,,,,,,29,
+1661,Errende Ebecee@AL_DECAGI,chase,30,48,500,1000,5000,no,target,always,0,,,,,,29,
 1662,Kavach Icarus@AC_DOUBLE,attack,46,10,500,1000,5000,no,target,always,0,,,,,,,
 1662,Kavach Icarus@AC_DOUBLE,attack,46,10,10000,1000,1000,no,target,skillused,46,,,,,,,
 1662,Kavach Icarus@AC_DOUBLE,chase,46,10,2000,1000,5000,no,target,always,0,,,,,,,
@@ -3674,8 +3674,8 @@
 1707,Thanatos Dolor@NPC_MENTALBREAKER,chase,159,2,500,0,5000,yes,target,always,0,,,,,,30,
 1707,Thanatos Dolor@NPC_DARKTHUNDER,attack,341,9,500,1000,5000,no,target,always,0,,,,,,,
 1707,Thanatos Dolor@NPC_DARKTHUNDER,chase,341,9,500,1000,5000,no,target,always,0,,,,,,,
-1707,Thanatos Dolor@AL_DECAGI,chase,30,10,2000,0,10000,yes,target,always,0,,,,,,,
-1707,Thanatos Dolor@AL_DECAGI,attack,30,10,2000,0,10000,yes,target,always,0,,,,,,,
+1707,Thanatos Dolor@AL_DECAGI,chase,30,48,2000,0,10000,yes,target,always,0,,,,,,,
+1707,Thanatos Dolor@AL_DECAGI,attack,30,48,2000,0,10000,yes,target,always,0,,,,,,,
 1707,Thanatos Dolor@AL_HEAL,attack,28,8,1000,0,5000,yes,friend,friendhpltmaxrate,40,,,,,,3,
 1707,Thanatos Dolor@AL_HEAL,attack,28,8,1000,0,5000,yes,self,myhpltmaxrate,40,,,,,,3,
 1707,Thanatos Dolor@AL_HEAL,idle,28,8,1000,0,5000,yes,friend,friendhpltmaxrate,40,,,,,,3,
@@ -3740,8 +3740,8 @@
 1712,Thanatos Dolor@NPC_MENTALBREAKER,chase,159,2,500,1000,10000,no,target,always,0,,,,,,,
 1712,Thanatos Dolor@NPC_DARKTHUNDER,attack,341,9,500,1000,5000,no,target,always,0,,,,,,,
 1712,Thanatos Dolor@NPC_DARKTHUNDER,chase,341,9,500,1000,5000,no,target,always,0,,,,,,,
-1712,Thanatos Dolor@AL_DECAGI,chase,30,10,2000,0,10000,yes,target,always,0,,,,,,,
-1712,Thanatos Dolor@AL_DECAGI,attack,30,10,2000,0,10000,yes,target,always,0,,,,,,,
+1712,Thanatos Dolor@AL_DECAGI,chase,30,48,2000,0,10000,yes,target,always,0,,,,,,,
+1712,Thanatos Dolor@AL_DECAGI,attack,30,48,2000,0,10000,yes,target,always,0,,,,,,,
 1712,Thanatos Dolor@AL_HEAL,attack,28,11,1000,0,5000,yes,friend,friendhpltmaxrate,70,,,,,,3,
 1712,Thanatos Dolor@AL_HEAL,attack,28,11,1000,0,5000,yes,self,myhpltmaxrate,70,,,,,,3,
 1712,Thanatos Dolor@AL_HEAL,idle,28,9,1000,0,5000,yes,friend,friendhpltmaxrate,70,,,,,,3,
@@ -3982,8 +3982,8 @@
 1754,Skeggiold@AL_HEAL,idle,28,9,5000,500,5000,no,self,myhpltmaxrate,30,,,,,,18,
 1754,Skeggiold@MG_THUNDERSTORM,attack,21,7,1000,1500,10000,no,target,always,0,,,,,,,
 1754,Skeggiold@MG_THUNDERSTORM,chase,21,7,1000,1500,10000,no,target,always,0,,,,,,,
-1754,Skeggiold@AL_DECAGI,attack,30,10,500,0,30000,no,target,always,0,,,,,,29,
-1754,Skeggiold@AL_DECAGI,chase,30,10,500,0,30000,no,target,always,0,,,,,,29,
+1754,Skeggiold@AL_DECAGI,attack,30,48,500,0,30000,no,target,always,0,,,,,,29,
+1754,Skeggiold@AL_DECAGI,chase,30,48,500,0,30000,no,target,always,0,,,,,,29,
 1754,Skeggiold@NPC_PETRIFYATTACK,attack,180,2,500,500,5000,no,target,always,0,,,,,,3,
 1754,Skeggiold@NPC_PETRIFYATTACK,chase,180,2,500,500,5000,no,target,always,0,,,,,,3,
 1754,Skeggiold@RG_STRIPARMOR,attack,217,3,500,0,5000,yes,target,always,0,,,,,,6,
@@ -4116,7 +4116,7 @@
 1769,Agav@MG_SAFETYWALL,attack,12,10,2000,0,5000,yes,self,always,0,,,,,,,
 1769,Agav@NPC_CURSEATTACK,attack,181,5,500,800,5000,no,target,always,0,,,,,,30,
 1769,Agav@NPC_CURSEATTACK,chase,181,5,500,800,5000,no,target,always,0,,,,,,30,
-1769,Agav@AL_DECAGI,chase,30,10,2000,0,10000,yes,target,always,0,,,,,,,
+1769,Agav@AL_DECAGI,chase,30,48,2000,0,10000,yes,target,always,0,,,,,,,
 1769,Agav@PR_LEXDIVINA,attack,76,1,1000,0,5000,yes,target,always,0,,,,,,36,
 1769,Agav@PR_LEXDIVINA,chase,76,1,1000,0,5000,yes,target,always,0,,,,,,36,
 1769,Agav@PR_LEXDIVINA,attack,76,1,5000,0,5000,yes,target,casttargeted,0,,,,,,36,
@@ -4275,7 +4275,7 @@
 1786,Agav@MG_SAFETYWALL,attack,12,10,2000,0,5000,yes,self,always,0,,,,,,,
 1786,Agav@NPC_CURSEATTACK,attack,181,5,500,800,5000,no,target,always,0,,,,,,30,
 1786,Agav@NPC_CURSEATTACK,chase,181,5,500,800,5000,no,target,always,0,,,,,,30,
-1786,Agav@AL_DECAGI,chase,30,10,2000,0,10000,yes,target,always,0,,,,,,,
+1786,Agav@AL_DECAGI,chase,30,48,2000,0,10000,yes,target,always,0,,,,,,,
 1786,Agav@PR_LEXDIVINA,attack,76,1,1000,0,5000,yes,target,always,0,,,,,,36,
 1786,Agav@PR_LEXDIVINA,chase,76,1,1000,0,5000,yes,target,always,0,,,,,,36,
 1786,Agav@PR_LEXDIVINA,attack,76,1,5000,0,5000,yes,target,casttargeted,0,,,,,,36,
@@ -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
@@ -5509,11 +5510,11 @@
 2008,Woomawang@NPC_CALLSLAVE,attack,352,1,10000,0,15000,yes,self,always,0,,,,,,,
 2008,Woomawang@NPC_CALLSLAVE,chase,352,1,10000,0,15000,yes,self,always,0,,,,,,,
 2008,Woomawang@NPC_CALLSLAVE,idle,352,1,10000,0,15000,yes,self,always,0,,,,,,,
-2008,Woomawang@NPC_SUMMONSLAVE,attack,196,1,10000,0,10000,yes,self,slavele,5,,,,,,,
-2008,Woomawang@NPC_SUMMONSLAVE,chase,196,1,10000,0,10000,yes,self,slavele,5,,,,,,,
-2008,Woomawang@NPC_SUMMONSLAVE,idle,196,1,10000,0,10000,yes,self,slavele,5,,,,,,,
-2008,Woomawang@NPC_METAMORPHOSIS,chase,193,1,10000,5000,5000,no,self,myhpltmaxrate,50,,,,,,,
-2008,Woomawang@NPC_METAMORPHOSIS,attack,193,1,10000,5000,5000,no,self,myhpltmaxrate,50,,,,,,,
+2008,Woomawang@NPC_SUMMONSLAVE,attack,196,1,10000,0,10000,yes,self,slavele,5,2010,,,,,,
+2008,Woomawang@NPC_SUMMONSLAVE,chase,196,1,10000,0,10000,yes,self,slavele,5,2010,,,,,,
+2008,Woomawang@NPC_SUMMONSLAVE,idle,196,6,10000,0,10000,yes,self,slavele,5,2010,,,,,,
+2008,Woomawang@NPC_METAMORPHOSIS,chase,193,6,10000,5000,5000,no,self,myhpltmaxrate,50,,,,,,,
+2008,Woomawang@NPC_METAMORPHOSIS,attack,193,6,10000,5000,5000,no,self,myhpltmaxrate,50,,,,,,,
 2008,Woomawang@NPC_SHIELDBRAKE,attack,346,10,2000,0,5000,yes,target,always,0,,,,,,,
 2008,Woomawang@LK_SPIRALPIERCE,attack,397,5,2000,500,5000,yes,target,always,0,,,,,,,
 2008,Woomawang@NPC_CRITICALWOUND,attack,673,3,2000,0,30000,yes,target,always,0,,,,,,,
@@ -5528,15 +5529,15 @@
 2008,Woomawang@NPC_AGIUP,chase,350,5,10000,0,30000,yes,self,myhpltmaxrate,60,,,,,,,
 2009,Woomawang@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 2009,Woomawang@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
-2009,Woomawang@NPC_RUN,attack,354,1,10000,0,0,yes,self,myhpltmaxrate,1,,,,,,26,
-2009,Woomawang@NPC_RUN,chase,354,1,10000,0,0,yes,self,myhpltmaxrate,1,,,,,,26,
+2009,Woomawang@NPC_RUN,attack,354,10,10000,0,0,yes,self,myhpltmaxrate,1,,,,,,26,
+2009,Woomawang@NPC_RUN,chase,354,10,10000,0,0,yes,self,myhpltmaxrate,1,,,,,,26,
 2009,Woomawang@AL_HEAL,idle,28,9,10000,0,2000,yes,self,myhpltmaxrate,99,,,,,,,
 2009,Woomawang@NPC_CALLSLAVE,attack,352,1,10000,0,15000,yes,self,always,0,,,,,,,
 2009,Woomawang@NPC_CALLSLAVE,chase,352,1,10000,0,15000,yes,self,always,0,,,,,,,
 2009,Woomawang@NPC_CALLSLAVE,idle,352,1,10000,0,15000,yes,self,always,0,,,,,,,
-2009,Woomawang@NPC_SUMMONSLAVE,attack,196,1,10000,0,10000,yes,self,slavele,5,,,,,,,
-2009,Woomawang@NPC_SUMMONSLAVE,chase,196,1,10000,0,10000,yes,self,slavele,5,,,,,,,
-2009,Woomawang@NPC_SUMMONSLAVE,idle,196,1,10000,0,10000,yes,self,slavele,5,,,,,,,
+2009,Woomawang@NPC_SUMMONSLAVE,attack,196,6,10000,0,10000,yes,self,slavele,5,2010,,,,,,
+2009,Woomawang@NPC_SUMMONSLAVE,chase,196,6,10000,0,10000,yes,self,slavele,5,2010,,,,,,
+2009,Woomawang@NPC_SUMMONSLAVE,idle,196,6,10000,0,10000,yes,self,slavele,5,2010,,,,,,
 2009,Woomawang@NPC_STONESKIN,chase,675,4,10000,1000,30000,no,self,myhpltmaxrate,3,,,,,,,
 2009,Woomawang@NPC_STONESKIN,attack,675,4,10000,1000,30000,no,self,myhpltmaxrate,3,,,,,,,
 2009,Woomawang@NPC_EVILLAND,attack,670,10,10000,0,15000,yes,target,myhpltmaxrate,50,,,,,,,
@@ -5650,13 +5651,14 @@
 2022,Nidhoggr's Shadow@NPC_ALLHEAL,walk,687,1,3000,10000,10000,no,self,rudeattacked,0,,,,,,,
 2022,Nidhoggr's Shadow@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,,
 2022,Nidhoggr's Shadow@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,,
-2022,Nidhoggr's Shadow@NPC_SUMMONSLAVE,attack,196,1,10000,700,10000,no,self,slavele,3,,,,,,,
-2022,Nidhoggr's Shadow@NPC_SUMMONSLAVE,idle,196,1,10000,700,10000,no,self,slavele,3,,,,,,,
+2022,Nidhoggr's Shadow@NPC_SUMMONSLAVE,attack,196,5,10000,700,10000,no,self,slavele,3,2027,,,,,,
+2022,Nidhoggr's Shadow@NPC_SUMMONSLAVE,idle,196,5,10000,700,10000,no,self,slavele,3,2027,,,,,,
+2022,Nidhoggr's Shadow@NPC_SUMMONSLAVE,idle,196,5,10000,700,10000,no,self,onspawn,0,2027,,,,,,
 2022,Nidhoggr's Shadow@NPC_MAGICMIRROR,idle,671,3,10000,0,120000,yes,self,always,0,,,,,,,
 2022,Nidhoggr's Shadow@NPC_MAGICMIRROR,chase,671,3,10000,0,120000,yes,self,always,0,,,,,,,
 2022,Nidhoggr's Shadow@NPC_MAGICMIRROR,attack,671,3,10000,0,120000,yes,self,always,0,,,,,,,
-2022,Nidhoggr's Shadow@NPC_STONESKIN,chase,675,3,10000,2500,300000,no,self,myhpltmaxrate,3,,,,,,,
-2022,Nidhoggr's Shadow@NPC_STONESKIN,attack,675,3,10000,2500,300000,no,self,myhpltmaxrate,3,,,,,,,
+2022,Nidhoggr's Shadow@NPC_STONESKIN,chase,675,3,10000,2500,300000,no,self,myhpltmaxrate,3,,,,,,,34
+2022,Nidhoggr's Shadow@NPC_STONESKIN,attack,675,3,10000,2500,300000,no,self,myhpltmaxrate,3,,,,,,,34
 2022,Nidhoggr's Shadow@NPC_POWERUP,attack,349,5,6000,0,60000,yes,self,myhpltmaxrate,15,,,,,,6,
 2022,Nidhoggr's Shadow@NPC_EVILLAND,attack,670,4,500,0,25000,yes,target,myhpltmaxrate,15,,,,,,,
 2022,Nidhoggr's Shadow@WZ_QUAGMIRE,chase,92,5,10000,700,5000,no,target,myhpltmaxrate,28,,,,,,12,
@@ -5669,8 +5671,8 @@
 2022,Nidhoggr's Shadow@NPC_WIDESTONE,attack,666,5,10000,0,60000,yes,self,myhpltmaxrate,40,,,,,,,
 2022,Nidhoggr's Shadow@NPC_EVILLAND,idle,670,10,500,0,120000,yes,target,myhpltmaxrate,50,,,,,,,
 2022,Nidhoggr's Shadow@NPC_EVILLAND,chase,670,10,500,0,120000,yes,target,myhpltmaxrate,50,,,,,,,
-2022,Nidhoggr's Shadow@NPC_HELLJUDGEMENT,chase,662,2,10000,7000,25000,no,self,myhpltmaxrate,50,,,,,,,
-2022,Nidhoggr's Shadow@NPC_HELLJUDGEMENT,attack,662,2,10000,7000,25000,no,self,myhpltmaxrate,50,,,,,,,
+2022,Nidhoggr's Shadow@NPC_HELLJUDGEMENT,chase,662,2,10000,7000,25000,no,self,myhpltmaxrate,50,,,,,,,32
+2022,Nidhoggr's Shadow@NPC_HELLJUDGEMENT,attack,662,2,10000,7000,25000,no,self,myhpltmaxrate,50,,,,,,,32
 2022,Nidhoggr's Shadow@NPC_DARKNESSBREATH,attack,658,10,10000,800,35000,no,target,myhpltmaxrate,50,,,,,,32,
 2022,Nidhoggr's Shadow@NPC_SLOWCAST,attack,672,5,10000,0,60000,yes,self,myhpltmaxrate,70,,,,,,,
 2022,Nidhoggr's Shadow@NPC_CRITICALWOUND,attack,673,3,2000,0,30000,yes,target,myhpltmaxrate,70,,,,,,,
@@ -5685,7 +5687,7 @@
 2022,Nidhoggr's Shadow@NPC_DRAGONFEAR,attack,659,5,2000,1000,20000,no,self,always,0,,,,,,32,
 2022,Nidhoggr's Shadow@WZ_METEOR,attack,83,10,2000,1000,10000,no,target,always,0,,,,,,29,
 2022,Nidhoggr's Shadow@SA_DISPELL,attack,289,5,10000,0,30000,yes,target,always,0,,,,,,,
-2022,Nidhoggr's Shadow@NPC_PULSESTRIKE,attack,661,5,2000,10000,40000,no,self,always,0,,,,,,,
+2022,Nidhoggr's Shadow@NPC_PULSESTRIKE,attack,661,5,2000,10000,40000,no,self,always,0,,,,,,,31
 2022,Nidhoggr's Shadow@NPC_ALLHEAL,idle,687,1,10000,120000,30000,yes,self,myhpltmaxrate,60,,,,,,20,
 2023,Dark Shadow@NPC_DARKSTRIKE,chase,340,2,2000,0,5000,yes,target,always,0,,,,,,,
 2023,Dark Shadow@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,9,,,,,,
@@ -5696,7 +5698,86 @@
 2026,Dandelion@NPC_POISON,attack,176,3,1000,500,60000,no,target,myhpltmaxrate,30,,,,,,,
 2026,Dandelion@NPC_COMBOATTACK,attack,171,1,3000,0,5000,yes,target,always,0,,,,,,,27
 2026,Dandelion@TF_SPRINKLESAND,attack,149,1,500,0,5000,yes,target,always,0,,,,,,,28
+
 2027,Dark Shadow@NPC_DARKSTRIKE,chase,340,2,2000,0,5000,yes,target,always,0,,,,,,,
 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"