summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorMichieru <Michieru@users.noreply.github.com>2014-10-08 10:31:28 +0200
committerMichieru <Michieru@users.noreply.github.com>2014-10-08 10:31:28 +0200
commit11ab6ab49bd0ee9f4c5e53833974589d0510645d (patch)
tree46ef2bafed8229c1ca2469c349ebb6ead46eb6df /src/map/battle.c
parentb41a5e90de640f118ade027eadbdb621d5d2d6f4 (diff)
downloadhercules-11ab6ab49bd0ee9f4c5e53833974589d0510645d.tar.gz
hercules-11ab6ab49bd0ee9f4c5e53833974589d0510645d.tar.bz2
hercules-11ab6ab49bd0ee9f4c5e53833974589d0510645d.tar.xz
hercules-11ab6ab49bd0ee9f4c5e53833974589d0510645d.zip
Update Hovering to it's official formula. (bug:8384)
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 5eabc719d..f95a4e568 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2707,10 +2707,6 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
sc_start2(src,bl,SC_COMBOATTACK,100,GC_WEAPONBLOCKING,src->id,2000);
return 0;
}
- if( sc->data[SC_HOVERING] && skill_id && (skill->get_inf(skill_id)&INF_GROUND_SKILL || skill_id == SR_WINDMILL) ) {
- d->dmg_lv = ATK_BLOCK;
- return 0;
- }
if ((sce=sc->data[SC_AUTOGUARD]) && flag&BF_WEAPON && !(skill->get_nk(skill_id)&NK_NO_CARDFIX_ATK) && rnd()%100 < sce->val2) {
int delay;
struct block_list *d_bl = NULL;
@@ -2783,7 +2779,7 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
return 0;
}
- if((sc->data[SC_HERMODE] || sc->data[SC_HOVERING]) && flag&BF_MAGIC)
+ if((sc->data[SC_HERMODE]) && flag&BF_MAGIC)
return 0;
if(sc->data[SC_NJ_TATAMIGAESHI] && (flag&(BF_MAGIC|BF_LONG)) == BF_LONG)