summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authormalufett <malufett.eat.my.binaries@gmail.com>2014-10-30 12:55:01 +0800
committermalufett <malufett.eat.my.binaries@gmail.com>2014-10-30 12:55:01 +0800
commit5a55c6f349b2f094494d83f3012004a76ed934a0 (patch)
tree963acdcb2ba955a2098aeba2e55b828bd5d92a27 /src/map
parent8f0508418425abb518381b46cc73caa1a9e66890 (diff)
downloadhercules-5a55c6f349b2f094494d83f3012004a76ed934a0.tar.gz
hercules-5a55c6f349b2f094494d83f3012004a76ed934a0.tar.bz2
hercules-5a55c6f349b2f094494d83f3012004a76ed934a0.tar.xz
hercules-5a55c6f349b2f094494d83f3012004a76ed934a0.zip
Fixed Bug#7736
-http://hercules.ws/board/tracker/issue-7736-fist-spell-w-double-attack-and-similar-effects/?gopid=20575#entry20575 Fixed RE ATK random variance. Thanks to Angelmelody. Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c1
-rw-r--r--src/map/status.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 1b8e44cb3..88d83f91b 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -5812,6 +5812,7 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t
if( --(sc->data[SC_SPELLFIST]->val1) >= 0 ){
struct Damage ad = battle->calc_attack(BF_MAGIC,src,target,sc->data[SC_SPELLFIST]->val3,sc->data[SC_SPELLFIST]->val4,flag|BF_SHORT);
wd.damage = ad.damage;
+ damage_div_fix(wd.damage, wd.div_);
}else
status_change_end(src,SC_SPELLFIST,INVALID_TIMER);
}
diff --git a/src/map/status.c b/src/map/status.c
index 824ad1f58..524d5b6a7 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -11384,7 +11384,7 @@ int status_get_weapon_atk(struct block_list *bl, struct weapon_atk *watk, int fl
if( !(flag&1) ){
if( max > min )
- max = min + rnd()%(max - min);
+ max = min + rnd()%(max - min + 1);
else
max = min;
}