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

DLC 2 Support for calculator #591

Merged
merged 4 commits into from
Dec 18, 2023
Merged

DLC 2 Support for calculator #591

merged 4 commits into from
Dec 18, 2023

Conversation

ShivaD173
Copy link
Contributor

  • Still Waiting for Dex to pass tests, but keeping PR ready
  • Added all new pokemon, moves, and abilities
  • Added Mechanics for new moves and abilites
  • Added support for Terestal Tera Type, right now always assumes boost. Let me know if better way to do it.

field.weather = undefined;
}
if (pokemon.hasAbility('Teraform Zero')) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

If you're implementing Teraform Zero specific mechanics it should be in its own function.

Plus, since this only happens once a battle it should be checking the abilityActive property or whatever its called.

@@ -338,6 +338,14 @@ export function calculateSMSSSV(
desc.weather = field.weather;
}

if (defender.hasAbility('Tera Shell')) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

This only happens if its also at full HP (check multiscale implementation).

typeEffectiveness = 0.5;
}

if (attacker.teraType === 'Stellar' && defender.teraType !== undefined) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

This should be before the Tera Shell check.

Copy link
Contributor

@Karthik99999 Karthik99999 Dec 17, 2023

Choose a reason for hiding this comment

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

This also looks like it makes all attacks from Stellar tera'd mons to be super effective, when it should just be Tera Blast and Tera Starstorm

@thejetou
Copy link
Collaborator

Still Waiting for Dex to pass tests, but keeping PR ready

@pkmn/dex has been update with DLC2 as of a few hours ago.

@@ -406,7 +406,51 @@ const SM = XY;

const SS = SM;

const SV = SS;
// const SV = SS;
Copy link
Collaborator

Choose a reason for hiding this comment

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

?

Psychic: {Stellar: 1},
Ghost: {Stellar: 1},
Dragon: {Stellar: 1},
Dark: {Steel: 1, Stellar: 1},
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is there a reason to specify Steel: 1?

@thejetou
Copy link
Collaborator

Doesn't your implementation mean that Stellar Pokemon are neutral to everything defensively?

@ShivaD173
Copy link
Contributor Author

Fixed these bugs listed, thanks for the review.
Tests now pass, versions updated to 0.8.1 for the dex and the other @pkmn packages.
Still need to have some way to define whether each type is tera boosted (probably some checkmark somewhere?), but I leave that to someone else.

@thejetou
Copy link
Collaborator

Still need to have some way to define whether each type is tera boosted (probably some checkmark somewhere?), but I leave that to someone else.

I'll work on that right now and when I'm done I'll merge your PR and push my commit.

Hopefully we can finish this today :).

@thejetou thejetou merged commit e2e5936 into smogon:master Dec 18, 2023
2 checks passed
@thejetou
Copy link
Collaborator

Great work, thank you!

@ShivaD173 ShivaD173 deleted the add_dlc2 branch December 19, 2023 01:55
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.

3 participants