summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-10-07 20:54:48 -0300
committershennetsind <ind@henn.et>2013-10-07 20:54:48 -0300
commit547b01da35d290b633efaefbbc3af2755d2811e7 (patch)
treefad3e500f42f2297929fb23c4a85b547052a76b2 /src
parente28ee66714adce23b96082197f2ac0a675f0e3c2 (diff)
downloadhercules-547b01da35d290b633efaefbbc3af2755d2811e7.tar.gz
hercules-547b01da35d290b633efaefbbc3af2755d2811e7.tar.bz2
hercules-547b01da35d290b633efaefbbc3af2755d2811e7.tar.xz
hercules-547b01da35d290b633efaefbbc3af2755d2811e7.zip
Fixed Pre-re spiral pierce (when cast by mobs)
Partial merge of a4b7719bde71b7fa82a2fcebb9084a3dafb1dc5c Closes #153 Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src')
-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 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.