[QoL] Change Dex filter name to Caught (#3361)

* change filter name `Dex` to `Caught`

* fix mis changed entry

* Update src/locales/fr/filter-bar.ts

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>

* Update src/locales/de/filter-bar.ts

Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>

* Update src/locales/pt_BR/filter-bar.ts

Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>

* Update src/locales/ko/filter-bar.ts

Co-authored-by: Enoch <enoch.jwsong@gmail.com>

* Update src/locales/zh_CN/filter-bar.ts

Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>

* Update src/locales/zh_TW/filter-bar.ts

Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>

---------

Co-authored-by: Lugiad' <adrien.grivel@hotmail.fr>
Co-authored-by: Jannik Tappert <38758606+CodeTappert@users.noreply.github.com>
Co-authored-by: José Ricardo Fleury Oliveira <josefleury@discente.ufg.br>
Co-authored-by: Enoch <enoch.jwsong@gmail.com>
Co-authored-by: Yonmaru40 <47717431+40chyan@users.noreply.github.com>
This commit is contained in:
Leo Kim 2024-08-06 11:54:31 +09:00 committed by GitHub
parent 1aa2c219bb
commit 20e52ed9a7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 20 additions and 20 deletions

View File

@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
export const filterBar: SimpleTranslationEntries = { export const filterBar: SimpleTranslationEntries = {
"genFilter": "Gen.", "genFilter": "Gen.",
"typeFilter": "Typ", "typeFilter": "Typ",
"dexFilter": "Dex.", "caughtFilter": "Gefangen",
"unlocksFilter": "Freisch.", "unlocksFilter": "Freisch.",
"miscFilter": "Sonst.", "miscFilter": "Sonst.",
"sortFilter": "Sort.", "sortFilter": "Sort.",

View File

@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
export const filterBar: SimpleTranslationEntries = { export const filterBar: SimpleTranslationEntries = {
"genFilter": "Gen", "genFilter": "Gen",
"typeFilter": "Type", "typeFilter": "Type",
"dexFilter": "Dex", "caughtFilter": "Caught",
"unlocksFilter": "Unlocks", "unlocksFilter": "Unlocks",
"miscFilter": "Misc", "miscFilter": "Misc",
"sortFilter": "Sort", "sortFilter": "Sort",

View File

@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
export const filterBar: SimpleTranslationEntries = { export const filterBar: SimpleTranslationEntries = {
"genFilter": "Gen.", "genFilter": "Gen.",
"typeFilter": "Tipo", "typeFilter": "Tipo",
"dexFilter": "Dex", "caughtFilter": "Caught",
"unlocksFilter": "Otros", "unlocksFilter": "Otros",
"miscFilter": "Misc", "miscFilter": "Misc",
"sortFilter": "Orden", "sortFilter": "Orden",

View File

@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
export const filterBar: SimpleTranslationEntries = { export const filterBar: SimpleTranslationEntries = {
"genFilter": "Gen", "genFilter": "Gen",
"typeFilter": "Type", "typeFilter": "Type",
"dexFilter": "Dex", "caughtFilter": "Capturés",
"unlocksFilter": "Débloq.", "unlocksFilter": "Débloq.",
"miscFilter": "Divers", "miscFilter": "Divers",
"sortFilter": "Tri", "sortFilter": "Tri",

View File

@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
export const filterBar: SimpleTranslationEntries = { export const filterBar: SimpleTranslationEntries = {
"genFilter": "Gen", "genFilter": "Gen",
"typeFilter": "Tipo", "typeFilter": "Tipo",
"dexFilter": "Dex", "caughtFilter": "Caught",
"unlocksFilter": "Altro", "unlocksFilter": "Altro",
"miscFilter": "Misc", "miscFilter": "Misc",
"sortFilter": "Ordina", "sortFilter": "Ordina",

View File

@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
export const filterBar: SimpleTranslationEntries = { export const filterBar: SimpleTranslationEntries = {
"genFilter": "세대", "genFilter": "세대",
"typeFilter": "타입", "typeFilter": "타입",
"dexFilter": "도감", "caughtFilter": "포획",
"unlocksFilter": "해금", "unlocksFilter": "해금",
"miscFilter": "기타", "miscFilter": "기타",
"sortFilter": "정렬", "sortFilter": "정렬",

View File

@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
export const filterBar: SimpleTranslationEntries = { export const filterBar: SimpleTranslationEntries = {
"genFilter": "Ger.", "genFilter": "Ger.",
"typeFilter": "Tipo", "typeFilter": "Tipo",
"dexFilter": "Dex", "caughtFilter": "Capturado",
"unlocksFilter": "Desbloqueios", "unlocksFilter": "Desbloqueios",
"miscFilter": "Outros", "miscFilter": "Outros",
"sortFilter": "Ordem", "sortFilter": "Ordem",

View File

@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
export const filterBar: SimpleTranslationEntries = { export const filterBar: SimpleTranslationEntries = {
"genFilter": "世代", "genFilter": "世代",
"typeFilter": "属性", "typeFilter": "属性",
"dexFilter": "Dex", "caughtFilter": "捕获",
"unlocksFilter": "解锁", "unlocksFilter": "解锁",
"miscFilter": "混合", "miscFilter": "混合",
"sortFilter": "排序", "sortFilter": "排序",

View File

@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales";
export const filterBar: SimpleTranslationEntries = { export const filterBar: SimpleTranslationEntries = {
"genFilter": "世代", "genFilter": "世代",
"typeFilter": "屬性", "typeFilter": "屬性",
"dexFilter": "Dex", "caughtFilter": "捕獲",
"unlocksFilter": "解鎖", "unlocksFilter": "解鎖",
"miscFilter": "混合", "miscFilter": "混合",
"sortFilter": "排序", "sortFilter": "排序",

View File

@ -8,7 +8,7 @@ import { addWindow, WindowVariant } from "./ui-theme";
export enum DropDownColumn { export enum DropDownColumn {
GEN, GEN,
TYPES, TYPES,
DEX, CAUGHT,
UNLOCKS, UNLOCKS,
MISC, MISC,
SORT SORT

View File

@ -398,7 +398,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
}); });
this.filterBar.addFilter(DropDownColumn.TYPES, i18next.t("filterBar:typeFilter"), new DropDown(this.scene, 0, 0, typeOptions, this.updateStarters, DropDownType.HYBRID, 0.5)); this.filterBar.addFilter(DropDownColumn.TYPES, i18next.t("filterBar:typeFilter"), new DropDown(this.scene, 0, 0, typeOptions, this.updateStarters, DropDownType.HYBRID, 0.5));
// shiny filter // caught filter
const shiny1Sprite = this.scene.add.sprite(0, 0, "shiny_icons"); const shiny1Sprite = this.scene.add.sprite(0, 0, "shiny_icons");
shiny1Sprite.setOrigin(0.15, 0.2); shiny1Sprite.setOrigin(0.15, 0.2);
shiny1Sprite.setScale(0.6); shiny1Sprite.setScale(0.6);
@ -415,7 +415,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
shiny3Sprite.setFrame(getVariantIcon(2)); shiny3Sprite.setFrame(getVariantIcon(2));
shiny3Sprite.setTint(getVariantTint(2)); shiny3Sprite.setTint(getVariantTint(2));
const shinyOptions = [ const caughtOptions = [
new DropDownOption(this.scene, "SHINY3", new DropDownLabel("", shiny3Sprite)), new DropDownOption(this.scene, "SHINY3", new DropDownLabel("", shiny3Sprite)),
new DropDownOption(this.scene, "SHINY2", new DropDownLabel("", shiny2Sprite)), new DropDownOption(this.scene, "SHINY2", new DropDownLabel("", shiny2Sprite)),
new DropDownOption(this.scene, "SHINY", new DropDownLabel("", shiny1Sprite)), new DropDownOption(this.scene, "SHINY", new DropDownLabel("", shiny1Sprite)),
@ -423,7 +423,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
new DropDownOption(this.scene, "UNCAUGHT", new DropDownLabel(i18next.t("filterBar:uncaught"))) new DropDownOption(this.scene, "UNCAUGHT", new DropDownLabel(i18next.t("filterBar:uncaught")))
]; ];
this.filterBar.addFilter(DropDownColumn.DEX, i18next.t("filterBar:dexFilter"), new DropDown(this.scene, 0, 0, shinyOptions, this.updateStarters, DropDownType.HYBRID)); this.filterBar.addFilter(DropDownColumn.CAUGHT, i18next.t("filterBar:caughtFilter"), new DropDown(this.scene, 0, 0, caughtOptions, this.updateStarters, DropDownType.HYBRID));
// unlocks filter // unlocks filter
const passiveLabels = [ const passiveLabels = [
@ -2130,16 +2130,16 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
const fitsType = this.filterBar.getVals(DropDownColumn.TYPES).some(type => container.species.isOfType((type as number) - 1)); const fitsType = this.filterBar.getVals(DropDownColumn.TYPES).some(type => container.species.isOfType((type as number) - 1));
const fitsShiny = this.filterBar.getVals(DropDownColumn.DEX).some(variant => { const fitsCaught = this.filterBar.getVals(DropDownColumn.CAUGHT).some(caught => {
if (variant === "SHINY3") { if (caught === "SHINY3") {
return isVariant3Caught; return isVariant3Caught;
} else if (variant === "SHINY2") { } else if (caught === "SHINY2") {
return isVariant2Caught && !isVariant3Caught; return isVariant2Caught && !isVariant3Caught;
} else if (variant === "SHINY") { } else if (caught === "SHINY") {
return isVariantCaught && !isVariant2Caught && !isVariant3Caught; return isVariantCaught && !isVariant2Caught && !isVariant3Caught;
} else if (variant === "NORMAL") { } else if (caught === "NORMAL") {
return isCaught && !isVariantCaught && !isVariant2Caught && !isVariant3Caught; return isCaught && !isVariantCaught && !isVariant2Caught && !isVariant3Caught;
} else if (variant === "UNCAUGHT") { } else if (caught === "UNCAUGHT") {
return isUncaught; return isUncaught;
} }
}); });
@ -2196,7 +2196,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
} }
}); });
if (fitsGen && fitsType && fitsShiny && fitsPassive && fitsCostReduction && fitsWin && fitsHA && fitsPokerus) { if (fitsGen && fitsType && fitsCaught && fitsPassive && fitsCostReduction && fitsWin && fitsHA && fitsPokerus) {
this.filteredStarterContainers.push(container); this.filteredStarterContainers.push(container);
} }
}); });