diff --git a/src/locales/de/filter-bar.ts b/src/locales/de/filter-bar.ts index 5ab2ae23f25..1094b0fd43a 100644 --- a/src/locales/de/filter-bar.ts +++ b/src/locales/de/filter-bar.ts @@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales"; export const filterBar: SimpleTranslationEntries = { "genFilter": "Gen.", "typeFilter": "Typ", - "dexFilter": "Dex.", + "caughtFilter": "Gefangen", "unlocksFilter": "Freisch.", "miscFilter": "Sonst.", "sortFilter": "Sort.", diff --git a/src/locales/en/filter-bar.ts b/src/locales/en/filter-bar.ts index aa234c6ac65..7a3174957ea 100644 --- a/src/locales/en/filter-bar.ts +++ b/src/locales/en/filter-bar.ts @@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales"; export const filterBar: SimpleTranslationEntries = { "genFilter": "Gen", "typeFilter": "Type", - "dexFilter": "Dex", + "caughtFilter": "Caught", "unlocksFilter": "Unlocks", "miscFilter": "Misc", "sortFilter": "Sort", diff --git a/src/locales/es/filter-bar.ts b/src/locales/es/filter-bar.ts index 5ed91f81c25..b55a35c1adf 100644 --- a/src/locales/es/filter-bar.ts +++ b/src/locales/es/filter-bar.ts @@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales"; export const filterBar: SimpleTranslationEntries = { "genFilter": "Gen.", "typeFilter": "Tipo", - "dexFilter": "Dex", + "caughtFilter": "Caught", "unlocksFilter": "Otros", "miscFilter": "Misc", "sortFilter": "Orden", diff --git a/src/locales/fr/filter-bar.ts b/src/locales/fr/filter-bar.ts index 0fba91ca458..13656192116 100644 --- a/src/locales/fr/filter-bar.ts +++ b/src/locales/fr/filter-bar.ts @@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales"; export const filterBar: SimpleTranslationEntries = { "genFilter": "Gen", "typeFilter": "Type", - "dexFilter": "Dex", + "caughtFilter": "Capturés", "unlocksFilter": "Débloq.", "miscFilter": "Divers", "sortFilter": "Tri", diff --git a/src/locales/it/filter-bar.ts b/src/locales/it/filter-bar.ts index 37b66a2023e..c6fcb2f0623 100644 --- a/src/locales/it/filter-bar.ts +++ b/src/locales/it/filter-bar.ts @@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales"; export const filterBar: SimpleTranslationEntries = { "genFilter": "Gen", "typeFilter": "Tipo", - "dexFilter": "Dex", + "caughtFilter": "Caught", "unlocksFilter": "Altro", "miscFilter": "Misc", "sortFilter": "Ordina", diff --git a/src/locales/ko/filter-bar.ts b/src/locales/ko/filter-bar.ts index 69f625b2ba1..a07a96a1ee8 100644 --- a/src/locales/ko/filter-bar.ts +++ b/src/locales/ko/filter-bar.ts @@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales"; export const filterBar: SimpleTranslationEntries = { "genFilter": "세대", "typeFilter": "타입", - "dexFilter": "도감", + "caughtFilter": "포획", "unlocksFilter": "해금", "miscFilter": "기타", "sortFilter": "정렬", diff --git a/src/locales/pt_BR/filter-bar.ts b/src/locales/pt_BR/filter-bar.ts index 2977493b237..d08d2d28707 100644 --- a/src/locales/pt_BR/filter-bar.ts +++ b/src/locales/pt_BR/filter-bar.ts @@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales"; export const filterBar: SimpleTranslationEntries = { "genFilter": "Ger.", "typeFilter": "Tipo", - "dexFilter": "Dex", + "caughtFilter": "Capturado", "unlocksFilter": "Desbloqueios", "miscFilter": "Outros", "sortFilter": "Ordem", diff --git a/src/locales/zh_CN/filter-bar.ts b/src/locales/zh_CN/filter-bar.ts index e2f3204e8ae..4ee38521a0a 100644 --- a/src/locales/zh_CN/filter-bar.ts +++ b/src/locales/zh_CN/filter-bar.ts @@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales"; export const filterBar: SimpleTranslationEntries = { "genFilter": "世代", "typeFilter": "属性", - "dexFilter": "Dex", + "caughtFilter": "捕获", "unlocksFilter": "解锁", "miscFilter": "混合", "sortFilter": "排序", diff --git a/src/locales/zh_TW/filter-bar.ts b/src/locales/zh_TW/filter-bar.ts index c338a77e4dc..8916088d884 100644 --- a/src/locales/zh_TW/filter-bar.ts +++ b/src/locales/zh_TW/filter-bar.ts @@ -3,7 +3,7 @@ import { SimpleTranslationEntries } from "#app/interfaces/locales"; export const filterBar: SimpleTranslationEntries = { "genFilter": "世代", "typeFilter": "屬性", - "dexFilter": "Dex", + "caughtFilter": "捕獲", "unlocksFilter": "解鎖", "miscFilter": "混合", "sortFilter": "排序", diff --git a/src/ui/filter-bar.ts b/src/ui/filter-bar.ts index 072d258085b..52266a3a06b 100644 --- a/src/ui/filter-bar.ts +++ b/src/ui/filter-bar.ts @@ -8,7 +8,7 @@ import { addWindow, WindowVariant } from "./ui-theme"; export enum DropDownColumn { GEN, TYPES, - DEX, + CAUGHT, UNLOCKS, MISC, SORT diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts index 6554c489fca..6735f5f1251 100644 --- a/src/ui/starter-select-ui-handler.ts +++ b/src/ui/starter-select-ui-handler.ts @@ -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)); - // shiny filter + // caught filter const shiny1Sprite = this.scene.add.sprite(0, 0, "shiny_icons"); shiny1Sprite.setOrigin(0.15, 0.2); shiny1Sprite.setScale(0.6); @@ -415,7 +415,7 @@ export default class StarterSelectUiHandler extends MessageUiHandler { shiny3Sprite.setFrame(getVariantIcon(2)); shiny3Sprite.setTint(getVariantTint(2)); - const shinyOptions = [ + const caughtOptions = [ new DropDownOption(this.scene, "SHINY3", new DropDownLabel("", shiny3Sprite)), new DropDownOption(this.scene, "SHINY2", new DropDownLabel("", shiny2Sprite)), 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"))) ]; - 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 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 fitsShiny = this.filterBar.getVals(DropDownColumn.DEX).some(variant => { - if (variant === "SHINY3") { + const fitsCaught = this.filterBar.getVals(DropDownColumn.CAUGHT).some(caught => { + if (caught === "SHINY3") { return isVariant3Caught; - } else if (variant === "SHINY2") { + } else if (caught === "SHINY2") { return isVariant2Caught && !isVariant3Caught; - } else if (variant === "SHINY") { + } else if (caught === "SHINY") { return isVariantCaught && !isVariant2Caught && !isVariant3Caught; - } else if (variant === "NORMAL") { + } else if (caught === "NORMAL") { return isCaught && !isVariantCaught && !isVariant2Caught && !isVariant3Caught; - } else if (variant === "UNCAUGHT") { + } else if (caught === "UNCAUGHT") { 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); } });