diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-18 15:36:00 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-18 15:36:00 +0000 |
| commit | ba0872fe48a8b9d78358e58f52483740d17de7c7 (patch) | |
| tree | 705eecb263bc7c63b7d24dda85ecaf5634f65cf8 /src/map/battle.c | |
| parent | f725525727f76fac8643b8953bb00ec73e320d24 (diff) | |
| download | hercules-ba0872fe48a8b9d78358e58f52483740d17de7c7.tar.gz hercules-ba0872fe48a8b9d78358e58f52483740d17de7c7.tar.bz2 hercules-ba0872fe48a8b9d78358e58f52483740d17de7c7.tar.xz hercules-ba0872fe48a8b9d78358e58f52483740d17de7c7.zip | |
- Moved the equipment/card resistances to status ailments outside of status_get_sc_def, so that they are applied only to rate, not duration.
- Due to this, the max sc resistance settings (battle/status.conf) no longer apply to equipment/card-granted resistances.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8795 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index f44493cb3..9d7bf7514 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1654,7 +1654,7 @@ static struct Damage battle_calc_weapon_attack( (target->type == BL_MOB && sd->right_weapon.ignore_def_mob & (is_boss(target)?2:1)) || sd->right_weapon.ignore_def_ele & (1<<tstatus->def_ele) || sd->right_weapon.ignore_def_race & (1<<tstatus->race) || - sd->right_weapon.ignore_def_race & (is_boss(target)?1<<10:1<<11) + sd->right_weapon.ignore_def_race & (is_boss(target)?1<<RC_BOSS:1<<RC_NONBOSS) )) flag.idef = 1; @@ -1662,7 +1662,7 @@ static struct Damage battle_calc_weapon_attack( (target->type == BL_MOB && sd->left_weapon.ignore_def_mob & (is_boss(target)?2:1)) || sd->left_weapon.ignore_def_ele & (1<<tstatus->def_ele) || sd->left_weapon.ignore_def_race & (1<<tstatus->race) || - sd->left_weapon.ignore_def_race & (is_boss(target)?1<<10:1<<11) + sd->left_weapon.ignore_def_race & (is_boss(target)?1<<RC_BOSS:1<<RC_NONBOSS) )) { if(battle_config.left_cardfix_to_right && flag.rh) //Move effect to right hand. [Skotlex] flag.idef = 1; |