* 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://svn.code.sf.net/p/rathena/svn/branches/renewal@14931 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog-Renewal.txt

@@ -1,5 +1,9 @@
 Date	Added
 
+2011/08/07
+	* Rev. 14931 Raised MAX_MERCENARY_CLASS to 44 for new mercenaries. [L0ne_W0lf]
+	* Raised max_lv to allow values up to 150 in battle.conf.
+	* Raised MAX_SKILL_TREE 77 in prep for 3rd class skill trees.
 2011/08/07
 	* Rev. 14927 Added bonus3 bAddClassDropItem, care of Epoque. [L0ne_W0lf]
 2011/07/10

conf/Changelog.txt

@@ -1,5 +1,7 @@
 Date	Added
 
+2011/08/10
+	* Rev. 14931 Upped max_lv and max_aura to 150, and max_aspd to 193.
 2011/07/09
 	* Rev. 14892 Removed 'msg_athena.conf' messages 619 and 620 (duplicates to 572 and 573) (since r5506). [Ai4rei]
 2011/05/13

conf/battle/client.conf

@@ -76,7 +76,7 @@ area_size: 14
 // NOTE: You also need to adjust the client if you want this to work.
 // NOTE: Default is 99. Values above 127 will probably behave incorrectly.
 // NOTE: If you don't know what this does, don't change it!!!
-max_lv: 99
+max_lv: 150
 
 // Level required to display an aura.
 // NOTE: This assumes that sending max_lv to the client will display the aura.
@@ -84,7 +84,7 @@ max_lv: 99
 // Example: If max_lv is 99 and aura_lv is 150, characters with level 99~149
 //          will be sent as being all level 98, and only characters with level
 //          150 or more will be reported as having level 99 and show an aura.
-aura_lv: 99
+aura_lv: 150
 
 // Will tuxedo and wedding dresses be shown when worn? (Note 1)
 wedding_modifydisplay: no

conf/battle/player.conf

@@ -74,7 +74,7 @@ natural_heal_skill_interval: 10000
 natural_heal_weight_rate: 50
 
 // Maximum atk speed. (Default 190, Highest allowed 199)
-max_aspd: 190
+max_aspd: 193
 
 // Maximum walk speed rate (200 would be capped to twice the normal speed)
 max_walk_speed: 300

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

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,,,,,,{},{},{}

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

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,attack,30,48,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,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@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@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@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@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,attack,30,48,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,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,chase,30,48,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,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,chase,30,48,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,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,attack,30,48,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,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,idle,173,1,1000,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,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,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,,,,,,,
+2008,Woomawang@NPC_SUMMONSLAVE,chase,196,1,10000,0,10000,yes,self,slavele,5,2010,,,,,,
-2008,Woomawang@NPC_SUMMONSLAVE,idle,196,1,10000,0,10000,yes,self,slavele,5,,,,,,,
+2008,Woomawang@NPC_SUMMONSLAVE,idle,196,6,10000,0,10000,yes,self,slavele,5,2010,,,,,,
-2008,Woomawang@NPC_METAMORPHOSIS,chase,193,1,10000,5000,5000,no,self,myhpltmaxrate,50,,,,,,,
+2008,Woomawang@NPC_METAMORPHOSIS,chase,193,6,10000,5000,5000,no,self,myhpltmaxrate,50,,,,,,,
-2008,Woomawang@NPC_METAMORPHOSIS,attack,193,1,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,attack,354,10,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,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,attack,196,6,10000,0,10000,yes,self,slavele,5,2010,,,,,,
-2009,Woomawang@NPC_SUMMONSLAVE,chase,196,1,10000,0,10000,yes,self,slavele,5,,,,,,,
+2009,Woomawang@NPC_SUMMONSLAVE,chase,196,6,10000,0,10000,yes,self,slavele,5,2010,,,,,,
-2009,Woomawang@NPC_SUMMONSLAVE,idle,196,1,10000,0,10000,yes,self,slavele,5,,,,,,,
+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,attack,196,5,10000,700,10000,no,self,slavele,3,2027,,,,,,
-2022,Nidhoggr's Shadow@NPC_SUMMONSLAVE,idle,196,1,10000,700,10000,no,self,slavele,3,,,,,,,
+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,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,,,,,,,
+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,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,,,,,,,
+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,,,,,,,

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
+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,50,0,0,0,0,350,400,800,{},{} // iRO/cRO 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

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"
+2201,0,0,0,0,0,0,0,"Brasilis Water Lily"
-2202,0,0,0,0,0,0,0,"Fortunate training"
+2202,0,0,0,0,0,0,0,"Brasilis Water Lily"
-2203,0,0,0,0,0,0,0,"Fortunate training"
+2203,0,0,0,0,0,0,0,"Brasilis Water Lily"
-2204,0,0,0,0,0,0,0,"Fortunate training"
+2204,0,0,0,0,0,0,0,"Brasilis Water Lily"
-2205,0,0,0,0,0,0,0,"Fortunate training"
+2205,0,0,0,0,0,0,0,"Brasilis Water Lily"
-2206,0,0,0,0,0,0,0,"Fortunate training"
+2206,0,0,0,0,0,0,0,"Brasilis Water Lily"
-2207,0,0,0,0,0,0,0,"Fortunate training"
+2207,0,0,0,0,0,0,0,"Brasilis Water Lily"
-2208,0,0,0,0,0,0,0,"Ghost of bathroom"
+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!"
+7054,0,1282,1000,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!"
+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"

doc/item_bonus.txt

@@ -437,3 +437,5 @@ bonus bUnstripable,n;	Armor cannot be taken off via strip skills (n is meaningle
 bonus2 bHPDrainValueRace,r,n;	Heals +n HP when attacking a monster of race r with normal attack.
 bonus bMagicSPGainValue,n;	Heals +n SP when killing an enemy with magic attack.
 bonus bMagicHPGainValue,n;	Heals +n HP when killing an enemy with magic attack.
+
+bonus3 bAddClassDropItem,s,x,n;		Adds an n/100% chance of dropping item s when killing monster class x.

npc/Changelog.txt

@@ -1,5 +1,7 @@
 Date		Added
 ======
+2011/08/10
+	* Revv. 14931 Added scripts and NPC Brasilis updates from trunk r14928. [L0ne_W0lf]
 2011/07/26
 	* Rev. 14922 Added Renewal Guides, and made the filenames uniform. [L0ne_W0lf]
 2011/07/21

npc/cities/brasilis.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -12,79 +12,150 @@
 //===== Additional Comments: ================================= 
 //= 1.0 First version. Transportation and Basic NPCs.
 //= 1.1 Fixed Zeny not being removed for payment. [Kisuka]
+//= 1.2 Updated dialog, added Ice Cream Maker. [L0ne_W0lf]
 //============================================================ 
 
-alberta,247,115,3	script	Brute Sailor#bra2	100,{
+alberta,247,115,3	script	Crewman#bra2	100,{
-	mes "[Brute Sailor]";
+	mes "[Crewman]";
-	mes "Hey, have you heard of the place called Brasilis?";
+	mes "Hey, have you heard of a place called Brasilis?";
-	mes "It's a place that's as hot as the Morroc desert, and as dense as the forests of Payon.";
+	mes "It's a tropical city that's hot like the desert but also rainy. It is a very mysterious place.";
 	next;
-	mes "[Brute Sailor]";
+	mes "[Crewman]";
-	mes "I have a map to get there, if you want I can take you to Brasilis.";
+	mes "We recently found a new ocean route to get there easily.";
-	mes "It will only cost you 10,000 zeny. What do you say?";
+	mes "It's just 10,000 zeny for a round trip! So do you want to go?";
 	next;
-	switch(select("Let's go to Brasilis!:Cancel.")) {
+	switch(select("Take me to Brasilis!:I'll stay here.")) {
 	case 1:
-		if (Zeny > 9999	) {
+		if (Zeny > 9999) {
-			mes "[Brute Sailor]";
+			mes "[Crewman]";
-			mes "Great! Let's Go!";
+			mes "Cool~!! Let's go~!";
+			set zeny,zeny-10000;
 			close2;
-			set Zeny,Zeny-10000;
 			warp "brasilis",314,60;
 			end;
 		}
 		else {
-			mes "[Brute Sailor]";
+			mes "[Crewman]";
-			mes "I'm sorry but you don't have";
+			mes "I said 10,000 zeny.";
-			mes "enough zeny now";
-			mes "You need 10,000 zeny";
-			mes "to go to Brasilis";
-			mes "Thank you.";
 			close;
 		}
 	case 2:
-		mes "[Brute Sailor]";
+		mes "[Crewman]";
-		mes "Let me know if you change your mind.";
+		mes "Well if you're ever interested, let me know and I can take you there.";
 		close;
 	}
 }
 
-brasilis,316,57,3	script	Brute Sailor#bra1	100,{
+brasilis,316,57,3	script	Crewman#bra1	100,{
-	mes "[Brute Sailor]";
+	mes "[Crewman]";
-	mes "My ship will be heading back to Alberta soon, would you like to go back?";
+	mes "My ship is going to back to Alberta, do you want to join us?";
 	next;
-	switch(select("Return to Alberta.:Cancel.")) {
+	switch(select("Go back to Alberta.:Not yet~.")) {
 	case 1:
-		mes "[Brute Sailor]";
+		mes "[Crewman]";
-		mes "Alright, lets get going!";
+		mes "I sure do miss home.";
 		close2;
 		warp "alberta",244,115;
 		end;
 	case 2:
-		mes "[Brute Sailor]";
+		mes "[Crewman]";
-		mes "Let me know if you change your mind.";
+		mes "Ok, suit yourself. We'll see you when we get back then.";
 		close;
 	}
 }
 
-brasilis,278,137,3	script	Bulletin Board#bra1	858,{
+brasilis,155,165,3	script	Signpost#bra1	858,{
-	mes ":: Happy Toucan Inn ::";
+	mes ":: Art Museum ::";
 	close;
 }
 
-brasilis,244,248,1	script	Bulletin Board#bra2	858,{
+brasilis,195,231,3	script	Signpost#bra2	858,{
-	mes ":: Brasilis Market ::";
+	mes ":: Verass Monument ::";
 	close;
 }
 
-brasilis,155,165,3	script	Bulletin Board#bra3	858,{
+brasilis,240,247,3	script	Signpost#bra3	858,{
-	mes ":: Brasilis Art Museum ::";
+	mes ":: Market ::";
-	close;
-}
-
-brasilis,303,309,3	script	Bulletin Board#bra4	858,{
-	mes ":: Jungle Cable ::";
 	mes " ";
-	mes "- Not recommended for the faint hearted! -";
+	mes "- For your Potions and Weaponry -";
 	close;
 }
+
+brasilis,303,309,3	script	Signpost#bra4	858,{
+	mes ":: Jungle Cable ::";
+	mes "";
+	mes "- Not for the faint of heart -";
+	close;
+}
+
+brasilis,278,137,3	script	Signpost#bra5	858,{
+	mes ":: Brasilis Hotel ::";
+	close;
+}
+
+brasilis,137,77,5	script	Ice-Cream Maker	85,{
+	mes "[Ice Cream Maker]";
+	mes "Come~come~";
+	mes "Ice cream is the perfect snack for a hot day~";
+	mes "It's just ^3355FF100 Zeny^000000~";
+	mes "Ice Cream~";
+	mes "Get 'yer Ice Cream!";
+	next;
+	switch(select("Give me one!:Ice Cream?:Cancel.")) {
+	case 1:
+		mes "[Ice Cream Maker]";
+		mes "Since there are so many people want to get a cool ice cream you can order only 5 at a time.";
+		mes "So how many d'ya want?";
+		next;
+		while(1) {
+			input .@input; //,1,5;
+			if (.@input == 0) {
+				mes "[Ice Cream Maker]";
+				mes "None?";
+				mes "Fine get outta the way, I have customers to serve.";
+				close;
+			}
+			else if ((.@input < 0) || (.@input > 5)) {
+				mes "[Ice Cream Maker]";
+				mes "Wow.";
+				mes "You ordered too much.";
+				mes "If you eat over 5 you might need to fight with a monster in your stomach. Calm down buddy.";
+				next;
+			}
+			else
+				break;
+		}
+		set .@icecream_hap,.@input*100;
+		if (Zeny < .@icecream_hap) {
+			mes "[Ice Cream Maker]";
+			mes "Dood~! You don't have enough money.";
+			mes "It's only ^3355FF100 Zeny^000000~ Seriously!";
+			close;
+		}
+		if (!checkweight(536,.@input)) {
+			mes "[Ice Cream Maker]";
+			mes "You seem to have too much stuff.";
+			mes "Lighten your pack before buying this.";
+			close;
+		}
+		set zeny,zeny-.@icecream_hap;
+		getitem 536,.@input; //Ice_Cream
+		close;
+	case 2:
+		mes "[Ice Cream Maker]";
+		mes "'Ice cream is...";
+		mes "Wait, don't you know";
+		mes "what Ice Cream is?";
+		mes "What rock have you";
+		mes "been living under?";
+		next;
+		mes "[Ice Cream Maker]";
+		mes "I'm not going to even start with how weird that sounds.";
+		mes "Anyway, get 'yer Ice Cream right here while it's nice and cold.";
+		close;
+	case 3:
+		mes "[Ice Cream Maker]";
+		mes "Don't miss your chance to eat the greatest Ice Cream in all the land~!";
+		close;
+	}
+}

npc/kafras/kafras_brasilis.txt

@@ -3,7 +3,7 @@
 //===== By: =========================
 //= L0ne_W0lf
 //===== Current Version: ===================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================
 //= eAthena 1.0
 //===== Description: ============================================
@@ -16,7 +16,8 @@
 //=  arg(3): Cost of Storage service
 //=  arg(4): Cost of Rent a Pushcart service
 //===== Additional Comments: ==========================================
-//= v1.0 First version.
+//= 1.0 First version.
+//- 1.1 Updated save point coordinates.
 //=====================================================================
 
 brasilis,197,221,4	script	Kafra Employee::kaf_bra	117,{
@@ -30,6 +31,6 @@ brasilis,197,221,4	script	Kafra Employee::kaf_bra	117,{
 	callfunc "F_Kafra",5,3,0,80,700;
 
 	M_Save:
-		savepoint "brasilis",197,219;
+		savepoint "brasilis",195,259;
 		callfunc "F_KafEnd",0,1,"in the city of Brasilis";
 }

npc/merchants/inn.txt

@@ -4,7 +4,7 @@
 //= Darkchild (1.1)
 //= Playtester (1.2)
 //===== Current Version: ===================================== 
-//= 3.0
+//= 3.0a
 //===== Compatible With: ===================================== 
 //= eAthena 1.0+
 //===== Description: ========================================= 
@@ -45,6 +45,7 @@
 //= 2.8 Removed Moscovia Inn; Its in quests/quest_moscovia.txt [Kisuka]
 //= 2.9 Added switch menus, updated to match AEGIS scripts. [Kisuka]
 //= 3.0 Added Brasilis inn receptionist. [L0ne_W0lf]
+//= 3.0a Updated dialog for Brasilis inn. [L0ne_W0lf]
 //============================================================ 
 
 
@@ -205,47 +206,42 @@ ve_in,157,219,5	script	Inn Master#Receptionist	709,{
 }
 
 //======================== Brasilis =================================
-bra_in01,27,24,3	script	Receptionist#bra	478,{
+bra_in01,27,24,3	script	Hotel Keeper#bra1	478,{
-	mes "[Receptionist]";
+	mes "[Hotel Keeper]";
-	mes "Welcome to the 'Happy Toucan' Inn,";
+	mes "Welcome to the beautiful Brasilis Hotel.";
-	mes "we have everything to make you feel at home.";
 	next;
-	switch(select("Save:Take Rest - 5,000 zeny:Cancel")) {
+	switch(select("Save:Rest -5000 zeny")) {
 	case 1:
-		mes "[Receptionist]";
+		mes "[Hotel Keeper]";
-		mes "Would you like me to save your respawn point here?";
+		mes "Do you want to save here at the Brasilis Hotel?";
 		next;
-		switch(select("No, thanks.:Sure!")) {
+		switch(select("No thank you.:Absolutely.")) {
 		case 1:
-			mes "[Receptionist]";
+			mes "[Hotel Keeper]";
-			mes "Alright, please come back if you change your mind.";
+			mes "Ok then, enjoy your stay.";
 			close;
 		case 2:
-			savepoint "bra_in01",143,68;
+			mes "[Hotel Keeper]";
-			mes "[Receptionist]";
+			mes "Your respawn has been saved here at the hotel. I hope that you enjoy your stay here in Brasilis.";
-			mes "Your respawn point has been saved.";
+			savepoint "bra_in01",144,69;
-			mes "Enjoy your stay in Brasilius and don't forget to check our natural beauties.";
 			close;
 		}
 	case 2:
-		if (Zeny < 5000) {
+		if (Zeny > 4999) {
-			mes "[Receptionist]";
+			mes "[Hotel Keeper]";
-			mes "I'm sorry, but the service charge is 5,000 zeny.";
+			mes "I will show you a great room.";
-			mes "Please make sure that you have enough money to check in next time, okay?";
-			close;
-		}
-		else {
-			mes "[Receptionist]";
-			mes "I'll take you to your room.";
 			close2;
 			set zeny,zeny-5000;
 			percentheal 100,100;
 			warp "bra_in01",144,69;
 			end;
 		}
-	case 3:
+		else {
+			mes "[Hotel Keeper]";
+			mes "I'm sorry, but the service charge is 5,000 zeny per night.";
 			close;
 		}
+	}
 }
 
 //======================= Inn Function ==============================

npc/merchants/shops.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= eAthena Dev Team
 //===== Current Version: ===================================== 
-//= 2.7b
+//= 2.8
 //===== Compatible With: ===================================== 
 //= eAthena 1.0+
 //===== Description: ========================================= 
@@ -31,6 +31,7 @@
 //=     Re-added Bill of Birds to Morroc Item Collectors.
 //= 2.7a Actually applied the right update to the comodo weapon shop. [L0ne_W0lf]
 //= 2.7b Corrected Brasilis Fruit Merchant. (bugreport:4278) [L0ne_W0lf]
+//= 2.8 Updates to Brasilis Merchants. [L0ne_W0lf]
 //============================================================ 
 
 //=======================================================
@@ -73,11 +74,10 @@ ayo_in01,90,160,1	shop	Armor Dealer#ayo	842,2211:-1,2401:-1,2403:-1,2501:-1,2503
 //=======================================================
 // Brasilis
 //=======================================================
-brasilis,252,257,5	shop	Tool Dealer#bra	478,645:-1,656:-1,601:-1,602:-1,1065:-1,1750:-1,610:-1
+brasilis,252,257,3	shop	Tool Dealer#bra	478,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1,610:-1
 brasilis,244,243,3	shop	Weapon Dealer#bra	477,1407:-1,1457:-1,1354:-1,1519:-1,13003:-1
-brasilis,201,309,4	shop	Pet Groomer#bra	476,537:-1,643:-1,10013:-1,10014:-1,554:-1,6113:-1,6114:-1,6115:-1
+brasilis,201,309,3	shop	Pet Groomer#bra	476,537:-1,643:-1
-// Apple -> Acai_Fruit
+brasilis,221,128,3	shop	Fruit Gardener#bra	477,11515:-1,513:-1,11516:-1
-brasilis,221,128,4	shop	Fruit Merchant#bra	476,11515:-1,513:-1,11516:-1
 
 //=======================================================
 // Comodo

npc/mobs/dungeons/bra_dun.txt

@@ -15,20 +15,23 @@
 //==================================================
 // bra_dun01 - Behind the Waterfall
 //==================================================
-bra_dun01,0,0,0,0	monster	Iara	2069,60,5000,0,0
+bra_dun01,0,0,0,0	monster	Piranha	2070,80,5000,0,0
-bra_dun01,0,0,0,0	monster	Piranha	2070,100,5000,0,0
+bra_dun01,0,0,0,0	monster	Iara	2069,30,5000,0,0
-bra_dun01,0,0,0,0	monster	Hydra	1068,10,5000,0,0
+bra_dun01,0,0,0,0	monster	Black Mushroom	1084,5,180000,90000,1
+bra_dun01,0,0,0,0	monster	Marina	1141,20,5000,0,0
+bra_dun01,0,0,0,0	monster	Kukre	1070,10,5000,0,0
 bra_dun01,0,0,0,0	monster	Plankton	1161,10,5000,0,0
-bra_dun01,0,0,0,0	monster	Marina	1141,10,5000,0,0
+bra_dun01,0,0,0,0	monster	Hydra	1068,15,5000,0,0
-bra_dun01,0,0,0,0	monster	Black Mushroom	1084,10,180000,90000,1
 
 //==================================================
 // bra_dun02 - Behind the Waterfall
 //==================================================
-bra_dun02,0,0,0,0	monster	Iara	2069,120,5000,0,0
+bra_dun02,0,0,0,0	monster	Piranha	2070,60,5000,0,0
-bra_dun02,0,0,0,0	monster	Piranha	2070,80,5000,0,0
+bra_dun02,0,0,0,0	monster	Iara	2069,110,5000,0,0
-bra_dun02,0,0,0,0	monster	Hydra	1068,20,5000,0,0
-bra_dun02,0,0,0,0	monster	Plankton	1161,20,5000,0,0
 bra_dun02,0,0,0,0	monster	Marina	1141,10,5000,0,0
+bra_dun02,0,0,0,0	monster	Kukre	1070,10,5000,0,0
+bra_dun02,0,0,0,0	monster	Plankton	1161,10,5000,0,0
+bra_dun02,0,0,0,0	monster	Hydra	1068,15,5000,0,0
+bra_dun02,0,0,0,0	monster	Shining Plant	1083,2,5000,0,0
+bra_dun02,0,0,0,0	monster	Black Mushroom	1084,5,5000,0,0
 bra_dun02,0,0,0,0	boss_monster	Boitata	2068,1,7200000,600000,1
-bra_dun02,0,0,0,0	monster	Black Mushroom	1084,10,180000,90000,1

npc/mobs/fields/brasilis.txt

@@ -13,10 +13,10 @@
 //==================================================
 // bra_fild01
 //==================================================
+bra_fild01,0,0,0,0	monster	Curupira	2074,50,5000,0,0
+bra_fild01,0,0,0,0	monster	Dokebi	1110,10,5000,0,0
+bra_fild01,0,0,0,0	monster	Savage	1166,5,5000,0,0
 bra_fild01,0,0,0,0	monster	Headless Mule	2071,40,5000,0,0
-bra_fild01,0,0,0,0	monster	Curupira	2074,80,5000,0,0
+bra_fild01,0,0,0,0	monster	Red Mushroom	1085,5,5000,0,0
-bra_fild01,0,0,0,0	monster	Dokebi	1110,20,5000,0,0
+bra_fild01,0,0,0,0	monster	Jaguar	2072,55,5000,0,0
-bra_fild01,0,0,0,0	monster	Jaguar	2072,10,5000,0,0
+bra_fild01,0,0,0,0	monster	Toucan	2073,60,5000,0,0
-bra_fild01,0,0,0,0	monster	Savage	1166,20,5000,0,0
-bra_fild01,0,0,0,0	monster	Toucan	2073,10,5000,0,0
-bra_fild01,0,0,0,0	monster	Red Mushroom	1085,3,5000,0,0

npc/scripts_athena.conf

@@ -79,7 +79,7 @@ npc: npc/quests/quests_alberta.txt
 npc: npc/quests/quests_aldebaran.txt
 npc: npc/quests/quests_amatsu.txt
 npc: npc/quests/quests_ayothaya.txt
-//npc: npc/quests/quests_brasilis.txt
+npc: npc/quests/quests_brasilis.txt
 npc: npc/quests/quests_comodo.txt
 npc: npc/quests/quests_ein.txt
 npc: npc/quests/quests_geffen.txt
@@ -166,6 +166,7 @@ npc: npc/quests/Bard_Quest.txt
 npc: npc/quests/2007_relay.txt
 //Guild Relay Quests
 npc: npc/quests/guildrelay.txt
+//npc: npc/quests/newgears/2008_headgear.txt
 //Falicious Okolnir
 //God Item Second Edition Quests
 npc: npc/quests/okolnir/godse_aru01.txt
@@ -353,5 +354,5 @@ npc: npc/battleground/kvm/kvm03.txt
 npc: npc/instances/SealedShrine.txt
 npc: npc/instances/EndlessTower.txt
 npc: npc/instances/OrcsMemory.txt
-//npc: npc/instances/NydhoggsNest.txt
+npc: npc/instances/NydhoggsNest.txt
 // --------------------------------------------------------------

npc/scripts_jobs.conf

@@ -46,14 +46,25 @@ npc: npc/jobs/2-2a/Gypsy.txt
 npc: npc/jobs/2-2a/Paladin.txt
 npc: npc/jobs/2-2a/Professor.txt
 npc: npc/jobs/2-2a/Stalker.txt
-// -- 1-1E (Without Quest)
+// -- 1-1E
 npc: npc/jobs/1-1e/gunslinger.txt
 npc: npc/jobs/1-1e/ninja.txt
 npc: npc/jobs/1-1e/taekwon.txt
-// -- 2-1E (Place Holder)
+// -- 2-1E
 npc: npc/jobs/2-1e/StarGladiator.txt
-// -- 2-2E (Place Holder)
+// -- 2-2E
 npc: npc/jobs/2-2e/SoulLinker.txt
+// -- 3-1
+//npc: npc/jobs/3-1/archbishop.txt
+//npc: npc/jobs/3-1/mechanic.txt
+//npc: npc/jobs/3-1/ranger.txt
+//npc: npc/jobs/3-1/rune_knight.txt
+//npc: npc/jobs/3-1/warlock.txt
+// -- 3-2
+//npc: npc/jobs/3-2/maestro.txt
+//npc: npc/jobs/3-2/royal_guard.txt
+//npc: npc/jobs/3-2/sorcerer.txt
+//npc: npc/jobs/3-2/sura.txt
 // --------------------------------------------------------------
 // ------------------------ Skill Quests ------------------------
 npc: npc/quests/skills/acolyte_skills.txt

npc/scripts_monsters.conf

@@ -4,9 +4,11 @@
 npc: npc/mobs/citycleaners.txt
 npc: npc/mobs/pvp.txt
 
+npc: npc/mobs/towns/brasilis.txt
+
 npc: npc/mobs/fields/amatsu.txt
 npc: npc/mobs/fields/ayothaya.txt
-//npc: npc/mobs/fields/brasilis.txt
+npc: npc/mobs/fields/brasilis.txt
 npc: npc/mobs/fields/comodo.txt
 //npc: npc/mobs/fields/dicastes.txt
 npc: npc/mobs/fields/einbroch.txt
@@ -37,7 +39,7 @@ npc: npc/mobs/dungeons/ama_dun.txt
 npc: npc/mobs/dungeons/anthell.txt
 npc: npc/mobs/dungeons/ayo_dun.txt
 npc: npc/mobs/dungeons/beach_dun.txt
-//npc: npc/mobs/dungeons/bra_dun.txt
+npc: npc/mobs/dungeons/bra_dun.txt
 npc: npc/mobs/dungeons/c_tower.txt
 //npc: npc/mobs/dungeons/dic_dun.txt
 npc: npc/mobs/dungeons/ein_dun.txt

npc/scripts_warps.conf

@@ -41,6 +41,7 @@ npc: npc/warps/dungeons/ama_dun.txt
 npc: npc/warps/dungeons/anthell.txt
 npc: npc/warps/dungeons/ayo_dun.txt
 npc: npc/warps/dungeons/beach_dun.txt
+npc: npc/warps/dungeons/bra_dun.txt
 npc: npc/warps/dungeons/c_tower.txt
 npc: npc/warps/dungeons/ein_dun.txt
 npc: npc/warps/dungeons/gef_dun.txt

src/common/mmo.h

@@ -160,7 +160,7 @@
 //Mercenary System
 #define MC_SKILLBASE 8201
 #define MAX_MERCSKILL 40
-#define MAX_MERCENARY_CLASS 40
+#define MAX_MERCENARY_CLASS 44
 
 enum item_types {
 	IT_HEALING = 0,

src/map/battle.c

@@ -3764,7 +3764,7 @@ static const struct _battle_data {
 	{ "arrow_decrement",                    &battle_config.arrow_decrement,                 1,      0,      2,              },
 	{ "max_aspd",                           &battle_config.max_aspd,                        199,    100,    199,            },
 	{ "max_walk_speed",                     &battle_config.max_walk_speed,                  300,    100,    100*DEFAULT_WALK_SPEED, },
-	{ "max_lv",                             &battle_config.max_lv,                          99,     0,      127,            },
+	{ "max_lv",                             &battle_config.max_lv,                          99,     0,      150,            },
 	{ "aura_lv",                            &battle_config.aura_lv,                         99,     0,      INT_MAX,        },
 	{ "max_hp",                             &battle_config.max_hp,                          32500,  100,    1000000000,     },
 	{ "max_sp",                             &battle_config.max_sp,                          32500,  100,    1000000000,     },

src/map/pc.h

@@ -428,7 +428,7 @@ struct map_session_data {
 };
 
 //Update this max as necessary. 55 is the value needed for Super Baby currently
-#define MAX_SKILL_TREE 55
+#define MAX_SKILL_TREE 77
 //Total number of classes (for data storage)
 #define CLASS_COUNT (JOB_MAX - JOB_NOVICE_HIGH + JOB_MAX_BASIC)