summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorHercules.ws <Hercules@efficiently.awesome>2014-08-07 00:35:10 +0200
committerHerculesWSAPI <Hercules@efficiently.awesome>2014-08-07 00:35:10 +0200
commitcaf89724767465ecf339c391bb6d7a937d563fb2 (patch)
treeac27091ea2bf077787786e113c7c839531c0166e /src/map
parentd45cf975aab39d04bd43dabaa455fde35b61b8da (diff)
downloadhercules-caf89724767465ecf339c391bb6d7a937d563fb2.tar.gz
hercules-caf89724767465ecf339c391bb6d7a937d563fb2.tar.bz2
hercules-caf89724767465ecf339c391bb6d7a937d563fb2.tar.xz
hercules-caf89724767465ecf339c391bb6d7a937d563fb2.zip
HPM Hooks Update
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 3a52769fc..49dcd54ef 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2844,7 +2844,7 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
else
damage >>= 1; //Receive 50% damage
}
-#endif
+#endif
if(sc->data[SC_DEFENDER] &&
((flag&(BF_LONG|BF_WEAPON)) == (BF_LONG|BF_WEAPON) || skill_id == CR_ACIDDEMONSTRATION))
@@ -2855,9 +2855,9 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
damage -= damage * 20 / 100;
if(sc->data[SC_FOGWALL]) {
- if(flag&BF_SKILL) { //25% reduction
- if ( !(skill->get_inf(skill_id)&INF_GROUND_SKILL) && !(skill->get_nk(skill_id)&NK_SPLASH) )
- damage -= 25*damage/100;
+ if(flag&BF_SKILL) { //25% reduction
+ if ( !(skill->get_inf(skill_id)&INF_GROUND_SKILL) && !(skill->get_nk(skill_id)&NK_SPLASH) )
+ damage -= 25*damage/100;
}
else if ((flag&(BF_LONG|BF_WEAPON)) == (BF_LONG|BF_WEAPON))
damage >>= 2; //75% reduction