Fixed an issue with MDEF & DEF where it does not updating after equipping.

MDEF & DEF are now can be negative value and adds boost on damage like in the official servers.
Fixed aspd calculations on some skill bonuses and reductions(SC_PARALYSE, SC_BODYPAINT, SC_INVISIBILITY, SC_GROOMY, SC_SWINGDANCE, SC_DANCEWITHWUG, SC_GLOOMYDAY, SC_EARTHDRIVE, SC_GT_CHANGE, SC_GT_REVITALIZE, SC_MELON_BOMB, SC_BOOST500, SC_EXTRACT_SALAMINE_JUICE, SC_INCASPDRATE)

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

3 files changed, 65 insertions, 23 deletions

diff --git a/src/map/battle.c b/src/map/battle.c
index 5f327803c..f7c206228 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3590,7 +3590,7 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
 			 * Damage from magic = Magic Attack * 111.5/(111.5+eMDEF) 
 			 * Damage = Magic Attack * 111.5/(111.5+eMDEF) - sMDEF 
 			 **/
-			ad.damage = ad.damage * 1115 / (1115 + mdef * 10) - mdef2;
+			ad.damage = ad.damage * 1115 / ((mdef*-1>111?-1:1)*(1115 + mdef * 10)) - mdef2;
 		#else
 			if(battle_config.magic_defense_type)
 				ad.damage = ad.damage - mdef*battle_config.magic_defense_type - mdef2;
diff --git a/src/map/clif.c b/src/map/clif.c
index edabcd756..660555504 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -2779,7 +2779,12 @@ void clif_updatestatus(struct map_session_data *sd,int type)
 			//negative check (in case you have something like Berserk active)
 			int mdef2 = pc_rightside_mdef(sd);
 
-			WFIFOL(fd,4)= ( mdef2 < 0 ) ? 0 : mdef2;
+			WFIFOL(fd,4)= 
+#ifndef RENEWAL	
+			( mdef2 < 0 ) ? 0 :
+#endif
+			mdef2;
+
 		}
 		break;
 	case SP_CRITICAL:
@@ -3126,7 +3131,11 @@ void clif_initialstatus(struct map_session_data *sd)
 	WBUFW(buf,26) = pc_rightside_def(sd);
 	WBUFW(buf,28) = pc_leftside_mdef(sd);
 	mdef2 = pc_rightside_mdef(sd);
-	WBUFW(buf,30) = ( mdef2 < 0 ) ? 0 : mdef2;  //Negative check for Frenzy'ed characters.
+	WBUFW(buf,30) = 
+#ifndef RENEWAL
+		( mdef2 < 0 ) ? 0 : //Negative check for Frenzy'ed characters.
+#endif
+		mdef2;  
 	WBUFW(buf,32) = sd->battle_status.hit;
 	WBUFW(buf,34) = sd->battle_status.flee;
 	WBUFW(buf,36) = sd->battle_status.flee2/10;
diff --git a/src/map/status.c b/src/map/status.c
index f8197ee7d..c1ed31d4a 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -3765,8 +3765,12 @@ void status_calc_bl_(struct block_list* bl, enum scb_flag flag, bool first)
 			)
 			clif_updatestatus(sd,SP_ATK1);
 
-		if(b_status.def != status->def)
+		if(b_status.def != status->def){
 			clif_updatestatus(sd,SP_DEF1);
+#ifdef RENEWAL
+			clif_updatestatus(sd,SP_DEF2);
+#endif
+		}
 
 		if(b_status.rhw.atk2 != status->rhw.atk2 || b_status.lhw.atk2 != status->lhw.atk2
 #ifdef RENEWAL
@@ -3775,8 +3779,12 @@ void status_calc_bl_(struct block_list* bl, enum scb_flag flag, bool first)
 			)
 			clif_updatestatus(sd,SP_ATK2);
 
-		if(b_status.def2 != status->def2)
+		if(b_status.def2 != status->def2){
 			clif_updatestatus(sd,SP_DEF2);
+#ifdef RENEWAL
+			clif_updatestatus(sd,SP_DEF1);
+#endif
+		}
 		if(b_status.flee2 != status->flee2)
 			clif_updatestatus(sd,SP_FLEE2);
 		if(b_status.cri != status->cri)
@@ -3785,10 +3793,18 @@ void status_calc_bl_(struct block_list* bl, enum scb_flag flag, bool first)
 			clif_updatestatus(sd,SP_MATK1);
 		if(b_status.matk_min != status->matk_min)
 			clif_updatestatus(sd,SP_MATK2);
-		if(b_status.mdef != status->mdef)
+		if(b_status.mdef != status->mdef){
 			clif_updatestatus(sd,SP_MDEF1);
-		if(b_status.mdef2 != status->mdef2)
+#ifdef RENEWAL
+			clif_updatestatus(sd,SP_MDEF2);
+#endif
+		}
+		if(b_status.mdef2 != status->mdef2){
 			clif_updatestatus(sd,SP_MDEF2);
+#ifdef RENEWAL
+			clif_updatestatus(sd,SP_MDEF1);
+#endif
+		}
 		if(b_status.rhw.range != status->rhw.range)
 			clif_updatestatus(sd,SP_ATTACKRANGE);
 		if(b_status.max_hp != status->max_hp)
@@ -4535,7 +4551,11 @@ static defType status_calc_def(struct block_list *bl, struct status_change *sc,
 static signed short status_calc_def2(struct block_list *bl, struct status_change *sc, int def2)
 {
 	if(!sc || !sc->count)
-		return cap_value(def2,1,SHRT_MAX);
+#ifdef RENEWAL
+		return (short)cap_value(def2,SHRT_MIN,SHRT_MAX);
+#else
+		return (short)cap_value(def2,1,SHRT_MAX);
+#endif
 	
 	if(sc->data[SC_BERSERK])
 		return 0;
@@ -4573,7 +4593,11 @@ static signed short status_calc_def2(struct block_list *bl, struct status_change
 	if( sc->data[SC_GT_REVITALIZE] )
 		def2 += def2 * ( 50 + 10 * sc->data[SC_GT_REVITALIZE]->val1 ) / 100;
 
+#ifdef RENEWAL
+	return (short)cap_value(def2,SHRT_MIN,SHRT_MAX);
+#else
 	return (short)cap_value(def2,1,SHRT_MAX);
+#endif
 }
 
 
@@ -4623,7 +4647,12 @@ static defType status_calc_mdef(struct block_list *bl, struct status_change *sc,
 static signed short status_calc_mdef2(struct block_list *bl, struct status_change *sc, int mdef2)
 {
 	if(!sc || !sc->count)
-		return cap_value(mdef2,1,SHRT_MAX);
+#ifdef RENEWAL
+		return (short)cap_value(mdef2,SHRT_MIN,SHRT_MAX);
+#else
+		return (short)cap_value(mdef2,1,SHRT_MAX);
+#endif
+
 
 	if(sc->data[SC_BERSERK])
 		return 0;
@@ -4634,7 +4663,11 @@ static signed short status_calc_mdef2(struct block_list *bl, struct status_chang
 	if(sc->data[SC_ANALYZE])
 		mdef2 -= mdef2 * ( 14 * sc->data[SC_ANALYZE]->val1 ) / 100;
 
+#ifdef RENEWAL
+	return (short)cap_value(mdef2,SHRT_MIN,SHRT_MAX);
+#else
 	return (short)cap_value(mdef2,1,SHRT_MAX);
+#endif
 }
 
 static unsigned short status_calc_speed(struct block_list *bl, struct status_change *sc, int speed)
@@ -4935,36 +4968,36 @@ static short status_calc_aspd_rate(struct block_list *bl, struct status_change *
 	if( sc->data[SC_FIGHTINGSPIRIT] && sc->data[SC_FIGHTINGSPIRIT]->val2 )
 		aspd_rate -= sc->data[SC_FIGHTINGSPIRIT]->val2;
 	if( sc->data[SC_PARALYSE] )
-		aspd_rate += aspd_rate * 10 / 100;
+		aspd_rate += 100;
 	if( sc->data[SC__BODYPAINT] )
-		aspd_rate += aspd_rate * (20 + 5 * sc->data[SC__BODYPAINT]->val1) / 100;
+		aspd_rate +=  200 + 50 * sc->data[SC__BODYPAINT]->val1;
 	if( sc->data[SC__INVISIBILITY] )
-		aspd_rate += aspd_rate * sc->data[SC__INVISIBILITY]->val2 / 100;
+		aspd_rate += sc->data[SC__INVISIBILITY]->val2 * 10 ;
 	if( sc->data[SC__GROOMY] )
-		aspd_rate += aspd_rate * sc->data[SC__GROOMY]->val2 / 100;
+		aspd_rate += sc->data[SC__GROOMY]->val2 * 10;
 	if( sc->data[SC_SWINGDANCE] )
-		aspd_rate -= aspd_rate * sc->data[SC_SWINGDANCE]->val2 / 100;
+		aspd_rate -= sc->data[SC_SWINGDANCE]->val2 * 10;
 	if( sc->data[SC_DANCEWITHWUG] )
-		aspd_rate -= aspd_rate * sc->data[SC_DANCEWITHWUG]->val3 / 100;
+		aspd_rate -= sc->data[SC_DANCEWITHWUG]->val3 * 10;
 	if( sc->data[SC_GLOOMYDAY] )
-		aspd_rate += aspd_rate * sc->data[SC_GLOOMYDAY]->val3 / 100;
+		aspd_rate += sc->data[SC_GLOOMYDAY]->val3 * 10;
 	if( sc->data[SC_EARTHDRIVE] )
-		aspd_rate += aspd_rate * 25 / 100;
+		aspd_rate += 250;
 	/*As far I tested the skill there is no ASPD addition is applied. [Jobbie] */
 	//if( sc->data[SC_RAISINGDRAGON] )
 	//	aspd_rate -= 100; //FIXME: Need official ASPD bonus of this status. [Jobbie]
 	if( sc->data[SC_GT_CHANGE] )
-		aspd_rate -= aspd_rate * (sc->data[SC_GT_CHANGE]->val2/200) / 100;
+		aspd_rate -= (sc->data[SC_GT_CHANGE]->val2/200) * 10;
 	if( sc->data[SC_GT_REVITALIZE] )
-		aspd_rate -= aspd_rate * sc->data[SC_GT_REVITALIZE]->val2 / 100;
+		aspd_rate -= sc->data[SC_GT_REVITALIZE]->val2 * 10;
 	if( sc->data[SC_MELON_BOMB] )
-		aspd_rate += aspd_rate * sc->data[SC_MELON_BOMB]->val1 / 100;
+		aspd_rate += sc->data[SC_MELON_BOMB]->val1 * 10;
 	if( sc->data[SC_BOOST500] )
-		aspd_rate -= aspd_rate * sc->data[SC_BOOST500]->val1/100;
+		aspd_rate -= sc->data[SC_BOOST500]->val1 *10;
 	if( sc->data[SC_EXTRACT_SALAMINE_JUICE] )
-		aspd_rate -= aspd_rate * sc->data[SC_EXTRACT_SALAMINE_JUICE]->val1/100;
+		aspd_rate -= sc->data[SC_EXTRACT_SALAMINE_JUICE]->val1 * 10;
 	if( sc->data[SC_INCASPDRATE] )
-		aspd_rate -= aspd_rate * sc->data[SC_INCASPDRATE]->val1 / 100;
+		aspd_rate -= sc->data[SC_INCASPDRATE]->val1 * 10;
 
 	return (short)cap_value(aspd_rate,0,SHRT_MAX);
 }