Compare commits

...

3 Commits

Author SHA1 Message Date
KimJeongSun
2b61e72b2d update comment 2024-09-12 22:11:59 +09:00
KimJeongSun
2d98e1fc3e update requested change from tinylad 2024-09-12 22:10:32 +09:00
KimJeongSun
fc30d07709 update requested changes from opaquer and tinylad and walker 2024-09-12 22:03:37 +09:00
3 changed files with 11 additions and 11 deletions

View File

@ -163,9 +163,9 @@ export default class BattleScene extends SceneBase {
public skipSeenDialogues: boolean = false; public skipSeenDialogues: boolean = false;
/** /**
* Determines if the egg hatching animation should be skipped * Determines if the egg hatching animation should be skipped
* - 0 = Never * - 0 = Never (never skip animation)
* - 1 = Always * - 1 = Ask (ask to skip animation when hatching 2 or more eggs)
* - 2 = Ask * - 2 = Always (automatically skip animation when hatching 2 or more eggs)
*/ */
public eggSkipPreference: number = 0; public eggSkipPreference: number = 0;

View File

@ -17,7 +17,7 @@ import { EggHatchData } from "#app/data/egg-hatch-data";
export class EggLapsePhase extends Phase { export class EggLapsePhase extends Phase {
private eggHatchData: EggHatchData[] = []; private eggHatchData: EggHatchData[] = [];
private readonly minEggsToPromptSkip: number = 5; private readonly minEggsToSkip: number = 2;
constructor(scene: BattleScene) { constructor(scene: BattleScene) {
super(scene); super(scene);
} }
@ -31,7 +31,7 @@ export class EggLapsePhase extends Phase {
this.eggHatchData= []; this.eggHatchData= [];
if (eggsToHatchCount > 0) { if (eggsToHatchCount > 0) {
if (eggsToHatchCount >= this.minEggsToPromptSkip && this.scene.eggSkipPreference === 2) { if (eggsToHatchCount >= this.minEggsToSkip && this.scene.eggSkipPreference === 1) {
this.scene.ui.showText(i18next.t("battle:eggHatching"), 0, () => { this.scene.ui.showText(i18next.t("battle:eggHatching"), 0, () => {
// show prompt for skip // show prompt for skip
this.scene.ui.showText(i18next.t("battle:eggSkipPrompt"), 0); this.scene.ui.showText(i18next.t("battle:eggSkipPrompt"), 0);
@ -44,7 +44,7 @@ export class EggLapsePhase extends Phase {
} }
); );
}, 100, true); }, 100, true);
} else if (eggsToHatchCount >= this.minEggsToPromptSkip && this.scene.eggSkipPreference === 1) { } else if (eggsToHatchCount >= this.minEggsToSkip && this.scene.eggSkipPreference === 2) {
this.scene.queueMessage(i18next.t("battle:eggHatching")); this.scene.queueMessage(i18next.t("battle:eggHatching"));
this.hatchEggsSkipped(eggsToHatch); this.hatchEggsSkipped(eggsToHatch);
this.showSummary(); this.showSummary();

View File

@ -290,16 +290,16 @@ export const Setting: Array<Setting> = [
value: "Never", value: "Never",
label: i18next.t("settings:never") label: i18next.t("settings:never")
}, },
{
value: "Always",
label: i18next.t("settings:always")
},
{ {
value: "Ask", value: "Ask",
label: i18next.t("settings:ask") label: i18next.t("settings:ask")
},
{
value: "Always",
label: i18next.t("settings:always")
} }
], ],
default: 2, default: 1,
type: SettingType.GENERAL type: SettingType.GENERAL
}, },
{ {