Compare commits

...

2 Commits

Author SHA1 Message Date
fabske0
9d7b9f742e change double battle dialogue use 2025-08-12 18:24:35 +02:00
fabske0
35cf80705e change biome locales uses 2025-08-12 13:56:06 +02:00
3 changed files with 32 additions and 31 deletions

View File

@ -7,6 +7,7 @@ import { TimeOfDay } from "#enums/time-of-day";
import { TrainerType } from "#enums/trainer-type"; import { TrainerType } from "#enums/trainer-type";
import { randSeedInt } from "#utils/common"; import { randSeedInt } from "#utils/common";
import { getEnumValues } from "#utils/enums"; import { getEnumValues } from "#utils/enums";
import { toCamelCase } from "#utils/strings";
import i18next from "i18next"; import i18next from "i18next";
export function getBiomeName(biome: BiomeId | -1) { export function getBiomeName(biome: BiomeId | -1) {
@ -15,13 +16,13 @@ export function getBiomeName(biome: BiomeId | -1) {
} }
switch (biome) { switch (biome) {
case BiomeId.GRASS: case BiomeId.GRASS:
return i18next.t("biome:GRASS"); return i18next.t("biome:grass");
case BiomeId.RUINS: case BiomeId.RUINS:
return i18next.t("biome:RUINS"); return i18next.t("biome:ruins");
case BiomeId.END: case BiomeId.END:
return i18next.t("biome:END"); return i18next.t("biome:end");
default: default:
return i18next.t(`biome:${BiomeId[biome].toUpperCase()}`); return i18next.t(`biome:${toCamelCase(BiomeId[biome])}`);
} }
} }

View File

@ -2,43 +2,43 @@
// that caused this to be moved out in the first place // that caused this to be moved out in the first place
export const doubleBattleDialogue = { export const doubleBattleDialogue = {
blue_red_double: { blue_red_double: {
encounter: ["doubleBattleDialogue:blue_red_double.encounter.1"], encounter: ["doubleBattleDialogue:blueRedDouble.encounter.1"],
victory: ["doubleBattleDialogue:blue_red_double.victory.1"], victory: ["doubleBattleDialogue:blueRedDouble.victory.1"],
}, },
red_blue_double: { red_blue_double: {
encounter: ["doubleBattleDialogue:red_blue_double.encounter.1"], encounter: ["doubleBattleDialogue:redBlueDouble.encounter.1"],
victory: ["doubleBattleDialogue:red_blue_double.victory.1"], victory: ["doubleBattleDialogue:redBlueDouble.victory.1"],
}, },
tate_liza_double: { tate_liza_double: {
encounter: ["doubleBattleDialogue:tate_liza_double.encounter.1"], encounter: ["doubleBattleDialogue:tateLizaDouble.encounter.1"],
victory: ["doubleBattleDialogue:tate_liza_double.victory.1"], victory: ["doubleBattleDialogue:tateLizaDouble.victory.1"],
}, },
liza_tate_double: { liza_tate_double: {
encounter: ["doubleBattleDialogue:liza_tate_double.encounter.1"], encounter: ["doubleBattleDialogue:lizaTateDouble.encounter.1"],
victory: ["doubleBattleDialogue:liza_tate_double.victory.1"], victory: ["doubleBattleDialogue:lizaTateDouble.victory.1"],
}, },
wallace_steven_double: { wallace_steven_double: {
encounter: ["doubleBattleDialogue:wallace_steven_double.encounter.1"], encounter: ["doubleBattleDialogue:wallaceStevenDouble.encounter.1"],
victory: ["doubleBattleDialogue:wallace_steven_double.victory.1"], victory: ["doubleBattleDialogue:wallaceStevenDouble.victory.1"],
}, },
steven_wallace_double: { steven_wallace_double: {
encounter: ["doubleBattleDialogue:steven_wallace_double.encounter.1"], encounter: ["doubleBattleDialogue:stevenWallaceDouble.encounter.1"],
victory: ["doubleBattleDialogue:steven_wallace_double.victory.1"], victory: ["doubleBattleDialogue:stevenWallaceDouble.victory.1"],
}, },
alder_iris_double: { alder_iris_double: {
encounter: ["doubleBattleDialogue:alder_iris_double.encounter.1"], encounter: ["doubleBattleDialogue:alderIrisDouble.encounter.1"],
victory: ["doubleBattleDialogue:alder_iris_double.victory.1"], victory: ["doubleBattleDialogue:alderIrisDouble.victory.1"],
}, },
iris_alder_double: { iris_alder_double: {
encounter: ["doubleBattleDialogue:iris_alder_double.encounter.1"], encounter: ["doubleBattleDialogue:irisAlderDouble.encounter.1"],
victory: ["doubleBattleDialogue:iris_alder_double.victory.1"], victory: ["doubleBattleDialogue:irisAlderDouble.victory.1"],
}, },
marnie_piers_double: { marnie_piers_double: {
encounter: ["doubleBattleDialogue:marnie_piers_double.encounter.1"], encounter: ["doubleBattleDialogue:marniePiersDouble.encounter.1"],
victory: ["doubleBattleDialogue:marnie_piers_double.victory.1"], victory: ["doubleBattleDialogue:marniePiersDouble.victory.1"],
}, },
piers_marnie_double: { piers_marnie_double: {
encounter: ["doubleBattleDialogue:piers_marnie_double.encounter.1"], encounter: ["doubleBattleDialogue:piersMarnieDouble.encounter.1"],
victory: ["doubleBattleDialogue:piers_marnie_double.victory.1"], victory: ["doubleBattleDialogue:piersMarnieDouble.victory.1"],
}, },
}; };

View File

@ -57,7 +57,7 @@ import { addWindow } from "#ui/ui-theme";
import { BooleanHolder, getLocalizedSpriteKey, isNullOrUndefined, padInt, rgbHexToRgba } from "#utils/common"; import { BooleanHolder, getLocalizedSpriteKey, isNullOrUndefined, padInt, rgbHexToRgba } from "#utils/common";
import { getEnumValues } from "#utils/enums"; import { getEnumValues } from "#utils/enums";
import { getPokemonSpecies, getPokemonSpeciesForm } from "#utils/pokemon-utils"; import { getPokemonSpecies, getPokemonSpeciesForm } from "#utils/pokemon-utils";
import { toTitleCase } from "#utils/strings"; import { toCamelCase, toTitleCase } from "#utils/strings";
import { argbFromRgba } from "@material/material-color-utilities"; import { argbFromRgba } from "@material/material-color-utilities";
import i18next from "i18next"; import i18next from "i18next";
import type BBCodeText from "phaser3-rex-plugins/plugins/gameobjects/tagtext/bbcodetext/BBCodeText"; import type BBCodeText from "phaser3-rex-plugins/plugins/gameobjects/tagtext/bbcodetext/BBCodeText";
@ -1517,13 +1517,13 @@ export class PokedexPageUiHandler extends MessageUiHandler {
this.biomes.map(b => { this.biomes.map(b => {
options.push({ options.push({
label: label:
i18next.t(`biome:${BiomeId[b.biome].toUpperCase()}`) + i18next.t(`biome:${toCamelCase(BiomeId[b.biome])}`) +
" - " + " - " +
i18next.t(`biome:${BiomePoolTier[b.tier].toUpperCase()}`) + i18next.t(`biome:${toCamelCase(BiomePoolTier[b.tier])}`) +
(b.tod.length === 1 && b.tod[0] === -1 (b.tod.length === 1 && b.tod[0] === -1
? "" ? ""
: " (" + : " (" +
b.tod.map(tod => i18next.t(`biome:${TimeOfDay[tod].toUpperCase()}`)).join(", ") + b.tod.map(tod => i18next.t(`biome:${toCamelCase(TimeOfDay[tod])}`)).join(", ") +
")"), ")"),
handler: () => false, handler: () => false,
}); });
@ -1538,13 +1538,13 @@ export class PokedexPageUiHandler extends MessageUiHandler {
this.preBiomes.map(b => { this.preBiomes.map(b => {
options.push({ options.push({
label: label:
i18next.t(`biome:${BiomeId[b.biome].toUpperCase()}`) + i18next.t(`biome:${toCamelCase(BiomeId[b.biome])}`) +
" - " + " - " +
i18next.t(`biome:${BiomePoolTier[b.tier].toUpperCase()}`) + i18next.t(`biome:${toCamelCase(BiomePoolTier[b.tier])}`) +
(b.tod.length === 1 && b.tod[0] === -1 (b.tod.length === 1 && b.tod[0] === -1
? "" ? ""
: " (" + : " (" +
b.tod.map(tod => i18next.t(`biome:${TimeOfDay[tod].toUpperCase()}`)).join(", ") + b.tod.map(tod => i18next.t(`biome:${toCamelCase(TimeOfDay[tod])}`)).join(", ") +
")"), ")"),
handler: () => false, handler: () => false,
}); });