Follow up dae8122 , thanks Cydh.

rathena · Dec 31, 2013 · 812016457584be46cab301591115ada643e75f1b · 8120164
1 parent b695ab3
commit 812016457584be46cab301591115ada643e75f1b
Showing with 17 additions and 26 deletions.

+8 −9 db/const.txt

+2 −2 doc/item_bonus.txt

+0 −1 src/map/battle.c

+4 −4 src/map/elemental.c

+3 −4 src/map/map.h

+0 −5 src/map/pc.c

+0 −1 src/map/pc.h
diff --git a/db/const.txt b/db/const.txt
@@ -635,15 +635,14 @@ bSetMDefRace	2060
 bHPVanishRate	2061
 
 bIgnoreDefClass	2062
-bIgnoreMdefRaceRate	2063
-bDefRatioAtkClass	2064
-bAddClass	2065
-bSubClass	2066
-bMagicAddClass	2067
-bWeaponComaClass	2068
-bHpDrainValueClass	2069
-bSpDrainValueClass	2070
-bIgnoreMdefClassRate	2071
+bDefRatioAtkClass	2063
+bAddClass	2064
+bSubClass	2065
+bMagicAddClass	2066
+bWeaponComaClass	2067
+bHpDrainValueClass	2068
+bSpDrainValueClass	2069
+bIgnoreMdefClassRate	2070
 
 EQI_HEAD_TOP	1
 EQI_ARMOR	2

diff --git a/doc/item_bonus.txt b/doc/item_bonus.txt
@@ -127,9 +127,9 @@ bonus2 bAddDamageClass,n,x;		+x% extra physical damage against monsters of class
 					Against players, n is their job id
 bonus2 bAddMagicDamageClass,n,x;	+x% extra magical damage against monsters of class n
 					Against players, n is their job id.
-bonus2 bAddDefClass,n,x;		x% physical damage reduction against monsters of class n
+bonus2 bAddDefMonster,n,x;		x% physical damage reduction against monsters of class n
 					Against players, n is their job id.
-bonus2 bAddMDefClass,n,x;		x% magical damage reduction against monsters of class n
+bonus2 bAddMDefMonster,n,x;		x% magical damage reduction against monsters of class n
 					Against players, n is their job id.
 bonus2 bIgnoreMdefRaceRate,n,x;		Disregard x% of the target's MDEF if the target belongs to race n
 bonus2 bHPDrainRate,n,x;		n/10 % probability to drain x% HP when attacking

diff --git a/src/map/battle.c b/src/map/battle.c
@@ -5344,7 +5344,6 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
 			if(sd) {
 				i = sd->ignore_mdef_by_race[tstatus->race] + sd->ignore_mdef_by_race[RC_ALL];
 				i += sd->ignore_mdef_by_class[tstatus->class_] + sd->ignore_mdef_by_class[CLASS_ALL];
-				i += sd->ignore_mdef;
 				if (i)
 				{
 					if (i > 100) i = 100;

diff --git a/src/map/elemental.c b/src/map/elemental.c
@@ -210,7 +210,7 @@ int elemental_delete(struct elemental_data *ed, int reply) {
 		return unit_free(&ed->bl, 0);
 
 	sd->ed = NULL;
-	sd->status.class_ = 0;
+	sd->status.ele_id = 0;
 
 	return unit_remove_map(&ed->bl, 0);
 }
@@ -238,7 +238,7 @@ int elemental_data_received(struct s_elemental *ele, bool flag) {
 		return 0;
 
 	if( !flag || i < 0 ) { // Not created - loaded - DB info
-		sd->status.class_ = 0;
+		sd->status.ele_id = 0;
 		return 0;
 	}
 
@@ -274,7 +274,7 @@ int elemental_data_received(struct s_elemental *ele, bool flag) {
 		ed = sd->ed;
 	}
 
-	sd->status.class_ = ele->elemental_id;
+	sd->status.ele_id = ele->elemental_id;
 
 	if( ed->bl.prev == NULL && sd->bl.prev != NULL ) {
 		if(map_addblock(&ed->bl))
@@ -755,7 +755,7 @@ static int elemental_ai_sub_timer(struct elemental_data *ed, struct map_session_
 
 static int elemental_ai_sub_foreachclient(struct map_session_data *sd, va_list ap) {
 	unsigned int tick = va_arg(ap,unsigned int);
-	if(sd->status.class_ && sd->ed)
+	if(sd->status.ele_id && sd->ed)
 		elemental_ai_sub_timer(sd->ed,sd,tick);
 
 	return 0;

diff --git a/src/map/map.h b/src/map/map.h
@@ -432,7 +432,7 @@ enum _sp {
 	SP_HP_DRAIN_VALUE,SP_SP_DRAIN_VALUE, // 1079-1080
 	SP_WEAPON_ATK,SP_WEAPON_ATK_RATE, // 1081-1082
 	SP_DELAYRATE,SP_HP_DRAIN_RATE_RACE,SP_SP_DRAIN_RATE_RACE, // 1083-1085
-	SP_IGNORE_MDEF_RATE,SP_IGNORE_DEF_RACE_RATE,SP_SKILL_HEAL2,SP_ADDEFF_ONSKILL, //1086-1089
+	SP_IGNORE_MDEF_RACE_RATE,SP_IGNORE_DEF_RACE_RATE,SP_SKILL_HEAL2,SP_ADDEFF_ONSKILL, //1086-1089
 	SP_ADD_HEAL_RATE,SP_ADD_HEAL2_RATE, SP_EQUIP_ATK, //1090-1092
 
 	SP_RESTART_FULL_RECOVER=2000,SP_NO_CASTCANCEL,SP_NO_SIZEFIX,SP_NO_MAGIC_DAMAGE,SP_NO_WEAPON_DAMAGE,SP_NO_GEMSTONE, // 2000-2005
@@ -452,9 +452,8 @@ enum _sp {
 	SP_SKILL_USE_SP,SP_MAGIC_ATK_ELE, SP_ADD_FIXEDCAST, SP_ADD_VARIABLECAST,  //2055-2058
 	SP_DEF_SET,SP_MDEF_SET,SP_HP_VANISH_RATE,  //2059-2061
 
-	SP_IGNORE_DEF_CLASS, SP_IGNORE_MDEF_RACE_RATE, SP_DEF_RATIO_ATK_CLASS, //2062-2064
-	SP_ADDCLASS, SP_SUBCLASS, SP_MAGIC_ADDCLASS, SP_WEAPON_COMA_CLASS, //2065-2068
-	SP_HP_DRAIN_VALUE_CLASS, SP_SP_DRAIN_VALUE_CLASS, SP_IGNORE_MDEF_CLASS_RATE //2069-2071
+	SP_IGNORE_DEF_CLASS, SP_DEF_RATIO_ATK_CLASS, SP_ADDCLASS, SP_SUBCLASS, SP_MAGIC_ADDCLASS, //2062-2066
+	SP_WEAPON_COMA_CLASS, SP_HP_DRAIN_VALUE_CLASS, SP_SP_DRAIN_VALUE_CLASS, SP_IGNORE_MDEF_CLASS_RATE //2067-2070
 };
 
 enum _look {

diff --git a/src/map/pc.c b/src/map/pc.c
@@ -2404,11 +2404,6 @@ int pc_bonus(struct map_session_data *sd,int type,int val)
 			if(sd->state.lr_flag != 2)
 				sd->bonus.misc_def_rate += val;
 			break;
-		case SP_IGNORE_MDEF_RATE:
-			if(sd->state.lr_flag != 2) {
-				sd->ignore_mdef += val;
-			}
-			break;
 		case SP_IGNORE_MDEF_ELE:
 			if(val > ELE_ALL) {
 				ShowError("pc_bonus: SP_IGNORE_MDEF_ELE: Invalid element %d\n", val);

diff --git a/src/map/pc.h b/src/map/pc.h
@@ -311,7 +311,6 @@ struct map_session_data {
 	int magic_atk_ele[ELE_NONE];
 	int critaddrace[RC_MAX];
 	int expaddrace[RC_MAX];
-	int ignore_mdef;
 	int ignore_mdef_by_race[RC_MAX];
 	int ignore_mdef_by_class[CLASS_MAX];
 	int ignore_def_by_race[RC_MAX];