Implement fainted forme regression #10810
+213
−44
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2370,6 +2370,13 @@ export class Battle { | |
| if (pokemon.side.totalFainted < 100) pokemon.side.totalFainted++; | ||
| this.runEvent('Faint', pokemon, faintData.source, faintData.effect); | ||
| this.singleEvent('End', pokemon.getAbility(), pokemon.abilityState, pokemon); | ||
| if (pokemon.regressionForme) { | ||
| pokemon.baseSpecies = pokemon.regressionForme.species; | ||
| pokemon.baseAbility = pokemon.regressionForme.ability; | ||
| pokemon.details = pokemon.getSimpleDetails(pokemon.baseSpecies.name); | ||
| pokemon.regressionForme = null; | ||
| this.add('detailschange', pokemon, pokemon.details, '[silent]'); | ||
| } | ||
| pokemon.clearVolatile(false); | ||
| pokemon.fainted = true; | ||
| pokemon.illusion = null; | ||
|
|
@@ -2494,8 +2501,7 @@ export class Battle { | |
| const species = pokemon.setSpecies(rawSpecies); | ||
| if (!species) continue; | ||
| pokemon.baseSpecies = rawSpecies; | ||
| pokemon.details = pokemon.getSimpleDetails(); | ||
| pokemon.setAbility(species.abilities['0'], null, true); | ||
| pokemon.baseAbility = pokemon.ability; | ||
|
|
||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -131,6 +131,9 @@ export class Pokemon { | |
| faintQueued: boolean; | ||
| subFainted: boolean | null; | ||
|
|
||
| /** If this Pokemon faints will change to this species */ | ||
| regressionForme: {species: Species, ability: ID} | null; | ||
|
|
||
| types: string[]; | ||
| addedType: string; | ||
| knownType: boolean; | ||
|
|
@@ -353,8 +356,7 @@ export class Pokemon { | |
| this.position = 0; | ||
| let displayedSpeciesName = this.species.name; | ||
| if (displayedSpeciesName === 'Greninja-Bond') displayedSpeciesName = 'Greninja'; | ||
| this.details = this.getSimpleDetails(displayedSpeciesName); | ||
|
|
||
| this.status = ''; | ||
| this.statusState = {}; | ||
|
|
@@ -419,6 +421,8 @@ export class Pokemon { | |
| this.faintQueued = false; | ||
| this.subFainted = null; | ||
|
|
||
| this.regressionForme = null; | ||
|
|
||
| this.types = this.baseSpecies.types; | ||
| this.baseTypes = this.types; | ||
| this.addedType = ''; | ||
|
|
@@ -509,17 +513,21 @@ export class Pokemon { | |
| return this.isActive ? this.getSlot() + fullname.slice(2) : fullname; | ||
| } | ||
|
|
||
| getSimpleDetails(displayedSpeciesName: string | null = null, illusionDetails = false) { | ||
| let name = displayedSpeciesName || this.species.name; | ||
| let level = this.level; | ||
| if (illusionDetails && this.illusion) { | ||
| if (this.battle.ruleTable.has('illusionlevelmod')) level = this.illusion.level; | ||
| name = this.illusion.species.name; | ||
| if (name === 'Greninja-Bond') name = 'Greninja'; | ||
| } | ||
| return name + (level === 100 ? '' : ', L' + level) + | ||
| (this.gender === '' ? '' : ', ' + this.gender) + (this.set.shiny ? ', shiny' : ''); | ||
| } | ||
|
|
||
| getDetails = () => { | ||
| const health = this.getHealth(); | ||
| let details = this.getSimpleDetails(null, true); | ||
| if (this.terastallized) details += `, tera:${this.terastallized}`; | ||
| return {side: health.side, secret: `${details}|${health.secret}`, shared: `${details}|${health.shared}`}; | ||
| }; | ||
|
|
@@ -1320,8 +1328,7 @@ export class Pokemon { | |
|
|
||
| // Pokemon transformed into Ogerpon cannot Terastallize | ||
| // restoring their ability to tera after they untransform is handled ELSEWHERE | ||
| if (['Ogerpon', 'Terapagos'].includes(this.species.baseSpecies) && this.canTerastallize) this.canTerastallize = false; | ||
|
|
||
| return true; | ||
| } | ||
|
|
@@ -1386,9 +1393,9 @@ export class Pokemon { | |
| const apparentSpecies = | ||
| this.illusion ? this.illusion.species.name : species.baseSpecies; | ||
| if (isPermanent) { | ||
| if (!this.regressionForme) this.regressionForme = {species: this.baseSpecies, ability: this.baseAbility}; | ||
| this.baseSpecies = rawSpecies; | ||
| this.details = this.getSimpleDetails(); | ||
| let details = (this.illusion || this).details; | ||
| if (this.terastallized) details += `, tera:${this.terastallized}`; | ||
| this.battle.add('detailschange', this, details); | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -81,6 +81,16 @@ assert.fullHP = function (pokemon, message) { | |
| }); | ||
| }; | ||
|
|
||
| assert.hasAbility = function (pokemon, ability, message) { | ||
| const actual = pokemon.ability; | ||
| const expected = toID(ability); | ||
| if (actual === expected) return; | ||
| throw new AssertionError({ | ||
| message: message || `Expected ${pokemon} ability to be ${expected}, not ${actual}.`, | ||
| stackStartFunction: assert.hasAbility, | ||
| }); | ||
| }; | ||
|
|
||
| assert.holdsItem = function (pokemon, message) { | ||
| if (pokemon.item) return; | ||
| throw new AssertionError({ | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm just wondering whether this can be
nullor failing that{species: pokemon.baseSpecies, ability: pokemon.baseAbility}.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because when Terapagos activates Tera Shift, it sets
baseSpeciesto Terapagos-Terastal andregressionForme = null. Terapagos-Stellar is the only case where we need to revert to a form that was not the currentbaseSpecies.For Morpeko, I just added a condition to avoid adding unnecessary logs if it was in its base form when it terastalized.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, I got the Terapagos formes confused there.