[battle, damage] refactor damage formula to match gen5+ #3196
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Technically I think this is ready for review, but I'll leave it as draft until we figure out what to do with the failing tests. |
SBird1337
force-pushed
the
refactor/damage
branch
2 times, most recently
from
8d2c097
to
23dd7b6
Compare
I used exact values I obtained from a Smogon Calc for the 2 problematic tests. Ready for review :) |
SBird1337
force-pushed
the
refactor/damage
branch
3 times, most recently
from
a59c0d6
to
14fafe9
Compare
AsparagusEduardo
requested changes
Aug 3, 2023
|
Please let me rebase before merging |
SBird1337
force-pushed
the
refactor/damage
branch
from
9320c72
to
64cfeb9
Compare
|
addressed Edus review and rebased. |
SBird1337
force-pushed
the
refactor/damage
branch
from
64cfeb9
to
8bd36ee
Compare
AsparagusEduardo
approved these changes
Aug 10, 2023
mrgriffin
approved these changes
Aug 11, 2023
|
@SBird1337 would you like to rebase, should I squash merge, or should I do a regular merge commit? :) |
HunarPG
pushed a commit
to HunarPG/pokeemerald-expansion
that referenced
this pull request
Aug 12, 2023
* [battle, damage] refactor damage formula to match gen5+ * [test] use exact values for dry skin, swarm tests * fixup: assume stats for dry-skin, swarm tests --------- Co-authored-by: sbird <[email protected]>
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Refactors the damage calculation and fixes any (to my knowledge) inconsistancies to the calculation of later games.
Description
Key notes are:
Also fixes the contrary test against intimidate, which was using a wrong multiplier.
Adds tests for the basic damage calculation using an example from https://bulbapedia.bulbagarden.net/wiki/Damage#Example
Changes the test in
weather_snow.cagainst solar blade fromKNOWN_FAILINGtoPASS.At the current state 2 old tests are failing with these changes:Dry Skin increases damage taken from Fire-type moves by 25%Swarm boosts Bug-type moves in a pinchRefactored the 2 problematic tests to use exact values.
this is due to numerical issues in the damage formula that also exist in the original games. I verfied both on showdown and accepted that as ground truth.
Discord contact info
karathan