Skip to content

Fixed bDoubleRate should stack additively with Double Attack #3384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
MrKeiKun wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −7
Draft

Fixed bDoubleRate should stack additively with Double Attack #3384

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/map/battle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4868,13 +4868,13 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src, struct bl
|| (sd->bonus.double_rate > 0 && sd->weapontype1 != W_FIST) //Will fail bare-handed
|| (sc != NULL && sc->data[SC_KAGEMUSYA] != NULL && sd->weapontype1 != W_FIST) // Need confirmation
) {
// Success chance is not added, the higher one is used [Skotlex]
if (rnd() % 100 < (5 * skill_lv > sd->bonus.double_rate ? 5 * skill_lv : sc != NULL && sc->data[SC_KAGEMUSYA] != NULL ? sc->data[SC_KAGEMUSYA]->val1 * 3 : sd->bonus.double_rate))
Copy link
Copy Markdown
Contributor

@skyleo skyleo Sep 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't this already have a higher chance (the one based on skill level) when sd->bonus.double_rate is lower which it usually is for Sidewinder Card?

{
wd.div_ = skill->get_num(TF_DOUBLE, skill_lv != 0 ? skill_lv : 1);
wd.type = BDT_MULTIHIT;
hitpercbonus += skill_lv;
}
// Success chance is not added, the higher one is used [Skotlex]
if (rnd() % 100 < min(100, 5 * skill_lv + sd->bonus.double_rate + (sc != NULL && sc->data[SC_KAGEMUSYA] != NULL ? sc->data[SC_KAGEMUSYA]->val1 * 3 : 0)))
Copy link
Copy Markdown
Contributor

@skyleo skyleo Sep 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would mean that one has a higher chance to cause Double Attack with Sidewinder Card equipped o-o

{
wd.div_ = skill->get_num(TF_DOUBLE, skill_lv != 0 ? skill_lv : 1);
wd.type = BDT_MULTIHIT;
hitpercbonus += skill_lv;
}
}
else if (((sd->weapontype1 == W_REVOLVER && (skill_lv = pc->checkskill(sd, GS_CHAINACTION)) > 0)
|| (sc && sc->count && sc->data[SC_ETERNAL_CHAIN] && (skill_lv = sc->data[SC_ETERNAL_CHAIN]->val1) > 0))
Expand Down
Loading