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

Gen 7/8: Fix -ate abilities, Reckless, and Iron Fist #446

Merged
merged 3 commits into from
May 8, 2021

Conversation

DaWoblefet
Copy link
Member

Something about #439 changed how -ate abilities worked with typing; currently, whenever the move enters the function, it is already Fairy / Electric / etc. and so the check for "if you're a Normal-type move" doesn't work. To fix this, I create a new move object to check if the original move really is Normal. I'm not super sure why this worked before; probably the correct solution is to set a flag or something.

Splitting off the if statement on Reckless and Iron Fist fixes that part.

Fixes:
https://www.smogon.com/forums/threads/pok%C3%A9mon-showdown-damage-calculator.3593546/post-8841109
https://www.smogon.com/forums/threads/pok%C3%A9mon-showdown-damage-calculator.3593546/post-8841181

@DaWoblefet
Copy link
Member Author

I have absolutely no idea what this build error is.

@DaWoblefet
Copy link
Member Author

I resolved this by storing a flag if an ate Ability should boost the user. This is closer to how the games do it as well.

@DaWoblefet DaWoblefet requested a review from KrisXV May 7, 2021 03:41
@KrisXV KrisXV merged commit 8da657a into smogon:master May 8, 2021
@KrisXV
Copy link
Member

KrisXV commented May 8, 2021

thank u

@DaWoblefet DaWoblefet deleted the iron-fist branch May 8, 2021 16:55
GriffinLedingham added a commit to pikalytics/damage-calc that referenced this pull request Jun 7, 2021
* smogon-master:
  Update copyright year
  Update dependencies
  Gen 7/8: Fix -ate abilities, Reckless, and Iron Fist (smogon#446)
  Convert modifiers from hex to decimal (smogon#444)
  Fix broken link in README.md (smogon#431)
  Function modularization tweaks (gens 7, 8) and iron ball calculations (smogon#439)
  Fix Reversal and Flail power calculation for Gen 4 (smogon#433)
  Actually fix build
  Fix build
  Gen 3: Double Facade base power when poisoned, paralyzed or burned (smogon#412)
  Added Power Spot, Fixed Dauntless Shield, Made Competitive activate from Intimidate, Cleaned up EV and IV exporting (smogon#435)
  Fix Rivalry boost (smogon#440)
  Change BP limit from 999 to 65535 (smogon#442)
  Update packages and fix build
  Search for imported sets (smogon#428)
  Docker addition api (smogon#422)
  Modularize the Gen 7 & 8 mechanics page (smogon#429)
  New TextField for naming the imported sets (smogon#423)
  Export import bugfix (smogon#426)
  Support field-wide Fairy Aura, Dark Aura and Aura Break when neither Pokemon uses the ability (smogon#430)
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.

2 participants