diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-06 20:18:02 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-12-06 20:18:02 +0000 |
| commit | b01369911c5fef70712d20f09970d6929f16ff9e (patch) | |
| tree | e86196909bd16a081d0bdad3238e2d44d893fd06 | |
| parent | b565f6ab9ba86952cca14355e9702991fc755fd2 (diff) | |
| download | hercules-b01369911c5fef70712d20f09970d6929f16ff9e.tar.gz hercules-b01369911c5fef70712d20f09970d6929f16ff9e.tar.bz2 hercules-b01369911c5fef70712d20f09970d6929f16ff9e.tar.xz hercules-b01369911c5fef70712d20f09970d6929f16ff9e.zip | |
Fixed "Highness Heal" Heal -- would not apply it's boost over AL_HEAL properly. bugreport:5100
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15020 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/map/skill.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 41c3580ae..a7e75b6f4 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -357,8 +357,6 @@ int skill_calc_heal(struct block_list *src, struct block_list *target, int skill hp += hp * skill * 2 / 100; break; } - if( skill_id == AB_HIGHNESSHEAL ) - hp = (hp * (20 + 3 * (skill_lv - 1))) / 10; if( ( (target && target->type == BL_MER) || !heal ) && skill_id != NPC_EVILLAND ) hp >>= 1; @@ -3941,9 +3939,12 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in **/ case AB_HIGHNESSHEAL: { - int heal = skill_calc_heal(src, bl, skillid, skilllv, true); + int heal = skill_calc_heal(src, bl, (skillid == AB_HIGHNESSHEAL)?AL_HEAL:skillid, (skillid == AB_HIGHNESSHEAL)?10:skilllv, true); int heal_get_jobexp; - + //Highness Heal: starts at 1.5 boost + 0.5 for each level + if( skillid == AB_HIGHNESSHEAL ) { + heal = heal * ( 15 + 5 * skilllv ) / 10; + } if( status_isimmune(bl) || (dstmd && (dstmd->class_ == MOBID_EMPERIUM || mob_is_battleground(dstmd))) || (skillid == AL_HEAL && dstsd && dstsd->sc.option&OPTION_MADOGEAR) )//Mado is immune to AL_HEAL |