Implement fainted forme regression #10810

andrebastosdias · 2025-01-09T07:05:24Z

@KrisXV I believe I have implemented your PR #9135 Closes #10025

I hard-coded regressions for Mega Evolutions, and Terastallized Ogerpon and Terapagos. I am not aware of any other Pokémon with this issue.

The first commit is just a simplification of the update of details, while the second commit contains the logic for the regression. It's easier to review as separate commits.

IMPORTANT: The client should not display the transform animation after the Pokémon faints. I added the [silent] flag, but I don’t think it’s necessary, as the animation occurs after the Pokémon leaves the screen (the client should be able to check this). Aside from that, the only other change is the Pokémon icon updating, which already happens.

andrebastosdias · 2025-01-09T08:00:00Z

I removed the tests from the Revival Blessing file and kept only Terapagos's tests so that we can also verify if Terapagos-Terastal does not revert. The other tests are a bit redundant.

sim/battle.ts

Co-authored-by: pyuk-bot <[email protected]>

pyuk-bot · 2025-01-09T10:10:02Z

I think Morpeko also needs special treatment to ensure it reverts to the correct forme after fainting while Terastallized.

KrisXV · 2025-01-09T22:28:27Z

sim/battle-actions.ts

@@ -1959,7 +1959,7 @@ export class BattleActions {
 		}
 		if (pokemon.species.baseSpecies === 'Morpeko') {
 			pokemon.baseSpecies = pokemon.species;
-			pokemon.details = pokemon.details.replace('Morpeko', pokemon.species.name);
+			pokemon.details = pokemon.getSimpleDetails();


Suggested change

pokemon.details = pokemon.getSimpleDetails();

pokemon.details = pokemon.getSimpleDetails(pokemon.species.name);

By default, pokemon.species.name is used. Currently, that argument is only used for Greninja-Bond.

DaWoblefet · 2025-01-10T05:08:13Z

Is this handling things like Ultra Necrozma becoming Dusk Mane/Dawn Wings, Zygarde-Complete becoming 50%/10%, Ash Greninja becoming regular Greninja etc? This looks like it's just addressing Megas and Ogerpon/Terapagos (see end of this post: https://www.smogon.com/forums/threads/pokemon-sun-moon-battle-mechanics-research.3586701/post-7729529). If they do work, it'd be good to have an extra test or two for forms that do regress and forms that don't.

It'd probably be good to have a test for the Hackmons behavior of e.g. Mega Charizard X -> Mega Evolves to Mega Charizard Y and faints -> regresses back to a fainted Mega Charizard X.

andrebastosdias · 2025-01-10T05:18:53Z

The logic handles every single one of those cases; we just need to add them to the condition. It should work with Mega-Charizard-X in Hackmons since it reverts to set.species.

I can add all those cases to the condition, or we could add a variable to Pokémon like revertIfFainted, which would serve as an argument for Pokemon.formeChange. Alternatively, I could set isPermanent to boolean | 'revertIfFainted' or something similar.

Edit: I could also change isPermanent?: boolean to notPermanent: boolean | null = true so:

true is not permanent
false is permanent
null is permanent until fainted

DaWoblefet · 2025-01-10T06:59:11Z

I like the idea of modifying isPermanent to your approach of notPermanent.

urkerab · 2025-01-10T09:50:22Z

Are Shaymin-Sky and Palafin the only cases where set.species would be incorrect? If so, would it help to update set.species in those two places, so that we could always revert to set.species rather than having an unwieldy hardcoded list?

andrebastosdias · 2025-01-10T09:54:03Z

Shaymin-Sky, Palafin-Hero and Terapagos-Terastal (and maybe some OMs). We don't need a hardcoded list, we just need a boolean revertOnFaint that is set inside formeChange. I'm just finishing another PR and I'll take care of this.

urkerab · 2025-01-10T09:57:43Z

I don't think you should have to change every call to formeChange just for three Pokémon...

andrebastosdias · 2025-01-10T10:06:52Z

If you want to change set.species, we would also need to change it back when Terapagos-Terastal terastalizes.

urkerab · 2025-01-10T10:40:53Z

So Terapagos-Terastal doesn't revert, but Terapagos-Stellar reverts to Terapagos? That's... weird.

andrebastosdias · 2025-01-10T10:44:14Z

https://www.smogon.com/forums/threads/scarlet-violet-battle-mechanics-research.3709545/post-9905712

andrebastosdias · 2025-01-10T12:09:56Z

I think it's clean. I wasn't feeling changing the set.

urkerab · 2025-01-10T12:42:57Z

Thanks for the link; I like this version. The only think I'm curious about is why setting the regression forme to null doesn't work in the other places.

andrebastosdias · 2025-01-10T12:44:21Z

Sorry, what do you mean by it doesn't work in the other places?

urkerab · 2025-01-10T13:30:35Z

sim/battle-actions.ts

@@ -1949,6 +1949,7 @@ export class BattleActions {
 		}
 		if (pokemon.species.name === 'Terapagos-Terastal' && type === 'Stellar') {
 			pokemon.formeChange('Terapagos-Stellar', null, true);
+			pokemon.regressionForme = {species: this.dex.species.get('Terapagos'), ability: toID('Tera Shift')};


I'm just wondering whether this can be null or failing that {species: pokemon.baseSpecies, ability: pokemon.baseAbility}.

Because when Terapagos activates Tera Shift, it sets baseSpecies to Terapagos-Terastal and regressionForme = null. Terapagos-Stellar is the only case where we need to revert to a form that was not the current baseSpecies.

For Morpeko, I just added a condition to avoid adding unnecessary logs if it was in its base form when it terastalized.

Sorry, I got the Terapagos formes confused there.

neither updates pokemon.details

pokemon.clearVolatile may be called in OMs and perform some shenanigans. Set the base variables before the call so they are transposed to the main variables, and change the details afterwards.

Neither Zacian-C, Zamazenta-C, nor Tera Morpeko announce their transformations. They are all handled on the client side. It doesn't happen in front of the players.

andrebastosdias added 2 commits January 9, 2025 06:40

Refactor details code

c9ca46d

Fainted forme regression

375ecc0

andrebastosdias requested review from HoeenCoder and KrisXV as code owners January 9, 2025 07:05

More logical tests

5bee8e7

Fix test name

e3aa97b

pyuk-bot reviewed Jan 9, 2025

View reviewed changes

sim/battle.ts Outdated Show resolved Hide resolved

Simplify details

f4fbc24

Co-authored-by: pyuk-bot <[email protected]>

Revert Morpeko

f4891c9

KrisXV reviewed Jan 9, 2025

View reviewed changes

Add more species

bd62d95

andrebastosdias added 2 commits January 10, 2025 12:06

Fixed with variable regressionForme

72b7af0

Add comment

f185f65

andrebastosdias mentioned this pull request Jan 10, 2025

Server compatibility: adding '[silent]' to 'detailschange' smogon/pokemon-showdown-client#2313

Closed

urkerab reviewed Jan 10, 2025

View reviewed changes

andrebastosdias mentioned this pull request Jan 10, 2025

Fix: Terastallize Ogerpon and Terapagos with different Tera types #10814

Open

andrebastosdias added 7 commits January 12, 2025 07:38

Transformation should never allow regression

3193f8c

Actually use pokemon.details

568761d

Rename methods

c09318b

neither updates pokemon.details

More refactor

a59cb35

pokemon.clearVolatile may be called in OMs and perform some shenanigans. Set the base variables before the call so they are transposed to the main variables, and change the details afterwards.

No message to client

4ef6789

Neither Zacian-C, Zamazenta-C, nor Tera Morpeko announce their transformations. They are all handled on the client side. It doesn't happen in front of the players.

Always regress to the set.species

03f797a

Remove redundant code

27b3f22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement fainted forme regression #10810

Implement fainted forme regression #10810

andrebastosdias commented Jan 9, 2025 •

edited

Loading

andrebastosdias commented Jan 9, 2025

pyuk-bot commented Jan 9, 2025

KrisXV Jan 9, 2025 •

edited

Loading

andrebastosdias Jan 10, 2025 •

edited

Loading

DaWoblefet commented Jan 10, 2025 •

edited

Loading

andrebastosdias commented Jan 10, 2025 •

edited

Loading

DaWoblefet commented Jan 10, 2025

urkerab commented Jan 10, 2025

andrebastosdias commented Jan 10, 2025

urkerab commented Jan 10, 2025

andrebastosdias commented Jan 10, 2025

urkerab commented Jan 10, 2025

andrebastosdias commented Jan 10, 2025

andrebastosdias commented Jan 10, 2025

urkerab commented Jan 10, 2025

andrebastosdias commented Jan 10, 2025

urkerab Jan 10, 2025

andrebastosdias Jan 10, 2025 •

edited

Loading

urkerab Jan 10, 2025

	pokemon.details = pokemon.getSimpleDetails();
	pokemon.details = pokemon.getSimpleDetails(pokemon.species.name);

Implement fainted forme regression #10810

Are you sure you want to change the base?

Implement fainted forme regression #10810

Conversation

andrebastosdias commented Jan 9, 2025 • edited Loading

andrebastosdias commented Jan 9, 2025

pyuk-bot commented Jan 9, 2025

KrisXV Jan 9, 2025 • edited Loading

Choose a reason for hiding this comment

andrebastosdias Jan 10, 2025 • edited Loading

Choose a reason for hiding this comment

DaWoblefet commented Jan 10, 2025 • edited Loading

andrebastosdias commented Jan 10, 2025 • edited Loading

DaWoblefet commented Jan 10, 2025

urkerab commented Jan 10, 2025

andrebastosdias commented Jan 10, 2025

urkerab commented Jan 10, 2025

andrebastosdias commented Jan 10, 2025

urkerab commented Jan 10, 2025

andrebastosdias commented Jan 10, 2025

andrebastosdias commented Jan 10, 2025

urkerab commented Jan 10, 2025

andrebastosdias commented Jan 10, 2025

urkerab Jan 10, 2025

Choose a reason for hiding this comment

andrebastosdias Jan 10, 2025 • edited Loading

Choose a reason for hiding this comment

urkerab Jan 10, 2025

Choose a reason for hiding this comment

andrebastosdias commented Jan 9, 2025 •

edited

Loading

KrisXV Jan 9, 2025 •

edited

Loading

andrebastosdias Jan 10, 2025 •

edited

Loading

DaWoblefet commented Jan 10, 2025 •

edited

Loading

andrebastosdias commented Jan 10, 2025 •

edited

Loading

andrebastosdias Jan 10, 2025 •

edited

Loading