- Corrected Smokie's pet script to use petskillbonus instead of "bonus"

- Added constant map_flag_gvg2 which tags gvg maps independently of whether woe is on or off.
- battle_calc_gvg_damage will be invoked in gvg maps regardless of woe time.
- NPC_MENTALBREAKER now zaps matk*lv SP based on observations by Tharis.
- md->class_ will be changed on mob-class-change to fix all class-change related bugs. On respawn, the spawn data will be used to revert to the original class. 
- Improved the pet skillbonus timer for "eternal bonuses" cases where the bonus delay is 0.
- Adjusted gvg long damage rate to 80%, magic damage rate to 60%


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

1 files changed, 9 insertions, 2 deletions

diff --git a/src/map/skill.c b/src/map/skill.c
index 83954c9a2..5842cdc31 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1234,9 +1234,16 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int
 		sc_start(bl,SkillStatusChangeTable(skillid),50+10*skilllv,skilllv,src->type==BL_PET?skilllv*1000:skill_get_time2(skillid,skilllv));
 		break;
 
-	case NPC_MENTALBREAKER:
-		status_percent_damage(src, bl, 0, -(10+skilllv));
+	case NPC_MENTALBREAKER: 
+	{	//Based on observations by Tharis, Mental Breaker should do SP damage
+	  	//equal to Matk*skLevel.
+		rate = sstatus->matk_min;
+		if (rate < sstatus->matk_max)
+			rate += rand()%(sstatus->matk_max - sstatus->matk_min);
+		rate*=skilllv;
+		status_zap(bl, 0, rate);
 		break;
+	}
 	// Equipment breaking monster skills [Celest]
 	case NPC_BREAKWEAPON:
 		skill_break_equip(bl, EQP_WEAPON, 150*skilllv, BCT_ENEMY);