From fc30d0770916af2e8e555f149365ec370b8d1784 Mon Sep 17 00:00:00 2001
From: KimJeongSun <leo@atlaslabs.ai>
Date: Thu, 12 Sep 2024 22:03:37 +0900
Subject: [PATCH] update requested changes from opaquer and tinylad and walker

---
 src/battle-scene.ts             |  6 +++---
 src/phases/egg-lapse-phase.ts   |  6 +++---
 src/system/settings/settings.ts | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index bc41d16a920..1c77e8d7d60 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -163,9 +163,9 @@ export default class BattleScene extends SceneBase {
   public skipSeenDialogues: boolean = false;
   /**
    * Determines if the egg hatching animation should be skipped
-   * - 0 = Never
-   * - 1 = Always
-   * - 2 = Ask
+   * - 0 = Never (skip animation)
+   * - 1 = Ask (ask to skip animation when hatching 2 or more eggs)
+   * - 2 = Always (automatically skip animation when hatching 2 or more eggs)
    */
   public eggSkipPreference: number = 0;
 
diff --git a/src/phases/egg-lapse-phase.ts b/src/phases/egg-lapse-phase.ts
index 0a2247db92c..f470eb9d19c 100644
--- a/src/phases/egg-lapse-phase.ts
+++ b/src/phases/egg-lapse-phase.ts
@@ -17,7 +17,7 @@ import { EggHatchData } from "#app/data/egg-hatch-data";
 export class EggLapsePhase extends Phase {
 
   private eggHatchData: EggHatchData[] = [];
-  private readonly minEggsToPromptSkip: number = 5;
+  private readonly maxEggsNotToSkip: number = 1;
   constructor(scene: BattleScene) {
     super(scene);
   }
@@ -31,7 +31,7 @@ export class EggLapsePhase extends Phase {
     this.eggHatchData= [];
 
     if (eggsToHatchCount > 0) {
-      if (eggsToHatchCount >= this.minEggsToPromptSkip && this.scene.eggSkipPreference === 2) {
+      if (eggsToHatchCount > this.maxEggsNotToSkip && this.scene.eggSkipPreference === 1) {
         this.scene.ui.showText(i18next.t("battle:eggHatching"), 0, () => {
           // show prompt for skip
           this.scene.ui.showText(i18next.t("battle:eggSkipPrompt"), 0);
@@ -44,7 +44,7 @@ export class EggLapsePhase extends Phase {
           }
           );
         }, 100, true);
-      } else if (eggsToHatchCount >= this.minEggsToPromptSkip && this.scene.eggSkipPreference === 1) {
+      } else if (eggsToHatchCount > this.maxEggsNotToSkip && this.scene.eggSkipPreference === 2) {
         this.scene.queueMessage(i18next.t("battle:eggHatching"));
         this.hatchEggsSkipped(eggsToHatch);
         this.showSummary();
diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts
index 7c67cad7df7..66021845c29 100644
--- a/src/system/settings/settings.ts
+++ b/src/system/settings/settings.ts
@@ -290,16 +290,16 @@ export const Setting: Array<Setting> = [
         value: "Never",
         label: i18next.t("settings:never")
       },
-      {
-        value: "Always",
-        label: i18next.t("settings:always")
-      },
       {
         value: "Ask",
         label: i18next.t("settings:ask")
+      },
+      {
+        value: "Always",
+        label: i18next.t("settings:always")
       }
     ],
-    default: 2,
+    default: 1,
     type: SettingType.GENERAL
   },
   {