Skip to content
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.

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

Fix Doram Skills Picky Peck and Bite #3018

Merged
merged 1 commit into from
Jan 5, 2022

Conversation

SinjiPrasetio
Copy link
Contributor

@SinjiPrasetio SinjiPrasetio commented Jul 15, 2021

Pull Request Prelude

Fix 1
Fixed Picky Peck skill.
Picky peck skill have an effect with Spirit of Life skill.
Fix 2
Fixed double cast activation chance of Picky Peck and Bite skill.

Source References : rAthena

src/map/battle.c Outdated Show resolved Hide resolved
@4144
Copy link
Contributor

4144 commented Aug 3, 2021

look like CI failed. probably you should add missing FALLTHROUGH or break

@MishimaHaruna MishimaHaruna changed the base branch from stable to master August 4, 2021 22:16
src/map/skill.c Show resolved Hide resolved
@MrKeiKun
Copy link
Contributor

proper usage of FALLTHROUGH in switch looks like this as example:

switch(skill_id) {
case RA_FIRINGTRAP:
case RA_ICEBOUNDTRAP:
	if (md.damage == 1)
		break;
	FALLTHROUGH
case RA_CLUSTERBOMB:
{
	struct Damage wd;
	wd = battle->calc_weapon_attack(src, target, skill_id, skill_lv, mflag);
	md.damage += wd.damage;
}
	break;
case NJ_ZENYNAGE:
	if (sd != NULL) {
		if (md.damage > sd->status.zeny)
			md.damage = sd->status.zeny;
		pc->payzeny(sd, (int)cap_value(md.damage, INT_MIN, INT_MAX), LOG_TYPE_STEAL, NULL);
	}
	break;
}

without the ; on it. Also squash your commits, i think whole changes can be squashed into one commit. goodluck :)

src/map/battle.c Outdated Show resolved Hide resolved
@sinju92
Copy link

sinju92 commented Dec 27, 2021

can merge this pull request to master?

Copy link
Member

@MishimaHaruna MishimaHaruna left a comment

Choose a reason for hiding this comment

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

I addressed the review comments and rebased

@MishimaHaruna MishimaHaruna merged commit a5290c4 into HerculesWS:master Jan 5, 2022
@SinjiPrasetio SinjiPrasetio deleted the SinjiContribution branch April 30, 2024 06:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants