diff options
| author | xantara <xantara@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-01-23 04:47:38 +0000 |
|---|---|---|
| committer | xantara <xantara@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-01-23 04:47:38 +0000 |
| commit | 8756ba5d50270bbad6ad7065a05a1329ef86878b (patch) | |
| tree | f38f058f4b77a563e5e7682ec8c9b2c5af8b54da /src/map/skill.c | |
| parent | 071702a2c76f8a69d33f68984961b735c23ca239 (diff) | |
| download | hercules-8756ba5d50270bbad6ad7065a05a1329ef86878b.tar.gz hercules-8756ba5d50270bbad6ad7065a05a1329ef86878b.tar.bz2 hercules-8756ba5d50270bbad6ad7065a05a1329ef86878b.tar.xz hercules-8756ba5d50270bbad6ad7065a05a1329ef86878b.zip | |
` Fixed Emperium's skill damage/heal and elemental resist (eg. Aspersio) - bugreport:5256
` Rebranded the Core.h file to rAthena
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15507 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 68769e599..e2cd4269e 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -9474,6 +9474,10 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns { int heal = skill_calc_heal(ss,bl,sg->skill_id,sg->skill_lv,true); struct mob_data *md = BL_CAST(BL_MOB, bl); +#if REMODE + if( md && md->class_ == MOBID_EMPERIUM ) + break; +#endif if( md && mob_is_battleground(md) ) break; if( tstatus->hp >= tstatus->max_hp ) @@ -9663,6 +9667,11 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns case UNT_APPLEIDUN: //Apple of Idun [Skotlex] { int heal; + struct mob_data *md = BL_CAST(BL_MOB, bl); +#if REMODE + if( md && md->class_ == MOBID_EMPERIUM ) + break; +#endif if( sg->src_id == bl->id && !(tsc && tsc->data[SC_SPIRIT] && tsc->data[SC_SPIRIT]->val2 == SL_BARDDANCER) ) break; // affects self only when soullinked heal = skill_calc_heal(ss,bl,sg->skill_id, sg->skill_lv, true); |