mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-07-18 14:22:19 +02:00
Compare commits
2 Commits
ebb09dda34
...
bd4729b4c5
Author | SHA1 | Date | |
---|---|---|---|
|
bd4729b4c5 | ||
|
7dd1832072 |
@ -367,6 +367,10 @@ export abstract class LapsingPersistentModifier extends PersistentModifier {
|
|||||||
return container;
|
return container;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getIconStackText(_scene: BattleScene, _virtual?: boolean): Phaser.GameObjects.BitmapText | null {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
getBattleCount(): number {
|
getBattleCount(): number {
|
||||||
return this.battleCount;
|
return this.battleCount;
|
||||||
}
|
}
|
||||||
@ -384,7 +388,8 @@ export abstract class LapsingPersistentModifier extends PersistentModifier {
|
|||||||
}
|
}
|
||||||
|
|
||||||
getMaxStackCount(_scene: BattleScene, _forThreshold?: boolean): number {
|
getMaxStackCount(_scene: BattleScene, _forThreshold?: boolean): number {
|
||||||
return 1;
|
// Must be an abitrary number greater than 1
|
||||||
|
return 2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -787,7 +792,7 @@ export class TerastallizeModifier extends LapsingPokemonHeldItemModifier {
|
|||||||
/**
|
/**
|
||||||
* Modifier used for held items, specifically vitamins like Carbos, Hp Up, etc., that
|
* Modifier used for held items, specifically vitamins like Carbos, Hp Up, etc., that
|
||||||
* increase the value of a given {@linkcode PermanentStat}.
|
* increase the value of a given {@linkcode PermanentStat}.
|
||||||
* @extends LapsingPersistentModifier
|
* @extends PokemonHeldItemModifier
|
||||||
* @see {@linkcode apply}
|
* @see {@linkcode apply}
|
||||||
*/
|
*/
|
||||||
export class BaseStatModifier extends PokemonHeldItemModifier {
|
export class BaseStatModifier extends PokemonHeldItemModifier {
|
||||||
|
@ -43,9 +43,9 @@ export class EggSummaryPhase extends Phase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
end() {
|
end() {
|
||||||
this.eggHatchHandler.clear();
|
|
||||||
this.scene.ui.setModeForceTransition(Mode.MESSAGE).then(() => {});
|
|
||||||
this.scene.time.delayedCall(250, () => this.scene.setModifiersVisible(true));
|
this.scene.time.delayedCall(250, () => this.scene.setModifiersVisible(true));
|
||||||
super.end();
|
this.scene.ui.setModeForceTransition(Mode.MESSAGE).then(() => {
|
||||||
|
super.end();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -97,6 +97,7 @@ export default class EggSummaryUiHandler extends MessageUiHandler {
|
|||||||
this.pokemonIconsContainer.removeAll(true);
|
this.pokemonIconsContainer.removeAll(true);
|
||||||
this.eggHatchBg.setVisible(false);
|
this.eggHatchBg.setVisible(false);
|
||||||
this.getUi().hideTooltip();
|
this.getUi().hideTooltip();
|
||||||
|
|
||||||
// Note: Questions on garbage collection go to @frutescens
|
// Note: Questions on garbage collection go to @frutescens
|
||||||
const activeKeys = this.scene.getActiveKeys();
|
const activeKeys = this.scene.getActiveKeys();
|
||||||
// Removing unnecessary sprites from animation manager
|
// Removing unnecessary sprites from animation manager
|
||||||
@ -117,7 +118,6 @@ export default class EggSummaryUiHandler extends MessageUiHandler {
|
|||||||
this.eggHatchData.length = 0;
|
this.eggHatchData.length = 0;
|
||||||
// Removes Pokemon icons in EggSummaryUiHandler
|
// Removes Pokemon icons in EggSummaryUiHandler
|
||||||
this.iconAnimHandler.removeAll();
|
this.iconAnimHandler.removeAll();
|
||||||
console.log("Egg Summary Handler cleared");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -256,7 +256,6 @@ export default class EggSummaryUiHandler extends MessageUiHandler {
|
|||||||
if (phase instanceof EggSummaryPhase) {
|
if (phase instanceof EggSummaryPhase) {
|
||||||
phase.end();
|
phase.end();
|
||||||
}
|
}
|
||||||
ui.revertMode();
|
|
||||||
success = true;
|
success = true;
|
||||||
} else {
|
} else {
|
||||||
const count = this.eggHatchData.length;
|
const count = this.eggHatchData.length;
|
||||||
|
Loading…
Reference in New Issue
Block a user