summaryrefslogtreecommitdiff
path: root/src/map/battle.c
diff options
context:
space:
mode:
authorMichieru <Michieru@users.noreply.github.com>2014-11-26 09:29:30 +0100
committerMichieru <Michieru@users.noreply.github.com>2014-11-26 09:29:30 +0100
commitd79dc3cf4660bce7c7b0c22238baa1bbd9d48e55 (patch)
tree9e9ba997f76199ae231cfaa36c224c8a7f93c26c /src/map/battle.c
parenteebf61b2418a6df201c1cc8cc7dfee7ee18ddbe8 (diff)
downloadhercules-d79dc3cf4660bce7c7b0c22238baa1bbd9d48e55.tar.gz
hercules-d79dc3cf4660bce7c7b0c22238baa1bbd9d48e55.tar.bz2
hercules-d79dc3cf4660bce7c7b0c22238baa1bbd9d48e55.tar.xz
hercules-d79dc3cf4660bce7c7b0c22238baa1bbd9d48e55.zip
Update Fire Expansion to official formula for all level
Fix Full Throttle Order of Calculations For Stat Increase/Decrease By Status's Mega Thanks to Rytech
Diffstat (limited to 'src/map/battle.c')
-rw-r--r--src/map/battle.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 5a17c8d90..c605ad1d5 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2910,6 +2910,13 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam
if ( sc->data[SC_WATER_BARRIER] )
damage = damage * ( 100 - 20 ) / 100;
+ if( sc->data[SC_FIRE_EXPANSION_SMOKE_POWDER] ) {
+ if( (flag&(BF_SHORT|BF_WEAPON)) == (BF_SHORT|BF_WEAPON) )
+ damage -= 15 * damage / 100;//15% reduction to physical melee attacks
+ else if( (flag&(BF_LONG|BF_WEAPON)) == (BF_LONG|BF_WEAPON) )
+ damage -= 50 * damage / 100;//50% reduction to physical ranged attacks
+ }
+
// Compressed code, fixed by map.h [Epoque]
if (src->type == BL_MOB) {
int i;