- Applied use of RC_BOSS/RC_NONBOSS in the ignore def code.

- Corrected SCB_LUK not updating SCB_BATK as well.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8598 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog-Trunk.txt

@@ -3,6 +3,8 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2006/09/02
+	* Corrected SCB_LUK not updating SCB_BATK as well. [Skotlex]
 2006/09/01
 	* Corrected script_commands description of getequipid, it returns -1, not 0
 	  on fail. [Skotlex]

src/map/battle.c

@@ -1634,13 +1634,13 @@ static struct Damage battle_calc_weapon_attack(
 			{	//Elemental/Racial adjustments
 				if(sd->right_weapon.def_ratio_atk_ele & (1<<tstatus->def_ele) ||
 					sd->right_weapon.def_ratio_atk_race & (1<<tstatus->race) ||
-					sd->right_weapon.def_ratio_atk_race & (is_boss(target)?1<<10:1<<11)
+					sd->right_weapon.def_ratio_atk_race & (1<<(is_boss(target)?RC_BOSS:RC_NONBOSS))
 				)
 					flag.pdef = 1;
 
 				if(sd->left_weapon.def_ratio_atk_ele & (1<<tstatus->def_ele) ||
 					sd->left_weapon.def_ratio_atk_race & (1<<tstatus->race) ||
-					sd->left_weapon.def_ratio_atk_race & (is_boss(target)?1<<10:1<<11)
+					sd->left_weapon.def_ratio_atk_race & (1<<(is_boss(target)?RC_BOSS:RC_NONBOSS))
 				) {	//Pass effect onto right hand if configured so. [Skotlex]
 					if (battle_config.left_cardfix_to_right && flag.rh)
 						flag.pdef = 1;

src/map/status.c

@@ -2914,7 +2914,7 @@ void status_calc_bl(struct block_list *bl, unsigned long flag)
 
 	if(flag&SCB_LUK) {
 		status->luk = status_calc_luk(bl, sc, b_status->luk);
-		flag|=SCB_CRI|SCB_FLEE2;
+		flag|=SCB_BATK|SCB_CRI|SCB_FLEE2;
 	}
 
 	if(flag&SCB_BATK && b_status->batk) {