diff options
| author | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-29 12:21:59 +0000 |
|---|---|---|
| committer | Inkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-05-29 12:21:59 +0000 |
| commit | 560fb33ed7fc650fd7f5a4e5f4eec423202ca6d5 (patch) | |
| tree | 1f4dd0d74e98c85ec804f4921ddb7412183d2f20 /src/map/battle.c | |
| parent | 228fb34bfaa18f1de0ab909f8d2df4819a6018e9 (diff) | |
| download | hercules-560fb33ed7fc650fd7f5a4e5f4eec423202ca6d5.tar.gz hercules-560fb33ed7fc650fd7f5a4e5f4eec423202ca6d5.tar.bz2 hercules-560fb33ed7fc650fd7f5a4e5f4eec423202ca6d5.tar.xz hercules-560fb33ed7fc650fd7f5a4e5f4eec423202ca6d5.zip | |
* Added new bonuses bHealPower and bHealPower2.
* Heal skills code clean up.
- bSkillHeal can affect offensive heal now.
- bSkillHeal2 can affect AppleIdun and SlimPitcher now.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13820 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/battle.c')
| -rw-r--r-- | src/map/battle.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index fb3bb0e25..205d6c4f6 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -2279,14 +2279,12 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list { //Calc base damage according to skill case AL_HEAL: case PR_BENEDICTIO: - ad.damage = skill_calc_heal(src, target, skill_lv)/2; + case PR_SANCTUARY: + ad.damage = skill_calc_heal(src, target, skill_num, skill_lv)/2; break; case PR_ASPERSIO: ad.damage = 40; break; - case PR_SANCTUARY: - ad.damage = (skill_lv>6)?388:skill_lv*50; - break; case ALL_RESURRECTION: case PR_TURNUNDEAD: //Undead check is on skill_castend_damageid code. @@ -2673,7 +2671,7 @@ struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list * md.dmotion = 0; //No flinch animation. break; case NPC_EVILLAND: - md.damage = (skill_lv>6)?666:skill_lv*100; + md.damage = skill_calc_heal(src,target,skill_num,skill_lv); break; } |