diff options
author | Hercules.ws <Hercules@efficiently.awesome> | 2014-08-08 10:53:09 +0200 |
---|---|---|
committer | HerculesWSAPI <Hercules@efficiently.awesome> | 2014-08-08 10:53:09 +0200 |
commit | 93891737444f5f92aebdb2302eddf8633d9387cf (patch) | |
tree | 5f565e989ebc0a3046b15adf489134cf06808697 /src/map/battle.c | |
parent | 781ba96bc45e706d8033c755897e3a7aafb80645 (diff) | |
download | hercules-93891737444f5f92aebdb2302eddf8633d9387cf.tar.gz hercules-93891737444f5f92aebdb2302eddf8633d9387cf.tar.bz2 hercules-93891737444f5f92aebdb2302eddf8633d9387cf.tar.xz hercules-93891737444f5f92aebdb2302eddf8633d9387cf.zip |
HPM Hooks Update
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
Diffstat (limited to 'src/map/battle.c')
-rw-r--r-- | src/map/battle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index dae29e76b..d960b7316 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -335,7 +335,7 @@ int64 battle_attr_fix(struct block_list *src, struct block_list *target, int64 d ratio += skill->enchant_eff[sc->data[SC_VIOLENTGALE]->val1-1]; if(sc->data[SC_DELUGE] && atk_elem == ELE_WATER) ratio += skill->enchant_eff[sc->data[SC_DELUGE]->val1-1]; - if(sc->data[SC_FIRE_CLOAK_OPTION] && atk_elem == ELE_FIRE)
+ if(sc->data[SC_FIRE_CLOAK_OPTION] && atk_elem == ELE_FIRE) damage += damage * sc->data[SC_FIRE_CLOAK_OPTION]->val2 / 100; } if( target && target->type == BL_SKILL ) { @@ -2867,7 +2867,7 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam damage >>= 2; //75% reduction } - if ( sc->data[SC_WATER_BARRIER] )
+ if ( sc->data[SC_WATER_BARRIER] ) damage = damage * ( 100 - 20 ) / 100; // Compressed code, fixed by map.h [Epoque] |