summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authormalufett <malufett.eat.my.binaries@gmail.com>2015-01-06 19:36:46 +0800
committermalufett <malufett.eat.my.binaries@gmail.com>2015-01-06 19:36:46 +0800
commit5a9aa4456714db8cc8752d685e24bbe39f71f94e (patch)
tree1dba6ea155e0b3fea5ad579bda4a33597006bfb2 /src/map
parent193c31060476ad127008267766a8bfc1bdaeffd0 (diff)
downloadhercules-5a9aa4456714db8cc8752d685e24bbe39f71f94e.tar.gz
hercules-5a9aa4456714db8cc8752d685e24bbe39f71f94e.tar.bz2
hercules-5a9aa4456714db8cc8752d685e24bbe39f71f94e.tar.xz
hercules-5a9aa4456714db8cc8752d685e24bbe39f71f94e.zip
Fixed LK_SPIRALPIERCE & NJ_TATAMIGAESHI change in damage output. Thanks to Michi
Signed-off-by: malufett <malufett.eat.my.binaries@gmail.com>
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index 86134db52..de57e7d2c 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -4742,6 +4742,18 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
else
wd.dmg_lv = ATK_DEF;
break;
+
+ case KO_BAKURETSU:
+ {
+#ifdef RENEWAL
+ GET_NORMAL_ATTACK((sc && sc->data[SC_MAXIMIZEPOWER] ? 1 : 0) | (sc && sc->data[SC_WEAPONPERFECT] ? 8 : 0));
+#endif
+ skillratio = skill_lv * (50 + status_get_dex(src) / 4);
+ skillratio = (int)(skillratio * (sd ? pc->checkskill(sd, NJ_TOBIDOUGU) : 10) * 40.f / 100.0f * status->get_lv(src) / 120);
+ ATK_RATE(skillratio + 10 * (sd ? sd->status.job_level : 0));
+ }
+ break;
+
#ifdef RENEWAL
case NJ_TATAMIGAESHI:
ATK_RATE(200);
@@ -4768,17 +4780,6 @@ struct Damage battle_calc_weapon_attack(struct block_list *src,struct block_list
wd.damage = battle->calc_masteryfix(src, target, skill_id, skill_lv, wd.damage, wd.div_, 0, flag.weapon);
}
#endif
-
- case KO_BAKURETSU:
- {
-#ifdef RENEWAL
- GET_NORMAL_ATTACK((sc && sc->data[SC_MAXIMIZEPOWER] ? 1 : 0) | (sc && sc->data[SC_WEAPONPERFECT] ? 8 : 0));
-#endif
- skillratio = skill_lv * (50 + status_get_dex(src) / 4);
- skillratio = (int)(skillratio * (sd ? pc->checkskill(sd, NJ_TOBIDOUGU) : 10) * 40.f / 100.0f * status->get_lv(src) / 120);
- ATK_RATE(skillratio + 10 * (sd ? sd->status.job_level : 0));
- }
- break;
default:
ATK_RATE(battle->calc_skillratio(BF_WEAPON, src, target, skill_id, skill_lv, skillratio, wflag));
}