From 547b01da35d290b633efaefbbc3af2755d2811e7 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Mon, 7 Oct 2013 20:54:48 -0300 Subject: Fixed Pre-re spiral pierce (when cast by mobs) Partial merge of a4b7719bde71b7fa82a2fcebb9084a3dafb1dc5c Closes #153 Signed-off-by: shennetsind --- src/map/battle.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/map/battle.c b/src/map/battle.c index c79dee7ee..b4cdf3cb0 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -4446,10 +4446,10 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list sd->inventory_data[index] && sd->inventory_data[index]->type == IT_WEAPON) wd.damage = sd->inventory_data[index]->weight*8/100; //80% of weight - } else - wd.damage = sstatus->rhw.atk2*8/10; //Else use Atk2 - - ATK_ADDRATE(50*skill_lv); //Skill modifier applies to weight only. + ATK_ADDRATE(50*skill_lv); //Skill modifier applies to weight only. + } else { + wd.damage = battle->calc_base_damage2(sstatus, &sstatus->rhw, sc, tstatus->size, sd, i); //Monsters have no weight and use ATK instead + } i = sstatus->str/10; i*=i; ATK_ADD(i); //Add str bonus. -- cgit v1.2.3-60-g2f50