diff --git a/src/locales/de/battle-info.ts b/src/locales/de/battle-info.ts new file mode 100644 index 00000000000..bbbab9951a8 --- /dev/null +++ b/src/locales/de/battle-info.ts @@ -0,0 +1,5 @@ +import { SimpleTranslationEntries } from "#app/interfaces/locales"; + +export const battleInfo: SimpleTranslationEntries = { + "generation": "{{generation}}. Generation", +} as const; diff --git a/src/locales/de/config.ts b/src/locales/de/config.ts index c3058551d34..1ba94eed24a 100644 --- a/src/locales/de/config.ts +++ b/src/locales/de/config.ts @@ -3,6 +3,7 @@ import { abilityTriggers } from "./ability-trigger"; import { arenaFlyout } from "./arena-flyout"; import { PGFachv, PGMachv } from "./achv"; import { battle } from "./battle"; +import { battleInfo } from "./battle-info"; import { battleMessageUiHandler } from "./battle-message-ui-handler"; import { berry } from "./berry"; import { bgmName } from "./bgm-name"; @@ -54,6 +55,7 @@ export const deConfig = { abilityTriggers: abilityTriggers, arenaFlyout: arenaFlyout, battle: battle, + battleInfo: battleInfo, battleMessageUiHandler: battleMessageUiHandler, berry: berry, bgmName: bgmName, diff --git a/src/locales/en/battle-info.ts b/src/locales/en/battle-info.ts new file mode 100644 index 00000000000..f24dad46c6c --- /dev/null +++ b/src/locales/en/battle-info.ts @@ -0,0 +1,5 @@ +import { SimpleTranslationEntries } from "#app/interfaces/locales"; + +export const battleInfo: SimpleTranslationEntries = { + "generation": "Generation {{generation}}", +} as const; diff --git a/src/locales/en/config.ts b/src/locales/en/config.ts index 0dd495e1eb0..4273c5e4bfe 100644 --- a/src/locales/en/config.ts +++ b/src/locales/en/config.ts @@ -5,6 +5,7 @@ import { abilityTriggers } from "./ability-trigger"; import { arenaFlyout } from "./arena-flyout"; import { PGFachv, PGMachv } from "./achv"; import { battle } from "./battle"; +import { battleInfo } from "./battle-info"; import { battleMessageUiHandler } from "./battle-message-ui-handler"; import { berry } from "./berry"; import { bgmName } from "./bgm-name"; @@ -54,6 +55,7 @@ export const enConfig = { abilityTriggers: abilityTriggers, arenaFlyout: arenaFlyout, battle: battle, + battleInfo: battleInfo, battleMessageUiHandler: battleMessageUiHandler, berry: berry, bgmName: bgmName, diff --git a/src/locales/es/battle-info.ts b/src/locales/es/battle-info.ts new file mode 100644 index 00000000000..f24dad46c6c --- /dev/null +++ b/src/locales/es/battle-info.ts @@ -0,0 +1,5 @@ +import { SimpleTranslationEntries } from "#app/interfaces/locales"; + +export const battleInfo: SimpleTranslationEntries = { + "generation": "Generation {{generation}}", +} as const; diff --git a/src/locales/es/config.ts b/src/locales/es/config.ts index af3e92c538d..be9955b33d7 100644 --- a/src/locales/es/config.ts +++ b/src/locales/es/config.ts @@ -3,6 +3,7 @@ import { abilityTriggers } from "./ability-trigger"; import { arenaFlyout } from "./arena-flyout"; import { PGFachv, PGMachv } from "./achv"; import { battle } from "./battle"; +import { battleInfo } from "./battle-info"; import { battleMessageUiHandler } from "./battle-message-ui-handler"; import { berry } from "./berry"; import { bgmName } from "./bgm-name"; @@ -54,6 +55,7 @@ export const esConfig = { abilityTriggers: abilityTriggers, arenaFlyout: arenaFlyout, battle: battle, + battleInfo: battleInfo, battleMessageUiHandler: battleMessageUiHandler, berry: berry, bgmName: bgmName, diff --git a/src/locales/fr/battle-info.ts b/src/locales/fr/battle-info.ts new file mode 100644 index 00000000000..a0b2ad2911a --- /dev/null +++ b/src/locales/fr/battle-info.ts @@ -0,0 +1,5 @@ +import { SimpleTranslationEntries } from "#app/interfaces/locales"; + +export const battleInfo: SimpleTranslationEntries = { + "generation": "Génération {{generation}}", +} as const; diff --git a/src/locales/fr/config.ts b/src/locales/fr/config.ts index 0225d4b3f2e..4f98040bc99 100644 --- a/src/locales/fr/config.ts +++ b/src/locales/fr/config.ts @@ -3,6 +3,7 @@ import { abilityTriggers } from "./ability-trigger"; import { arenaFlyout } from "./arena-flyout"; import { PGFachv, PGMachv } from "./achv"; import { battle } from "./battle"; +import { battleInfo } from "./battle-info"; import { battleMessageUiHandler } from "./battle-message-ui-handler"; import { berry } from "./berry"; import { bgmName } from "./bgm-name"; @@ -54,6 +55,7 @@ export const frConfig = { abilityTriggers: abilityTriggers, arenaFlyout: arenaFlyout, battle: battle, + battleInfo: battleInfo, battleMessageUiHandler: battleMessageUiHandler, berry: berry, bgmName: bgmName, diff --git a/src/locales/it/battle-info.ts b/src/locales/it/battle-info.ts new file mode 100644 index 00000000000..195ad0616e0 --- /dev/null +++ b/src/locales/it/battle-info.ts @@ -0,0 +1,5 @@ +import { SimpleTranslationEntries } from "#app/interfaces/locales"; + +export const battleInfo: SimpleTranslationEntries = { + "generation": "Generazione {{generation}}", +} as const; diff --git a/src/locales/it/config.ts b/src/locales/it/config.ts index 3d715d3843a..72024a46ebb 100644 --- a/src/locales/it/config.ts +++ b/src/locales/it/config.ts @@ -3,6 +3,7 @@ import { abilityTriggers } from "./ability-trigger"; import { arenaFlyout } from "./arena-flyout"; import { PGFachv, PGMachv } from "./achv"; import { battle } from "./battle"; +import { battleInfo } from "./battle-info"; import { battleMessageUiHandler } from "./battle-message-ui-handler"; import { berry } from "./berry"; import { bgmName } from "./bgm-name"; @@ -54,6 +55,7 @@ export const itConfig = { abilityTriggers: abilityTriggers, arenaFlyout: arenaFlyout, battle: battle, + battleInfo: battleInfo, battleMessageUiHandler: battleMessageUiHandler, berry: berry, bgmName: bgmName, diff --git a/src/locales/ko/battle-info.ts b/src/locales/ko/battle-info.ts new file mode 100644 index 00000000000..4386f7814b4 --- /dev/null +++ b/src/locales/ko/battle-info.ts @@ -0,0 +1,5 @@ +import { SimpleTranslationEntries } from "#app/interfaces/locales"; + +export const battleInfo: SimpleTranslationEntries = { + "generation": "{{generation}}세대", +} as const; diff --git a/src/locales/ko/config.ts b/src/locales/ko/config.ts index 12a955706df..501e2025bbb 100644 --- a/src/locales/ko/config.ts +++ b/src/locales/ko/config.ts @@ -3,6 +3,7 @@ import { abilityTriggers } from "./ability-trigger"; import { arenaFlyout } from "./arena-flyout"; import { PGFachv, PGMachv } from "./achv"; import { battle } from "./battle"; +import { battleInfo } from "./battle-info"; import { battleMessageUiHandler } from "./battle-message-ui-handler"; import { berry } from "./berry"; import { bgmName } from "./bgm-name"; @@ -54,6 +55,7 @@ export const koConfig = { abilityTriggers: abilityTriggers, arenaFlyout: arenaFlyout, battle: battle, + battleInfo: battleInfo, battleMessageUiHandler: battleMessageUiHandler, berry: berry, bgmName: bgmName, diff --git a/src/locales/pt_BR/battle-info.ts b/src/locales/pt_BR/battle-info.ts new file mode 100644 index 00000000000..37cb7cb1aeb --- /dev/null +++ b/src/locales/pt_BR/battle-info.ts @@ -0,0 +1,5 @@ +import { SimpleTranslationEntries } from "#app/interfaces/locales"; + +export const battleInfo: SimpleTranslationEntries = { + "generation": "Geração {{generation}}", +} as const; diff --git a/src/locales/pt_BR/config.ts b/src/locales/pt_BR/config.ts index 9e1f88392e9..2baabba9e1f 100644 --- a/src/locales/pt_BR/config.ts +++ b/src/locales/pt_BR/config.ts @@ -3,6 +3,7 @@ import { abilityTriggers } from "./ability-trigger"; import { arenaFlyout } from "./arena-flyout"; import { PGFachv, PGMachv } from "./achv"; import { battle } from "./battle"; +import { battleInfo } from "./battle-info"; import { battleMessageUiHandler } from "./battle-message-ui-handler"; import { berry } from "./berry"; import { bgmName } from "./bgm-name"; @@ -54,6 +55,7 @@ export const ptBrConfig = { abilityTriggers: abilityTriggers, arenaFlyout: arenaFlyout, battle: battle, + battleInfo: battleInfo, battleMessageUiHandler: battleMessageUiHandler, berry: berry, bgmName: bgmName, diff --git a/src/locales/zh_CN/battle-info.ts b/src/locales/zh_CN/battle-info.ts new file mode 100644 index 00000000000..684ce4bc26a --- /dev/null +++ b/src/locales/zh_CN/battle-info.ts @@ -0,0 +1,5 @@ +import { SimpleTranslationEntries } from "#app/interfaces/locales"; + +export const battleInfo: SimpleTranslationEntries = { + "generation": "第{{generation}}世代", +} as const; diff --git a/src/locales/zh_CN/config.ts b/src/locales/zh_CN/config.ts index 2425602a092..caf192a3709 100644 --- a/src/locales/zh_CN/config.ts +++ b/src/locales/zh_CN/config.ts @@ -3,6 +3,7 @@ import { abilityTriggers } from "./ability-trigger"; import { arenaFlyout } from "./arena-flyout"; import { PGFachv, PGMachv } from "./achv"; import { battle } from "./battle"; +import { battleInfo } from "./battle-info"; import { battleMessageUiHandler } from "./battle-message-ui-handler"; import { berry } from "./berry"; import { bgmName } from "./bgm-name"; @@ -54,6 +55,7 @@ export const zhCnConfig = { abilityTriggers: abilityTriggers, arenaFlyout: arenaFlyout, battle: battle, + battleInfo: battleInfo, battleMessageUiHandler: battleMessageUiHandler, berry: berry, bgmName: bgmName, diff --git a/src/locales/zh_TW/battle-info.ts b/src/locales/zh_TW/battle-info.ts new file mode 100644 index 00000000000..684ce4bc26a --- /dev/null +++ b/src/locales/zh_TW/battle-info.ts @@ -0,0 +1,5 @@ +import { SimpleTranslationEntries } from "#app/interfaces/locales"; + +export const battleInfo: SimpleTranslationEntries = { + "generation": "第{{generation}}世代", +} as const; diff --git a/src/locales/zh_TW/config.ts b/src/locales/zh_TW/config.ts index 1b5a4001aee..97a2f280761 100644 --- a/src/locales/zh_TW/config.ts +++ b/src/locales/zh_TW/config.ts @@ -3,6 +3,7 @@ import { abilityTriggers } from "./ability-trigger"; import { arenaFlyout } from "./arena-flyout"; import { PGFachv, PGMachv } from "./achv"; import { battle } from "./battle"; +import { battleInfo } from "./battle-info"; import { battleMessageUiHandler } from "./battle-message-ui-handler"; import { berry } from "./berry"; import { bgmName } from "./bgm-name"; @@ -54,6 +55,7 @@ export const zhTwConfig = { abilityTriggers: abilityTriggers, arenaFlyout: arenaFlyout, battle: battle, + battleInfo: battleInfo, battleMessageUiHandler: battleMessageUiHandler, berry: berry, bgmName: bgmName, diff --git a/src/ui/battle-info.ts b/src/ui/battle-info.ts index 3b889228e27..ec6fee85f98 100644 --- a/src/ui/battle-info.ts +++ b/src/ui/battle-info.ts @@ -329,6 +329,11 @@ export default class BattleInfo extends Phaser.GameObjects.Container { } if (!this.player) { + if (this.nameText.visible) { + this.nameText.on("pointerover", () => (this.scene as BattleScene).ui.showTooltip(null, i18next.t("battleInfo:generation", { generation: i18next.t(`starterSelectUiHandler:gen${pokemon.species.generation}`) }))); + this.nameText.on("pointerout", () => (this.scene as BattleScene).ui.hideTooltip()); + } + const dexEntry = pokemon.scene.gameData.dexData[pokemon.species.speciesId]; this.ownedIcon.setVisible(!!dexEntry.caughtAttr); const opponentPokemonDexAttr = pokemon.getDexAttr(); @@ -645,6 +650,10 @@ export default class BattleInfo extends Phaser.GameObjects.Container { this.nameText.setText(displayName); this.lastName = pokemon.name; + + if (this.nameText.visible) { + this.nameText.setInteractive(new Phaser.Geom.Rectangle(0, 0, this.nameText.width, this.nameText.height), Phaser.Geom.Rectangle.Contains); + } } updatePokemonExp(pokemon: Pokemon, instant?: boolean, levelDurationMultiplier: number = 1): Promise {