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.

Sign up for GitHub

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

[Bug] Caught Pokemon Summary-Modifier Display Fix #3145

Merged
merged 3 commits into from
Jul 25, 2024
Merged

[Bug] Caught Pokemon Summary-Modifier Display Fix #3145

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf4d735
Fixed modifiers not displaying on summary screen
Jul 25, 2024
ce9678f
Addressed Typedoc issues
Jul 25, 2024
48ed1c7
Documentation added
Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/phases.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5039,7 +5039,7 @@ export class AttemptCapturePhase extends PokemonPhase {
this.scene.ui.setMode(Mode.MESSAGE).then(() => {
promptRelease();
});
});
}, false);
}, () => {
this.scene.ui.setMode(Mode.PARTY, PartyUiMode.RELEASE, this.fieldIndex, (slotIndex: integer, _option: PartyOption) => {
this.scene.ui.setMode(Mode.MESSAGE).then(() => {
Expand Down
5 changes: 3 additions & 2 deletions src/ui/summary-ui-handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ export default class SummaryUiHandler extends UiHandler {
private moveCursorBlinkTimer: Phaser.Time.TimerEvent;

private pokemon: PlayerPokemon;
private playerParty: boolean;
private newMove: Move;
private moveSelectFunction: Function;
private transitioning: boolean;
Expand Down Expand Up @@ -272,7 +273,7 @@ export default class SummaryUiHandler extends UiHandler {

this.pokemon = args[0] as PlayerPokemon;
this.summaryUiMode = args.length > 1 ? args[1] as SummaryUiMode : SummaryUiMode.DEFAULT;

this.playerParty = args[4] ?? true;
this.scene.ui.bringToTop(this.summaryContainer);

this.summaryContainer.setVisible(true);
Expand Down Expand Up @@ -853,7 +854,7 @@ export default class SummaryUiHandler extends UiHandler {
});

const itemModifiers = (this.scene.findModifiers(m => m instanceof PokemonHeldItemModifier
&& m.pokemonId === this.pokemon.id, true) as PokemonHeldItemModifier[])
&& m.pokemonId === this.pokemon.id, this.playerParty) as PokemonHeldItemModifier[])
.sort(modifierSortFunc);

itemModifiers.forEach((item, i) => {
Expand Down
Loading