mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-09-23 15:03:24 +02:00
Fixing starter duplication bug, ran biome all
This commit is contained in:
Wlowscha
parent
c2d68d48e2
commit
690b88989c
@ -3,8 +3,8 @@ import type { InputsController } from "#app/inputs-controller";
|
||||
import { Button } from "#enums/buttons";
|
||||
import { UiMode } from "#enums/ui-mode";
|
||||
import { Setting, SettingKeys, settingIndex } from "#system/settings";
|
||||
import { PokedexPageUiHandler } from "#ui/handlers/pokedex-page-ui-handler";
|
||||
import type { MessageUiHandler } from "#ui/handlers/message-ui-handler";
|
||||
import { PokedexPageUiHandler } from "#ui/handlers/pokedex-page-ui-handler";
|
||||
import { PokedexUiHandler } from "#ui/handlers/pokedex-ui-handler";
|
||||
import { RunInfoUiHandler } from "#ui/handlers/run-info-ui-handler";
|
||||
import { StarterSelectUiHandler } from "#ui/handlers/starter-select-ui-handler";
|
||||
|
||||
@ -628,10 +628,10 @@ export class StarterSummary extends Phaser.GameObjects.Container {
|
||||
// We will only update the sprite if there is a change to form, shiny/variant
|
||||
// or gender for species with gender sprite differences
|
||||
const shouldUpdateSprite =
|
||||
(species.genderDiffs && !isNullOrUndefined(female)) ||
|
||||
!isNullOrUndefined(formIndex) ||
|
||||
!isNullOrUndefined(shiny) ||
|
||||
!isNullOrUndefined(variant);
|
||||
(species.genderDiffs && !isNullOrUndefined(female))
|
||||
|| !isNullOrUndefined(formIndex)
|
||||
|| !isNullOrUndefined(shiny)
|
||||
|| !isNullOrUndefined(variant);
|
||||
|
||||
this.updateCandyTooltip();
|
||||
|
||||
|
||||
@ -1124,7 +1124,7 @@ export class StarterSelectUiHandler extends MessageUiHandler {
|
||||
} else if (this.statsMode) {
|
||||
this.toggleStatsMode(false);
|
||||
success = true;
|
||||
} else if (this.starterSpecies.length) {
|
||||
} else if (this.starterSpecies.length > 0) {
|
||||
this.popStarter(this.starterSpecies.length - 1);
|
||||
success = true;
|
||||
this.updateInstructions();
|
||||
@ -1401,11 +1401,9 @@ export class StarterSelectUiHandler extends MessageUiHandler {
|
||||
// TODO: is this bang correct?
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
if (this.speciesStarterDexEntry!.caughtAttr & DexAttr.VARIANT_3) {
|
||||
// TODO: is this bang correct?
|
||||
break;
|
||||
}
|
||||
} else if (this.speciesStarterDexEntry!.caughtAttr & DexAttr.VARIANT_3) {
|
||||
// TODO: is this bang correct?
|
||||
break;
|
||||
}
|
||||
} while (newVariant !== props.variant);
|
||||
this.setShinyAndVariant(speciesId, true, newVariant);
|
||||
@ -1427,8 +1425,8 @@ export class StarterSelectUiHandler extends MessageUiHandler {
|
||||
do {
|
||||
newFormIndex = (newFormIndex + 1) % formCount;
|
||||
if (
|
||||
this.lastSpecies.forms[newFormIndex].isStarterSelectable &&
|
||||
this.speciesStarterDexEntry!.caughtAttr! & globalScene.gameData.getFormAttr(newFormIndex)
|
||||
this.lastSpecies.forms[newFormIndex].isStarterSelectable
|
||||
&& this.speciesStarterDexEntry!.caughtAttr! & globalScene.gameData.getFormAttr(newFormIndex)
|
||||
) {
|
||||
// TODO: are those bangs correct?
|
||||
break;
|
||||
@ -1462,10 +1460,8 @@ export class StarterSelectUiHandler extends MessageUiHandler {
|
||||
newAbilityIndex = (newAbilityIndex + 1) % abilityCount;
|
||||
}
|
||||
break;
|
||||
} else {
|
||||
if (abilityAttr & AbilityAttr.ABILITY_HIDDEN) {
|
||||
break;
|
||||
}
|
||||
} else if (abilityAttr & AbilityAttr.ABILITY_HIDDEN) {
|
||||
break;
|
||||
}
|
||||
} while (newAbilityIndex !== this.abilityCursor);
|
||||
this.setNewAbilityIndex(speciesId, newAbilityIndex);
|
||||
@ -1651,10 +1647,10 @@ export class StarterSelectUiHandler extends MessageUiHandler {
|
||||
);
|
||||
const newCost = globalScene.gameData.getSpeciesStarterValue(this.lastSpecies.speciesId);
|
||||
if (
|
||||
!isDupe &&
|
||||
isValidForChallenge &&
|
||||
currentPartyValue + newCost <= getRunValueLimit() &&
|
||||
this.starterSpecies.length < PLAYER_PARTY_MAX_SIZE
|
||||
!isDupe
|
||||
&& isValidForChallenge
|
||||
&& currentPartyValue + newCost <= getRunValueLimit()
|
||||
&& this.starterSpecies.length < PLAYER_PARTY_MAX_SIZE
|
||||
) {
|
||||
options = [
|
||||
{
|
||||
@ -2084,7 +2080,7 @@ export class StarterSelectUiHandler extends MessageUiHandler {
|
||||
},
|
||||
});
|
||||
ui.setModeWithoutClear(UiMode.OPTION_SELECT, {
|
||||
options: options,
|
||||
options,
|
||||
yOffset: 47,
|
||||
});
|
||||
};
|
||||
@ -2131,7 +2127,7 @@ export class StarterSelectUiHandler extends MessageUiHandler {
|
||||
},
|
||||
});
|
||||
ui.setModeWithoutClear(UiMode.OPTION_SELECT, {
|
||||
options: options,
|
||||
options,
|
||||
yOffset: 47,
|
||||
});
|
||||
}
|
||||
@ -2165,7 +2161,7 @@ export class StarterSelectUiHandler extends MessageUiHandler {
|
||||
if (this.statsMode) {
|
||||
this.toggleStatsMode(false);
|
||||
success = true;
|
||||
} else if (this.starterSpecies.length) {
|
||||
} else if (this.starterSpecies.length > 0) {
|
||||
this.popStarter(this.starterSpecies.length - 1);
|
||||
success = true;
|
||||
this.updateInstructions();
|
||||
@ -2190,128 +2186,120 @@ export class StarterSelectUiHandler extends MessageUiHandler {
|
||||
[success, error] = this.processStartCursorInput(button);
|
||||
} else if (this.randomCursorObj.visible) {
|
||||
[success, error] = this.processRandomCursorInput(button);
|
||||
} else if (button === Button.ACTION) {
|
||||
if (!this.speciesStarterDexEntry?.caughtAttr) {
|
||||
error = true;
|
||||
} else if (this.starterSpecies.length <= 6) {
|
||||
// checks to see if the party has 6 or fewer pokemon
|
||||
this.openPokemonMenu();
|
||||
success = true;
|
||||
}
|
||||
} else {
|
||||
if (button === Button.ACTION) {
|
||||
if (!this.speciesStarterDexEntry?.caughtAttr) {
|
||||
error = true;
|
||||
} else if (this.starterSpecies.length <= 6) {
|
||||
// checks to see if the party has 6 or fewer pokemon
|
||||
this.openPokemonMenu();
|
||||
success = true;
|
||||
}
|
||||
} else {
|
||||
if (
|
||||
[
|
||||
Button.CYCLE_SHINY,
|
||||
Button.CYCLE_FORM,
|
||||
Button.CYCLE_GENDER,
|
||||
Button.CYCLE_ABILITY,
|
||||
Button.CYCLE_NATURE,
|
||||
Button.CYCLE_TERA,
|
||||
].includes(button)
|
||||
) {
|
||||
success = this.processCycleButtonsInput(button);
|
||||
}
|
||||
if (
|
||||
[
|
||||
Button.CYCLE_SHINY,
|
||||
Button.CYCLE_FORM,
|
||||
Button.CYCLE_GENDER,
|
||||
Button.CYCLE_ABILITY,
|
||||
Button.CYCLE_NATURE,
|
||||
Button.CYCLE_TERA,
|
||||
].includes(button)
|
||||
) {
|
||||
success = this.processCycleButtonsInput(button);
|
||||
}
|
||||
|
||||
switch (button) {
|
||||
case Button.UP:
|
||||
if (currentRow > 0) {
|
||||
if (this.scrollCursor > 0 && currentRow - this.scrollCursor === 0) {
|
||||
this.scrollCursor--;
|
||||
this.updateScroll();
|
||||
success = this.setCursor(this.cursor);
|
||||
} else {
|
||||
success = this.setCursor(this.cursor - 9);
|
||||
}
|
||||
} else {
|
||||
this.filterBarCursor = this.filterBar.getNearestFilter(this.starterContainers[this.cursor]);
|
||||
this.setFilterMode(true);
|
||||
success = true;
|
||||
}
|
||||
break;
|
||||
case Button.DOWN:
|
||||
if (currentRow < numOfRows - 1 && this.cursor + 9 < this.filteredStarterIds.length) {
|
||||
// not last row
|
||||
if (currentRow - this.scrollCursor === 8) {
|
||||
// last row of visible starters
|
||||
this.scrollCursor++;
|
||||
this.updateScroll();
|
||||
success = this.setCursor(this.cursor);
|
||||
} else {
|
||||
success = this.setCursor(this.cursor + 9);
|
||||
}
|
||||
} else if (numOfRows > 1) {
|
||||
// DOWN from last row of Pokemon > Wrap around to first row
|
||||
this.scrollCursor = 0;
|
||||
switch (button) {
|
||||
case Button.UP:
|
||||
if (currentRow > 0) {
|
||||
if (this.scrollCursor > 0 && currentRow - this.scrollCursor === 0) {
|
||||
this.scrollCursor--;
|
||||
this.updateScroll();
|
||||
success = this.setCursor(this.cursor % 9);
|
||||
success = this.setCursor(this.cursor);
|
||||
} else {
|
||||
// DOWN from single row of Pokemon > Go to filters
|
||||
this.filterBarCursor = this.filterBar.getNearestFilter(this.starterContainers[this.cursor]);
|
||||
this.setFilterMode(true);
|
||||
success = true;
|
||||
success = this.setCursor(this.cursor - 9);
|
||||
}
|
||||
break;
|
||||
case Button.LEFT:
|
||||
if (this.cursor % 9 !== 0) {
|
||||
success = this.setCursor(this.cursor - 1);
|
||||
} else {
|
||||
this.filterBarCursor = this.filterBar.getNearestFilter(this.starterContainers[this.cursor]);
|
||||
this.setFilterMode(true);
|
||||
success = true;
|
||||
}
|
||||
break;
|
||||
case Button.DOWN:
|
||||
if (currentRow < numOfRows - 1 && this.cursor + 9 < this.filteredStarterIds.length) {
|
||||
// not last row
|
||||
if (currentRow - this.scrollCursor === 8) {
|
||||
// last row of visible starters
|
||||
this.scrollCursor++;
|
||||
this.updateScroll();
|
||||
success = this.setCursor(this.cursor);
|
||||
} else {
|
||||
// LEFT from filtered Pokemon, on the left edge
|
||||
if (onScreenCurrentRow === 0) {
|
||||
// from the first row of starters we go to the random selection
|
||||
this.cursorObj.setVisible(false);
|
||||
this.showRandomCursor();
|
||||
} else if (this.starterSpecies.length === 0) {
|
||||
// no starter in team and not on first row > wrap around to the last column
|
||||
success = this.setCursor(this.cursor + Math.min(8, onScreenLastIndex - this.cursor));
|
||||
} else if (onScreenCurrentRow < 7) {
|
||||
// at least one pokemon in team > for the first 7 rows, go to closest starter
|
||||
this.cursorObj.setVisible(false);
|
||||
this.starterIconsCursorIndex = findClosestStarterIndex(
|
||||
this.cursorObj.y - 1,
|
||||
this.starterSpecies.length,
|
||||
);
|
||||
this.moveStarterIconsCursor(this.starterIconsCursorIndex);
|
||||
} else {
|
||||
// at least one pokemon in team > from the bottom 2 rows, go to start run button
|
||||
this.cursorObj.setVisible(false);
|
||||
this.setNoSpecies();
|
||||
this.startCursorObj.setVisible(true);
|
||||
}
|
||||
success = true;
|
||||
success = this.setCursor(this.cursor + 9);
|
||||
}
|
||||
break;
|
||||
case Button.RIGHT:
|
||||
// is not right edge
|
||||
if (this.cursor % 9 < (currentRow < numOfRows - 1 ? 8 : (numberOfStarters - 1) % 9)) {
|
||||
success = this.setCursor(this.cursor + 1);
|
||||
} else if (numOfRows > 1) {
|
||||
// DOWN from last row of Pokemon > Wrap around to first row
|
||||
this.scrollCursor = 0;
|
||||
this.updateScroll();
|
||||
success = this.setCursor(this.cursor % 9);
|
||||
} else {
|
||||
// DOWN from single row of Pokemon > Go to filters
|
||||
this.filterBarCursor = this.filterBar.getNearestFilter(this.starterContainers[this.cursor]);
|
||||
this.setFilterMode(true);
|
||||
success = true;
|
||||
}
|
||||
break;
|
||||
case Button.LEFT:
|
||||
if (this.cursor % 9 !== 0) {
|
||||
success = this.setCursor(this.cursor - 1);
|
||||
} else {
|
||||
// LEFT from filtered Pokemon, on the left edge
|
||||
if (onScreenCurrentRow === 0) {
|
||||
// from the first row of starters we go to the random selection
|
||||
this.cursorObj.setVisible(false);
|
||||
this.showRandomCursor();
|
||||
} else if (this.starterSpecies.length === 0) {
|
||||
// no starter in team and not on first row > wrap around to the last column
|
||||
success = this.setCursor(this.cursor + Math.min(8, onScreenLastIndex - this.cursor));
|
||||
} else if (onScreenCurrentRow < 7) {
|
||||
// at least one pokemon in team > for the first 7 rows, go to closest starter
|
||||
this.cursorObj.setVisible(false);
|
||||
this.starterIconsCursorIndex = findClosestStarterIndex(this.cursorObj.y - 1, this.starterSpecies.length);
|
||||
this.moveStarterIconsCursor(this.starterIconsCursorIndex);
|
||||
} else {
|
||||
// RIGHT from filtered Pokemon, on the right edge
|
||||
if (onScreenCurrentRow === 0) {
|
||||
// from the first row of starters we go to the random selection
|
||||
this.cursorObj.setVisible(false);
|
||||
this.showRandomCursor();
|
||||
} else if (this.starterSpecies.length === 0) {
|
||||
// no selected starter in team > wrap around to the first column
|
||||
success = this.setCursor(this.cursor - Math.min(8, this.cursor % 9));
|
||||
} else if (onScreenCurrentRow < 7) {
|
||||
// at least one pokemon in team > for the first 7 rows, go to closest starter
|
||||
this.cursorObj.setVisible(false);
|
||||
this.starterIconsCursorIndex = findClosestStarterIndex(
|
||||
this.cursorObj.y - 1,
|
||||
this.starterSpecies.length,
|
||||
);
|
||||
this.moveStarterIconsCursor(this.starterIconsCursorIndex);
|
||||
} else {
|
||||
// at least one pokemon in team > from the bottom 2 rows, go to start run button
|
||||
this.cursorObj.setVisible(false);
|
||||
this.setNoSpecies();
|
||||
this.startCursorObj.setVisible(true);
|
||||
}
|
||||
success = true;
|
||||
// at least one pokemon in team > from the bottom 2 rows, go to start run button
|
||||
this.cursorObj.setVisible(false);
|
||||
this.setNoSpecies();
|
||||
this.startCursorObj.setVisible(true);
|
||||
}
|
||||
break;
|
||||
}
|
||||
success = true;
|
||||
}
|
||||
break;
|
||||
case Button.RIGHT:
|
||||
// is not right edge
|
||||
if (this.cursor % 9 < (currentRow < numOfRows - 1 ? 8 : (numberOfStarters - 1) % 9)) {
|
||||
success = this.setCursor(this.cursor + 1);
|
||||
} else {
|
||||
// RIGHT from filtered Pokemon, on the right edge
|
||||
if (onScreenCurrentRow === 0) {
|
||||
// from the first row of starters we go to the random selection
|
||||
this.cursorObj.setVisible(false);
|
||||
this.showRandomCursor();
|
||||
} else if (this.starterSpecies.length === 0) {
|
||||
// no selected starter in team > wrap around to the first column
|
||||
success = this.setCursor(this.cursor - Math.min(8, this.cursor % 9));
|
||||
} else if (onScreenCurrentRow < 7) {
|
||||
// at least one pokemon in team > for the first 7 rows, go to closest starter
|
||||
this.cursorObj.setVisible(false);
|
||||
this.starterIconsCursorIndex = findClosestStarterIndex(this.cursorObj.y - 1, this.starterSpecies.length);
|
||||
this.moveStarterIconsCursor(this.starterIconsCursorIndex);
|
||||
} else {
|
||||
// at least one pokemon in team > from the bottom 2 rows, go to start run button
|
||||
this.cursorObj.setVisible(false);
|
||||
this.setNoSpecies();
|
||||
this.startCursorObj.setVisible(true);
|
||||
}
|
||||
success = true;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -2598,6 +2586,8 @@ export class StarterSelectUiHandler extends MessageUiHandler {
|
||||
|
||||
this.filterBar.updateFilterLabels();
|
||||
|
||||
this.filteredStarterIds = [];
|
||||
|
||||
// filter
|
||||
this.allStarterSpecies.forEach(species => {
|
||||
// Exclude starters which are not valid for the challenge
|
||||
@ -2718,8 +2708,7 @@ export class StarterSelectUiHandler extends MessageUiHandler {
|
||||
|
||||
// HA Filter
|
||||
const speciesHasHiddenAbility =
|
||||
species.abilityHidden !== species.ability1
|
||||
&& species.abilityHidden !== AbilityId.NONE;
|
||||
species.abilityHidden !== species.ability1 && species.abilityHidden !== AbilityId.NONE;
|
||||
const hasHA = starterData.abilityAttr & AbilityAttr.ABILITY_HIDDEN;
|
||||
const fitsHA = this.filterBar.getVals(DropDownColumn.MISC).some(misc => {
|
||||
if (misc.val === "HIDDEN_ABILITY" && misc.state === DropDownState.ON) {
|
||||
@ -2787,8 +2776,8 @@ export class StarterSelectUiHandler extends MessageUiHandler {
|
||||
return (a - b) * -sort.dir;
|
||||
case SortCriteria.COST:
|
||||
return (
|
||||
(globalScene.gameData.getSpeciesStarterValue(a) - globalScene.gameData.getSpeciesStarterValue(b)) *
|
||||
-sort.dir
|
||||
(globalScene.gameData.getSpeciesStarterValue(a) - globalScene.gameData.getSpeciesStarterValue(b))
|
||||
* -sort.dir
|
||||
);
|
||||
case SortCriteria.CANDY: {
|
||||
const candyCountA = globalScene.gameData.starterData[a].candyCount;
|
||||
@ -2825,10 +2814,8 @@ export class StarterSelectUiHandler extends MessageUiHandler {
|
||||
|
||||
this.starterSelectScrollBar.setScrollCursor(this.scrollCursor);
|
||||
|
||||
// biome-ignore-start lint/nursery/useIterableCallbackReturn: benign
|
||||
this.pokerusCursorObjs.forEach(cursor => cursor.setVisible(false));
|
||||
this.starterCursorObjs.forEach(cursor => cursor.setVisible(false));
|
||||
// biome-ignore-end lint/nursery/useIterableCallbackReturn: benign
|
||||
|
||||
let pokerusCursorIndex = 0;
|
||||
this.starterContainers.forEach((container, i) => {
|
||||
|
||||
@ -6,10 +6,8 @@ import { TextStyle } from "#enums/text-style";
|
||||
import { UiMode } from "#enums/ui-mode";
|
||||
import { AchvBar } from "#ui/containers/achv-bar";
|
||||
import type { BgmBar } from "#ui/containers/bgm-bar";
|
||||
import { PokedexPageUiHandler } from "#ui/handlers/pokedex-page-ui-handler";
|
||||
import { SavingIconHandler } from "#ui/containers/saving-icon-handler";
|
||||
import { GamepadBindingUiHandler } from "#ui/gamepad-binding-ui-handler";
|
||||
import { PokedexUiHandler } from "#ui/handlers/pokedex-ui-handler";
|
||||
import { AchvsUiHandler } from "#ui/handlers/achvs-ui-handler";
|
||||
import { AutoCompleteUiHandler } from "#ui/handlers/autocomplete-ui-handler";
|
||||
import { AwaitableUiHandler } from "#ui/handlers/awaitable-ui-handler";
|
||||
@ -33,7 +31,9 @@ import { MessageUiHandler } from "#ui/handlers/message-ui-handler";
|
||||
import { ModifierSelectUiHandler } from "#ui/handlers/modifier-select-ui-handler";
|
||||
import { MysteryEncounterUiHandler } from "#ui/handlers/mystery-encounter-ui-handler";
|
||||
import { PartyUiHandler } from "#ui/handlers/party-ui-handler";
|
||||
import { PokedexPageUiHandler } from "#ui/handlers/pokedex-page-ui-handler";
|
||||
import { PokedexScanUiHandler } from "#ui/handlers/pokedex-scan-ui-handler";
|
||||
import { PokedexUiHandler } from "#ui/handlers/pokedex-ui-handler";
|
||||
import { RegistrationFormUiHandler } from "#ui/handlers/registration-form-ui-handler";
|
||||
import { RenameFormUiHandler } from "#ui/handlers/rename-form-ui-handler";
|
||||
import { RunHistoryUiHandler } from "#ui/handlers/run-history-ui-handler";
|
||||
|
||||
@ -41,8 +41,8 @@ export function isPassiveAvailable(speciesId: number): boolean {
|
||||
const starterData = globalScene.gameData.starterData[speciesId];
|
||||
|
||||
return (
|
||||
starterData.candyCount >= getPassiveCandyCount(speciesStarterCosts[speciesId]) &&
|
||||
!(starterData.passiveAttr & Passive.UNLOCKED)
|
||||
starterData.candyCount >= getPassiveCandyCount(speciesStarterCosts[speciesId])
|
||||
&& !(starterData.passiveAttr & Passive.UNLOCKED)
|
||||
);
|
||||
}
|
||||
|
||||
@ -56,9 +56,8 @@ export function isValueReductionAvailable(speciesId: number): boolean {
|
||||
const starterData = globalScene.gameData.starterData[speciesId];
|
||||
|
||||
return (
|
||||
starterData.candyCount >=
|
||||
getValueReductionCandyCounts(speciesStarterCosts[speciesId])[starterData.valueReduction] &&
|
||||
starterData.valueReduction < VALUE_REDUCTION_MAX
|
||||
starterData.candyCount >= getValueReductionCandyCounts(speciesStarterCosts[speciesId])[starterData.valueReduction]
|
||||
&& starterData.valueReduction < VALUE_REDUCTION_MAX
|
||||
);
|
||||
}
|
||||
|
||||
@ -265,8 +264,8 @@ export function getDexAttrFromPreferences(speciesId: number, starterPreferences:
|
||||
* If neither of these pass, we add DexAttr.MALE to our temp props
|
||||
*/
|
||||
if (
|
||||
starterPreferences[speciesId]?.female ||
|
||||
((caughtAttr & DexAttr.FEMALE) > 0n && (caughtAttr & DexAttr.MALE) === 0n)
|
||||
starterPreferences[speciesId]?.female
|
||||
|| ((caughtAttr & DexAttr.FEMALE) > 0n && (caughtAttr & DexAttr.MALE) === 0n)
|
||||
) {
|
||||
props += DexAttr.FEMALE;
|
||||
} else {
|
||||
@ -276,8 +275,8 @@ export function getDexAttrFromPreferences(speciesId: number, starterPreferences:
|
||||
* If they're not there, it enables shiny state by default if any shiny was caught
|
||||
*/
|
||||
if (
|
||||
starterPreferences[speciesId]?.shiny ||
|
||||
((caughtAttr & DexAttr.SHINY) > 0n && starterPreferences[speciesId]?.shiny !== false)
|
||||
starterPreferences[speciesId]?.shiny
|
||||
|| ((caughtAttr & DexAttr.SHINY) > 0n && starterPreferences[speciesId]?.shiny !== false)
|
||||
) {
|
||||
props += DexAttr.SHINY;
|
||||
if (starterPreferences[speciesId]?.variant !== undefined) {
|
||||
@ -333,9 +332,9 @@ export function getSpeciesDetailsFromPreferences(species: PokemonSpecies, starte
|
||||
formIndex: props.formIndex,
|
||||
female: props.female,
|
||||
variant: props.variant,
|
||||
abilityIndex: abilityIndex,
|
||||
abilityIndex,
|
||||
natureIndex: nature,
|
||||
teraType: teraType,
|
||||
teraType,
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user