diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-06-07 15:18:54 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-06-07 15:18:54 +0000 |
| commit | a608dec02072f9b297bad8ae95e730751e4d84a9 (patch) | |
| tree | ba83cab844d360e6cdbf230da5af0b69d87b0340 | |
| parent | c8062d07fe79e0cda2f60cd169c7d22a84926006 (diff) | |
| download | hercules-a608dec02072f9b297bad8ae95e730751e4d84a9.tar.gz hercules-a608dec02072f9b297bad8ae95e730751e4d84a9.tar.bz2 hercules-a608dec02072f9b297bad8ae95e730751e4d84a9.tar.xz hercules-a608dec02072f9b297bad8ae95e730751e4d84a9.zip | |
Magical damage reflection now works against boss monsters and only on target skill(but EarthQuake with one target is an exception).(bugreport:3026, bugreport:2527)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13857 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/skill.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index b0c6cdefb..c3e93d142 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 09/06/07 + * Magical damage reflection now works against boss monsters and only on target skill(but EarthQuake with one target is an exception). [Inkfish] * Changed hardcoded "5" to MAX_ARROW_RESOURCE in skill_arrow_create preventing proper usage. (bugreport:3025) [Paradox924X] * Implemented "cooking exp" that increases the success chance of cooking by 0.05% per try and the max bonus is 20%. [Inkfish] 09/06/05 diff --git a/src/map/skill.c b/src/map/skill.c index cc141a0ed..56e90fd9e 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1630,8 +1630,9 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds } } - if (dmg.flag&BF_MAGIC) { - if( !(sstatus->mode&MD_BOSS) && (dmg.damage || dmg.damage2) && skill_magic_reflect(src, bl, src==dsrc) ) + if( dmg.flag&BF_MAGIC && ( skillid != NPC_EARTHQUAKE || (flag&0xFFF) == 1 ) ) + { // Earthquake on multiple targets is not counted as a target skill. [Inkfish] + if( (dmg.damage || dmg.damage2) && skill_magic_reflect(src, bl, src==dsrc) ) { //Magic reflection, switch caster/target struct block_list *tbl = bl; bl = src; |