diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-02 20:40:51 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-02 20:40:51 +0000 |
| commit | 30953733770f10449ce32662369546e5ebd34449 (patch) | |
| tree | 323ba460f3f6d50e037c843365d7b3979e5ff965 | |
| parent | 82c514c4d87e1cbf5a486e41bc09e2f31069f354 (diff) | |
| download | hercules-30953733770f10449ce32662369546e5ebd34449.tar.gz hercules-30953733770f10449ce32662369546e5ebd34449.tar.bz2 hercules-30953733770f10449ce32662369546e5ebd34449.tar.xz hercules-30953733770f10449ce32662369546e5ebd34449.zip | |
- 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8598 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/battle.c | 4 | ||||
| -rw-r--r-- | src/map/status.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 0bd459045..0187eac2b 100644 --- a/Changelog-Trunk.txt +++ b/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]
diff --git a/src/map/battle.c b/src/map/battle.c index e77a26e2e..fe693d1ec 100644 --- a/src/map/battle.c +++ b/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; diff --git a/src/map/status.c b/src/map/status.c index 70f235b9d..895ef06ac 100644 --- a/src/map/status.c +++ b/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) {
|