Compare commits

..

No commits in common. "2b61e72b2db0e5602effa999963392c626bc3f95" and "2c782ddf55517dfd5846034a2ba10692309f095e" have entirely different histories.

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;
/**
* Determines if the egg hatching animation should be skipped
* - 0 = Never (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)
* - 0 = Never
* - 1 = Always
* - 2 = Ask
*/
public eggSkipPreference: number = 0;

View File

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

View File

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