From 2c782ddf55517dfd5846034a2ba10692309f095e Mon Sep 17 00:00:00 2001
From: KimJeongSun <leo@atlaslabs.ai>
Date: Thu, 12 Sep 2024 17:39:19 +0900
Subject: [PATCH] change eggSkip variable name more descriptive to
 eggSkipPreference

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

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 2f919592016..bc41d16a920 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -167,7 +167,7 @@ export default class BattleScene extends SceneBase {
    * - 1 = Always
    * - 2 = Ask
    */
-  public eggSkip: number = 0;
+  public eggSkipPreference: number = 0;
 
   /**
      * Defines the experience gain display mode.
diff --git a/src/phases/egg-lapse-phase.ts b/src/phases/egg-lapse-phase.ts
index 3c3e57627de..0a2247db92c 100644
--- a/src/phases/egg-lapse-phase.ts
+++ b/src/phases/egg-lapse-phase.ts
@@ -31,7 +31,7 @@ export class EggLapsePhase extends Phase {
     this.eggHatchData= [];
 
     if (eggsToHatchCount > 0) {
-      if (eggsToHatchCount >= this.minEggsToPromptSkip && this.scene.eggSkip === 2) {
+      if (eggsToHatchCount >= this.minEggsToPromptSkip && this.scene.eggSkipPreference === 2) {
         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.eggSkip === 1) {
+      } else if (eggsToHatchCount >= this.minEggsToPromptSkip && this.scene.eggSkipPreference === 1) {
         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 d977d5fd9d6..7c67cad7df7 100644
--- a/src/system/settings/settings.ts
+++ b/src/system/settings/settings.ts
@@ -749,7 +749,7 @@ export function setSetting(scene: BattleScene, setting: string, value: integer):
     scene.skipSeenDialogues = Setting[index].options[value].value === "On";
     break;
   case SettingKeys.Egg_Skip:
-    scene.eggSkip = value;
+    scene.eggSkipPreference = value;
     break;
   case SettingKeys.Battle_Style:
     scene.battleStyle = value;