mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2024-11-26 00:36:25 +00:00
This reverts commit 5c79e6258b
.
This commit is contained in:
parent
5c79e6258b
commit
5eab016903
@ -32,7 +32,6 @@ import {
|
||||
} from "./dialogue";
|
||||
import { biome } from "./biome";
|
||||
import { pokemonInfoContainer } from "./pokemon-info-container";
|
||||
import { modifierSelectUiHandler } from "./modifier-select-ui-handler";
|
||||
|
||||
export const deConfig = {
|
||||
ability: ability,
|
||||
@ -70,6 +69,5 @@ export const deConfig = {
|
||||
PGMmiscDialogue: PGMmiscDialogue,
|
||||
PGFmiscDialogue: PGFmiscDialogue,
|
||||
PGMdoubleBattleDialogue: PGMdoubleBattleDialogue,
|
||||
PGFdoubleBattleDialogue: PGFdoubleBattleDialogue,
|
||||
modifierSelectUiHandler: modifierSelectUiHandler
|
||||
PGFdoubleBattleDialogue: PGFdoubleBattleDialogue
|
||||
};
|
||||
|
@ -1,12 +0,0 @@
|
||||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const modifierSelectUiHandler: SimpleTranslationEntries = {
|
||||
"transfer": "Transfer",
|
||||
"reroll": "Reroll",
|
||||
"lockRarities": "Lock Rarities",
|
||||
"transferDesc": "Transfer a held item from one Pokémon to another.",
|
||||
"rerollDesc": "Spend money to reroll your item options.",
|
||||
"lockRaritiesDesc": "Lock item rarities on reroll (affects reroll cost).",
|
||||
"rerollCost": "₽{{cost}}",
|
||||
"itemCost": "₽{{cost}}"
|
||||
} as const;
|
@ -32,7 +32,6 @@ import {
|
||||
} from "./dialogue";
|
||||
import { biome } from "./biome";
|
||||
import { pokemonInfoContainer } from "./pokemon-info-container";
|
||||
import { modifierSelectUiHandler } from "./modifier-select-ui-handler";
|
||||
|
||||
export const enConfig = {
|
||||
ability: ability,
|
||||
@ -70,6 +69,5 @@ export const enConfig = {
|
||||
PGMmiscDialogue: PGMmiscDialogue,
|
||||
PGFmiscDialogue: PGFmiscDialogue,
|
||||
PGMdoubleBattleDialogue: PGMdoubleBattleDialogue,
|
||||
PGFdoubleBattleDialogue: PGFdoubleBattleDialogue,
|
||||
modifierSelectUiHandler: modifierSelectUiHandler
|
||||
PGFdoubleBattleDialogue: PGFdoubleBattleDialogue
|
||||
};
|
||||
|
@ -1,12 +0,0 @@
|
||||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const modifierSelectUiHandler: SimpleTranslationEntries = {
|
||||
"transfer": "Transfer",
|
||||
"reroll": "Reroll",
|
||||
"lockRarities": "Lock Rarities",
|
||||
"transferDesc": "Transfer a held item from one Pokémon to another.",
|
||||
"rerollDesc": "Spend money to reroll your item options.",
|
||||
"lockRaritiesDesc": "Lock item rarities on reroll (affects reroll cost).",
|
||||
"rerollCost": "₽{{cost}}",
|
||||
"itemCost": "₽{{cost}}"
|
||||
} as const;
|
@ -32,7 +32,6 @@ import {
|
||||
} from "./dialogue";
|
||||
import { biome } from "./biome";
|
||||
import { pokemonInfoContainer } from "./pokemon-info-container";
|
||||
import { modifierSelectUiHandler } from "./modifier-select-ui-handler";
|
||||
|
||||
export const esConfig = {
|
||||
ability: ability,
|
||||
@ -70,6 +69,5 @@ export const esConfig = {
|
||||
PGMmiscDialogue: PGMmiscDialogue,
|
||||
PGFmiscDialogue: PGFmiscDialogue,
|
||||
PGMdoubleBattleDialogue: PGMdoubleBattleDialogue,
|
||||
PGFdoubleBattleDialogue: PGFdoubleBattleDialogue,
|
||||
modifierSelectUiHandler: modifierSelectUiHandler
|
||||
PGFdoubleBattleDialogue: PGFdoubleBattleDialogue
|
||||
};
|
||||
|
@ -1,12 +0,0 @@
|
||||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const modifierSelectUiHandler: SimpleTranslationEntries = {
|
||||
"transfer": "Transfer",
|
||||
"reroll": "Reroll",
|
||||
"lockRarities": "Lock Rarities",
|
||||
"transferDesc": "Transfer a held item from one Pokémon to another.",
|
||||
"rerollDesc": "Spend money to reroll your item options.",
|
||||
"lockRaritiesDesc": "Lock item rarities on reroll (affects reroll cost).",
|
||||
"rerollCost": "₽{{cost}}",
|
||||
"itemCost": "₽{{cost}}"
|
||||
} as const;
|
@ -32,7 +32,6 @@ import {
|
||||
} from "./dialogue";
|
||||
import { biome } from "./biome";
|
||||
import { pokemonInfoContainer } from "./pokemon-info-container";
|
||||
import { modifierSelectUiHandler } from "./modifier-select-ui-handler";
|
||||
|
||||
export const frConfig = {
|
||||
ability: ability,
|
||||
@ -70,6 +69,5 @@ export const frConfig = {
|
||||
PGMmiscDialogue: PGMmiscDialogue,
|
||||
PGFmiscDialogue: PGFmiscDialogue,
|
||||
PGMdoubleBattleDialogue: PGMdoubleBattleDialogue,
|
||||
PGFdoubleBattleDialogue: PGFdoubleBattleDialogue,
|
||||
modifierSelectUiHandler: modifierSelectUiHandler
|
||||
PGFdoubleBattleDialogue: PGFdoubleBattleDialogue
|
||||
};
|
||||
|
@ -1,12 +0,0 @@
|
||||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const modifierSelectUiHandler: SimpleTranslationEntries = {
|
||||
"transfer": "Transférer",
|
||||
"reroll": "Relancer",
|
||||
"lockRarities": "Bloquer la rareté",
|
||||
"transferDesc": "Transférer un objet tenu par un Pokémon vers un autre.",
|
||||
"rerollDesc": "Payer pour relancer les objets gratuits proposés.",
|
||||
"lockRaritiesDesc": "La relance proposera des objets gratuits de rareté\négale ou supérieure. Affecte le cout de relance.",
|
||||
"rerollCost": "{{cost}} ₽",
|
||||
"itemCost": "{{cost}} ₽"
|
||||
} as const;
|
@ -32,7 +32,6 @@ import {
|
||||
} from "./dialogue";
|
||||
import { biome } from "./biome";
|
||||
import { pokemonInfoContainer } from "./pokemon-info-container";
|
||||
import { modifierSelectUiHandler } from "./modifier-select-ui-handler";
|
||||
|
||||
export const itConfig = {
|
||||
ability: ability,
|
||||
@ -70,6 +69,5 @@ export const itConfig = {
|
||||
PGMmiscDialogue: PGMmiscDialogue,
|
||||
PGFmiscDialogue: PGFmiscDialogue,
|
||||
PGMdoubleBattleDialogue: PGMdoubleBattleDialogue,
|
||||
PGFdoubleBattleDialogue: PGFdoubleBattleDialogue,
|
||||
modifierSelectUiHandler: modifierSelectUiHandler
|
||||
PGFdoubleBattleDialogue: PGFdoubleBattleDialogue
|
||||
};
|
||||
|
@ -1,12 +0,0 @@
|
||||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const modifierSelectUiHandler: SimpleTranslationEntries = {
|
||||
"transfer": "Transfer",
|
||||
"reroll": "Reroll",
|
||||
"lockRarities": "Lock Rarities",
|
||||
"transferDesc": "Transfer a held item from one Pokémon to another.",
|
||||
"rerollDesc": "Spend money to reroll your item options.",
|
||||
"lockRaritiesDesc": "Lock item rarities on reroll (affects reroll cost).",
|
||||
"rerollCost": "₽{{cost}}",
|
||||
"itemCost": "₽{{cost}}"
|
||||
} as const;
|
@ -32,7 +32,7 @@ import {
|
||||
} from "./dialogue";
|
||||
import { biome } from "./biome";
|
||||
import { pokemonInfoContainer } from "./pokemon-info-container";
|
||||
import { modifierSelectUiHandler } from "./modifier-select-ui-handler";
|
||||
|
||||
|
||||
export const koConfig = {
|
||||
ability: ability,
|
||||
@ -70,6 +70,5 @@ export const koConfig = {
|
||||
PGMmiscDialogue: PGMmiscDialogue,
|
||||
PGFmiscDialogue: PGFmiscDialogue,
|
||||
PGMdoubleBattleDialogue: PGMdoubleBattleDialogue,
|
||||
PGFdoubleBattleDialogue: PGFdoubleBattleDialogue,
|
||||
modifierSelectUiHandler: modifierSelectUiHandler
|
||||
PGFdoubleBattleDialogue: PGFdoubleBattleDialogue
|
||||
};
|
||||
|
@ -1,12 +0,0 @@
|
||||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const modifierSelectUiHandler: SimpleTranslationEntries = {
|
||||
"transfer": "도구 이동",
|
||||
"reroll": "새로고침",
|
||||
"lockRarities": "레어도 고정",
|
||||
"transferDesc": "포켓몬이 지닌 도구를 다른 포켓몬에게 옮깁니다.",
|
||||
"rerollDesc": "소지금을 사용하여 선택 가능한 도구들을 새로고침합니다.",
|
||||
"lockRaritiesDesc": "새로고침할 때 도구 레어도를 고정합니다(새로고침 비용 상승함).",
|
||||
"rerollCost": "₽{{cost}}",
|
||||
"itemCost": "₽{{cost}}"
|
||||
} as const;
|
@ -32,7 +32,6 @@ import {
|
||||
} from "./dialogue";
|
||||
import { biome } from "./biome";
|
||||
import { pokemonInfoContainer } from "./pokemon-info-container";
|
||||
import { modifierSelectUiHandler } from "./modifier-select-ui-handler";
|
||||
|
||||
export const ptBrConfig = {
|
||||
ability: ability,
|
||||
@ -70,6 +69,5 @@ export const ptBrConfig = {
|
||||
PGMmiscDialogue: PGMmiscDialogue,
|
||||
PGFmiscDialogue: PGFmiscDialogue,
|
||||
PGMdoubleBattleDialogue: PGMdoubleBattleDialogue,
|
||||
PGFdoubleBattleDialogue: PGFdoubleBattleDialogue,
|
||||
modifierSelectUiHandler: modifierSelectUiHandler
|
||||
PGFdoubleBattleDialogue: PGFdoubleBattleDialogue
|
||||
};
|
||||
|
@ -1,12 +0,0 @@
|
||||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const modifierSelectUiHandler: SimpleTranslationEntries = {
|
||||
"transfer": "Transfer",
|
||||
"reroll": "Reroll",
|
||||
"lockRarities": "Lock Rarities",
|
||||
"transferDesc": "Transfer a held item from one Pokémon to another.",
|
||||
"rerollDesc": "Spend money to reroll your item options.",
|
||||
"lockRaritiesDesc": "Lock item rarities on reroll (affects reroll cost).",
|
||||
"rerollCost": "₽{{cost}}",
|
||||
"itemCost": "₽{{cost}}"
|
||||
} as const;
|
@ -32,7 +32,6 @@ import {
|
||||
} from "./dialogue";
|
||||
import { biome } from "./biome";
|
||||
import { pokemonInfoContainer } from "./pokemon-info-container";
|
||||
import { modifierSelectUiHandler } from "./modifier-select-ui-handler";
|
||||
|
||||
export const zhCnConfig = {
|
||||
ability: ability,
|
||||
@ -70,6 +69,5 @@ export const zhCnConfig = {
|
||||
PGMmiscDialogue: PGMmiscDialogue,
|
||||
PGFmiscDialogue: PGFmiscDialogue,
|
||||
PGMdoubleBattleDialogue: PGMdoubleBattleDialogue,
|
||||
PGFdoubleBattleDialogue: PGFdoubleBattleDialogue,
|
||||
modifierSelectUiHandler: modifierSelectUiHandler
|
||||
PGFdoubleBattleDialogue: PGFdoubleBattleDialogue
|
||||
};
|
||||
|
@ -1,12 +0,0 @@
|
||||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const modifierSelectUiHandler: SimpleTranslationEntries = {
|
||||
"transfer": "交换道具",
|
||||
"reroll": "刷新掉落",
|
||||
"lockRarities": "锁定稀有度",
|
||||
"transferDesc": "将一只宝可梦所持有的道具交换给另一只。",
|
||||
"rerollDesc": "花钱刷新掉落道具选项。",
|
||||
"lockRaritiesDesc": "在刷新时锁定道具稀有度(影响刷新费用)。",
|
||||
"rerollCost": "₽{{cost}}",
|
||||
"itemCost": "₽{{cost}}"
|
||||
} as const;
|
@ -31,7 +31,6 @@ import {
|
||||
} from "./dialogue";
|
||||
import { biome } from "./biome";
|
||||
import { pokemonInfoContainer } from "./pokemon-info-container";
|
||||
import { modifierSelectUiHandler } from "./modifier-select-ui-handler";
|
||||
|
||||
export const zhTWConfig = {
|
||||
ability: ability,
|
||||
@ -68,6 +67,5 @@ export const zhTWConfig = {
|
||||
PGMmiscDialogue: PGMmiscDialogue,
|
||||
PGFmiscDialogue: PGFmiscDialogue,
|
||||
PGMdoubleBattleDialogue: PGMdoubleBattleDialogue,
|
||||
PGFdoubleBattleDialogue: PGFdoubleBattleDialogue,
|
||||
modifierSelectUiHandler: modifierSelectUiHandler
|
||||
PGFdoubleBattleDialogue: PGFdoubleBattleDialogue
|
||||
};
|
||||
|
@ -1,12 +0,0 @@
|
||||
import { SimpleTranslationEntries } from "#app/plugins/i18n";
|
||||
|
||||
export const modifierSelectUiHandler: SimpleTranslationEntries = {
|
||||
"transfer": "Transfer",
|
||||
"reroll": "Reroll",
|
||||
"lockRarities": "Lock Rarities",
|
||||
"transferDesc": "Transfer a held item from one Pokémon to another.",
|
||||
"rerollDesc": "Spend money to reroll your item options.",
|
||||
"lockRaritiesDesc": "Lock item rarities on reroll (affects reroll cost).",
|
||||
"rerollCost": "₽{{cost}}",
|
||||
"itemCost": "₽{{cost}}"
|
||||
} as const;
|
@ -221,7 +221,6 @@ declare module "i18next" {
|
||||
PGFbattleSpecDialogue: SimpleTranslationEntries;
|
||||
PGFmiscDialogue: SimpleTranslationEntries;
|
||||
PGFdoubleBattleDialogue: DialogueTranslationEntries;
|
||||
modifierSelectUiHandler: SimpleTranslationEntries;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
@ -7,7 +7,6 @@ import { Mode } from "./ui";
|
||||
import { LockModifierTiersModifier, PokemonHeldItemModifier } from "../modifier/modifier";
|
||||
import { handleTutorial, Tutorial } from "../tutorial";
|
||||
import {Button} from "../enums/buttons";
|
||||
import i18next from "i18next";
|
||||
|
||||
export const SHOP_OPTIONS_ROW_LIMIT = 6;
|
||||
|
||||
@ -42,22 +41,27 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
|
||||
ui.add(this.modifierContainer);
|
||||
|
||||
this.transferButtonContainer = this.scene.add.container((this.scene.game.canvas.width / 6) - 1, -64);
|
||||
this.transferButtonContainer.setName("container-transfer-btn");
|
||||
this.transferButtonContainer.setVisible(false);
|
||||
ui.add(this.transferButtonContainer);
|
||||
|
||||
const transferButtonText = addTextObject(this.scene, -4, -2, i18next.t("modifierSelectUiHandler:transfer"), TextStyle.PARTY);
|
||||
const transferButtonText = addTextObject(this.scene, -4, -2, "Transfer", TextStyle.PARTY);
|
||||
transferButtonText.setName("text-transfer-btn");
|
||||
transferButtonText.setOrigin(1, 0);
|
||||
this.transferButtonContainer.add(transferButtonText);
|
||||
|
||||
this.rerollButtonContainer = this.scene.add.container(16, -64);
|
||||
this.rerollButtonContainer.setName("container-reroll-brn");
|
||||
this.rerollButtonContainer.setVisible(false);
|
||||
ui.add(this.rerollButtonContainer);
|
||||
|
||||
const rerollButtonText = addTextObject(this.scene, -4, -2, i18next.t("modifierSelectUiHandler:reroll"), TextStyle.PARTY);
|
||||
const rerollButtonText = addTextObject(this.scene, -4, -2, "Reroll", TextStyle.PARTY);
|
||||
rerollButtonText.setName("text-reroll-btn");
|
||||
rerollButtonText.setOrigin(0, 0);
|
||||
this.rerollButtonContainer.add(rerollButtonText);
|
||||
|
||||
this.rerollCostText = addTextObject(this.scene, 0, 0, "", TextStyle.MONEY);
|
||||
this.rerollCostText.setName("text-reroll-cost");
|
||||
this.rerollCostText.setOrigin(0, 0);
|
||||
this.rerollCostText.setPositionRelative(rerollButtonText, rerollButtonText.displayWidth + 5, 1);
|
||||
this.rerollButtonContainer.add(this.rerollCostText);
|
||||
@ -66,7 +70,7 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
|
||||
this.lockRarityButtonContainer.setVisible(false);
|
||||
ui.add(this.lockRarityButtonContainer);
|
||||
|
||||
this.lockRarityButtonText = addTextObject(this.scene, -4, -2, i18next.t("modifierSelectUiHandler:lockRarities"), TextStyle.PARTY);
|
||||
this.lockRarityButtonText = addTextObject(this.scene, -4, -2, "Lock Rarities", TextStyle.PARTY);
|
||||
this.lockRarityButtonText.setOrigin(0, 0);
|
||||
this.lockRarityButtonContainer.add(this.lockRarityButtonText);
|
||||
}
|
||||
@ -142,7 +146,7 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
|
||||
const maxUpgradeCount = typeOptions.map(to => to.upgradeCount).reduce((max, current) => Math.max(current, max), 0);
|
||||
|
||||
this.scene.showFieldOverlay(750);
|
||||
this.scene.updateAndShowLuckText(750);
|
||||
this.scene.updateAndShowText(750);
|
||||
this.scene.updateMoneyText();
|
||||
|
||||
let i = 0;
|
||||
@ -299,13 +303,13 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
|
||||
ui.showText(options[this.cursor].modifierTypeOption.type.getDescription(this.scene));
|
||||
} else if (!cursor) {
|
||||
this.cursorObj.setPosition(6, this.lockRarityButtonContainer.visible ? -72 : -60);
|
||||
ui.showText(i18next.t("modifierSelectUiHandler:rerollDesc"));
|
||||
ui.showText("Spend money to reroll your item options.");
|
||||
} else if (cursor === 1) {
|
||||
this.cursorObj.setPosition((this.scene.game.canvas.width / 6) - 50, -60);
|
||||
ui.showText(i18next.t("modifierSelectUiHandler:transferDesc"));
|
||||
ui.showText("Transfer a held item from one Pokémon to another.");
|
||||
} else {
|
||||
this.cursorObj.setPosition(6, -60);
|
||||
ui.showText(i18next.t("modifierSelectUiHandler:lockRaritiesDesc"));
|
||||
ui.showText("Lock item rarities on reroll (affects reroll cost).");
|
||||
}
|
||||
|
||||
return ret;
|
||||
@ -358,9 +362,8 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
|
||||
|
||||
updateRerollCostText(): void {
|
||||
const canReroll = this.scene.money >= this.rerollCost;
|
||||
const rerollCostFormatted = this.rerollCost.toLocaleString(i18next.language);
|
||||
|
||||
this.rerollCostText.setText(i18next.t("modifierSelectUiHandler:rerollCost", { cost: rerollCostFormatted }));
|
||||
this.rerollCostText.setText(`₽${this.rerollCost.toLocaleString("en-US")}`);
|
||||
this.rerollCostText.setColor(this.getTextColor(canReroll ? TextStyle.MONEY : TextStyle.PARTY_RED));
|
||||
this.rerollCostText.setShadowColor(this.getTextColor(canReroll ? TextStyle.MONEY : TextStyle.PARTY_RED, true));
|
||||
}
|
||||
@ -615,9 +618,8 @@ class ModifierOption extends Phaser.GameObjects.Container {
|
||||
updateCostText(): void {
|
||||
const scene = this.scene as BattleScene;
|
||||
const textStyle = this.modifierTypeOption.cost <= scene.money ? TextStyle.MONEY : TextStyle.PARTY_RED;
|
||||
const itemCostFormatted = this.modifierTypeOption.cost.toLocaleString(i18next.language);
|
||||
|
||||
this.itemCostText.setText(i18next.t("modifierSelectUiHandler:itemCost", { cost: itemCostFormatted }));
|
||||
this.itemCostText.setText(`₽${this.modifierTypeOption.cost.toLocaleString("en-US")}`);
|
||||
this.itemCostText.setColor(getTextColor(textStyle, false, scene.uiTheme));
|
||||
this.itemCostText.setShadowColor(getTextColor(textStyle, true, scene.uiTheme));
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user