From 63e772956b55b95704a76d7e7556c77e22450ed0 Mon Sep 17 00:00:00 2001 From: aleos89 Date: Fri, 15 Apr 2016 10:50:13 -0400 Subject: [PATCH] Corrected some skills healing immune targets (fixes #1109) * Gentle Touch - Cure and Tuna Belly will no longer heal Emperium or Barricades. Thanks to @admkakaroto and @Darkelfen! --- src/map/skill.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/map/skill.c b/src/map/skill.c index ad3d8b5727..bf0bdaa1c1 100755 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -9798,9 +9798,11 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui case SR_GENTLETOUCH_CURE: { - int heal; + unsigned int heal; - if (!dstmd || dstmd->mob_id != MOBID_EMPERIUM || !mob_is_battleground(dstmd)) { + if (dstmd && (dstmd->mob_id == MOBID_EMPERIUM || mob_is_battleground(dstmd))) + heal = 0; + else { heal = (120 * skill_lv) + (status_get_max_hp(bl) * skill_lv / 100); status_heal(bl, heal, 0, 0); } @@ -10789,9 +10791,11 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui case SU_TUNABELLY: { - int heal; + unsigned int heal; - if (!dstmd || dstmd->mob_id != MOBID_EMPERIUM || !mob_is_battleground(dstmd)) { + if (dstmd && (dstmd->mob_id == MOBID_EMPERIUM || mob_is_battleground(dstmd))) + heal = 0; + else { heal = ((2 * skill_lv - 1) * 10) * status_get_max_hp(bl) / 100; status_heal(bl, heal, 0, 0); }