mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-18 22:32:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix key usage for trainer locales

Browse Source
This commit is contained in:
Dean 2025-04-01 13:43:51 -07:00
parent 5217703d2b
commit 3e875810de
2 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/field/trainer.ts
View File

@ -33,14 +33,16 @@ export default class Trainer extends Phaser.GameObjects.Container {
public partyTemplateIndex: number; public partyTemplateIndex: number;
public name: string; public name: string;
public partnerName: string; public partnerName: string;
public nameKey: string;
public partnerNameKey: string | undefined;
public originalIndexes: { [key: number]: number } = {}; public originalIndexes: { [key: number]: number } = {};
constructor( constructor(
trainerType: TrainerType, trainerType: TrainerType,
variant: TrainerVariant, variant: TrainerVariant,
partyTemplateIndex?: number, partyTemplateIndex?: number,
name?: string, nameKey?: string,
partnerName?: string, partnerNameKey?: string,
trainerConfigOverride?: TrainerConfig, trainerConfigOverride?: TrainerConfig,
) { ) {
super(globalScene, -72, 80); super(globalScene, -72, 80);
@ -59,28 +61,41 @@ export default class Trainer extends Phaser.GameObjects.Container {
: Utils.randSeedWeightedItem(this.config.partyTemplates.map((_, i) => i)), : Utils.randSeedWeightedItem(this.config.partyTemplates.map((_, i) => i)),
this.config.partyTemplates.length - 1, this.config.partyTemplates.length - 1,
); );
if (i18next.exists("trainersCommon:" + TrainerType[trainerType], { returnObjects: true })) { const classKey = `trainersCommon:${TrainerType[trainerType]}`;
const namePool = i18next.t("trainersCommon:" + TrainerType[trainerType], { returnObjects: true }); if (i18next.exists(classKey, { returnObjects: true })) {
this.name = if (nameKey) {
name || this.nameKey = nameKey;
Utils.randSeedItem( } else {
Object.values( const genderKey = i18next.exists(`${classKey}.MALE`)
namePool.hasOwnProperty("MALE") ? variant === TrainerVariant.FEMALE
? namePool[variant === TrainerVariant.FEMALE ? "FEMALE" : "MALE"] ? ".FEMALE"
: namePool, : ".MALE"
), : undefined;
const trainerKey = Utils.randSeedItem(
Object.keys(i18next.t(`${classKey}${genderKey}`, { returnObjects: true })),
); );
this.nameKey = `${classKey}${genderKey}.${trainerKey}`;
}
this.name = i18next.t(this.nameKey);
if (variant === TrainerVariant.DOUBLE) { if (variant === TrainerVariant.DOUBLE) {
if (this.config.doubleOnly) { if (this.config.doubleOnly) {
if (partnerName) { if (partnerNameKey) {
this.partnerName = partnerName; this.partnerNameKey = partnerNameKey;
this.partnerName = i18next.t(this.partnerNameKey);
} else { } else {
[this.name, this.partnerName] = this.name.split(" & "); [this.name, this.partnerName] = this.name.split(" & ");
} }
} else { } else {
this.partnerName = this.partnerNameKey =
partnerName || partnerNameKey ||
Utils.randSeedItem(Object.values(namePool.hasOwnProperty("FEMALE") ? namePool["FEMALE"] : namePool)); Utils.randSeedItem(
Object.keys(
i18next.t(`${classKey}${i18next.exists(`${classKey}.FEMALE`) ? ".FEMALE" : undefined}`, {
returnObjects: true,
}),
),
);
this.partnerName = i18next.t(this.partnerNameKey);
} }
} }
} }

10
src/system/trainer-data.ts
View File

@ -5,8 +5,8 @@ export default class TrainerData {
public trainerType: TrainerType; public trainerType: TrainerType;
public variant: TrainerVariant; public variant: TrainerVariant;
public partyTemplateIndex: number; public partyTemplateIndex: number;
public name: string; public nameKey: string;
public partnerName: string; public partnerNameKey: string | undefined;
constructor(source: Trainer | any) { constructor(source: Trainer | any) {
const sourceTrainer = source instanceof Trainer ? (source as Trainer) : null; const sourceTrainer = source instanceof Trainer ? (source as Trainer) : null;
@ -17,11 +17,11 @@ export default class TrainerData {
? TrainerVariant.FEMALE ? TrainerVariant.FEMALE
: TrainerVariant.DEFAULT; : TrainerVariant.DEFAULT;
this.partyTemplateIndex = source.partyMemberTemplateIndex; this.partyTemplateIndex = source.partyMemberTemplateIndex;
this.name = source.name; this.nameKey = source.nameKey;
this.partnerName = source.partnerName; this.partnerNameKey = source.partnerNameKey;
} }
toTrainer(): Trainer { toTrainer(): Trainer {
return new Trainer(this.trainerType, this.variant, this.partyTemplateIndex, this.name, this.partnerName); return new Trainer(this.trainerType, this.variant, this.partyTemplateIndex, this.nameKey, this.partnerNameKey);
} }
} }