diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-08-18 08:25:04 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-08-18 08:25:04 +0000 |
| commit | abc6f29b74a026f0c2ba219fbd9dcbd0ed1cfa31 (patch) | |
| tree | c931d0cadaadf2c93f893a23f2b28083a967fce8 | |
| parent | 5dd60b0ea5e16eb326b472709feabd3c36e3d1b8 (diff) | |
| download | hercules-abc6f29b74a026f0c2ba219fbd9dcbd0ed1cfa31.tar.gz hercules-abc6f29b74a026f0c2ba219fbd9dcbd0ed1cfa31.tar.bz2 hercules-abc6f29b74a026f0c2ba219fbd9dcbd0ed1cfa31.tar.xz hercules-abc6f29b74a026f0c2ba219fbd9dcbd0ed1cfa31.zip | |
Equipment DEF penalty shouldn't be applied to players in Mental Strength.(bugreport:3454)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14010 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/battle.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 6c6f34ec7..d51c03b29 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. +09/08/17 + * Equipment DEF penalty shouldn't be applied to players in Mental Strength. (bugreport:3454) [Inkfish] 09/08/14 * Fixed self skills affecting target unit when used within combo delay for Asura and Flying Kick. (bugreport:3495) [Inkfish] 09/08/11 diff --git a/src/map/battle.c b/src/map/battle.c index 63e2357f4..b80616803 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1807,10 +1807,12 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src,struct blo target_count = unit_counttargeted(target,battle_config.vit_penalty_count_lv); if(target_count >= battle_config.vit_penalty_count) { if(battle_config.vit_penalty_type == 1) { - def1 = (def1 * (100 - (target_count - (battle_config.vit_penalty_count - 1))*battle_config.vit_penalty_num))/100; + if( !tsc || !tsc->data[SC_STEELBODY] ) + def1 = (def1 * (100 - (target_count - (battle_config.vit_penalty_count - 1))*battle_config.vit_penalty_num))/100; def2 = (def2 * (100 - (target_count - (battle_config.vit_penalty_count - 1))*battle_config.vit_penalty_num))/100; } else { //Assume type 2 - def1 -= (target_count - (battle_config.vit_penalty_count - 1))*battle_config.vit_penalty_num; + if( !tsc || !tsc->data[SC_STEELBODY] ) + def1 -= (target_count - (battle_config.vit_penalty_count - 1))*battle_config.vit_penalty_num; def2 -= (target_count - (battle_config.vit_penalty_count - 1))*battle_config.vit_penalty_num; } } |