src/modifier/modifier.ts

@@ -367,10 +367,6 @@ export abstract class LapsingPersistentModifier extends PersistentModifier {
     return container;
   }
 
-  getIconStackText(_scene: BattleScene, _virtual?: boolean): Phaser.GameObjects.BitmapText | null {
-    return null;
-  }
-
   getBattleCount(): number {
     return this.battleCount;
   }
@@ -388,8 +384,7 @@ export abstract class LapsingPersistentModifier extends PersistentModifier {
   }
 
   getMaxStackCount(_scene: BattleScene, _forThreshold?: boolean): number {
-    // Must be an abitrary number greater than 1
-    return 2;
+    return 1;
   }
 }
 
@@ -792,7 +787,7 @@ export class TerastallizeModifier extends LapsingPokemonHeldItemModifier {
 /**
  * Modifier used for held items, specifically vitamins like Carbos, Hp Up, etc., that
  * increase the value of a given {@linkcode PermanentStat}.
- * @extends PokemonHeldItemModifier
+ * @extends LapsingPersistentModifier
  * @see {@linkcode apply}
  */
 export class BaseStatModifier extends PokemonHeldItemModifier {

src/phases/egg-summary-phase.ts

@@ -43,9 +43,9 @@ export class EggSummaryPhase extends Phase {
   }
 
   end() {
+    this.eggHatchHandler.clear();
+    this.scene.ui.setModeForceTransition(Mode.MESSAGE).then(() => {});
     this.scene.time.delayedCall(250, () => this.scene.setModifiersVisible(true));
-    this.scene.ui.setModeForceTransition(Mode.MESSAGE).then(() => {
-      super.end();
-    });
+    super.end();
   }
 }

src/ui/egg-summary-ui-handler.ts

@@ -97,7 +97,6 @@ export default class EggSummaryUiHandler extends MessageUiHandler {
     this.pokemonIconsContainer.removeAll(true);
     this.eggHatchBg.setVisible(false);
     this.getUi().hideTooltip();
-
     // Note: Questions on garbage collection go to @frutescens
     const activeKeys = this.scene.getActiveKeys();
     // Removing unnecessary sprites from animation manager
@@ -118,6 +117,7 @@ export default class EggSummaryUiHandler extends MessageUiHandler {
     this.eggHatchData.length = 0;
     // Removes Pokemon icons in EggSummaryUiHandler
     this.iconAnimHandler.removeAll();
+    console.log("Egg Summary Handler cleared");
   }
 
   /**
@@ -256,6 +256,7 @@ export default class EggSummaryUiHandler extends MessageUiHandler {
       if (phase instanceof EggSummaryPhase) {
         phase.end();
       }
+      ui.revertMode();
       success = true;
     } else {
       const count = this.eggHatchData.length;