mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-18 22:32:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
Lylian 2025-01-22 16:28:50 +01:00
parent aba5491294
commit 4266239b28
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/field/pokemon.ts
View File

@ -442,7 +442,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
this.battleData.illusion = { this.battleData.illusion = {
active: true, active: true,
available: true, available: true,
basePokemon: this, basePokemon: { ...this },
species: getPokemonSpecies(speciesId), species: getPokemonSpecies(speciesId),
formIndex: lastPokemon.formIndex, formIndex: lastPokemon.formIndex,
gender: lastPokemon.gender, gender: lastPokemon.gender,
@ -473,7 +473,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
this.battleData.illusion = { this.battleData.illusion = {
active: true, active: true,
available: true, available: true,
basePokemon: this, basePokemon: { ...this },
species: randomIllusion, species: randomIllusion,
formIndex: randomIllusion.formIndex, formIndex: randomIllusion.formIndex,
gender: this.gender gender: this.gender

2
src/test/abilities/illusion.test.ts
View File

@ -57,6 +57,7 @@ describe("Abilities - Illusion", () => {
const zorua = game.scene.getEnemyPokemon()!; const zorua = game.scene.getEnemyPokemon()!;
expect(zorua.battleData.illusion.active).equals(false); expect(zorua.battleData.illusion.active).equals(false);
expect(zorua.name).equals("Zorua")
}); });
it("break after getting ability changed", async () => { it("break after getting ability changed", async () => {
@ -126,7 +127,6 @@ describe("Abilities - Illusion", () => {
await game.phaseInterceptor.to(TurnEndPhase); await game.phaseInterceptor.to(TurnEndPhase);
const zoroark = game.scene.getPlayerPokemon()!; const zoroark = game.scene.getPlayerPokemon()!;
//console.log(zoroark.battleData.illusion);
expect(zoroark.name).equals("Axew"); expect(zoroark.name).equals("Axew");
expect(zoroark.getNameToRender()).equals("axew nickname"); expect(zoroark.getNameToRender()).equals("axew nickname");
expect(zoroark.getGender(false, true)).equals(Gender.FEMALE); expect(zoroark.getGender(false, true)).equals(Gender.FEMALE);

2
src/ui/party-ui-handler.ts
View File

@ -1299,7 +1299,7 @@ class PartySlot extends Phaser.GameObjects.Container {
const fusionShinyStar = globalScene.add.image(0, 0, "shiny_star_small_2"); const fusionShinyStar = globalScene.add.image(0, 0, "shiny_star_small_2");
fusionShinyStar.setOrigin(0, 0); fusionShinyStar.setOrigin(0, 0);
fusionShinyStar.setPosition(shinyStar.x, shinyStar.y); fusionShinyStar.setPosition(shinyStar.x, shinyStar.y);
fusionShinyStar.setTint(getVariantTint(this.pokemon.battleData.illusion.fusionVariant ?? this.pokemon.fusionVariant)); fusionShinyStar.setTint(getVariantTint(this.pokemon.battleData.illusion.basePokemon?.fusionVariant ?? this.pokemon.fusionVariant));
slotInfoContainer.add(fusionShinyStar); slotInfoContainer.add(fusionShinyStar);
} }

6
src/ui/summary-ui-handler.ts
View File

@ -333,8 +333,8 @@ export default class SummaryUiHandler extends UiHandler {
this.pokemonSprite.setPipelineData("teraColor", getTypeRgb(this.pokemon.getTeraType())); this.pokemonSprite.setPipelineData("teraColor", getTypeRgb(this.pokemon.getTeraType()));
this.pokemonSprite.setPipelineData("ignoreTimeTint", true); this.pokemonSprite.setPipelineData("ignoreTimeTint", true);
this.pokemonSprite.setPipelineData("spriteKey", this.pokemon.getSpriteKey()); this.pokemonSprite.setPipelineData("spriteKey", this.pokemon.getSpriteKey());
this.pokemonSprite.setPipelineData("shiny", this.pokemon.battleData.illusion.shiny ?? this.pokemon.shiny); this.pokemonSprite.setPipelineData("shiny", this.pokemon.battleData.illusion.basePokemon?.shiny ?? this.pokemon.shiny);
this.pokemonSprite.setPipelineData("variant", this.pokemon.battleData.illusion.variant ?? this.pokemon.variant); this.pokemonSprite.setPipelineData("variant", this.pokemon.battleData.illusion.basePokemon?.variant ?? this.pokemon.variant);
[ "spriteColors", "fusionSpriteColors" ].map(k => { [ "spriteColors", "fusionSpriteColors" ].map(k => {
delete this.pokemonSprite.pipelineData[`${k}Base`]; delete this.pokemonSprite.pipelineData[`${k}Base`];
if (this.pokemon?.summonData?.speciesForm) { if (this.pokemon?.summonData?.speciesForm) {
@ -405,7 +405,7 @@ export default class SummaryUiHandler extends UiHandler {
this.fusionShinyIcon.setPosition(this.shinyIcon.x, this.shinyIcon.y); this.fusionShinyIcon.setPosition(this.shinyIcon.x, this.shinyIcon.y);
this.fusionShinyIcon.setVisible(doubleShiny); this.fusionShinyIcon.setVisible(doubleShiny);
if (isFusion) { if (isFusion) {
this.fusionShinyIcon.setTint(getVariantTint(this.pokemon.battleData.illusion.fusionVariant ?? this.pokemon.fusionVariant)); this.fusionShinyIcon.setTint(getVariantTint(this.pokemon.battleData.illusion.basePokemon?.fusionVariant ?? this.pokemon.fusionVariant));
} }
this.pokeball.setFrame(getPokeballAtlasKey(this.pokemon.pokeball)); this.pokeball.setFrame(getPokeballAtlasKey(this.pokemon.pokeball));